client_side_validations 3.0.3 → 3.0.4

data/javascript/rails.validations.js

@@ -314,6 +314,7 @@ var clientSideValidations = {
           element.before(inputErrorField);
           inputErrorField.find('span#input_tag').replaceWith(element);
           inputErrorField.find('label.message').attr('for', element.attr('id'));
+          labelErrorField.find('label.message').attr('for', element.attr('id'));
           label.replaceWith(labelErrorField);
           labelErrorField.find('label#label_tag').replaceWith(label);
         }

data/lib/client_side_validations/action_view/form_builder.rb

@@ -15,16 +15,20 @@ module ClientSideValidations::ActionView::Helpers
       end
 
       base.class_eval do
-        alias_method_chain :initialize,   :client_side_validations
-        alias_method_chain :fields_for,   :client_side_validations
-        alias_method_chain :check_box,    :client_side_validations
-        alias_method_chain :radio_button, :client_side_validations
+        alias_method_chain :initialize,                :client_side_validations
+        alias_method_chain :fields_for,                :client_side_validations
+        alias_method_chain :check_box,                 :client_side_validations
+        alias_method_chain :radio_button,              :client_side_validations
+        alias_method_chain :select,                    :client_side_validations
+        alias_method_chain :collection_select,         :client_side_validations
+        alias_method_chain :grouped_collection_select, :client_side_validations
+        alias_method_chain :time_zone_select,          :client_side_validations
 
         def self.client_side_form_settings(options, form_helper)
           {
             :type => self.to_s,
             :input_tag => form_helper.class.field_error_proc.call(%{<span id="input_tag" />}, Struct.new(:error_message, :tag_id).new([], "")),
-            :label_tag => form_helper.class.field_error_proc.call(%{<label id="label_tag" />})
+            :label_tag => form_helper.class.field_error_proc.call(%{<label id="label_tag" />}, Struct.new(:error_message, :tag_id).new([], ""))
           }
         end
       end
@@ -51,6 +55,26 @@ module ClientSideValidations::ActionView::Helpers
       radio_button_without_client_side_validations(method, tag_value, options)
     end
 
+    def select_with_client_side_validations(method, choices, options = {}, html_options = {})
+      apply_client_side_validators(method, html_options)
+      select_without_client_side_validations(method, choices, options, html_options)
+    end
+
+    def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
+      apply_client_side_validators(method, html_options)
+      collection_select_without_client_side_validations(method, collection, value_method, text_method, options, html_options)
+    end
+
+    def grouped_collection_select_with_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+      apply_client_side_validators(method, html_options)
+      grouped_collection_select_without_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+    end
+
+    def time_zone_select_with_client_side_validations(method, priority_zones = nil, options = {}, html_options = {})
+      apply_client_side_validators(method, html_options)
+      time_zone_select_without_client_side_validations(method, priority_zones = nil, options, html_options)
+    end
+
   private
 
     def apply_client_side_validators(method, options = {})

data/lib/client_side_validations/active_record/middleware.rb

@@ -17,7 +17,7 @@ module ClientSideValidations::ActiveRecord
         relation = t[attribute].matches(value)
       end
 
-      relation = relation.and(t[:id].not_eq(params[:id])) if params[:id]
+      relation = relation.and(t.primary_key.not_eq(params[:id])) if params[:id]
 
       (params[:scope] || {}).each do |key, value|
         relation = relation.and(t[key].eq(value))

data/lib/client_side_validations/version.rb

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

data/test/action_view/cases/test_helpers.rb

@@ -283,5 +283,55 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     end
     assert_equal expected, output_buffer
   end
+
+  def test_select
+    form_for(@post, :validate => true) do |f|
+      concat f.select(:cost, [])
+    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
+      %{<select data-validate="true" id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_collection_select
+    form_for(@post, :validate => true) do |f|
+      concat f.collection_select(:cost, [], :id, :name)
+    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
+      %{<select data-validate="true" id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_grouped_collection_select
+    form_for(@post, :validate => true) do |f|
+      concat f.grouped_collection_select(:cost, [], :group_method, :group_label_method, :id, :name)
+    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
+      %{<select data-validate="true" id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_time_zone_select
+    zones = mock('TimeZones')
+    zones.stubs(:all).returns([])
+    form_for(@post, :validate => true) do |f|
+      concat f.time_zone_select(:cost, nil, :model => zones)
+    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
+      %{<select data-validate="true" id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
 end
 

data/test/action_view/cases/test_legacy_helpers.rb

@@ -157,4 +157,50 @@ class ClientSideValidations::LegacyActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, result
   end
 
+  def test_select
+    form_for(@post) do |f|
+      concat f.select(:cost, [])
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+      %{<select id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_collection_select
+    form_for(@post) do |f|
+      concat f.collection_select(:cost, [], :id, :name)
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+      %{<select id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_grouped_collection_select
+    form_for(@post) do |f|
+      concat f.grouped_collection_select(:cost, [], :group_method, :group_label_method, :id, :name)
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+      %{<select id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_time_zone_select
+    zones = mock('TimeZones')
+    zones.stubs(:all).returns([])
+    form_for(@post) do |f|
+      concat f.time_zone_select(:cost, nil, :model => zones)
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+      %{<select id="post_cost" name="post[cost]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
 end
+

metadata

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