validatious-on-rails 0.4.5 → 0.4.6

data/test/validatious_on_rails/rails/action_view_helpers_test.rb

@@ -65,13 +65,13 @@ class FormHelperTest < ::ActionView::TestCase
 
       test ":check_box" do # a.k.a. "acceptance required"
         # Using +helper+
-        assert_has_class 'acceptance-accept_true', check_box(:bogus_item, :signed, {}, '1', '0')
-        assert_has_class 'acceptance-accept_true some_other_class', check_box(:bogus_item, :signed, :class => 'some_other_class')
+        assert_has_class 'acceptance-accept_true_false', check_box(:bogus_item, :signed, {}, '1', '0')
+        assert_has_class 'acceptance-accept_true_false some_other_class', check_box(:bogus_item, :signed, :class => 'some_other_class')
         # Using builder
-        assert_has_class 'acceptance-accept_true', form_for(@bogus_item, :url => '/bogus_items') { |f|
+        assert_has_class 'acceptance-accept_true_false', form_for(@bogus_item, :url => '/bogus_items') { |f|
             concat f.check_box(:signed, {})
           }
-        assert_has_class 'acceptance-accept_true some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+        assert_has_class 'acceptance-accept_true_false some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
             concat f.check_box(:signed, :class => 'some_other_class')
           }
       end
@@ -214,17 +214,19 @@ class FormHelperTest < ::ActionView::TestCase
     end
 
     test "format_of" do
+      url_param_id = ValidatiousOnRails::Validatious::Validator.generate_id(/^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i.inspect)
+      validator_class = "format-with_#{url_param_id}_false_false"
       # Using helper
-      assert_has_class 'url', text_field(:bogus_item, :url, {})
-      assert_has_class 'url some_other_class', text_field(:bogus_item, :url, :class => 'some_other_class')
+      assert_has_class "#{validator_class}", text_field(:bogus_item, :url, {})
+      assert_has_class "#{validator_class} some_other_class", text_field(:bogus_item, :url, :class => 'some_other_class')
       # Using builder
-      assert_has_class 'url', form_for(@bogus_item, :url => '/bogus_items') { |f|
+      assert_has_class "#{validator_class}", form_for(@bogus_item, :url => '/bogus_items') { |f|
           concat f.text_field(:url, {})
         }
-      assert_has_class 'url some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+      assert_has_class "#{validator_class} 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\"/m, @content_for_validatious
+      assert_match /v2.Validator\.add\(\{.*\"format-with\"/m, @content_for_validatious
     end
     
     # TODO: The other validators...

data/test/validatious_on_rails/validatious/validator_test.rb

@@ -6,8 +6,8 @@ require 'active_support/test_case'
 class ValidatorTest < ::ActiveSupport::TestCase
 
   def setup
-    @empty_validator = ValidatiousOnRails::Validatious::ClientSideValidator.new('dummie')
-    @custom_validator = returning ValidatiousOnRails::Validatious::ClientSideValidator.new('dummie') do |v|
+    @empty_validator = ValidatiousOnRails::Validatious::ClientSideValidator.new
+    @custom_validator = returning ValidatiousOnRails::Validatious::ClientSideValidator.new do |v|
       v.message = 'Fail, fail, fail!'
       v.params = ['some', 'params']
       v.aliases = ['some', 'aliases']
@@ -17,26 +17,26 @@ class ValidatorTest < ::ActiveSupport::TestCase
   end
 
   test "creating an empty validator - and generate valid v2.Validator and class call" do
-    assert_equal 'dummie', @empty_validator.name
+    assert_equal 'client-side', @empty_validator.name
     assert_equal '', @empty_validator.message
     assert_equal ([]), @empty_validator.params
     assert_equal ([]), @empty_validator.aliases
-    assert_equal true, @empty_validator.accept_empty
+    assert_equal false, @empty_validator.accept_empty
     assert_equal "function(field, value, params){return true;}", @empty_validator.fn
 
     expected_v2_validator = 'v2.Validator.add({
-      acceptEmpty: true,
+      acceptEmpty: false,
       fn: function(field, value, params){return true;},
-      name: "dummie"
+      name: "client-side"
     });'
 
     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 ::ValidatiousOnRails::Validatious::Validator.truncate_whitespace(expected_v2_validator), @empty_validator.to_js
+    assert_equal ::ValidatiousOnRails::Validatious::Validator.truncate_whitespace(expected_v2_validator), @empty_validator.to_js.strip
   end
 
   test "creating a custom validator - and generate valid v2.Validator and class call" do
-    assert_equal 'dummie', @custom_validator.name
+    assert_equal 'client-side', @custom_validator.name
     assert_equal 'Fail, fail, fail!', @custom_validator.message
     assert_equal (["some", "params"]), @custom_validator.params
     assert_equal (["some", "aliases"]), @custom_validator.aliases
@@ -48,13 +48,13 @@ class ValidatorTest < ::ActiveSupport::TestCase
       aliases: ["some","aliases"],
       fn: function(field, value, params){return false;},
       message: "Fail, fail, fail!",
-      name: "dummie",
+      name: "client-side",
       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 ::ValidatiousOnRails::Validatious::Validator.truncate_whitespace(expected_v2_validator), @custom_validator.to_js
+    assert_equal ::ValidatiousOnRails::Validatious::Validator.truncate_whitespace(expected_v2_validator), @custom_validator.to_js.strip
   end
 
   context "Message" do
@@ -84,7 +84,7 @@ class ValidatorTest < ::ActiveSupport::TestCase
         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)
+      assert_equal(compact_fn, duck_validator.fn.strip)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 +01:00
+date: 2009-10-29 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -41,11 +41,11 @@ extra_rdoc_files:
 - lib/validatious-on-rails/validatious/remote_validator.rb
 - lib/validatious-on-rails/validatious/validator.rb
 - lib/validatious-on-rails/validatious/validators.rb
-- lib/validatious-on-rails/validatious/validators/acceptance_validator.rb
-- lib/validatious-on-rails/validatious/validators/confirmation_validator.rb
-- 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/acceptance_accept_validator.rb
+- lib/validatious-on-rails/validatious/validators/confirmation_of_validator.rb
+- lib/validatious-on-rails/validatious/validators/exclusion_in_validator.rb
+- lib/validatious-on-rails/validatious/validators/format_with_validator.rb
+- lib/validatious-on-rails/validatious/validators/inclusion_in_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
@@ -88,11 +88,11 @@ files:
 - lib/validatious-on-rails/validatious/remote_validator.rb
 - lib/validatious-on-rails/validatious/validator.rb
 - lib/validatious-on-rails/validatious/validators.rb
-- lib/validatious-on-rails/validatious/validators/acceptance_validator.rb
-- lib/validatious-on-rails/validatious/validators/confirmation_validator.rb
-- 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/acceptance_accept_validator.rb
+- lib/validatious-on-rails/validatious/validators/confirmation_of_validator.rb
+- lib/validatious-on-rails/validatious/validators/exclusion_in_validator.rb
+- lib/validatious-on-rails/validatious/validators/format_with_validator.rb
+- lib/validatious-on-rails/validatious/validators/inclusion_in_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

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

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-module ValidatiousOnRails
-  module Validatious
-    class AcceptanceValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        name = 'acceptance-accept'
-        super name, options
-        self.message = self.class.generate_message(validation, :key => :accepted)
-        self.accept_empty = validation.options[:allow_nil]
-        self.fn = %{
-          var accept_value = params[0] + '';
-          if (accept_value == 'true') {
-            accept_value = true
-          };
-          if (accept_value == 'false') {
-            accept_value = false
-          };
-          return value == accept_value;
-        }
-        self.fn.freeze
-      end
-
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-module ValidatiousOnRails
-  module Validatious
-    class ConfirmationValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        name = 'confirmation-of'
-        super name, options
-        self.params = ['field-id']
-        self.message = self.class.generate_message(validation)
-        self.accept_empty = true
-        # Identical to Validatious "confirmation-of" validator, but we want Rails I18n message support, so...
-        self.fn = %{
-          return value === v2.$f(params[0]).getValue();
-        }
-        self.fn.freeze
-      end
-
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-# TODO: See notes in FormatValidator.
-#
-module ValidatiousOnRails
-  module Validatious
-    class ExclusionValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        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_nil]
-        self.fn = %{
-          #{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; }
-          };
-          return true;
-        }
-        self.fn.freeze
-      end
-
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-# TODO: Would be "cool" if each format rule was save as a JS var,
-# and referenced with class Validatious style:
-#
-#   <head>:
-#     var ssn-se = /^\d{6}-{4}$/;
-#     <<< format validator here >>>
-#   <body>:
-#     <input type="text" class="format-with_ssn-se" ... />
-#
-# Same for inclusion/exclusion too. Easy to implement, but low prio.
-#
-module ValidatiousOnRails
-  module Validatious
-    class FormatValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        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, :key => :invalid)
-        self.accept_empty = validation.options[:allow_nil]
-        self.fn = %{
-          #{self.class.validate_blank(validation.options[:allow_blank])}
-          return #{validation.options[:with].inspect.gsub(/\\A/, '^').gsub(/\\z/, '$')}.test(value);
-        }
-        self.fn.freeze
-      end
-
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
-
-# TODO: See notes in FormatValidator.
-#
-module ValidatiousOnRails
-  module Validatious
-    class InclusionValidator < ClientSideValidator
-
-      def initialize(validation, options = {})
-        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_nil]
-        self.fn = %{
-          #{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; }
-          };
-          return false;
-        }
-        self.fn.freeze
-      end
-
-    end
-  end
-end