client_side_validations 3.0.2 → 3.0.3

data/lib/client_side_validations/action_view/form_builder.rb

@@ -54,11 +54,25 @@ module ClientSideValidations::ActionView::Helpers
   private
 
     def apply_client_side_validators(method, options = {})
-      if @options[:validate] && options[:validate] != false && validators = @object.client_side_validation_hash[method]
+      if @options[:validate] && options[:validate] != false && validators = filter_validators(@object.client_side_validation_hash[method], options[:validate])
         options.merge!("data-validate" => true)
         @options[:validators].merge!("#{@object_name}[#{method}]" => validators)
       end
     end
 
+    def filter_validators(validators, filters)
+      if validators
+        filtered_validators = validators.inject({}) do |filtered_validators, validator|
+          unless filters && filters.key?(validator.first) && !filters[validator.first]
+            filtered_validators[validator.first] = validator.last
+          end
+
+          filtered_validators
+        end
+
+        filtered_validators.empty? ? nil : filtered_validators
+      end
+    end
+
   end
 end

data/lib/client_side_validations/action_view/form_helper.rb

@@ -6,10 +6,9 @@ module ClientSideValidations::ActionView::Helpers
       options = args.extract_options!
       if options[:validate]
 
-        # Turn off SimpleForm's HTML5 Form Validations
-        if options[:builder].to_s == 'SimpleForm::FormBuilder'
-          options[:html][:novalidate] = true
-        end
+        # Always turn off HTML5 Validations
+        options[:html] ||= {}
+        options[:html][:novalidate] = true
 
         case record_or_name_or_array
         when String, Symbol
@@ -37,7 +36,7 @@ module ClientSideValidations::ActionView::Helpers
 
     def fields_for(record_or_name_or_array, *args, &block)
       output = super
-      @validators.merge!(args.last[:validators])
+      @validators.merge!(args.last[:validators]) if @validators
       output
     end
 

data/lib/client_side_validations/active_model.rb

@@ -17,7 +17,7 @@ module ClientSideValidations::ActiveModel
 
   module Validations
     def client_side_validation_hash
-      _validators.except(nil).inject({}) do |attr_hash, attr|
+      _validators.except(nil, :block).inject({}) do |attr_hash, attr|
 
         validator_hash = attr[1].inject({}) do |kind_hash, validator|
           client_side_hash = validator.client_side_hash(self, attr[0])
@@ -36,7 +36,7 @@ module ClientSideValidations::ActiveModel
     private
 
     def can_use_for_client_side_validation?(client_side_hash, validator)
-      ((self.respond_to?(:new_record?) && client_side_hash[:on] == (self.new_record? ? :create : :update)) || client_side_hash[:on].nil?) && !validator.options.key?(:if) && !validator.options.key?(:unless)
+      ((self.respond_to?(:new_record?) && client_side_hash[:on] == (self.new_record? ? :create : :update)) || client_side_hash[:on].nil?) && !validator.options.key?(:if) && !validator.options.key?(:unless) && validator.kind != :block
     end
   end
 end

data/lib/client_side_validations/active_record/middleware.rb

@@ -8,7 +8,11 @@ module ClientSideValidations::ActiveRecord
       t = klass.arel_table
 
       if params[:case_sensitive] == 'true'
-        relation = t[attribute].eq(value)
+        if t.engine.connection.instance_variable_get("@config")[:adapter] == 'mysql'
+          relation = Arel::Nodes::SqlLiteral.new("BINARY #{t[attribute].eq(value).to_sql}")
+        else
+          relation = t[attribute].eq(value)
+        end
       else
         relation = t[attribute].matches(value)
       end

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/test/action_view/cases/helper.rb

@@ -91,7 +91,9 @@ module ActionViewTestSetup
     txt << %{ class="#{html_class}"} if html_class
     txt << %{ data-validate="true"} if validators
     txt << %{ id="#{id}"} if id
-    txt << %{ method="post">}
+    txt << %{ method="post"}
+    txt << %{ novalidate="novalidate"} if validators
+    txt << %{>}
   end
 
   def whole_form(action = "http://www.example.com", id = nil, html_class = nil, options = nil)

data/test/action_view/cases/test_helpers.rb

@@ -233,5 +233,55 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     end
     assert_equal expected, output_buffer
   end
+
+  def test_ignore_an_individual_validator
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank"
+        },
+        :format => {
+          :with => /.+/,
+          :message => "is invalid"
+        }
+      }
+    }
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => { :format => false })
+    end
+
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_ignore_many_validators
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank"
+        },
+        :format => {
+          :with => /.+/,
+          :message => "is invalid"
+        }
+      }
+    }
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => { :presence => false, :format => false })
+    end
+
+    validators = {}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input id="post_cost" name="post[cost]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
 end
 

data/test/action_view/cases/test_legacy_helpers.rb

@@ -147,4 +147,14 @@ class ClientSideValidations::LegacyActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
+  def test_fields_for
+    result = fields_for(@comment) do |c|
+      c.text_field(:title)
+    end
+
+    expected = %{<input id="comment_title" name="comment[title]" size="30" type="text" />}
+
+    assert_equal expected, result
+  end
+
 end

data/test/active_model/cases/test_validations.rb

@@ -147,5 +147,16 @@ class ActiveModel::ValidationsTest < ClientSideValidations::ActiveModelTestBase
     expected_hash = {}
     assert_equal expected_hash, person.client_side_validation_hash
   end
+
+  def test_generic_block_validators_should_be_ignored
+    person = new_person do |p|
+      p.validates_each(:first_name) do |record, attr, value|
+        record.errors.add(:first_name, "failed")
+      end
+    end
+
+    expected_hash = {}
+    assert_equal expected_hash, person.client_side_validation_hash
+  end
 end
 

data/test/formtastic/cases/test_form_helper.rb

@@ -14,7 +14,7 @@ class ClientSideValidations::Formtastic::FormHelperTest < ActionView::TestCase
       concat f.input(:cost)
     end
 
-    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic post" data-validate="true" id="edit_post_123" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" /></li></form><script>var edit_post_123 = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic post" data-validate="true" id="edit_post_123" method="post" novalidate="novalidate"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" /></li></form><script>var edit_post_123 = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
     assert_equal expected, output_buffer, "\n\n *** If you're running Ruby 1.8 and this test fails is is most likely due to 1.8's lack of insertion order persistence with Hashes ***\n"
   end
 

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -04:00
+date: 2011-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency