client_side_validations 3.0.5 → 3.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7bbfbec3b5249e2f44af35b70f85e6ffe9290248
+  data.tar.gz: 511bde483bc7b4958690df487f5668ec08361871
+SHA512:
+  metadata.gz: c0cd68439759ff06235233463653296bc7366fa868aba93655e468d3cd20cb8010d73991e45c97287201b2d471bafc9ba2370c6e75597c79644dd2500f1e5c2a
+  data.tar.gz: 33cfd19f17ea44875b07506d3f6599f884f434815f9e2b79636270047a45fa769e42a986ba158d16c60b951d164ae550f497ec963b70847f09c8de8a6fffd111

data/client_side_validations.gemspec

@@ -12,33 +12,23 @@ Gem::Specification.new do |s|
   s.summary     = %q{Client Side Validations}
   s.description = %q{Client Side Validations}
 
-  s.files         = `git ls-files -- {lib/*,javascript/*,*.gemspec}`.split("\n")
+  s.files         = `git ls-files -- {lib/*,vendor/*,*.gemspec}`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport'
-
   s.add_development_dependency 'rails', '~> 3.0.0'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'bson_ext'
   s.add_development_dependency 'mongoid', '~> 2.0.0'
   s.add_development_dependency 'mongo_mapper','~>0.9.0'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'simple_form'
-  s.add_development_dependency 'formtastic'
+  s.add_development_dependency 'simple_form', '~> 1.5.0'
+  s.add_development_dependency 'formtastic', '~> 1.2.0'
 
   # For QUnit testing
   s.add_development_dependency 'sinatra', '~> 1.0'
   s.add_development_dependency 'shotgun'
   s.add_development_dependency 'thin'
   s.add_development_dependency 'json'
-
-  ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
-  if ruby_minor_version == 8
-    s.add_development_dependency 'minitest'
-    s.add_development_dependency 'ruby-debug'
-  elsif ruby_minor_version == 9
-    s.add_development_dependency 'ruby-debug19'
-  end
 end

data/lib/client_side_validations/action_view/form_builder.rb

@@ -2,7 +2,7 @@ module ClientSideValidations::ActionView::Helpers
   module FormBuilder
 
     def self.included(base)
-      (base.field_helpers - %w(apply_form_for_options! label check_box radio_button fields_for hidden_field)).each do |selector|
+      (base.field_helpers.map(&:to_s) - %w(apply_form_for_options! label check_box radio_button fields_for hidden_field)).each do |selector|
         base.class_eval <<-RUBY_EVAL
           def #{selector}_with_client_side_validations(method, options = {})
             apply_client_side_validators(method, options)
@@ -78,33 +78,33 @@ module ClientSideValidations::ActionView::Helpers
   private
 
     def apply_client_side_validators(method, options = {})
-      if @options[:validate] && options[:validate] != false && validators = filter_validators(@object.client_side_validation_hash[method], options[:validate])
+      if @options[:validate] && options[:validate] != false && validators = filter_validators(method, options[:validate])
         options.merge!("data-validate" => true)
         @options[:validators].merge!("#{@object_name}[#{method}]#{options[:multiple] ? "[]" : nil}" => validators)
       end
     end
 
-    def filter_validators(validators, filters)
-      if validators
-        filtered_validators = validators.inject({}) do |filtered_validators, validator|
-          filtered_validators[validator.first] = validator.last
+    def filter_validators(method, filters)
+      if validators = @object.client_side_validation_hash[method]
+        unfiltered_validators = validators.inject({}) do |unfiltered_validators, validator|
+          unfiltered_validators[validator.first] = validator.last
           if has_filter_for_validator?(validator, filters)
             if filter_validator?(validator, filters)
-              filtered_validators.delete(validator.first)
-            elsif force_validator_despite_conditional?(validator, filters) && !can_run_validator?(validator)
-              filtered_validators.delete(validator.first)
+              unfiltered_validators.delete(validator.first)
+            elsif force_validator_despite_conditional?(validator, filters) && !can_run_validator?(validator, method)
+              unfiltered_validators.delete(validator.first)
             end
           else
-            if validator.last.key?(:if) || validator.last.key?(:unless)
-              filtered_validators.delete(validator.first)
+            if (conditional = (validator.last[:if] || validator.last[:unless])) && conditional.is_a?(Symbol) && !conditional_method_is_change_method?(conditional, method)
+              unfiltered_validators.delete(validator.first)
             end
           end
-          filtered_validators[validator.first].delete(:if) if filtered_validators[validator.first]
-          filtered_validators[validator.first].delete(:unless) if filtered_validators[validator.first]
-          filtered_validators
+          unfiltered_validators[validator.first].delete(:if)     if unfiltered_validators[validator.first]
+          unfiltered_validators[validator.first].delete(:unless) if unfiltered_validators[validator.first]
+          unfiltered_validators
         end
 
