client_side_validations 3.1.0 → 3.2.0

data/lib/client_side_validations/active_record/uniqueness.rb

@@ -1,10 +1,11 @@
 module ClientSideValidations::ActiveRecord
   module Uniqueness
-    def client_side_hash(model, attribute)
+    def client_side_hash(model, attribute, force = nil)
       hash = {}
-      hash[:message] = model.errors.generate_message(attribute, message_type, options.except(:scope))
+      hash[:message]        = model.errors.generate_message(attribute, message_type, options.except(:scope))
       hash[:case_sensitive] = options[:case_sensitive]
-      hash[:id] = model.id unless model.new_record?
+      hash[:id]             = model.id unless model.new_record?
+      hash[:allow_blank]    = true if options[:allow_blank]
       if options.key?(:scope) && options[:scope].present?
         hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
           scope_hash.merge!(scope_item => model.send(scope_item))

data/lib/client_side_validations/active_record.rb

@@ -1,4 +1,5 @@
 require 'client_side_validations/active_model'
+require 'client_side_validations/middleware'
 require 'client_side_validations/active_record/middleware'
 
 %w{uniqueness}.each do |validator|
@@ -8,4 +9,4 @@ require 'client_side_validations/active_record/middleware'
 end
 
 ActiveRecord::Base.send(:include, ClientSideValidations::ActiveModel::Validations)
-
+ClientSideValidations::Middleware::Uniqueness.register_orm(ClientSideValidations::ActiveRecord::Middleware)

data/lib/client_side_validations/config.rb

@@ -0,0 +1,9 @@
+module ClientSideValidations
+  module Config
+    class << self
+      attr_accessor :disabled_validators
+    end
+
+    self.disabled_validators = []
+  end
+end

data/lib/client_side_validations/core_ext/regexp.rb

@@ -1,6 +1,6 @@
 class Regexp
   def as_json(options = nil)
