validatious-on-rails 0.3.6 → 0.3.7

data/Rakefile

@@ -7,12 +7,12 @@ require 'rake/rdoctask'
 NAME = "validatious-on-rails"
 SUMMARY = %Q{Rails plugin that maps model validations to class names on form elements to integrate with Validatious.}
 HOMEPAGE = "http://github.com/grimen/#{NAME}"
-AUTHORS = ["Christian Johansen", "Jonas Grimfelt"]
-EMAIL = "christian@cjohansen.no"
+AUTHORS = ["Jonas Grimfelt", "Christian Johansen"]
+EMAIL = "grimen@gmail.com"
 SUPPORT_FILES = %w(README)
 
 begin
-  gem 'technicalpickles-jeweler', '>= 1.2.1'
+  gem 'jeweler', '>= 1.2.1'
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name        = NAME

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

@@ -1,6 +1,12 @@
 module ValidatiousOnRails
   module Helpers
 
+    def self.included(base)
+      base.class_eval do
+        extend ClassMethods
+      end
+    end
+
     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)
@@ -30,6 +36,19 @@ module ValidatiousOnRails
       return args, tail
     end
 
+    module ClassMethods
+      
+      def define_with_validatious_support(field_type)
+        define_method :"#{field_type}_with_validation" do |*args|
+          args, tail = ::ValidatiousOnRails::Helpers.extract_args!(*args)
+          options = self.attach_validator_for(args.first, args.second, args.extract_options!)
+          self.send :"#{field_type}_without_validation", *((args << options) + tail)
+        end
+        alias_method_chain field_type, :validation
+      end
+
+    end
+
   end
 end
 

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

@@ -16,55 +16,40 @@ module ActionView # :nodoc:
       # so the hooking of these helpers don't have to be very explicit.
       #
       FIELD_TYPES.each do |field_type|
-        define_method :"#{field_type}_with_validation" do |*args|
-          args, tail = ::ValidatiousOnRails::Helpers.extract_args!(*args)
-          options = self.attach_validator_for(args.first, args.second, args.extract_options!)
-          self.send :"#{field_type}_without_validation", *((args << options) + tail)
-        end
-        alias_method_chain field_type, :validation
+        define_with_validatious_support(field_type)
       end
 
       # Adds the title attribute to label tags when there is no title
       # set, and the label text is provided. The title is set to object_name.humanize
       #
       def label_with_title(object_name, method, text = nil, options = {})
-        options[:title] ||= method.to_s.humanize unless text.nil?
+        options[:title] ||= object_name.to_s.classify.constantize.human_attribute_name(method.to_s) unless text.nil?
         label_without_title(object_name, method, text, options)
       end
       alias_method_chain :label, :title
 
     end
 
-    module FormOptionsHelper
+    module FormOptionsHelper # :nodoc:
 
       include ::ValidatiousOnRails::Helpers
 
-      FIELD_TYPES = [:time_zone_select, :select, :collection_select, :grouped_options_for_select].freeze
+      FIELD_TYPES = [:time_zone_select, :select, :collection_select, :grouped_collection_select].freeze
 
       FIELD_TYPES.each do |field_type|
-        define_method :"#{field_type}_with_validation" do |*args|
-          args, tail = ::ValidatiousOnRails::Helpers.extract_args!(*args)
-          options = self.attach_validator_for(args.first, args.second, args.extract_options!)
-          self.send :"#{field_type}_without_validation", *((args << options) + tail)
-        end
-        alias_method_chain field_type, :validation
+        define_with_validatious_support(field_type)
       end
 
     end
 
-    module DateHelper
+    module DateHelper # :nodoc:
 
       include ::ValidatiousOnRails::Helpers
 
       FIELD_TYPES = [:date_select, :datetime_select, :time_select].freeze
 
       FIELD_TYPES.each do |field_type|
-        define_method :"#{field_type}_with_validation" do |*args|
-          args, tail = ::ValidatiousOnRails::Helpers.extract_args!(*args)
-          options = self.attach_validator_for(args.first, args.second, args.extract_options!)
-          self.send :"#{field_type}_without_validation", *((args << options) + tail)
-        end
-        alias_method_chain field_type, :validation
+        define_with_validatious_support(field_type)
       end
 
     end

data/test/test_helper.rb

@@ -52,6 +52,8 @@ build_model :bogus_items do
   string :url
   string :name
   string :email
+  string :file_path
+  string :dummie
   
   text    :body
   integer :variant