-        filtered_validators.empty? ? nil : filtered_validators
+        unfiltered_validators.empty? ? nil : unfiltered_validators
       end
     end
 
@@ -120,33 +120,38 @@ module ClientSideValidations::ActionView::Helpers
       filters == true || filters[validator.first] == true
     end
 
-    def can_run_validator?(validator)
+    def can_run_validator?(validator, method)
       result        = true
-      if_result     = can_run_if_validator?(validator.last[:if])
-      unless_result = can_run_unless_validator?(validator.last[:unless])
+      if_result     = run_if_validator(validator.last[:if], method)
+      unless_result = run_unless_validator(validator.last[:unless], method)
       result        = result && if_result unless if_result.nil?
       result        = result && unless_result unless unless_result.nil?
       result
     end
 
-    def can_run_if_validator?(conditional)
+    def run_if_validator(conditional, method)
       if conditional
         if conditional.is_a?(Symbol)
-          !!@object.send(conditional)
+          conditional_method_is_change_method?(conditional, method) ? true : !!@object.send(conditional)
         else
           !!conditional.call(@object)
         end
       end
     end
 
-    def can_run_unless_validator?(conditional)
+    def run_unless_validator(conditional, method)
       if conditional
         if conditional.is_a?(Symbol)
-          !@object.send(conditional)
+          conditional_method_is_change_method?(conditional, method) ? true : !@object.send(conditional)
         else
           !conditional.call(@object)
         end
       end
     end
+
+    def conditional_method_is_change_method?(conditional, method)
+      conditional.to_sym == "#{method}_changed?".to_sym
+    end
   end
 end
+

data/lib/client_side_validations/action_view/form_helper.rb

@@ -10,7 +10,7 @@ module ClientSideValidations::ActionView::Helpers
 
         # Always turn off HTML5 Validations
         options[:html] ||= {}
-        options[:html][:novalidate] = true
+        options[:html][:novalidate] = 'novalidate'
 
         case record_or_name_or_array
         when String, Symbol

data/lib/client_side_validations/active_record/middleware.rb

@@ -2,6 +2,7 @@ module ClientSideValidations::ActiveRecord
   class Middleware
 
     def self.is_unique?(klass, attribute, value, params)
+      value = type_cast_value(klass, attribute, value)
       column = klass.columns_hash[attribute.to_s]
       value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s if column.text?
 
@@ -23,11 +24,18 @@ module ClientSideValidations::ActiveRecord
         relation = relation.and(t.primary_key.not_eq(params[:id])) if params[:id]
       end
 
-      (params[:scope] || {}).each do |key, value|
-        relation = relation.and(t[key].eq(value))
+      (params[:scope] || {}).each do |attribute, value|
+        value = type_cast_value(klass, attribute, value)
+        relation = relation.and(t[attribute].eq(value))
       end
 
       !klass.where(relation).exists?
     end
+
+    private
+
+    def self.type_cast_value(klass, attribute, value)
+      klass.columns_hash[attribute].type_cast(value)
+    end
   end
 end

data/lib/client_side_validations/engine.rb

@@ -0,0 +1,6 @@
+module ClientSideValidations
+  class Engine < ::Rails::Engine
+    config.app_middleware.use ClientSideValidations::Middleware::Validators
+  end
+end
+

data/lib/client_side_validations/files.rb

@@ -0,0 +1,8 @@
+# This is only used by dependant libraries that need to find the files
+
+module ClientSideValidations
+  module Files
+    Initializer = File.expand_path(File.dirname(__FILE__) + '/../generators/templates/client_side_validations/initializer.rb')
+    Javascript  = File.expand_path(File.dirname(__FILE__) + '/../../vendor/assets/javascripts/rails.validations.js')
+  end
+end

data/lib/client_side_validations/middleware.rb

@@ -76,10 +76,5 @@ module ClientSideValidations
     end
 
   end
-
-  class Engine < ::Rails::Engine
-    config.app_middleware.use ClientSideValidations::Middleware::Validators
-  end
-
 end
 

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = "3.0.5"
+  VERSION = '3.0.14'
 end

data/lib/client_side_validations.rb

@@ -6,5 +6,8 @@ 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'
-require 'client_side_validations/middleware' if defined?(::Rails)
+if defined?(::Rails)
+  require 'client_side_validations/middleware'
+  require 'client_side_validations/engine'
+end
 

data/lib/generators/client_side_validations/install_generator.rb

@@ -6,15 +6,15 @@ module ClientSideValidations
       desc 'Creates a ClientSideValidations initializer and copies client-side-validations.js to public/javascripts.'
 
       def copy_initializer
-        copy_file 'client_side_validations.rb', 'config/initializers/client_side_validations.rb'
+        copy_file 'client_side_validations/initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
       def copy_locale
