better_form 0.4.1 → 0.4.2

data/lib/better_form/builder.rb

@@ -45,39 +45,41 @@ module BetterForm
 
     def generate_validations(object, attribute)
       validations = {}
+      @attribute = attribute
 
       # Don't try to add validations for an object that doesn't have _validators
       return {} unless object.respond_to?(:_validators)
 
       # Iterate over each validator for this attribute, and add the appropriate HTML5 data-* attributes
       object._validators[attribute].each do |validator|
+        @options = validator.options
         validation = case validator
           when ActiveModel::Validations::AcceptanceValidator
-            if validation_applies?(validator.options)
-              { 'data-validates-acceptance' => true }
+            if validation_applies?
+              { 'data-validates-acceptance' => validation_message('must be accepted') }
             end
           when ActiveModel::Validations::ConfirmationValidator
-            if validation_applies?(validator.options)
+            if validation_applies?
               {}
             end
           when ActiveModel::Validations::ExclusionValidator
             {}
           when ActiveModel::Validations::FormatValidator
-            if validation_applies?(validator.options)
-              { 'data-validates-format' => true, 'data-validates-format-with' => validator.options[:with].inspect }
+            if validation_applies?
+              { 'data-validates-format' => validation_message, 'data-validates-format-with' => validator.options[:with].inspect }
             end
           when ActiveModel::Validations::InclusionValidator
             {}
           when ActiveModel::Validations::LengthValidator
-            if validation_applies?(validator.options)
+            if validation_applies?
               {}
             end
           when ActiveModel::Validations::NumericalityValidator
-            if validation_applies?(validator.options)
-              { 'data-validates-numericality' => true }
+            if validation_applies?
+              { 'data-validates-numericality' => validation_message('is not a number') }
             end
           when ActiveModel::Validations::PresenceValidator
-            { 'data-validates-presence' => true }
+            { 'data-validates-presence' => validation_message('is required') }
         end
         validations.merge!(validation ||= {})
       end
@@ -85,12 +87,16 @@ module BetterForm
       validations
     end
 
-    def validation_applies?(options)
-      case options[:on]
+    def validation_applies?
+      case @options[:on]
         when :create then true if @object.new_record?
         when :update then true if !@object.new_record?
         else true
       end
     end
+
+    def validation_message(suffix = 'is invalid')
+      @options[:message] ? @options[:message] : "#{@attribute.to_s.humanize} #{suffix}"
+    end
   end
 end

data/lib/better_form/version.rb

@@ -1,3 +1,3 @@
 module BetterForm
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: better_form
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Nicholas Firth-McCoy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +11:00
+date: 2011-03-23 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Better Rails 3 FormBuilder