validatious-on-rails 0.4.4 → 0.4.5

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

@@ -12,7 +12,7 @@ module ValidatiousOnRails
     def attach_validator_for(object_name, method, options = {})
       options = ::ValidatiousOnRails::ModelValidations.options_for(object_name, method, options, @content_for_validatious)
       custom_js = options.delete(:js)
-      content_for :validatious, custom_js if custom_js.present?
+      content_for :validatious, custom_js << "\n" if custom_js.present?
       options
     end
 

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

@@ -52,7 +52,7 @@ module ValidatiousOnRails
           validator_classes << v.to_class
         end
         classes = validator_classes.compact.join(' ').strip
-        js = validator_js.compact.join(' ').strip
+        js = validator_js.compact.join("\n").strip
         options.merge!(:class => (classes unless classes.blank?), :js => (js unless js.blank?))
       end
 

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

@@ -12,7 +12,7 @@ module ValidatiousOnRails
       # Override default Validator-fn, with default a ClientSideValidator-fn.
       #
       def fn
-        (@fn ||= "function(field, value, params) {return true;}").gsub(/[\n\t]/, '')
+        self.class.truncate_whitespace(@fn ||= "function(field, value, params){return true;}")
       end
 
     end

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

@@ -17,11 +17,11 @@ module ValidatiousOnRails
       #   2. Always return true, callback-function should perform the actual client side validation.
       #
       def fn
-        (@fn ||= %{
+        self.class.truncate_whitespace(@fn ||= %{
             function(field, value, params) {
               return !!v2.Rails.performRemoteValidation('#{self.name}', field, value, params, '#{self.message}');
             }
-          }).gsub(/[\n\t]/, '')
+          })
       end
 
       class << self
@@ -35,23 +35,23 @@ module ValidatiousOnRails
         def perform_validation(record, attribute_name, value, params = {})
           return true if record.blank?
           record.send :"#{attribute_name}=", value
-          
+
           if record.valid?
             ValidatiousOnRails.log "Validation: SUCCESS"
             true
           else
             return true if record.errors[attribute_name.to_sym].blank?
-            
+
             # TODO: Refactor this when "the better" namin convention is used (see TODO).
             validation_macro = ("validates_%s" % self.name.split('::').last.underscore.gsub(/_validator$/, ''))
             validation = record.class.reflect_on_validations_for(attribute_name.to_sym).select { |v|
                 v.macro.to_s == validation_macro || v.macro.to_s == "#{validation_macro}_of"
               }.first
             return true if validation.blank?
-            
+
             # {{variable}} => .*
             validation_error_message = self.new(validation).message.gsub(/\{\{.*\}\}/, '.*')
-            
+
             # Ugly, but probably the only way (?) to identify a certain error without open
             # up rails core validation methods - not scalable.
             is_invalid = record.errors[attribute_name.to_sym].any? do |error_message|

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

@@ -122,7 +122,7 @@ module ValidatiousOnRails
           value ||= ''
           # If no function specified yet, always validate true by default.
           value << "\nreturn true;" unless value =~ /return (.+)/i
-          "function(field, value, params) {#{value}}"
+          "function(field, value, params){#{value}}"
         end
       end
 
@@ -140,8 +140,8 @@ module ValidatiousOnRails
         js_options = options.keys.collect(&:to_s).sort.collect { |k|
             v = options[k.to_sym]
             ("#{k}: #{k.to_sym == :fn ? v : v.to_json}" if [false, true].include?(v) || v.present?)
-          }.compact.join(', ')
-        "v2.Validator.add({#{js_options}});"
+          }.compact.join(',')
+        self.class.truncate_whitespace("v2.Validator.add({#{js_options}});")
       end
       alias :to_s :to_js
 
@@ -155,10 +155,14 @@ module ValidatiousOnRails
 
       class << self
 
