grimen-validatious-on-rails 0.1.0 → 0.1.1

data/generators/validatious/validatious_generator.rb

@@ -5,7 +5,7 @@ class ValidatiousGenerator < Rails::Generator::Base
   def manifest
     record do |m|
       m.template 'v2.standalone.full.min.js', File.join('public', 'javascripts', 'v2.standalone.full.min.js')
-      m.template 'validatious_config.js', File.join('public', 'javascripts', 'validatious.config.js')
+      m.template 'validatious.config.js', File.join('public', 'javascripts', 'validatious.config.js')
     end
   end
   

data/lib/validatious/form_helper.rb

@@ -11,7 +11,7 @@ module ActionView
       # Add validation class names to: text-fields.
       #
       def text_field_with_validation(object_name, method, options = {})
-        options = Validatious::RailsValidation.options_for(object_name, method, options)
+        options = ::Validatious::RailsValidation.options_for(object_name, method, options)
         text_field_without_validation(object_name, method, options)
       end
       alias_method_chain :text_field, :validation
@@ -20,7 +20,7 @@ module ActionView
       # Add validation class names to: password-fields.
       #
       def password_field_with_validation(object_name, method, options = {})
-        options = Validatious::RailsValidation.options_for(object_name, method, options)
+        options = ::Validatious::RailsValidation.options_for(object_name, method, options)
         password_field_without_validation(object_name, method, options)
       end
       alias_method_chain :password_field, :validation
@@ -29,7 +29,7 @@ module ActionView
       # Add validation class names to: text-areas.
       #
       def text_area_with_validation(object_name, method, options = {})
-        options = Validatious::RailsValidation.options_for(object_name, method, options)
+        options = ::Validatious::RailsValidation.options_for(object_name, method, options)
         text_area_without_validation(object_name, method, options)
       end
       alias_method_chain :text_area, :validation
@@ -38,7 +38,7 @@ module ActionView
       # Add validation class names to: check-boxes.
       #
       def check_box_with_validation(object_name, method, options = {}, checked_value = '1', unchecked_value = '0')
-        options = Validatious::RailsValidation.options_for(object_name, method, options)
+        options = ::Validatious::RailsValidation.options_for(object_name, method, options)
         check_box_without_validation(object_name, method, options)
       end
       alias_method_chain :check_box, :validation
@@ -47,7 +47,7 @@ module ActionView
       # Add validation class names to: radio-buttons.
       #
       def radio_button_with_validation(object_name, method, tag_value, options = {})
-        options = Validatious::RailsValidation.options_for(object_name, method, options)
+        options = ::Validatious::RailsValidation.options_for(object_name, method, options)
         radio_button_without_validation(object_name, method, tag_value, options)
       end
       alias_method_chain :radio_button, :validation

data/lib/validatious/rails_validation.rb

@@ -31,16 +31,15 @@ module Validatious
       # Input may be an ActiveRecord class, a class name (string), or an object
       # name along with a method/field.
       #
-      def options_for(object_name, method, options = {})
-        validation = self.from_active_record(object_name, method)
+      def options_for(object_name, attribute_method, options = {})
+        validation = self.from_active_record(object_name, attribute_method)
 
         # Loop validation and add/append pairs to options.
-        validation.each_pair do |attr, value|
-          options[attr] ||= ''
-          options[attr] << value
-
+        validation.each_pair do |attribute, value|
+          options[attribute] ||= ''
+          options[attribute] << value
           # Shake out duplicates.
-          options[attr] = options[attr].split.uniq.join(' ').strip
+          options[attribute] = options[attribute].split.uniq.join(' ').strip
         end
         options
       end
@@ -55,17 +54,39 @@ module Validatious
       # Returns a string that will be recognized by Validatious as a class name in
       # form markup.
       #
-      def from_active_record(object_or_class, method)
+      def from_active_record(object_or_class, attribute_method)
         klass = object_or_class.to_s.classify.constantize
         options = {:class => ''}
         validation_classes = []
-        
+
         # Iterate thorugh the validations for the current class,
         # and collect validation options.
