client_side_validations 3.2.5 → 4.2.12

data/lib/client_side_validations/engine.rb

@@ -3,4 +3,3 @@ module ClientSideValidations
     config.app_middleware.use ClientSideValidations::Middleware::Validators
   end
 end
-

data/lib/client_side_validations/generators/rails_validations.rb

@@ -3,8 +3,8 @@ module ClientSideValidations
     class RailsValidations
       def self.assets
         [{
-          :path => File.expand_path('../../../../vendor/assets/javascripts', __FILE__),
-          :file => 'rails.validations.js'
+          path: File.expand_path('../../../../vendor/assets/javascripts', __FILE__),
+          file: 'rails.validations.js'
         }]
       end
 
@@ -12,4 +12,3 @@ module ClientSideValidations
     end
   end
 end
-

data/lib/client_side_validations/generators.rb

@@ -1,12 +1,15 @@
 module ClientSideValidations
   module Generators
-    Assets = []
+    @@assets = []
 
     def self.register_assets(klass)
-      Assets.push(*klass.assets)
+      @@assets.concat(klass.assets)
+    end
+
+    def self.assets
+      @@assets
     end
   end
 end
 
 require 'client_side_validations/generators/rails_validations'
-

data/lib/client_side_validations/middleware.rb

@@ -1,9 +1,6 @@
-# encoding: utf-8
-
 require 'client_side_validations/core_ext'
 
 module ClientSideValidations
-
   module Middleware
     class Validators
       def initialize(app)
@@ -11,16 +8,33 @@ module ClientSideValidations
       end
 
       def call(env)
-        if matches = /^\/validators\/(\w+)$/.match(env['PATH_INFO'])
-          if ClientSideValidations::Config.disabled_validators.include?(matches[1].to_sym)
-            [500, {'Content-Type' => 'application/json', 'Content-Length' => '0'}, ['']]
-          else
-            "::ClientSideValidations::Middleware::#{matches[1].camelize}".constantize.new(env).response
-          end
+        matches = %r{\A/?#{ClientSideValidations::Config.root_path}/validators\/(\w+)\z}.match(env['PATH_INFO'])
+        if matches
+          process_request(matches.captures.first, env)
         else
           @app.call(env)
         end
       end
+
+      def process_request(validation, env)
+        if disabled_validators.include?(validation)
+          error_resp
+        else
+          klass_name = validation.camelize
+          klass_name = "::ClientSideValidations::Middleware::#{klass_name}"
+          klass_name.constantize.new(env).response
+        end
+      rescue
+        error_resp
+      end
+
+      def disabled_validators
+        ClientSideValidations::Config.disabled_validators.map(&:to_s)
+      end
+
+      def error_resp
+        [500, { 'Content-Type' => 'application/json', 'Content-Length' => '0' }, ['']]
+      end
     end
 
     class Base
@@ -35,7 +49,7 @@ module ClientSideValidations
       end
 
       def response
-        [status, {'Content-Type' => content_type, 'Content-Length' => body.length.to_s}, [body]]
+        [status, { 'Content-Type' => content_type, 'Content-Length' => body.length.to_s }, [body]]
       end
 
       def content_type
@@ -44,13 +58,13 @@ module ClientSideValidations
     end
 
     class Uniqueness < Base
-      IGNORE_PARAMS = %w{case_sensitive id scope}
-      REGISTERED_ORMS = []
+      IGNORE_PARAMS = %w(case_sensitive id scope).freeze
+      @@registered_orms = []
       class NotValidatable < StandardError; end
 
       def response
         begin
-          if is_unique?
+          if unique?
             self.status = 404
             self.body   = 'true'
           else
@@ -69,7 +83,7 @@ module ClientSideValidations
       end
 
       def self.registered_orms
-        REGISTERED_ORMS
+        @@registered_orms
       end
 
       def registered_orms
@@ -78,7 +92,7 @@ module ClientSideValidations
 
       private
 
-      def is_unique?
+      def unique?
         convert_scope_value_from_null_to_nil
         klass, attribute, value = extract_resources
         middleware_class        = nil
@@ -88,29 +102,26 @@ module ClientSideValidations
         end
 
         registered_orms.each do |orm|
-          if orm.is_class?(klass)
+          if orm.class?(klass)
             middleware_class = orm
             break
           end
         end
 
-        middleware_class.is_unique?(klass, attribute, value, request.params)
+        middleware_class.unique?(klass, attribute, value, request.params)
       end
 
       def convert_scope_value_from_null_to_nil
-        if request.params['scope']
-          request.params['scope'].each do |key, value|
-            if value == 'null'
-              request.params['scope'][key] = nil
-            end
-          end
+        return unless request.params['scope']
+        request.params['scope'].each do |key, value|
+          request.params['scope'][key] = nil if value == 'null'
         end
       end
 
       def extract_resources
         parent_key = (request.params.keys - IGNORE_PARAMS).first
-   
-        if nested?(request.params[parent_key], 1) 
+
+        if nested?(request.params[parent_key], 1)
           klass, attribute, value = uproot(request.params[parent_key])
           klass = klass.classify.constantize
         else
@@ -137,14 +148,12 @@ module ClientSideValidations
 
       def nested?(hash = nil, levels = 0)
         i = 0
-        until !(hash.respond_to? :keys)
+        while hash.respond_to? :keys
           hash = hash[hash.keys.first]
           i += 1
         end
         i > levels
       end
-
     end
   end
 end
-

data/lib/client_side_validations/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
-  VERSION = '3.2.5'
+  VERSION = '4.2.12'.freeze
 end

data/lib/client_side_validations.rb

@@ -10,4 +10,3 @@ if defined?(::Rails)
   require 'client_side_validations/middleware'
   require 'client_side_validations/engine'
 end
-

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -1,18 +1,14 @@
 module ClientSideValidations
   module Generators
     class CopyAssetsGenerator < Rails::Generators::Base
-
       def copy_javascript_asset
-        if self.class == CopyAssetsGenerator || !asset_pipeline_enabled?
-          assets.each do |asset|
-            source_paths << asset[:path]
-            copy_file asset[:file], "#{asset_directory}/#{asset[:file]}"
-          end
+        return unless self.class == CopyAssetsGenerator || !asset_pipeline_enabled?
+        assets.each do |asset|
+          source_paths << asset[:path]
+          copy_file asset[:file], "#{asset_directory}/#{asset[:file]}"
         end
       end
 
-      private
-
       def self.asset_directory
         if asset_pipeline_enabled?
           "app#{Rails.configuration.assets.prefix}/javascripts"
@@ -21,16 +17,8 @@ module ClientSideValidations
         end
       end
 
-      def asset_directory
-        CopyAssetsGenerator.asset_directory
-      end
-
       def self.assets
-        Assets
-      end
-
-      def assets
-        CopyAssetsGenerator.assets
+        ClientSideValidations::Generators.assets
       end
 
       def self.asset_file_names
@@ -38,13 +26,8 @@ module ClientSideValidations
       end
 
       def self.asset_pipeline_enabled?
-        if Rails.application
-          (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets || {}) : {})[:enabled]
-        end
-      end
-
-      def asset_pipeline_enabled?
-        self.class.asset_pipeline_enabled?
+        # Rails 4.1 doesn't provide :enabled in asset configuration, so we look for Sprockets
+        defined?(Sprockets).present?
       end
 
       def self.installation_message
