client_side_validations 2.9.6 → 2.9.8

data/lib/client_side_validations.rb

@@ -29,7 +29,7 @@ module ClientSideValidations
         # the first element of the array for id, even if it is nil
         id                  = [params["#{resource}[id]"]].flatten.first
         body                = is_unique?(resource, attribute, value, id).to_s
-        [200, {'Content-Type' => 'application/json', 'Content-Length' => "#{body.length}"}, body]
+        [200, {'Content-Type' => 'application/json', 'Content-Length' => "#{body.length}"}, [body]]
       else
         @app.call(env)
       end

data/lib/client_side_validations/adapters/action_view.rb

@@ -9,17 +9,18 @@ module ClientSideValidations
             attr_accessor :validate_options
             
             define_method(:form_for) do |record_or_name_or_array, *args, &proc|
-              options = Hash.new { |h, k| h[k] = {}}
-              options.merge!(args.extract_options!.symbolize_keys!)
+              options = args.extract_options!.symbolize_keys!
               script = ""
               if validations = options.delete(:validations)
-                set_validate_options(validations, record_or_name_or_array)
+                set_validate_options(validations, record_or_name_or_array, options)
+                unless options.has_key?(:html)
+                  options[:html] = {}
+                end
                 options[:html]['data-csv'] = validate_options.delete('data-csv')
                 script = %{<script type='text/javascript'>var #{options[:html]['data-csv']}_validate_options=#{validate_options.to_json};</script>}
               end
-              args << {}.merge(options)
+              args << options
               result = form_method.bind(self).call(record_or_name_or_array, *args, &proc)
-              
               if rails3?
                 result += script.html_safe
               else
@@ -40,34 +41,34 @@ module ClientSideValidations
           !version.blank? && version >= 3
         end
         
-        def set_validate_options(validations, record_or_name_or_array)
+        def set_validate_options(validations, record_or_name_or_array, form_for_options)
           options = ::ClientSideValidations.default_options || { }
           
           case validations
           when true
-            object_name      = get_object_name(record_or_name_or_array)
-            data_csv         = get_data_csv(record_or_name_or_array)
+            object_name      = get_object_name(record_or_name_or_array, form_for_options)
+            data_csv         = get_data_csv(record_or_name_or_array, form_for_options)
             validate_options = rules_and_messages(record_or_name_or_array)
           when Hash
             validations.symbolize_keys!
             if validations.has_key?(:instance)
-              object_name      = get_object_name(validations[:instance])
-              data_csv         = get_data_csv(validations[:instance])
+              object_name      = get_object_name(validations[:instance], form_for_options)
+              data_csv         = get_data_csv(validations[:instance], form_for_options)
               validate_options = validations[:instance].validate_options
             elsif validations.has_key?(:class)
-              object_name      = get_object_name(validations[:class].new)
-              data_csv         = get_data_csv(validations[:instance].new)
+              object_name      = get_object_name(validations[:class], form_for_options)
+              data_csv         = get_data_csv(validations[:class], form_for_options)
               validate_options = validations[:class].new.validate_options
             else
-              object_name      = get_object_name(record_or_name_or_array)
-              data_csv         = get_data_csv(record_or_name_or_array)
+              object_name      = get_object_name(record_or_name_or_array, form_for_options)
+              data_csv         = get_data_csv(record_or_name_or_array, form_for_options)
               validate_options = rules_and_messages(record_or_name_or_array)
             end
 
             options.merge!(validations[:options] || {})
           else
-            object_name      = get_object_name(validations)
-            data_csv         = get_data_csv(validations)
+            object_name      = get_object_name(validations, form_for_options)
+            data_csv         = get_data_csv(validations, form_for_options)
             validate_options = validations.new.validate_options
           end
           
@@ -86,14 +87,6 @@ module ClientSideValidations
           validate_options
         end
         
-        def convert_options_to_json(options)
-          json = []
-          options.each do |k, v|
-            json << %{#{k}:#{v}}
-          end
-          %{{#{json.join(',')}}}
-        end
-        
         def rules_and_messages(record_or_name_or_array)
           case record_or_name_or_array
           when String, Symbol
@@ -105,32 +98,36 @@ module ClientSideValidations
           end
         end
         
-        def get_data_csv(object)
+        def get_data_csv(object, form_for_options)
           case object
           when String, Symbol
-            object.to_s
+            form_for_options[:as] || object.to_s
           when Array
-            get_data_csv(object.last)
+            get_data_csv(object.last, form_for_options)
           when Class
-            object.to_s.underscore
+            form_for_options[:as] || object.to_s.underscore
           else
-            dom_id(object)
+            if object.respond_to?(:persisted?) && object.persisted?
+              form_for_options[:as] ? "#{form_for_options[:as]}_edit" : dom_id(object)
+            else
+              form_for_options[:as] ? "#{form_for_options[:as]}_new" : dom_id(object)
+            end
           end
         end
         
-        def get_object_name(object)
+        def get_object_name(object, form_for_options)
           case object
           when String, Symbol
-            object.to_s
+            form_for_options[:as] || object.to_s
           when Array
-            get_object_name(object.last)
+            get_object_name(object.last, form_for_options)
           when Class
-            get_object_name(object.new)
+            get_object_name(object.new, form_for_options)
           else
             if rails3?
-              ::ActiveModel::Naming.singular(object)
+              form_for_options[:as] || ::ActiveModel::Naming.singular(object)
             else
-              ::ActionController::RecordIdentifier.singular_class_name(object)
+              form_for_options[:as] || ::ActionController::RecordIdentifier.singular_class_name(object)
             end
           end
         end

data/lib/client_side_validations/adapters/active_model.rb

@@ -73,7 +73,11 @@ module ClientSideValidations
           if defined?(ActiveRecord) && base.kind_of?(ActiveRecord::Base)
             I18n.translate('activerecord.errors.messages.taken')
           elsif defined?(Mongoid) && base.class.included_modules.include?(Mongoid::Document)
-            I18n.translate('errors.messages.taken')
+            if ruby18?
+              I18n.translate('errors.messages.taken')
+            else
+              I18n.translate('activemodel.errors.messages.taken')
+            end
           end
         when :confirmation
           I18n.translate(i18n_prefix + 'errors.messages.confirmation')
@@ -99,6 +103,18 @@ module ClientSideValidations
         validation.kind.to_s
       end
       
+      def ruby18?
+        ruby_split[0] == '1' && ruby_split[1] == '8'
+      end
+
+      def ruby19?
+        ruby_split[0] == '1' && ruby_split[1] == '9'
+      end
+
+      def ruby_split
+        RUBY_VERSION.split('.')
+      end
+      
       def i18n_prefix
         if defined?(::ActiveModel)
           ''

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: client_side_validations
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 59
   prerelease: false
   segments: 
   - 2
   - 9
-  - 6
-  version: 2.9.6
+  - 8
+  version: 2.9.8
 platform: ruby
 authors: 
 - Brian Cardarella