client_side_validations 3.0.4 → 3.1.0

data/test/mongoid/cases/test_middleware.rb

@@ -21,14 +21,14 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists
     Book.create(:author_email => 'book@test.com')
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com' }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
   def test_uniqueness_when_resource_does_not_exist
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com' }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com' }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -36,7 +36,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_id_is_given
     book = Book.create(:author_email => 'book@test.com')
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com', 'id' => book.id }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com', 'id' => book.id }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -44,7 +44,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_scope_is_given
     Book.create(:author_email => 'book@test.com', :age => 25)
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30 } }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30 } }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -52,7 +52,7 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_multiple_scopes_are_given
     Book.create(:author_email => 'book@test.com', :age => 30, :author_name => 'Brian')
-    get '/validators/uniqueness.json', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
+    get '/validators/uniqueness', { 'book[author_email]' => 'book@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -60,9 +60,18 @@ class ClientSideValidationsMongoidMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_case_insensitive
     Book.create(:author_name => 'Brian')
-    get '/validators/uniqueness.json', { 'book[author_name]' => 'BRIAN', 'case_sensitive' => false }
+    get '/validators/uniqueness', { 'book[author_name]' => 'BRIAN', 'case_sensitive' => false }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+
+  def test_uniqueness_when_resource_is_a_nested_module
+    MongoidTestModule::Book2.create(:author_email => 'book@test.com')
+    get '/validators/uniqueness', { 'mongoid_test_module/book2[author_email]' => 'book@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 end
+

data/test/mongoid/cases/test_uniqueness_validator.rb

@@ -40,5 +40,10 @@ class Mongoid::UniqunessValidatorTest < ClientSideValidations::MongoidTestBase
     assert_equal expected_hash, result_hash
   end
 
+  def test_uniqueness_client_side_hash_when_nested_module
+    @book = MongoidTestModule::Book2.new
+    expected_hash = { :message => "is already taken", :class => 'mongoid_test_module/book2' }
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@book, :age)
+  end
 end
 

data/test/mongoid/models/book.rb

@@ -6,3 +6,7 @@ class Book
   field :author_email, :type => String
 end
 
+module MongoidTestModule
+  class Book2 < Book; end
+end
+

data/test/simple_form/cases/helper.rb

@@ -1,2 +1,5 @@
+require 'action_view'
+require 'action_controller/railtie'
+require 'rails'
 require 'simple_form'
 require 'client_side_validations/simple_form'

data/test/simple_form/cases/test_form_helper.rb

@@ -1,4 +1,5 @@
 require 'action_view/cases/helper'
+require 'middleware/cases/helper'
 require 'simple_form/cases/helper'
 
 class ClientSideValidations::SimpleForm::FormHelperTest < ActionView::TestCase
@@ -10,11 +11,12 @@ class ClientSideValidations::SimpleForm::FormHelperTest < ActionView::TestCase
   end
 
   def test_simple_form_for
+    ActionView::TestCase::TestController.any_instance.stubs(:action_name).returns('edit')
     simple_form_for(@post, :validate => true) do |f|
       concat f.input(:cost)
     end
 
-    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="simple_form 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><div class="input string required"><label class="string required" for="post_cost"><abbr title="required">*</abbr> Cost</label><input class="string required" data-validate="true" id="post_cost" name="post[cost]" required="required" size="50" type="text" /></div></form><script>var edit_post_123 = {"type":"SimpleForm::FormBuilder","error_class":"error","error_tag":"span","wrapper_error_class":"field_with_errors","wrapper_tag":"div","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="simple_form 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><div class="input string required"><label class="string required" for="post_cost"><abbr title="required">*</abbr> Cost</label><input class="string required" data-validate="true" id="post_cost" name="post[cost]" required="required" size="50" type="text" /></div></form><script>window['edit_post_123'] = {"type":"SimpleForm::FormBuilder","error_class":"error","error_tag":"span","wrapper_error_class":"field_with_errors","wrapper_tag":"div","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
 

data/test/test_loader.rb

@@ -0,0 +1,6 @@
+# Sanity check to make sure the entire library loads OK
+
+require 'base_helper'
+require 'client_side_validations'
+require 'client_side_validations/files'
+require 'client_side_validations/version'

data/{javascript → vendor/assets/javascripts}/rails.validations.js

@@ -1,5 +1,5 @@
 /*!
- * Rails 3 Client Side Validations - v3.0.1
+ * Rails 3 Client Side Validations - v3.1.0
  * https://github.com/bcardarlela/client_side_validations
  *
  * Copyright (c) 2011 Brian Cardarella
@@ -24,7 +24,7 @@
         .bind('form:validate:pass',   function(eventData) { clientSideValidations.callbacks.form.pass(  form, eventData); })
 
         // Set up the events for each validatable form element
-        .find('[data-validate]:input')
+        .find('[data-validate]:input:not(:radio)')
           .live('focusout',                function()          { $(this).isValid(settings.validators); })
           .live('change',                  function()          { $(this).data('changed', true); })
           // Callbacks
@@ -48,13 +48,15 @@
           var confirmationElement = $(this),
               element = form.find('#' + this.id.match(/(.+)_confirmation/)[1] + '[data-validate]:input');
 
-          $('#' + confirmationElement.attr('id'))
-            .live('focusout', function() {
-              element.data('changed', true).isValid(settings.validators);
-            })
-            .live('keyup', function() {
-              element.data('changed', true).isValid(settings.validators);
-            })
+          if (element[0]) {
+            $('#' + confirmationElement.attr('id'))
+              .live('focusout', function() {
+                element.data('changed', true).isValid(settings.validators);
+              })
+              .live('keyup', function() {
+                element.data('changed', true).isValid(settings.validators);
+              })
+          }
         });
 
       var addError = function(element, message) {
@@ -127,7 +129,7 @@ var clientSideValidations = {
     all: function() { return jQuery.extend({}, clientSideValidations.validators.local, clientSideValidations.validators.remote) },
     local: {
       presence: function(element, options) {
-        if (/^\s*$/.test(element.val())) {
+        if (/^\s*$/.test(element.val() || "")) {
           return options.message;
         }
       },
@@ -171,7 +173,7 @@ var clientSideValidations = {
           equal_to: '==', less_than: '<', less_than_or_equal_to: '<=' }
 
         for (var check in CHECKS) {
-          if (options[check] && !(new Function("return " + element.val() + CHECKS[check] + options[check])())) {
+          if (options[check] != undefined && !(new Function("return " + element.val() + CHECKS[check] + options[check])())) {
             return options.messages[check];
           }
         }
@@ -191,7 +193,7 @@ var clientSideValidations = {
         } else if (options.minimum) {
           blankOptions.message = options.messages.minimum;
         }
-        if ((message = this.presence(element, blankOptions)) && options.allow_blank == true && !options.maximum) {
+        if ((message = this.presence(element, blankOptions)) && options.allow_blank == true) {
           return;
         } else if (message) {
           return message;
@@ -290,10 +292,15 @@ var clientSideValidations = {
         } else {
           var name = element.attr('name');
         }
+
+        // Override the name if a nested module class is passed
+        if (options['class']) {
+          name = options['class'] + '[' + name.split('[')[1]
+        }
         data[name] = element.val();
 
         if (jQuery.ajax({
-          url: '/validators/uniqueness.json',
+          url: '/validators/uniqueness',
           data: data,
           async: false
         }).status == 200) {
@@ -305,7 +312,7 @@ var clientSideValidations = {
   formBuilders: {
     'ActionView::Helpers::FormBuilder': {
       add: function(element, settings, message) {
-        if (element.data('valid') !== false) {
+        if (element.data('valid') !== false && jQuery('label.message[for="' + element.attr('id') + '"]')[0] == undefined) {
           var inputErrorField = jQuery(settings.input_tag),
               labelErrorField = jQuery(settings.label_tag),
               label = jQuery('label[for="' + element.attr('id') + '"]:not(.message)');
@@ -353,7 +360,7 @@ var clientSideValidations = {
       }
 
     },
-    'Formtastic::SemanticFormBuilder': {
+    'Formtastic::FormBuilder': {
       add: function(element, settings, message) {
         if (element.data('valid') !== false) {
           var wrapper = element.closest('li');
@@ -370,7 +377,14 @@ var clientSideValidations = {
         var errorElement = wrapper.find('p.' + settings.inline_error_class);
         errorElement.remove();
       }
-
+    },
+    'NestedForm::Builder': {
+      add: function(element, settings, message) {
+        clientSideValidations.formBuilders['ActionView::Helpers::FormBuilder'].add(element, settings, message);
+      },
+      remove: function(element, settings, message) {
+        clientSideValidations.formBuilders['ActionView::Helpers::FormBuilder'].remove(element, settings, message);
+      }
     }
   },
   callbacks: {
@@ -387,4 +401,4 @@ var clientSideValidations = {
       pass:   function(form, eventData) { }
     }
   }
-}
+};

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,33 +10,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -04:00
+date: 2011-06-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :runtime
+        version: 3.1.0.rc4
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: sqlite3
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: bson_ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -47,25 +47,25 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongoid
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: mongo_mapper
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 0.9.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -96,9 +96,9 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.0.rc3
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -167,7 +167,6 @@ extra_rdoc_files: []
 
 files: 
 - client_side_validations.gemspec
-- javascript/rails.validations.js
 - lib/client_side_validations.rb
 - lib/client_side_validations/action_view.rb
 - lib/client_side_validations/action_view/form_builder.rb
@@ -187,16 +186,24 @@ files:
 - lib/client_side_validations/core_ext.rb
 - lib/client_side_validations/core_ext/range.rb
 - lib/client_side_validations/core_ext/regexp.rb
+- lib/client_side_validations/engine.rb
+- lib/client_side_validations/files.rb
 - lib/client_side_validations/formtastic.rb
 - lib/client_side_validations/middleware.rb
+- lib/client_side_validations/mongo_mapper.rb
+- lib/client_side_validations/mongo_mapper/middleware.rb
+- lib/client_side_validations/mongo_mapper/uniqueness.rb
 - lib/client_side_validations/mongoid.rb
 - lib/client_side_validations/mongoid/middleware.rb
 - lib/client_side_validations/mongoid/uniqueness.rb
 - lib/client_side_validations/simple_form.rb
 - lib/client_side_validations/version.rb
+- lib/generators/client_side_validations/copy_asset_generator.rb
 - lib/generators/client_side_validations/install_generator.rb
-- lib/generators/templates/README
-- lib/generators/templates/client_side_validations.rb
+- lib/generators/templates/client_side_validations/README.rails.3.0
+- lib/generators/templates/client_side_validations/README.rails.3.1
+- lib/generators/templates/client_side_validations/initializer.rb
+- vendor/assets/javascripts/rails.validations.js
 - test/action_view/cases/helper.rb
 - test/action_view/cases/test_helpers.rb
 - test/action_view/cases/test_legacy_helpers.rb
@@ -226,7 +233,7 @@ files:
 - test/formtastic/cases/helper.rb
 - test/formtastic/cases/test_form_builder.rb
 - test/formtastic/cases/test_form_helper.rb
-- test/generators/cases/test_install_generator.rb
+- test/generators/cases/test_generators.rb
 - test/javascript/config.ru
 - test/javascript/public/test/callbacks/elementAfter.js
 - test/javascript/public/test/callbacks/elementBefore.js
@@ -238,6 +245,7 @@ files:
 - test/javascript/public/test/callbacks/formPass.js
 - test/javascript/public/test/form_builders/validateForm.js
 - test/javascript/public/test/form_builders/validateFormtastic.js
+- test/javascript/public/test/form_builders/validateNestedForm.js
 - test/javascript/public/test/form_builders/validateSimpleForm.js
 - test/javascript/public/test/settings.js
 - test/javascript/public/test/validateElement.js
@@ -258,6 +266,11 @@ files:
 - test/javascript/views/layout.erb
 - test/middleware/cases/helper.rb
 - test/middleware/cases/test_middleware.rb
+- test/mongo_mapper/cases/helper.rb
+- test/mongo_mapper/cases/test_base.rb
+- test/mongo_mapper/cases/test_middleware.rb
+- test/mongo_mapper/cases/test_uniqueness_validator.rb
+- test/mongo_mapper/models/magazine.rb
 - test/mongoid/cases/helper.rb
 - test/mongoid/cases/test_base.rb
 - test/mongoid/cases/test_middleware.rb
@@ -266,6 +279,7 @@ files:
 - test/simple_form/cases/helper.rb
 - test/simple_form/cases/test_form_builder.rb
 - test/simple_form/cases/test_form_helper.rb
+- test/test_loader.rb
 has_rdoc: true
 homepage: https://github.com/bcardarella/client_side_validations
 licenses: []
@@ -289,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: client_side_validations
+rubyforge_project: 
 rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
@@ -324,7 +338,7 @@ test_files:
 - test/formtastic/cases/helper.rb
 - test/formtastic/cases/test_form_builder.rb
 - test/formtastic/cases/test_form_helper.rb
-- test/generators/cases/test_install_generator.rb
+- test/generators/cases/test_generators.rb
 - test/javascript/config.ru
 - test/javascript/public/test/callbacks/elementAfter.js
 - test/javascript/public/test/callbacks/elementBefore.js
@@ -336,6 +350,7 @@ test_files:
 - test/javascript/public/test/callbacks/formPass.js
 - test/javascript/public/test/form_builders/validateForm.js
 - test/javascript/public/test/form_builders/validateFormtastic.js
+- test/javascript/public/test/form_builders/validateNestedForm.js
 - test/javascript/public/test/form_builders/validateSimpleForm.js
 - test/javascript/public/test/settings.js
 - test/javascript/public/test/validateElement.js
@@ -356,6 +371,11 @@ test_files:
 - test/javascript/views/layout.erb
 - test/middleware/cases/helper.rb
 - test/middleware/cases/test_middleware.rb
+- test/mongo_mapper/cases/helper.rb
+- test/mongo_mapper/cases/test_base.rb
+- test/mongo_mapper/cases/test_middleware.rb
+- test/mongo_mapper/cases/test_uniqueness_validator.rb
+- test/mongo_mapper/models/magazine.rb
 - test/mongoid/cases/helper.rb
 - test/mongoid/cases/test_base.rb
 - test/mongoid/cases/test_middleware.rb
@@ -364,3 +384,4 @@ test_files:
 - test/simple_form/cases/helper.rb
 - test/simple_form/cases/test_form_builder.rb
 - test/simple_form/cases/test_form_helper.rb
+- test/test_loader.rb

data/lib/generators/templates/README

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

data/test/generators/cases/test_install_generator.rb

@@ -1,15 +0,0 @@
-require 'rails/generators/test_case'
-require 'generators/client_side_validations/install_generator'
-
-class InstallGeneratorTest < Rails::Generators::TestCase
-  tests ClientSideValidations::Generators::InstallGenerator
-  destination File.expand_path('../../tmp', __FILE__)
-  setup :prepare_destination
-
-  test 'Assert all files are properly created' do
-    run_generator
-    assert_file 'config/initializers/client_side_validations.rb'
-    assert_file 'public/javascripts/rails.validations.js'
-  end
-end
-