@@ -52,7 +35,20 @@ module ClientSideValidations
       end
 
       desc installation_message
+
+      private
+
+      def asset_directory
+        CopyAssetsGenerator.asset_directory
+      end
+
+      def assets
+        CopyAssetsGenerator.assets
+      end
+
+      def asset_pipeline_enabled?
+        self.class.asset_pipeline_enabled?
+      end
     end
   end
 end
-

data/lib/generators/client_side_validations/install_generator.rb

@@ -3,14 +3,11 @@ require 'generators/client_side_validations/copy_assets_generator'
 module ClientSideValidations
   module Generators
     class InstallGenerator < CopyAssetsGenerator
-
       def copy_initializer
         source_paths << File.expand_path('../../templates/client_side_validations', __FILE__)
         copy_file 'initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
-      private
-
       def self.installation_message
         "Copies initializer into config/initializers and #{super.downcase}"
       end
@@ -19,4 +16,3 @@ module ClientSideValidations
     end
   end
 end
-

data/lib/generators/templates/client_side_validations/initializer.rb

@@ -1,12 +1,16 @@
 # ClientSideValidations Initializer
 
-# Uncomment to disable uniqueness validator, possible security issue
+# Disabled validators. The uniqueness validator is disabled by default for security issues. Enable it on your own responsibility!
 # ClientSideValidations::Config.disabled_validators = [:uniqueness]
 
 # Uncomment to validate number format with current I18n locale
 # ClientSideValidations::Config.number_format_with_locale = true
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
+#
+# Note: client_side_validation requires the error to be encapsulated within
+# <label for="#{instance.send(:tag_id)}" class="message"></label>
+#
 # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
 #   unless html_tag =~ /^<label/
 #     %{<div class="field_with_errors">#{html_tag}<label for="#{instance.send(:tag_id)}" class="message">#{instance.error_message.first}</label></div>}.html_safe
@@ -14,4 +18,3 @@
 #     %{<div class="field_with_errors">#{html_tag}</div>}.html_safe
 #   end
 # end
-