-    Regexp.new inspect.sub("\\A","^").sub("\\Z","$").sub("\\z","$").sub(/^\//,"").sub(/\/[a-z]*$/,""), self.options
+    Regexp.new inspect.sub('\\A','^').sub('\\Z','$').sub('\\z','$').sub(/^\//,'').sub(/\/[a-z]*$/,'').gsub(/\(\?#.+\)/, '').gsub(/\(\?-\w+:/,'(').gsub(/\s/,''), self.options & 5
   end
 
   def to_json(options = nil)
@@ -11,4 +11,3 @@ class Regexp
     inspect
   end
 end
-

data/lib/client_side_validations/generators/rails_validations.rb

@@ -0,0 +1,15 @@
+module ClientSideValidations
+  module Generators
+    class RailsValidations
+      def self.assets
+        [{
+          :path => File.expand_path('../../../../vendor/assets/javascripts', __FILE__),
+          :file => 'rails.validations.js'
+        }]
+      end
+
+      Generators.register_assets(self)
+    end
+  end
+end
+

data/lib/client_side_validations/generators.rb

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

data/lib/client_side_validations/middleware.rb

@@ -11,9 +11,12 @@ module ClientSideValidations
       end
 
       def call(env)
-        case env['PATH_INFO']
-        when %r{\/validators\/(\w+)}
-          "::ClientSideValidations::Middleware::#{$1.camelize}".constantize.new(env).response
+        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
         else
           @app.call(env)
         end
@@ -24,9 +27,11 @@ module ClientSideValidations
       attr_accessor :request, :body, :status
 
       def initialize(env)
-        self.body    = ''
-        self.status  = 200
-        self.request = ActionDispatch::Request.new(env)
+        # Filter out cache buster
+        env['QUERY_STRING'] = env['QUERY_STRING'].split('&').select { |p| !p.match(/^_=/) }.join('&')
+        self.body           = ''
+        self.status         = 200
+        self.request        = ActionDispatch::Request.new(env)
       end
 
       def response
@@ -40,35 +45,69 @@ module ClientSideValidations
 
     class Uniqueness < Base
       IGNORE_PARAMS = %w{case_sensitive id scope}
+      REGISTERED_ORMS = []
+      class NotValidatable < StandardError; end
 
       def response
-        if is_unique?
-          self.status = 404
-          self.body   = 'true'
-        else
-          self.status = 200
-          self.body   = 'false'
+        begin
+          if is_unique?
+            self.status = 404
+            self.body   = 'true'
+          else
+            self.status = 200
+            self.body   = 'false'
+          end
+        rescue NotValidatable
+          self.status = 500
+          self.body = ''
         end
         super
       end
 
+      def self.register_orm(orm)
+        registered_orms << orm
+      end
+
+      def self.registered_orms
+        REGISTERED_ORMS
+      end
+
+      def registered_orms
+        self.class.registered_orms
+      end
+
       private
 
       def is_unique?
-        resource = extract_resource
-        klass = resource.classify.constantize
-        attribute = request.params[resource].keys.first
-        value = request.params[resource][attribute]
-
-        if (defined?(::ActiveRecord::Base) && klass < ::ActiveRecord::Base)
-          middleware_klass = ClientSideValidations::ActiveRecord::Middleware
-        elsif (defined?(::Mongoid::Document) && klass.included_modules.include?(::Mongoid::Document))
-          middleware_klass = ClientSideValidations::Mongoid::Middleware
-        elsif (defined?(::MongoMapper::Document) && klass.included_modules.include?(::MongoMapper::Document))
-          middleware_klass = ClientSideValidations::MongoMapper::Middleware
+        convert_scope_value_from_null_to_nil
+        resource         = extract_resource
+        klass            = resource.classify.constantize
+        attribute        = request.params[resource].keys.first
+        value            = request.params[resource][attribute]
+        middleware_class = nil
+
+        unless Array.wrap(klass._validators[attribute.to_sym]).find { |v| v.kind == :uniqueness }
+          raise NotValidatable
+        end
+
+        registered_orms.each do |orm|
+          if orm.is_class?(klass)
+            middleware_class = orm
+            break
+          end
         end
 
-        middleware_klass.is_unique?(klass, attribute, value, request.params)
+        middleware_class.is_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
+        end
       end
 
       def extract_resource

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/client_side_validations.rb

@@ -1,12 +1,12 @@
 module ClientSideValidations
 end
 
+require 'client_side_validations/config'
 require 'client_side_validations/active_model'  if defined?(::ActiveModel)
 require 'client_side_validations/active_record' if defined?(::ActiveRecord)
-require 'client_side_validations/mongoid'       if defined?(::Mongoid)
-require 'client_side_validations/mongo_mapper'  if defined?(::MongoMapper)
 require 'client_side_validations/action_view'   if defined?(::ActionView)
 if defined?(::Rails)
+  require 'client_side_validations/generators'
   require 'client_side_validations/middleware'
   require 'client_side_validations/engine'
 end

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -0,0 +1,58 @@
+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
+        end
+      end
+
+      private
+
+      def self.asset_directory
+        if asset_pipeline_enabled?
+          "app#{Rails.configuration.assets.prefix}/javascripts"
+        else
+          'public/javascripts'
+        end
+      end
+
+      def asset_directory
+        CopyAssetsGenerator.asset_directory
+      end
+
+      def self.assets
+        Assets
+      end
+
+      def assets
+        CopyAssetsGenerator.assets
+      end
+
+      def self.asset_file_names
+        assets.map { |asset| asset[:file] }.join(', ')
+      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?
+      end
+
+      def self.installation_message
+        "Copies #{asset_file_names} to #{asset_directory}"
+      end
+
+      desc installation_message
+    end
+  end
+end
+

data/lib/generators/client_side_validations/install_generator.rb

@@ -1,33 +1,21 @@
+require 'generators/client_side_validations/copy_assets_generator'
+
 module ClientSideValidations
   module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates/client_side_validations', __FILE__)
-
-      if Rails.version >= '3.1'
-        desc 'Creates a ClientSideValidations initializer.'
-      else
-        desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
-      end
+    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
 
-      def copy_javascript_asset
-        if Rails.version >= '3.0'
-          if Rails.version < '3.1'
-            copy_file '../../../../vendor/assets/javascripts/rails.validations.js', 'public/javascripts/rails.validations.js'
-          end
-        end
-      end
+      private
 
-      def show_readme
-        if Rails.version >= '3.1'
-          readme 'README.rails.3.1' if behavior == :invoke
-        else
-          readme 'README.rails.3.0' if behavior == :invoke
-        end
+      def self.installation_message
+        "Copies initializer into config/initializers and #{super.downcase}"
       end
+
+      desc installation_message
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # ClientSideValidations Initializer
 
-require 'client_side_validations/simple_form' if defined?(::SimpleForm)
-require 'client_side_validations/formtastic'  if defined?(::Formtastic)
+# Uncomment to disable uniqueness validator, possible security issue
+# ClientSideValidations::Config.disabled_validators = [:uniqueness]
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
 # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|