validatious-on-rails 0.3.2 → 0.3.3

data/lib/validatious-on-rails/validatious/validator.rb

@@ -157,6 +157,15 @@ module ValidatiousOnRails
 
       class << self
 
+        def validate_blank(validation)
+          %{
+            var isBlank = /^[\s\t\n]*$/.test(value);
+            if (#{validation.options[:allow_blank] == true} && isBlank) {
+              return true;
+            };
+          }
+        end
+
         # Generate a unique valdiator ID to avoid clashes.
         # Note: Ruby #hash is way faster than SHA1 (etc.) - just replace any negative sign.
         #

data/lib/validatious-on-rails/validatious/validators/exclusion_validator.rb

@@ -11,8 +11,9 @@ module ValidatiousOnRails
         name, alias_name = self.class.generate_name(validation, :in, self.class.generate_id(validation.options[:in].inspect))
         super name, options
         self.message = self.class.generate_message(validation)
-        self.accept_empty = validation.options[:allow_blank] || validation.options[:allow_nil]
+        self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
+          #{self.class.validate_blank(validation)}
           var exclusion_values = #{validation.options[:in].to_json};
           for (var i = 0; i < exclusion_values.length; i++) {
             if (exclusion_values[i] == value) { return false; }

data/lib/validatious-on-rails/validatious/validators/format_validator.rb

@@ -20,8 +20,9 @@ module ValidatiousOnRails
         name, alias_name = self.class.generate_name(validation, :with, self.class.generate_id(validation.options[:with].inspect))
         super name, options
         self.message = self.class.generate_message(validation)
-        self.accept_empty = validation.options[:allow_blank] || validation.options[:allow_nil]
+        self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
+          #{self.class.validate_blank(validation)}
           return #{validation.options[:with].inspect}.test(value);
         }
         self.fn.freeze

data/lib/validatious-on-rails/validatious/validators/inclusion_validator.rb

@@ -11,8 +11,9 @@ module ValidatiousOnRails
         name, alias_name = self.class.generate_name(validation, :in, self.class.generate_id(validation.options[:in].inspect))
         super name, options
         self.message = self.class.generate_message(validation)
-        self.accept_empty = validation.options[:allow_blank] || validation.options[:allow_nil]
+        self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
+          #{self.class.validate_blank(validation)}
           var inclusion_values = #{validation.options[:in].to_json};
           for (var i = 0; i < inclusion_values.length; i++) {
             if (inclusion_values[i] == value) { return true; }

data/lib/validatious-on-rails/validatious/validators/length/is_validator.rb

@@ -12,8 +12,9 @@ module ValidatiousOnRails
           super name, options
           self.params = ['count']
           self.message = self.class.generate_message(validation, :key => :wrong_length)
-          self.accept_empty = validation.options[:allow_blank] || validation.options[:allow_nil]
+          self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
+            #{self.class.validate_blank(validation)}
             value += '';
             return value == params[0];
           }

data/lib/validatious-on-rails/validatious/validators/length/maximum_validator.rb

@@ -12,8 +12,9 @@ module ValidatiousOnRails
           super name, options
           self.params = ['count']
           self.message = self.class.generate_message(validation, :key => :too_long)
-          self.accept_empty = validation.options[:allow_blank] || validation.options[:allow_nil]
+          self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
+            #{self.class.validate_blank(validation)}
             value += '';
             return value.length <= params[0];
           }

data/lib/validatious-on-rails/validatious/validators/length/minimum_validator.rb

@@ -12,8 +12,9 @@ module ValidatiousOnRails
           super name, options
           self.params = ['count']
           self.message = self.class.generate_message(validation, :key => :too_short)
-          self.accept_empty = validation.options[:allow_blank] || validation.options[:allow_nil]
+          self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
+            #{self.class.validate_blank(validation)}
             value += '';
             return value.length >= params[0];
           }

data/test/validatious_on_rails/helpers_test.rb

@@ -17,7 +17,7 @@ class HelpersTest < ::ActionView::TestCase
     context "custom_validatious_validators" do
 
       test "should not output custom validators if there are none" do
-        helper_output = ::ValidatiousOnRails::Helpers.attached_validators
+        helper_output = javascript_for_validatious
         assert_equal '', helper_output.to_s
       end
 
@@ -25,14 +25,12 @@ class HelpersTest < ::ActionView::TestCase
         form_for(::BogusItem.new, :url => '/bogus_items') do |f|
           concat f.text_field(:url)
         end
-
-        # FIXME: Not sure how to test content_for-helpers...returns nil.
-        concat ::ValidatiousOnRails::Helpers.attached_validators
+        concat javascript_for_validatious
 
         # In parts...
-        # assert_match /<script.+>.*v2.Validator.*<\/script>/, output_buffer
-        # assert_match /<script.*id="custom_validatious_validators".*>/, helper_output
-        # assert_match /<script.*type="text\/javascript".*>/, helper_output
+        assert_match /<script.+>.*v2.Validator.*<\/script>/, output_buffer
+        assert_match /<script.*id="custom_validators".*>/, output_buffer
+        assert_match /<script.*type="text\/javascript".*>/, output_buffer
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Christian Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +02:00
+date: 2009-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: []