client_side_validations 3.0.3 → 3.1.0

data/lib/generators/client_side_validations/install_generator.rb

@@ -1,20 +1,32 @@
 module ClientSideValidations
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates', __FILE__)
+      source_root File.expand_path('../../templates/client_side_validations', __FILE__)
 
-      desc 'Creates a ClientSideValidations initializer and copies client-side-validations.js to public/javascripts.'
+      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
 
       def copy_initializer
-        copy_file 'client_side_validations.rb', 'config/initializers/client_side_validations.rb'
+        copy_file 'initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
-      def copy_locale
-        copy_file '../../../javascript/rails.validations.js', 'public/javascripts/rails.validations.js'
+      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
 
       def show_readme
-        readme 'README' if behavior == :invoke
+        if Rails.version >= '3.1'
+          readme 'README.rails.3.1' if behavior == :invoke
+        else
+          readme 'README.rails.3.0' if behavior == :invoke
+        end
       end
     end
   end

data/lib/generators/templates/client_side_validations/README.rails.3.0

@@ -0,0 +1,6 @@
+*********************
+ClientSideValidations
+*********************
+
+Client Side Validations only works with jQuery.
+You'll need to include jQuery in your layout file before you include 'rails.validations.js'

data/lib/generators/templates/client_side_validations/README.rails.3.1

@@ -0,0 +1,7 @@
+*********************
+ClientSideValidations
+*********************
+
+In your app/assets/javascripts/application.js file add the following:
+
+//= require rails.validations

data/lib/generators/templates/{client_side_validations.rb → 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)
+require 'client_side_validations/formtastic'  if defined?(::Formtastic)
 
 # 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|

data/test/action_view/cases/helper.rb

@@ -1,8 +1,14 @@
 require 'base_helper'
 require 'action_view'
-require 'client_side_validations/action_view'
-require 'action_view/template/handlers/erb'
+require 'action_view/template'
 require 'action_view/models'
+require 'client_side_validations/action_view'
+
+module ActionController
+  class Base
+    include ActionDispatch::Routing::RouteSet.new.url_helpers
+  end
+end
 
 module ActionViewTestSetup
   include ::ClientSideValidations::ActionView::Helpers::FormHelper
@@ -12,6 +18,19 @@ module ActionViewTestSetup
     @output_buffer = super
   end
 
+  Routes = ActionDispatch::Routing::RouteSet.new
+  Routes.draw do
+    resources :posts do
+      resources :comments
+    end
+  end
+
+  def _routes
+    Routes
+  end
+
+  include Routes.url_helpers
+
   def setup
     super
 
@@ -67,14 +86,11 @@ module ActionViewTestSetup
     @post.body        = "Back to the hill and over it again!"
     @post.secret      = 1
     @post.written_on  = Date.new(2004, 6, 15)
-  end
 
-  def url_for(object)
-    @url_for_options = object
-    if object.is_a?(Hash)
-      "http://www.example.com"
+    if defined?(ActionView::OutputFlow)
+      @view_flow        = ActionView::OutputFlow.new
     else
-      super
+      @_content_for     = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
     end
   end
 
@@ -85,11 +101,12 @@ module ActionViewTestSetup
     txt << %{</div>}
   end
 
-  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil)
+  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil, file = nil)
     txt =  %{<form accept-charset="UTF-8" action="#{action}"}
     txt << %{ data-remote="true"} if remote
     txt << %{ class="#{html_class}"} if html_class
     txt << %{ data-validate="true"} if validators
+    txt << %{ enctype="multipart/form-data"} if file
     txt << %{ id="#{id}"} if id
     txt << %{ method="post"}
     txt << %{ novalidate="novalidate"} if validators
@@ -100,20 +117,24 @@ module ActionViewTestSetup
     contents = block_given? ? yield : ""
 
     if options.is_a?(Hash)
-      method, remote, validators = options.values_at(:method, :remote, :validators)
+      method, remote, validators, file = options.values_at(:method, :remote, :validators, :file)
     else
       method = options
     end
 
-    html = form_text(action, id, html_class, remote, validators) + snowman(method) + (contents || "") + "</form>"
+    html = form_text(action, id, html_class, remote, validators, file) + snowman(method) + (contents || "") + "</form>"
 
     if options.is_a?(Hash) && options[:validators]
-      html + %Q{<script>var #{id} = #{client_side_form_settings_helper.merge(:validators => validators).to_json};</script>}
+      build_script_tag(html, id, options[:validators])
     else
       html
     end
   end
 
+  def build_script_tag(html, id, validators)
+    (html || "") + %Q{<script>window['#{id}'] = #{client_side_form_settings_helper.merge(:validators => validators).to_json};</script>}
+  end
+
   protected
     def comments_path(post)
       "/posts/#{post.id}/comments"
@@ -152,3 +173,4 @@ module ActionViewTestSetup
     end
 
 end
+

data/test/action_view/cases/test_helpers.rb

@@ -44,7 +44,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     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
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators, :file => true) do
       %{<input data-validate="true" id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer
@@ -283,5 +283,318 @@ 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_select_multiple
+    form_for(@post, :validate => true) do |f|
+      concat f.select(:cost, [], {}, :multiple => true)
+    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" multiple="multiple" 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
+
+  def test_conditional_validator_filters
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost)
+      concat f.text_field(:title)
+    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" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validators_should_be_filtered
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost)
+      concat f.text_field(:title)
+    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" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {: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" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(true)
+    @post.stubs(:can_validate?).returns(false)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    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" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_individually
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {: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" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition_individually
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(true)
+    @post.stubs(:can_validate?).returns(false)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
+    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" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_with_procs
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => Proc.new { |post| post.cannot_validate? }
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => Proc.new { |post| post.can_validate? }
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {: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" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_pushing_script_to_content_for
+    form_for(@post, :validate => :post) do |f|
+      concat f.text_field(:cost)
+    end
+
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="edit_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><input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" /></form>}
+    assert_equal expected, output_buffer
+    assert_equal build_script_tag(nil, "edit_post_123", validators), content_for(:post)
+  end
 end
 

data/test/action_view/cases/test_legacy_helpers.rb

@@ -30,7 +30,7 @@ class ClientSideValidations::LegacyActionViewHelpersTest < ActionView::TestCase
       concat f.file_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => :put, :file => true) do
       %{<input id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer
@@ -157,4 +157,61 @@ 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_select_multiple
+    form_for(@post) do |f|
+      concat f.select(:cost, [], {}, :multiple => true)
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+      %{<select id="post_cost" multiple="multiple" 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
+

data/test/active_model/cases/test_validations.rb

@@ -138,24 +138,37 @@ class ActiveModel::ValidationsTest < ClientSideValidations::ActiveModelTestBase
     assert_equal expected_hash, person.client_side_validation_hash
   end
 
-  def test_validators_with_if_or_unless_are_ignored
+  def test_generic_block_validators_should_be_ignored
     person = new_person do |p|
-      p.validates_presence_of :first_name, :if     => Proc.new { |p| true }
-      p.validates_presence_of :last_name,  :unless => Proc.new { |p| true }
+      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
 
-  def test_generic_block_validators_should_be_ignored
+  def test_conditionals_persist_on_validator
     person = new_person do |p|
-      p.validates_each(:first_name) do |record, attr, value|
-        record.errors.add(:first_name, "failed")
-      end
+      p.validates :first_name, :presence => { :if => :can_validate? }
+      p.validates :last_name, :presence => { :unless => :cannot_validate? }
     end
 
-    expected_hash = {}
+    expected_hash = {
+      :first_name => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      },
+      :last_name => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      }
+    }
     assert_equal expected_hash, person.client_side_validation_hash
   end
 end