-        klass.reflect_on_validations_for(method).each do |validation|
-          validation_options = self.send(validation.macro.to_s.sub(/^validates_/, ''), validation)
-          validation_classes << validation_options[:class]
+        klass.reflect_on_validations_for(attribute_method.to_sym).each do |validation|
+          validates_type = validation.macro.to_s.sub(/^validates_/, '')
+
+          # Skip "confirmation_of"-validation info for the attribute that
+          # needs to be confirmed. Validatious expects this validation rule
+          # on the confirmation field. *
+          unless validates_type =~ /^confirmation_of$/
+            validation_options = self.send(validates_type, validation)
+            validation_classes << validation_options[:class]
+          end
+        end
+
+        # Special case for "confirmation_of"-validation (see * above).
+        if attribute_method.to_s =~ /(.+)_confirmation$/
+          confirm_attribute_method = $1
+          # Check if validates_confirmation_of(:hello) actually exists,
+          # if :hello_confirmation field exists - just to be safe.
+          klass.reflect_on_validations_for(confirm_attribute_method.to_sym).each do |validation|
+            if validation.macro.to_s =~ /^validates_confirmation_of$/
+              validation_options = self.confirmation_of(validation)
+              validation_classes << validation_options[:class]
+              break
+            end
+          end
         end
+
         options[:class] = [options[:class], validation_classes].flatten.compact.join(' ')
         options
       end
@@ -82,17 +103,25 @@ module Validatious
       #
       # Resolve validation from validates_associated.
       #
+      # Note: Most probably too hard to implement.
+      #
       def associated(validation)
         {:class => ''}
       end
 
       #
-      # TODO: Resolve validation from validates_confirmation_of.
+      # Resolve validation from validates_confirmation_of.
       #
-      # Note: Should be added to "#{field}_confirmation" instead of "#{field}", i.e. non-standard approach.
+      # Note: This validation needed to be treated a bit differently in compare
+      #       to the other validations. See "from_active_record".
       #
       def confirmation_of(validation)
-        {:class => ''}
+        field_id_to_confirm = unless validation.active_record.present?
+          "#{validation.active_record.name.tableize.singularize.gsub('/', '_')}_#{validation.name}"
+        else
+          "#{validation.name}"
+        end
+        {:class => "confirmation-of_#{field_id_to_confirm}"}
       end
 
       #

data/test/test_helper.rb

@@ -42,6 +42,7 @@ build_model :bogus_items do
   boolean :signed
   
   validates_presence_of :name, :body
+  validates_confirmation_of :name
   validates_acceptance_of :signed
   validates_format_of :url,
     :with => /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i,

data/test/validatious/form_helper_test.rb

@@ -45,6 +45,12 @@ class FormHelperTest < Test::Unit::TestCase
     # TODO
   end
 
+  def test_confirmation_field
+    # TODO: Add form-builder-test as well
+    assert_has_class "confirmation-of_name", text_field(:bogus_item, :name_confirmation)
+    assert_has_class "confirmation-of_name text", text_field(:bogus_item, :name_confirmation, :class => "text")
+  end
+
   def test_normal_label
     assert_equal "<label for=\"bogus_item_name\">Name</label>", label(:bogus_item, :name)
   end

data/test/validatious/rails_validation_test.rb

@@ -5,8 +5,15 @@ class RailsValidationTest < Test::Unit::TestCase
   
   include ActionView::Helpers::FormHelper
   
+  #
+  # Simulate a validation
+  #
+  def validation(macro, options = {})
+    ActiveRecord::Reflection::MacroReflection.new(macro, :name, options, BogusItem.new)
+  end
+  
   def test_acceptance_of
-    validation = Validatious::RailsValidation.presence_of(validation(:validates_acceptance_of))
+    validation = Validatious::RailsValidation.acceptance_of(validation(:validates_acceptance_of))
     assert_equal 'required', validation[:class]
   end
   
@@ -15,7 +22,8 @@ class RailsValidationTest < Test::Unit::TestCase
   end
   
   def test_confirmation_of
-    # TODO: not implemented
+    validation = Validatious::RailsValidation.confirmation_of(validation(:validates_confirmation_of))
+    assert_equal 'confirmation-of_name', validation[:class]
   end
   
   def test_exclusion_of
@@ -78,11 +86,4 @@ class RailsValidationTest < Test::Unit::TestCase
     # TODO: not implemented
   end
   
-  #
-  # Simulate a validation
-  #
-  def validation(macro, options = {})
-    ActiveRecord::Reflection::MacroReflection.new(macro, :name, options, nil)
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grimen-validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Christian Johansen