@@ -61,7 +63,7 @@ build_model :bogus_items do
   string :field_with_client_side_validations
   string :field_without_client_side_validations
   
-  validates_presence_of :name, :body, :variant
+  validates_presence_of :name, :body, :variant, :file_path, :dummie
   validates_confirmation_of :name
   validates_acceptance_of :signed, :accept => true
   validates_format_of :url,
@@ -88,3 +90,20 @@ RAILS_ROOT = File.join(File.dirname(__FILE__)) unless defined?(RAILS_ROOT)
 # Log file for testing only.
 #
 ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), 'debug.log'))
+
+module Test::Unit::Assertions
+
+  #
+  # Assert that a piece of HTML includes the class name.
+  #
+  def assert_has_class(class_name, html, message = nil)
+    # Might need to consider this...but works a bit better.
+    classes = html.scan(/class="([^"]*)"/).collect { |c| c.to_s.split(' ') }.flatten
+    full_message = build_message(message, "<?>\nexpected to include class(es) <?>.\n", html, class_name)
+
+    assert_block(full_message) do
+      class_name.split(' ').all? { |cname| classes.include?(cname) }
+    end
+  end
+
+end

data/test/validatious_on_rails/rails/action_view_helpers_test.rb

@@ -1,162 +1,253 @@
 # encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), *%w(.. .. test_helper)))
 
-module Test::Unit::Assertions
-
-  #
-  # Assert that a piece of HTML includes the class name.
-  #
-  def assert_has_class(class_name, html, message = nil)
-    # Might need to consider this...but works a bit better.
-    classes = html.scan(/class="([^"]*)"/).collect { |c| c.to_s.split(' ') }.flatten
-    full_message = build_message(message, "<?>\nexpected to include class(es) <?>.\n", html, class_name)
-
-    assert_block(full_message) do
-      class_name.split(' ').all? { |cname| classes.include?(cname) }
-    end
-  end
-
-end
-
 require 'action_view/test_case'
 
 class FormHelperTest < ::ActionView::TestCase
 
-  include ActionView::Helpers::FormHelper
+  include ::ActionView::Helpers::FormHelper
+  include ::ActiveSupport
 
-  def setup
+  before do
     @bogus_item = BogusItem.new
   end
 
-  test "attach custom javascript validations to layout" do
-    @content_for_validatious = nil
-    view_output = form_for(@bogus_item, :url => '/bogus_items') do |f|
-      concat f.text_field(:url)
+  context "layout" do
+    test "attach custom javascript validations to layout" do
+      @content_for_validatious = nil
+      view_output = form_for(@bogus_item, :url => '/bogus_items') do |f|
+        concat f.text_field(:url)
+      end
+      assert_match /v2.Validator/, @content_for_validatious
     end
-    assert_match /v2.Validator/, @content_for_validatious
   end
 
-  test "required :text_field" do
-    # Using helper
-    assert_has_class 'presence', text_field(:bogus_item, :name)
-    assert_has_class 'presence some_other_class', text_field(:bogus_item, :name, :class => 'some_other_class')
-
-    # Using builder
-    assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.text_field(:name)
-      }
-    assert_has_class 'presence text', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.text_field(:name, :class => 'text')
-      }
-  end
+  context "field class names" do
+    context "form helpers" do
+      test ":text_field" do
+        # Using helper
+        assert_has_class 'presence', text_field(:bogus_item, :name, {})
+        assert_has_class 'presence some_other_class', text_field(:bogus_item, :name, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.text_field(:name, {})
+          }
+        assert_has_class 'presence text', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.text_field(:name, :class => 'text')
+          }
+      end
 