-        copy_file '../../../javascript/rails.validations.js', 'public/javascripts/rails.validations.js'
+        copy_file '../../../vendor/assets/javascripts/rails.validations.js', 'public/javascripts/rails.validations.js'
       end
 
       def show_readme
-        readme 'README' if behavior == :invoke
+        readme 'client_side_validations/README' if behavior == :invoke
       end
     end
   end

data/test/action_view/cases/test_helpers.rb

@@ -346,7 +346,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters
+  def test_conditional_validators_should_be_filtered
     hash = {
       :cost => {
         :presence => {
@@ -379,7 +379,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validators_should_be_filtered
+  def test_conditional_validator_filters_being_forced
     hash = {
       :cost => {
         :presence => {
@@ -400,8 +400,44 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @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)
+      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 = {}
@@ -412,7 +448,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced
+  def test_conditional_validator_filters_being_forced_individually
     hash = {
       :cost => {
         :presence => {
@@ -433,8 +469,8 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @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)
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
     end
 
     validators = {
@@ -448,7 +484,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_and_not_meeting_condition
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition_individually
     hash = {
       :cost => {
         :presence => {
@@ -469,8 +505,8 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @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)
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
     end
 
     validators = {}
@@ -481,18 +517,18 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_individually
+  def test_conditional_validator_filters_being_forced_with_procs
     hash = {
       :cost => {
         :presence => {
           :message => "can't be blank",
-          :unless => :cannot_validate?
+          :unless => Proc.new { |post| post.cannot_validate? }
         }
       },
       :title => {
         :presence => {
           :message => "can't be blank",
-          :if => :can_validate?
+          :if => Proc.new { |post| post.can_validate? }
         }
       }
     }
@@ -502,8 +538,8 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @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 })
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
     end
 
     validators = {
@@ -517,58 +553,57 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_and_not_meeting_condition_individually
+  def test_conditional_validator_ignored_when_using_changed_helpers
     hash = {
       :cost => {
         :presence => {
           :message => "can't be blank",
-          :unless => :cannot_validate?
+          :unless => :cost_changed?
         }
       },
       :title => {
         :presence => {
           :message => "can't be blank",
-          :if => :can_validate?
+          :if => :title_changed?
         }
       }
     }
 
     @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 })
+      concat f.text_field(:cost)
+      concat f.text_field(:title)
     end
 
-    validators = {}
+    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 id="post_cost" name="post[cost]" size="30" type="text" />} +
-      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+      %{<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_with_procs
+  def test_conditional_validator_ignored_when_using_changed_helpers_and_forcing_validators
     hash = {
       :cost => {
         :presence => {
           :message => "can't be blank",
-          :unless => Proc.new { |post| post.cannot_validate? }
+          :unless => :cost_changed?
         }
       },
       :title => {
         :presence => {
           :message => "can't be blank",
-          :if => Proc.new { |post| post.can_validate? }
+          :if => :title_changed?
         }
       }
     }
 
     @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)

data/test/active_record/cases/test_middleware.rb

@@ -171,5 +171,20 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
-end
 
+  def test_uniqueness_when_value_must_be_typecast
+    User.create(:active => false)
+    get '/validators/uniqueness.json', { 'user[active]' => 'false', 'case_sensitive' => true }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+
+  def test_uniqueness_when_scope_is_given_and_value_must_be_typecast
+    User.create(:email => 'user@test.com', :active => true)
+    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'scope' => { 'active' => 'true' }, 'case_sensitive' => true }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+end

data/test/active_record/models/user.rb

@@ -1,4 +1,4 @@
-users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT, email TEXT, title VARCHAR(5));}
+users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT, email TEXT, title VARCHAR(5), active BOOLEAN);}
 ActiveRecord::Base.connection.execute(users_table)
 
 class User < ActiveRecord::Base

data/test/base_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
-require 'ruby-debug'
+require 'bundler'
+Bundler.setup
 require 'test/unit'
 require 'mocha'
 

data/test/javascript/server.rb

@@ -2,7 +2,7 @@ require 'sinatra'
 require 'json'
 require 'ruby-debug'
 
-use Rack::Static, :urls => ['/javascript'], :root => File.expand_path('../..', settings.root)
+use Rack::Static, :urls => ['/vendor/assets/javascripts'], :root => File.expand_path('../..', settings.root)
 
 helpers do
   def jquery_link version

data/test/javascript/views/layout.erb

@@ -12,7 +12,7 @@
     </style>
 
     <%= script_tag jquery_src %>
-    <%= script_tag "/javascript/rails.validations.js" %>
+    <%= script_tag "/vendor/assets/javascripts/rails.validations.js" %>
   </head>
 
   <body id="body">

data/test/middleware/cases/helper.rb

@@ -11,5 +11,6 @@ module TestApp
 end
 
 require 'client_side_validations/middleware'
+require 'client_side_validations/engine'
 
 TestApp::Application.initialize!