From 9f27ef84299764a7a8941a36eaf2b4a0db509f66 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Fri, 6 Feb 2015 06:00:07 +0000
Subject: [PATCH] VRFS-2698 renamed url_validator to site_validator

---
 ...alidator.js.coffee => site_validator.js.coffee} |  4 ++--
 ..._validator.css.scss => site_validator.css.scss} |  2 +-
 web/app/controllers/api_users_controller.rb        |  2 +-
 ...lidator.html.slim => _site_validator.html.slim} |  3 +--
 web/app/views/spikes/site_validate.html.slim       | 10 +++++-----
 web/app/views/spikes/username_validate.html.slim   | 14 ++++++++++++++
 6 files changed, 24 insertions(+), 11 deletions(-)
 rename web/app/assets/javascripts/{url_validator.js.coffee => site_validator.js.coffee} (94%)
 rename web/app/assets/stylesheets/client/{url_validator.css.scss => site_validator.css.scss} (97%)
 rename web/app/views/clients/{_url_validator.html.slim => _site_validator.html.slim} (75%)
 create mode 100644 web/app/views/spikes/username_validate.html.slim

diff --git a/web/app/assets/javascripts/url_validator.js.coffee b/web/app/assets/javascripts/site_validator.js.coffee
similarity index 94%
rename from web/app/assets/javascripts/url_validator.js.coffee
rename to web/app/assets/javascripts/site_validator.js.coffee
index 08546ac31..dfa89b1c4 100644
--- a/web/app/assets/javascripts/url_validator.js.coffee
+++ b/web/app/assets/javascripts/site_validator.js.coffee
@@ -2,13 +2,13 @@ $ = jQuery
 context = window
 context.JK ||= {};
 
-context.JK.UrlValidator = class UrlValidator
+context.JK.SiteValidator = class SiteValidator
 
   constructor: (site_type) ->
     @EVENTS = context.JK.EVENTS
     @rest = context.JK.Rest()
     @site_type = site_type
-    @input_div = $(".url_validator#"+site_type+"_url")
+    @input_div = $(".site_validator#"+site_type+"_validator")
     @data_input = @input_div.find('input')
     this.show_format_status()
     @logger = context.JK.logger
diff --git a/web/app/assets/stylesheets/client/url_validator.css.scss b/web/app/assets/stylesheets/client/site_validator.css.scss
similarity index 97%
rename from web/app/assets/stylesheets/client/url_validator.css.scss
rename to web/app/assets/stylesheets/client/site_validator.css.scss
index 6ce18ea57..549d58594 100644
--- a/web/app/assets/stylesheets/client/url_validator.css.scss
+++ b/web/app/assets/stylesheets/client/site_validator.css.scss
@@ -1,6 +1,6 @@
 @import "client/common";
 
-.url_validator {
+.site_validator {
   input {
     width: 100%;
     padding: 5px;
diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb
index f206037f2..f31dd0ea0 100644
--- a/web/app/controllers/api_users_controller.rb
+++ b/web/app/controllers/api_users_controller.rb
@@ -711,7 +711,7 @@ class ApiUsersController < ApiController
       url = Utils.username_url(data, site)
     end
     unless url.blank?
-      if errmsg = Utils.url_validator(url)
+      if errmsg = Utils.site_validator(url)
         render json: { message: 'Invalid Site', errors: { site: [errmsg] } }, status: 200
       else
         render json: { message: 'Valid Site' }, status: 200
diff --git a/web/app/views/clients/_url_validator.html.slim b/web/app/views/clients/_site_validator.html.slim
similarity index 75%
rename from web/app/views/clients/_url_validator.html.slim
rename to web/app/views/clients/_site_validator.html.slim
index bd4d3d422..d66dcf917 100644
--- a/web/app/views/clients/_url_validator.html.slim
+++ b/web/app/views/clients/_site_validator.html.slim
@@ -1,7 +1,6 @@
-div class="url_validator" id="#{site_type}_url"
+div class="site_validator" id="#{site_type}_validator"
   span class="validate-checkmark"
   span class="spinner-small upload-spinner"
   input type='text' id="validate_input_#{site_type}" maxlength="2000"
   br
   div class="error"
-  
diff --git a/web/app/views/spikes/site_validate.html.slim b/web/app/views/spikes/site_validate.html.slim
index b2f58273b..cd0a475e7 100644
--- a/web/app/views/spikes/site_validate.html.slim
+++ b/web/app/views/spikes/site_validate.html.slim
@@ -1,14 +1,14 @@
-= javascript_include_tag "url_validator"
+= javascript_include_tag "site_validator"
 div style="width:50%"
-  = render "clients/url_validator", site_type: 'url'
-= stylesheet_link_tag "client/url_validator"
+  = render "clients/site_validator", site_type: 'url'
+= stylesheet_link_tag "client/site_validator"
 
 javascript:
   var initialized = false;
   $(document).on('JAMKAZAM_READY', function(e, data) {
       setTimeout(function() {
-        window.url_validator = new JK.UrlValidator('url')
-        url_validator.init()
+        window.site_validator = new JK.SiteValidator('url')
+        site_validator.init()
         $('#validate_input_url').val('http://www.jamkazam.com')
       }, 1)
   })
diff --git a/web/app/views/spikes/username_validate.html.slim b/web/app/views/spikes/username_validate.html.slim
new file mode 100644
index 000000000..2af35bb8a
--- /dev/null
+++ b/web/app/views/spikes/username_validate.html.slim
@@ -0,0 +1,14 @@
+= javascript_include_tag "site_validator"
+div style="width:50%"
+  = render "clients/site_validator", site_type: 'youtube'
+= stylesheet_link_tag "client/site_validator"
+
+javascript:
+  var initialized = false;
+  $(document).on('JAMKAZAM_READY', function(e, data) {
+      setTimeout(function() {
+        window.site_validator = new JK.SiteValidator('youtube')
+        site_validator.init()
+        $('#validate_input_youtube').val('jonathankolyer')
+      }, 1)
+  })