-  test "required :password_field" do
-    # Using helper
-    assert_has_class 'presence', password_field(:bogus_item, :name)
-    assert_has_class 'presence some_other_class', password_field(:bogus_item, :name, :class => 'some_other_class')
-    
-    # Using builder
-    assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.password_field(:name)
-      }
-    assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.password_field(:name, :class => 'some_other_class')
-      }
-  end
+      test ":password_field" do
+        # Using helper
+        assert_has_class 'presence', password_field(:bogus_item, :name, {})
+        assert_has_class 'presence some_other_class', password_field(:bogus_item, :name, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.password_field(:name, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.password_field(:name, :class => 'some_other_class')
+          }
+      end
 
-  test "required :text_area" do
-    # Using helper
-    assert_has_class 'presence', text_area(:bogus_item, :body)
-    assert_has_class 'presence some_other_class', text_area(:bogus_item, :body, :class => 'some_other_class')
-    
-    # Using builder
-    assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.text_area(:body)
-      }
-    assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.text_area(:body, :class => 'some_other_class')
-      }
-  end
+      test ":text_area" do
+        # Using helper
+        assert_has_class 'presence', text_area(:bogus_item, :body, {})
+        assert_has_class 'presence some_other_class', text_area(:bogus_item, :body, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.text_area(:body, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.text_area(:body, :class => 'some_other_class')
+          }
+      end
 
-  test "required :check_box" do # a.k.a. "acceptance required"
-    # Using helper
-    assert_has_class 'acceptance-accept_true', check_box(:bogus_item, :signed)
-    assert_has_class 'acceptance-accept_true 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|
-        concat f.check_box(:signed)
-      }
-    assert_has_class 'acceptance-accept_true some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.check_box(:signed, :class => 'some_other_class')
-      }
-  end
+      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')
+        # Using builder
+        assert_has_class 'acceptance-accept_true', 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|
+            concat f.check_box(:signed, :class => 'some_other_class')
+          }
+      end
 