-        def validate_blank(validation)
+        def truncate_whitespace(string)
+          string.gsub(/[\n]+[\s]+/, '')
+        end
+
+        def validate_blank(allow_blank)
           %{
-            var isBlank = /^[\s\t\n]*$/.test(value);
-            if (#{validation.options[:allow_blank] == true} && isBlank) {
+            var isBlank = /^[#{'\s\t\n'}]*$/.test(value);
+            if (#{allow_blank == true} && isBlank) {
               return true;
             };
           }

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

@@ -8,7 +8,7 @@ module ValidatiousOnRails
       def initialize(validation, options = {})
         name = 'acceptance-accept'
         super name, options
-        self.message = self.class.generate_message(validation)
+        self.message = self.class.generate_message(validation, :key => :accepted)
         self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
           var accept_value = params[0] + '';

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

@@ -13,7 +13,7 @@ module ValidatiousOnRails
         self.message = self.class.generate_message(validation)
         self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
-          #{self.class.validate_blank(validation)}
+          #{self.class.validate_blank(validation.options[:allow_blank])}
           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

@@ -22,7 +22,7 @@ module ValidatiousOnRails
         self.message = self.class.generate_message(validation, :key => :invalid)
         self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
-          #{self.class.validate_blank(validation)}
+          #{self.class.validate_blank(validation.options[:allow_blank])}
           return #{validation.options[:with].inspect.gsub(/\\A/, '^').gsub(/\\z/, '$')}.test(value);
         }
         self.fn.freeze

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

@@ -13,7 +13,7 @@ module ValidatiousOnRails
         self.message = self.class.generate_message(validation)
         self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
-          #{self.class.validate_blank(validation)}
+          #{self.class.validate_blank(validation.options[:allow_blank])}
           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

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

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

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

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

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

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

@@ -12,7 +12,7 @@ module ValidatiousOnRails
         self.accept_empty = false
         # Identical to Validatious "required" validator, but we want Rails I18n message support, so...
         self.fn = %{
-          return !v2.empty(value) && !(typeof value.length !== 'undefined' && value.length === 0);
+          return !v2.empty(value) && !(typeof value.length !== 'undefined' && value.length === 0) && !/^[#{'\s\t\n'}]*$/.test(value);
         }
         self.fn.freeze
       end

data/test/validatious_on_rails/rails/action_view_helpers_test.rb

@@ -224,7 +224,7 @@ class FormHelperTest < ::ActionView::TestCase
       assert_has_class 'url some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
           concat f.text_field(:url, :class => 'some_other_class')
         }
-      assert_match /v2.Validator\.add\(.*\{.*"url"/, @content_for_validatious
+      assert_match /v2.Validator\.add\(\{.*\"url\"/m, @content_for_validatious
     end
     
     # TODO: The other validators...

data/test/validatious_on_rails/validatious/validator_test.rb

@@ -22,17 +22,17 @@ class ValidatorTest < ::ActiveSupport::TestCase
     assert_equal ([]), @empty_validator.params
     assert_equal ([]), @empty_validator.aliases
     assert_equal true, @empty_validator.accept_empty
-    assert_equal "function(field, value, params) {return true;}", @empty_validator.fn.gsub(/\n/, '')
+    assert_equal "function(field, value, params){return true;}", @empty_validator.fn
 
     expected_v2_validator = 'v2.Validator.add({
       acceptEmpty: true,
-      fn: function(field, value, params) {return true;},
+      fn: function(field, value, params){return true;},
       name: "dummie"
     });'
 
     assert_equal @custom_validator.name, @custom_validator.to_class
     assert_equal "#{@custom_validator.name}_1_hello_2", @custom_validator.to_class(1, "hello", 2)
-    assert_equal expected_v2_validator.gsub(/[\n\s\t]/, ''), @empty_validator.to_js.gsub(/[\n\s\t]/, '')
+    assert_equal ::ValidatiousOnRails::Validatious::Validator.truncate_whitespace(expected_v2_validator), @empty_validator.to_js
   end
 
   test "creating a custom validator - and generate valid v2.Validator and class call" do
@@ -41,25 +41,25 @@ class ValidatorTest < ::ActiveSupport::TestCase
     assert_equal (["some", "params"]), @custom_validator.params
     assert_equal (["some", "aliases"]), @custom_validator.aliases
     assert_equal false, @custom_validator.accept_empty
-    assert_equal "function(field, value, params) {return false;}", @custom_validator.fn.gsub(/\n/, '')
+    assert_equal "function(field, value, params){return false;}", @custom_validator.fn
 
     expected_v2_validator = 'v2.Validator.add({
       acceptEmpty: false,
-      aliases: ["some", "aliases"],
-      fn: function(field, value, params) {return false;},
+      aliases: ["some","aliases"],
+      fn: function(field, value, params){return false;},
       message: "Fail, fail, fail!",
       name: "dummie",
-      params: ["some", "params"]
+      params: ["some","params"]
     });'
 
     assert_equal @custom_validator.name, @custom_validator.to_class
     assert_equal "#{@custom_validator.name}_1_hello_2", @custom_validator.to_class(1, "hello", 2)
-    assert_equal expected_v2_validator.gsub(/[\n\s\t]/, ''), @custom_validator.to_js.gsub(/[\n\s\t]/, '')
+    assert_equal ::ValidatiousOnRails::Validatious::Validator.truncate_whitespace(expected_v2_validator), @custom_validator.to_js
   end
 
   context "Message" do
     test "I18n lookup" do
-      validator_klass = ValidatiousOnRails::Validatious::Validator
+      validator_klass = ::ValidatiousOnRails::Validatious::Validator
       # For some reason can't raise this in tests. =S
       # assert_raise(::I18n::MissingInterpolationArgument) {
       #    validator_klass.generate_message :key => :too_short
@@ -70,4 +70,22 @@ class ValidatorTest < ::ActiveSupport::TestCase
     end
   end
 
+  context "JavaScript" do
+    test "truncation of whitespace characters" do
+      duck_validator = ::ValidatiousOnRails::Validatious::ClientSideValidator.new('duck')
+      # Well... =)
+      duck_validator.fn = %{
+        var duck_says = "Quack!";
+
+        if (duck_says != "Quack!") {
+          return (duck_says == "Quack! ${{interpolation}} Quack!");
+        }
+
+        return true;
+      }
+      compact_fn = %{function(field, value, params){var duck_says = "Quack!";if (duck_says != "Quack!") {return (duck_says == "Quack! ${{interpolation}} Quack!");}return true;}}
+      assert_equal(compact_fn, duck_validator.fn)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 +02:00
+date: 2009-10-26 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -46,7 +46,6 @@ extra_rdoc_files:
 - lib/validatious-on-rails/validatious/validators/exclusion_validator.rb
 - lib/validatious-on-rails/validatious/validators/format_validator.rb
 - lib/validatious-on-rails/validatious/validators/inclusion_validator.rb
-- lib/validatious-on-rails/validatious/validators/invalid_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/is_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/maximum_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/minimum_validator.rb
@@ -59,7 +58,6 @@ extra_rdoc_files:
 - lib/validatious-on-rails/validatious/validators/numericality/odd_validator.rb
 - lib/validatious-on-rails/validatious/validators/numericality/only_integer_validator.rb
 - lib/validatious-on-rails/validatious/validators/presence_validator.rb
-- lib/validatious-on-rails/validatious/validators/remote_client_validator.rb
 - lib/validatious-on-rails/validatious/validators/uniqueness_validator.rb
 - rails/init.rb
 - test/test_helper.rb
@@ -95,7 +93,6 @@ files:
 - lib/validatious-on-rails/validatious/validators/exclusion_validator.rb
 - lib/validatious-on-rails/validatious/validators/format_validator.rb
 - lib/validatious-on-rails/validatious/validators/inclusion_validator.rb
-- lib/validatious-on-rails/validatious/validators/invalid_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/is_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/maximum_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/minimum_validator.rb
@@ -108,7 +105,6 @@ files:
 - lib/validatious-on-rails/validatious/validators/numericality/odd_validator.rb
 - lib/validatious-on-rails/validatious/validators/numericality/only_integer_validator.rb
 - lib/validatious-on-rails/validatious/validators/presence_validator.rb
-- lib/validatious-on-rails/validatious/validators/remote_client_validator.rb
 - lib/validatious-on-rails/validatious/validators/uniqueness_validator.rb
 - rails/init.rb
 - test/test_helper.rb

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

@@ -1,19 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-module ValidatiousOnRails
-  module Validatious
-    class RemoteClientValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        super 'remote-client', options
-        self.message = self.class.generate_message(validation)
-        self.accept_empty = false
-        self.fn = %{
-          return !!params[0];
-        }
-      end
-
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-module ValidatiousOnRails
-  module Validatious
-    class RemoteClientValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        super 'remote-client', options
-        self.message = self.class.generate_message(validation)
-        self.accept_empty = false
-        self.fn = %{
-          return !!params[0];
-        }
-      end
-
-    end
-  end
-end