client_side_validations 3.1.1 → 3.1.3

data/client_side_validations.gemspec

@@ -17,14 +17,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rails', '3.1.0.rc4'
+  s.add_development_dependency 'rails', '~> 3.1.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 'mongo_mapper','~> 0.9.0'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'simple_form'
-  s.add_development_dependency 'formtastic', '~> 2.0.0.rc3'
+  s.add_development_dependency 'simple_form', '~> 1.5.0'
+  s.add_development_dependency 'formtastic', '~> 2.0.0'
 
   # For QUnit testing
   s.add_development_dependency 'sinatra', '~> 1.0'

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.1.1'
+  VERSION = '3.1.3'
 end

data/lib/generators/client_side_validations/copy_asset_generator.rb

@@ -2,14 +2,27 @@ module ClientSideValidations
   module Generators
     class CopyAssetGenerator < Rails::Generators::Base
       source_root File.expand_path('../../../../vendor/assets/javascripts', __FILE__)
-      if Rails.version >= '3.1'
+
+      private
+
+      def self.asset_pipeline_enabled?
+        (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets || {}) : {})[:enabled]
+      end
+
+      def asset_pipeline_enabled?
+        self.class.asset_pipeline_enabled?
+      end
+
+      public
+
+      if asset_pipeline_enabled?
         desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to app/assets/javascripts.'
       else
         desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
       end
 
       def copy_javascript_asset
-        if Rails.version >= '3.1'
+        if asset_pipeline_enabled?
           destination = 'app/assets/javascripts'
         else
           destination = 'public/javascripts'

data/lib/generators/client_side_validations/install_generator.rb

@@ -3,7 +3,19 @@ module ClientSideValidations
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../../templates/client_side_validations', __FILE__)
 
-      if Rails.version >= '3.1'
+      private
+
+      def self.asset_pipeline_enabled?
+        (Rails.configuration.respond_to?(:assets) ? (Rails.configuration.assets || {}) : {})[:enabled]
+      end
+
+      def asset_pipeline_enabled?
+        self.class.asset_pipeline_enabled?
+      end
+
+      public
+
+      if asset_pipeline_enabled?
         desc 'Creates a ClientSideValidations initializer.'
       else
         desc 'Creates a ClientSideValidations initializer and copies rails.validations.js to public/javascripts.'
@@ -14,10 +26,8 @@ module ClientSideValidations
       end
 
       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
+        unless asset_pipeline_enabled?
+          copy_file '../../../../vendor/assets/javascripts/rails.validations.js', 'public/javascripts/rails.validations.js'
         end
       end
 
@@ -28,6 +38,7 @@ module ClientSideValidations
           readme 'README.rails.3.0' if behavior == :invoke
         end
       end
+
     end
   end
 end

data/test/base_helper.rb

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

data/test/formtastic/cases/test_form_helper.rb

@@ -14,8 +14,8 @@ 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" 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 input required stringish" id="post_cost_input"><label class=\" label\" for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" required=\"required\" type="text" />\n\n</li></form><script>window['edit_post_123'] = {"type":"Formtastic::FormBuilder","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 input required stringish" id="post_cost_input"><label class=\" label\" for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" />\n\n</li></form><script>window['edit_post_123'] = {"type":"Formtastic::FormBuilder","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
 
-end
+end

data/test/generators/cases/test_generators.rb

@@ -7,10 +7,32 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../tmp', __FILE__)
   setup :prepare_destination
 
-  test 'Assert all files are properly created' do
+  test 'Assert all files are properly created when no asset pipeline present' do
+    stub_configuration
     run_generator
     assert_file 'config/initializers/client_side_validations.rb'
-    assert_file 'public/javascripts/rails.validations.js' if Rails.version > '3.0' && Rails.version < '3.1'
+    assert_file 'public/javascripts/rails.validations.js'
+  end
+
+  test 'Assert all files are properly created when asset pipeline present and disabled' do
+    stub_configuration
+    Rails.configuration.stubs(:assets).returns({})
+    Rails.configuration.assets[:enabled] = false
+    run_generator
+    assert_file 'config/initializers/client_side_validations.rb'
+    assert_file 'public/javascripts/rails.validations.js'
+  end
+
+  test 'Assert all files are properly created when asset pipeline present and enabled' do
+    stub_configuration
+    Rails.configuration.stubs(:assets).returns({})
+    Rails.configuration.assets[:enabled] = true
+    run_generator
+    assert_file 'config/initializers/client_side_validations.rb'
+  end
+
+  def stub_configuration
+    Rails.stubs(:configuration).returns(mock('Configuration'))
   end
 end
 
@@ -19,13 +41,30 @@ class CopyAssetGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../tmp', __FILE__)
   setup :prepare_destination
 
-  test 'Assert file is properly created' do
+  test 'Assert file is properly created when no asset pipeline present' do
+    stub_configuration
     run_generator
-    if Rails.version >= '3.1'
-      assert_file 'app/assets/javascripts/rails.validations.js'
-    else
-      assert_file 'public/javascripts/rails.validations.js'
-    end
+    assert_file 'public/javascripts/rails.validations.js'
+  end
+
+  test 'Assert file is properly created when asset pipeline present and disabled' do
+    stub_configuration
+    Rails.configuration.stubs(:assets).returns({})
+    Rails.configuration.assets[:enabled] = false
+    run_generator
+    assert_file 'public/javascripts/rails.validations.js'
+  end
+
+  test 'Assert file is properly created when asset pipeline present and enabled' do
+    stub_configuration
+    Rails.configuration.stubs(:assets).returns({})
+    Rails.configuration.assets[:enabled] = true
+    run_generator
+    assert_file 'app/assets/javascripts/rails.validations.js'
+  end
+
+  def stub_configuration
+    Rails.stubs(:configuration).returns(mock('Configuration'))
   end
 end
 

data/test/javascript/public/test/validators/numericality.js

@@ -28,6 +28,15 @@ test('when only allowing integers and value is integer', function() {
   equal(clientSideValidations.validators.local.numericality(element, options), undefined);
 });
 
+test('when only allowing integers and value has a negative or positive sign', function() {
+  var element = $('<input type="text" />');
+  var options = { messages: { only_integer: "failed validation"}, only_integer: true };
+  element.val('-23');
+  equal(clientSideValidations.validators.local.numericality(element, options), undefined);
+  element.val('+23');
+  equal(clientSideValidations.validators.local.numericality(element, options), undefined);
+});
+
 test('when only allowing integers and value is not integer', function() {
   var element = $('<input type="text" />');
   var options = { messages: { only_integer: "failed validation" }, only_integer: true };

data/test/javascript/public/test/validators/uniqueness.js

@@ -94,3 +94,14 @@ test('when matching uniqueness on a resource with a defined class name', functio
   equal(clientSideValidations.validators.remote.uniqueness(element, options), 'failed validation');
 });
 
+test('when allowing blank', function() {
+ var element = $('<input type="text" name="user2[email]" />');
+ var options = { 'message': "failed validation", 'with': /\d+/, 'allow_blank': true };
+ equal(clientSideValidations.validators.remote.uniqueness(element, options), undefined);
+});
+
+test('when not allowing blank', function() {
+ var element = $('<input type="text" name="user2[email]" />');
+ var options = { 'message': "failed validation", 'with': /\d+/ };
+ equal(clientSideValidations.validators.remote.uniqueness(element, options), "failed validation");
+});

data/vendor/assets/javascripts/rails.validations.js

@@ -1,5 +1,5 @@
 /*!
- * Rails 3 Client Side Validations - v3.1.1
+ * Rails 3 Client Side Validations - v3.1.3
  * https://github.com/bcardarlela/client_side_validations
  *
  * Copyright (c) 2011 Brian Cardarella
@@ -165,7 +165,7 @@ var clientSideValidations = {
           return options.messages.numericality;
         }
 
-        if (options.only_integer && !/^\d+$/.test(element.val())) {
+        if (options.only_integer && !/^[+-]?\d+$/.test(element.val())) {
           return options.messages.only_integer;
         }
 
@@ -263,48 +263,54 @@ var clientSideValidations = {
     },
     remote: {
       uniqueness: function(element, options) {
-        var data = {};
-        data['case_sensitive'] = !!options.case_sensitive;
-        if (options.id) {
-          data['id'] = options.id;
-        }
+        if ((message = clientSideValidations.validators.local.presence(element, options)) && options.allow_blank === true) {
+          return;
+        } else if (message) {
+          return message;
+        } else {
+          var data = {};
+          data['case_sensitive'] = !!options.case_sensitive;
+          if (options.id) {
+            data['id'] = options.id;
+          }
 
-        if (options.scope) {
-          data.scope = {}
-          for (key in options.scope) {
-            var scoped_element = jQuery('[name="' + element.attr('name').replace(/\[\w+]$/, '[' + key + ']' + '"]'));
-            if (scoped_element[0] && scoped_element.val() != options.scope[key]) {
-              data.scope[key] = scoped_element.val();
-              scoped_element.unbind('change.' + element.id).bind('change.' + element.id, function() { element.trigger('change'); element.trigger('focusout'); });
-            } else {
-              data.scope[key] = options.scope[key];
+          if (options.scope) {
+            data.scope = {}
+            for (key in options.scope) {
+              var scoped_element = jQuery('[name="' + element.attr('name').replace(/\[\w+]$/, '[' + key + ']' + '"]'));
+              if (scoped_element[0] && scoped_element.val() != options.scope[key]) {
+                data.scope[key] = scoped_element.val();
+                scoped_element.unbind('change.' + element.id).bind('change.' + element.id, function() { element.trigger('change'); element.trigger('focusout'); });
+              } else {
+                data.scope[key] = options.scope[key];
+              }
             }
           }
-        }
 
-        // Kind of a hack but this will isolate the resource name and attribute.
-        // e.g. user[records_attributes][0][title] => records[title]
-        // e.g. user[record_attributes][title] => record[title]
-        // Server side handles classifying the resource properly
-        if (/_attributes]/.test(element.attr('name'))) {
-          var name = element.attr('name').match(/\[\w+_attributes]/g).pop().match(/\[(\w+)_attributes]/).pop();
-          name += /(\[\w+])$/.exec(element.attr('name'))[1];
-        } else {
-          var name = element.attr('name');
-        }
+          // Kind of a hack but this will isolate the resource name and attribute.
+          // e.g. user[records_attributes][0][title] => records[title]
+          // e.g. user[record_attributes][title] => record[title]
+          // Server side handles classifying the resource properly
+          if (/_attributes]/.test(element.attr('name'))) {
+            var name = element.attr('name').match(/\[\w+_attributes]/g).pop().match(/\[(\w+)_attributes]/).pop();
+            name += /(\[\w+])$/.exec(element.attr('name'))[1];
+          } 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();
+          // 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',
-          data: data,
-          async: false
-        }).status == 200) {
-          return options.message;
+          if (jQuery.ajax({
+            url: '/validators/uniqueness',
+            data: data,
+            async: false
+          }).status == 200) {
+            return options.message;
+          }
         }
       }
     }

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 -04:00
+date: 2011-11-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc4
+        version: 3.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -85,9 +85,9 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.5.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0.rc3
+        version: 2.0.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency