validation_hints 0.1.0 → 0.1.1

data/lib/active_model/hints.rb

@@ -11,8 +11,18 @@ module ActiveModel
     include Enumerable
 
     CALLBACKS_OPTIONS = [:if, :unless, :on, :allow_nil, :allow_blank, :strict]
-    MESSAGES_FOR_VALIDATORS = %w(confirmation acceptance presence uniqueness format inclusion exclusion associated numericality)
-    MESSAGES_FOR_OPTIONS = %w(within in is minimum maximum greater_than greater_than_or_equal_to equal_to less_than less_than_or_equal_to odd even)
+    MESSAGES_FOR_VALIDATORS = %w(confirmation acceptance presence uniqueness format associated numericality)
+    MESSAGES_FOR_OPTIONS = %w(within in is minimum maximum greater_than greater_than_or_equal_to equal_to less_than less_than_or_equal_to odd even only_integer)
+    OPTIONS_THAT_WE_DONT_USE_YET = {
+      :acceptance => :acceptance
+
+    }
+    VALIDATORS_THAT_WE_DONT_KNOW_WHAT_TO_DO_WITH = %w(validates_associated)
+
+    # Should virtual element for
+    #  validates :email, :confirmation => true
+    #  validates :email_confirmation, :presence => true
+    # also have a hint?
 
     attr_reader :messages
 
@@ -36,12 +46,19 @@ module ActiveModel
       @base.class.validators_on(attribute).map do |v|
         # check for validators that have no options
         validator = v.class.to_s.split('::').last.downcase.gsub('validator','')
-        if MESSAGES_FOR_VALIDATORS.include?(validator)
-          result << generate_message(attribute, validator)
-        end
-        v.options.each do |o|
-          if MESSAGES_FOR_OPTIONS.include?(o.first.to_s)
-            result << generate_message(attribute, [ validator, o.first.to_s ].join('.'), { :count => o.last } )
+        message_key =  validator
+        message_key =  [validator, ".must_be_a_number"].join('.') if validator == 'numericality' # create an option for numericality; the way YAML works a key (numericality) with subkeys (greater_than, etc etc) can not have a string itself. So we create a subkey for numericality
+        message_key =  [validator, v.options[:message]].join('.') if v.options[:message].is_a?(Symbol) # if a message was supplied as a symbol, we use it instead
+        if v.options[:message].is_a?(Symbol)
+          result << generate_message(attribute, message_key, v.options)
+        else
+          result << generate_message(attribute, message_key, v.options) if MESSAGES_FOR_VALIDATORS.include?(validator)
+          v.options.each do |o|
+            if MESSAGES_FOR_OPTIONS.include?(o.first.to_s)
+              count = o.last
+              count = o.last.to_sentence if %w(inclusion exclusion).include?(validator)
+              result << generate_message(attribute, [ validator, o.first.to_s ].join('.'), { :count => count } )
+            end
           end
         end
       end
@@ -264,6 +281,7 @@ module ActiveModel
     end
 
     def generate_message(attribute, type, options = {})
+      #options.delete(:message) if options[:message].is_a?(Symbol)
       if @base.class.respond_to?(:i18n_scope)
         defaults = @base.class.lookup_ancestors.map do |klass|
           [ :"#{@base.class.i18n_scope}.hints.models.#{klass.model_name.i18n_key}.attributes.#{attribute}.#{type}",
@@ -273,6 +291,7 @@ module ActiveModel
         defaults = []
       end
 
+      defaults << options[:message] # defaults << options.delete(:message)
       defaults << :"#{@base.class.i18n_scope}.hints.messages.#{type}" if @base.class.respond_to?(:i18n_scope)
       defaults << :"hints.attributes.#{attribute}.#{type}"
       defaults << :"hints.messages.#{type}"

data/lib/validation_hints/locale/en.yml

@@ -10,21 +10,24 @@ en:
     # The values :model, :attribute and :value are always available for interpolation
     # The value :count is available when applicable. Can be used for pluralization.
     messages:
-      inclusion: "is not included in the list"
-      exclusion: "is reserved"
+      inclusion:
+        in: "must be one of %{count}"
+      exclusion:
+        in: "must not be one of %{count}"
       format: "what's this"
       associated: "is invalid"
       uniqueness: "must be unique"
       confirmation: "doesn't match confirmation"
-      acceptence: "must be accepted"
+      acceptance: "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"
+        is: "must be exactly %{count} characters"
+        radiolaria: "must be between %{minimum} and %{maximum} characters"
+      numericality:
+        must_be_a_number: "must be a number"
+        only_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}"
@@ -32,3 +35,4 @@ en:
         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.1.0"
+  VERSION = "0.1.1"
 end

metadata

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