-  test "required :radio_button" do
-    # Using helper
-     assert_has_class 'presence', radio_button(:bogus_item, :variant, 1)
-     assert_has_class 'presence some_other_class', radio_button(:bogus_item, :variant, 1, :class => 'some_other_class')
-     
-     assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
-         concat f.radio_button(:variant, 1)
-       }
-     assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
-         concat f.radio_button(:variant, 1, :class => 'some_other_class')
-       }
-  end
+      test ":radio_button" do
+        # Using helper
+        assert_has_class 'presence', radio_button(:bogus_item, :variant, 1, {})
+        assert_has_class 'presence some_other_class', radio_button(:bogus_item, :variant, 1, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.radio_button(:variant, 1, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.radio_button(:variant, 1, :class => 'some_other_class')
+          }
+      end
+      
+      test ":file_field" do
+        # Using helper
+        assert_has_class 'presence', file_field(:bogus_item, :file_path, {})
+        assert_has_class 'presence some_other_class', file_field(:bogus_item, :file_path, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.file_field(:variant, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.file_field(:variant, :class => 'some_other_class')
+          }
+      end
+    end
 
-  test "confirmation_of :name field" do
-    # Using helper
-    assert_has_class 'confirmation-of_name', text_field(:bogus_item, :name_confirmation)
-    assert_has_class 'confirmation-of_name some_other_class', text_field(:bogus_item, :name_confirmation, :class => 'some_other_class')
-    
-    # Using builder
-    assert_has_class 'confirmation-of_name', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.text_field(:name_confirmation)
-      }
-    assert_has_class 'confirmation-of_name some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
-        concat f.text_field(:name_confirmation, :class => 'some_other_class')
-      }
-  end
+    context "form options fields" do
+      test ":select" do
+        # Using helper
+        assert_has_class 'presence', select(:bogus_item, :variant, [], {}, {})
+        assert_has_class 'presence some_other_class', select(:bogus_item, :variant, [], {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.select(:variant, [], {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.select(:variant, [], {}, :class => 'some_other_class')
+          }
+      end
 
-  test "format_of :url field" do
-    # 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')
-    
-    # Using builder
-    assert_has_class 'url', 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|
-        concat f.text_field(:url, :class => 'some_other_class')
-      }
-    assert_match /v2.Validator\.add\(.*\{.*"url"/, @content_for_validatious
-  end
-  
-  test "exclusion_of :variant field" do
-    # TODO
-  end
+      test ":collection_select" do
+        # Using helper
+        assert_has_class 'presence', collection_select(:bogus_item, :variant, [], :to_param, :to_s, {}, {})
+        assert_has_class 'presence some_other_class', collection_select(:bogus_item, :variant, [], :to_param, :to_s, {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.collection_select(:variant, [], :to_param, :to_s, {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.collection_select(:variant, [], :to_param, :to_s, {}, :class => 'some_other_class')
+          }
+      end
 
-  test "inclusion_of :variant field" do
-    # TODO
-  end
+      test ":grouped_collection_select" do
+        # Using helper
+        assert_has_class 'presence', grouped_collection_select(:bogus_item, :variant, [], :bogus_items, :name, :id, :name, {}, {})
+        assert_has_class 'presence some_other_class', grouped_collection_select(:bogus_item, :variant, [], :bogus_items, :name, :id, :name, {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.grouped_collection_select(:variant, [], :bogus_items, :name, :id, :name, {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.grouped_collection_select(:variant, [], :bogus_items, :name, :id, :name, {}, :class => 'some_other_class')
+          }
+      end
 
-  test "regular label" do
-    # Using helper
-    assert_equal "<label for=\"bogus_item_name\">Name</label>", label(:bogus_item, :name)
+      test ":time_zone_select" do
+        # Using helper
+        assert_has_class 'presence', time_zone_select(:bogus_item, :dummie, TimeZone.us_zones, {}, {})
+        assert_has_class 'presence some_other_class', time_zone_select(:bogus_item, :dummie, TimeZone.us_zones, {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.time_zone_select(:dummie, TimeZone.us_zones, {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.time_zone_select(:dummie, TimeZone.us_zones, {}, :class => 'some_other_class')
+          }
+      end
+    end
+
+    context "date helper fields" do
+      test ":datetime_select" do
+        # Using helper
+        assert_has_class 'presence', datetime_select(:bogus_item, :dummie, {}, {})
+        assert_has_class 'presence some_other_class', datetime_select(:bogus_item, :dummie, {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.datetime_select(:dummie, {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.datetime_select(:dummie, {}, :class => 'some_other_class')
+          }
+      end
+      
+      test ":date_select" do
+        # Using helper
+        assert_has_class 'presence', date_select(:bogus_item, :dummie, {}, {})
+        assert_has_class 'presence some_other_class', date_select(:bogus_item, :dummie, {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.date_select(:dummie, {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.date_select(:dummie, {}, :class => 'some_other_class')
+          }
+      end
+      
+      test ":time_select" do
+        # Using helper
+        assert_has_class 'presence', time_select(:bogus_item, :dummie, {}, {})
+        assert_has_class 'presence some_other_class', time_select(:bogus_item, :dummie, {}, :class => 'some_other_class')
+        # Using builder
+        assert_has_class 'presence', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.time_select(:dummie, {}, {})
+          }
+        assert_has_class 'presence some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+            concat f.time_select(:dummie, {}, :class => 'some_other_class')
+          }
+      end
+    end
   end
 
-  test "label with title" do
-    # Using helper
-    assert_equal "<label for=\"bogus_item_name\" title=\"craaazy\">Name</label>",
-                 label(:bogus_item, :name, nil, :title => "craaazy")
+  context "validator types" do
+    test "confirmation_of" do
+      # Using helper
+      assert_has_class 'confirmation-of_name', text_field(:bogus_item, :name_confirmation, {})
+      assert_has_class 'confirmation-of_name some_other_class', text_field(:bogus_item, :name_confirmation, :class => 'some_other_class')
+      # Using builder
+      assert_has_class 'confirmation-of_name', form_for(@bogus_item, :url => '/bogus_items') { |f|
+          concat f.text_field(:name_confirmation, {})
+        }
+      assert_has_class 'confirmation-of_name some_other_class', form_for(@bogus_item, :url => '/bogus_items') { |f|
+          concat f.text_field(:name_confirmation, :class => 'some_other_class')
+        }
+    end
+
+    test "format_of" do
+      # 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')
+      # Using builder
+      assert_has_class 'url', 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|
+          concat f.text_field(:url, :class => 'some_other_class')
+        }
+      assert_match /v2.Validator\.add\(.*\{.*"url"/, @content_for_validatious
+    end
+    
+    # TODO: The other validators...
   end
 
-  test "label without title" do
-    # Using helper
-    assert_equal "<label for=\"bogus_item_name\" title=\"Name\">Your name</label>",
-                 label(:bogus_item, :name, "Your name")
+  # TODO: Re-visit label - needed still?
+  context "label" do
+    test "regular" do
+      # Using helper
+      assert_equal "<label for=\"bogus_item_name\">Name</label>", label(:bogus_item, :name)
+    end
+    
+    test "with title" do
+      # Using helper
+      assert_equal "<label for=\"bogus_item_name\" title=\"craaazy\">Name</label>",
+                   label(:bogus_item, :name, nil, :title => "craaazy")
+    end
+    
+    test "without title" do
+      # Using helper
+      assert_equal "<label for=\"bogus_item_name\" title=\"Name\">Your name</label>",
+                   label(:bogus_item, :name, "Your name")
+    end
   end
 
   private

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
-- Christian Johansen
 - Jonas Grimfelt
+- Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 +02:00
+date: 2009-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Rails plugin that maps model validations to class names on form elements to integrate with Validatious.
-email: christian@cjohansen.no
+email: grimen@gmail.com
 executables: []
 
 extensions: []