validation_hints 0.0.5 → 0.0.6

data/lib/active_model/hints.rb

@@ -43,21 +43,32 @@ module ActiveModel
     end
 
     def validation_hints_for(attribute)
+      result = Array.new
       @base.class.validators_on(attribute).map do |v|
+        puts "** ** ** ** V " + v.class.to_s.split('::').last.downcase.gsub('validator','')
+        # check for validators that have no options
         validator = v.class.to_s.split('::').last.downcase.gsub('validator','')
         if MESSAGES_FOR_VALIDATORS.include?(validator)
-          generate_keys(attribute, validator)
+          result << generate_message(attribute, validator)
         end
-      end.flatten.compact
-                                #        key = v.class.to_s.underscore.gsub('/','.')
-                                #        puts "************#{v.inspect}"
-                                #        key = [v.qualifier, key].join('.') if v.respond_to?(:qualifier)
-                                #        [ key, v.options.except(*CALLBACKS_OPTIONS).keys.map do |o|
-                                #            key + "." + o.to_s
-                                #          end ].flatten
+        v.options.each do |o|
+        puts "** ** ** ** O " + o.inspect
+               if MESSAGES_FOR_OPTIONS.include?(o.first.to_s)
+                result << generate_message(attribute, [ validator, o.first.to_s ].join('.'), { :count => o.last } )
+               end
+        end
+      end
+
+      #        key = v.class.to_s.underscore.gsub('/','.')
+      #        puts "************#{v.inspect}"
+      #        key = [v.qualifier, key].join('.') if v.respond_to?(:qualifier)
+      #        [ key, v.options.except(*CALLBACKS_OPTIONS).keys.map do |o|
+      #            key + "." + o.to_s
+      #          end ].flatten
+      result
     end
 
-    def generate_keys(attribute, type)
+    def generate_message(attribute, type, options = {})
 
       if @base.class.respond_to?(:i18n_scope)
         defaults = @base.class.lookup_ancestors.map do |klass|
@@ -75,16 +86,16 @@ module ActiveModel
       defaults.compact!
       defaults.flatten!
 
-      #key = defaults.shift
+      key = defaults.shift
 
       options = {
         :default => defaults,
         :model => @base.class.model_name.human,
         :attribute => @base.class.human_attribute_name(attribute),
-      }
+      }.merge(options)
       puts "*" + File.basename(__FILE__) + ": " + "ATTR #{attribute}, OPTIONS #{options.inspect} "
-      #I18n.translate(key, options)
-      [ defaults, options ]
+#      [ key, options ]
+      I18n.translate(key, options)
     end
 
 

data/lib/validation_hints/locale/en.yml

@@ -1,7 +1,9 @@
 ## YAML Template.
 ---
 en:
-  errors:
+  activerecord:
+                less_than_or_equal_to: "must be less than or equal to %{count}"
+  hints:
     # The default format to use in full error messages.
     format: "%{attribute} %{message}"
 
@@ -10,20 +12,23 @@ en:
     messages:
       inclusion: "is not included in the list"
       exclusion: "is reserved"
-      invalid: "is invalid"
+      format: "what's this"
+      associated: "is invalid"
+      uniqueness: "must be unique"
       confirmation: "doesn't match confirmation"
-      accepted: "must be accepted"
-      empty: "can't be empty"
-      blank: "can't be blank"
-      too_long: "is too long (maximum is %{count} characters)"
-      too_short: "is too kort (minimum is %{count} characters)"
-      wrong_length: "is the wrong length (should be %{count} characters)"
-      not_a_number: "is not a number"
-      not_an_integer: "must be an integer"
-      greater_than: "must be greater than %{count}"
-      greater_than_or_equal_to: "must be greater than or equal to %{count}"
-      equal_to: "must be equal to %{count}"
-      less_than: "must be less than %{count}"
-      less_than_or_equal_to: "must be less than or equal to %{count}"
-      odd: "must be odd"
-      even: "must be even"
+      acceptence: "must be accepted"
+      presence: "can't be blank"
+      length:
+        maximum: "must not be longer than %{count} characters"
+        minimum: "must not be shorter than %{count} characters"
+        wrong_length: "must be exactly %{count} characters"
+      numericality: "not a number"
+      numericality: 
+        not_an_integer: "must be an integer"
+        greater_than: "must be greater than %{count}"
+        greater_than_or_equal_to: "must be greater than or equal to %{count}"
+        equal_to: "must be equal to %{count}"
+        less_than: "must be less than %{count}"
+        less_than_or_equal_to: "must be less than or equal to %{count}"
+        odd: "must be odd"
+        even: "must be even"

data/lib/validation_hints/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module ValidationHints
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_hints
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm