validatious-on-rails 0.4.1 → 0.4.2

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

@@ -189,9 +189,10 @@ module ValidatiousOnRails
         # Generate proper error message using explicit message, or I18n-lookup.
         # Core validations gets treated by Rails - unless explicit message is set that is.
         #
-        def generate_message(validation, *args)
+        def generate_message(*args)
           options = args.extract_options!
-          explicit_message = validation.options[:message]
+          validation = args.shift if args.first.is_a?(::ActiveRecord::Reflection::MacroReflection)
+          explicit_message = validation.options[:message] if validation
           key = options.delete(:key) || (explicit_message if explicit_message.is_a?(::Symbol))
 
           message = if key.present?
@@ -199,7 +200,7 @@ module ValidatiousOnRails
               :default => "activerecord.errors.messages.#{key}"))
           elsif explicit_message.is_a?(::String)
             explicit_message
-          else
+          elsif validation.present?
             unless ::ValidatiousOnRails::ModelValidations::CORE_VALIDATIONS.include?(validation.macro.to_sym)
               # No core validation, try to make up a descent I18n lookup path using conventions.
               key ||= validation.macro.to_s.tr('-', '_').gsub(/^validates?_/, '').gsub(/_of/, '').to_sym

data/lib/validatious-on-rails/validatious/validators/length/is_validator.rb

@@ -11,7 +11,7 @@ module ValidatiousOnRails
           name = 'length-is'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :wrong_length)
+          self.message = self.class.generate_message(validation, :key => :wrong_length, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             #{self.class.validate_blank(validation)}

data/lib/validatious-on-rails/validatious/validators/length/maximum_validator.rb

@@ -11,7 +11,7 @@ module ValidatiousOnRails
           name = 'length-maximum'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :too_long)
+          self.message = self.class.generate_message(validation, :key => :too_long, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             #{self.class.validate_blank(validation)}

data/lib/validatious-on-rails/validatious/validators/length/minimum_validator.rb

@@ -11,7 +11,7 @@ module ValidatiousOnRails
           name = 'length-minimum'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :too_short)
+          self.message = self.class.generate_message(validation, :key => :too_short, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             #{self.class.validate_blank(validation)}

data/lib/validatious-on-rails/validatious/validators/numericality/equal_to_validator.rb

@@ -10,7 +10,7 @@ module ValidatiousOnRails
           name = 'numericality-equal-to'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :equal_to)
+          self.message = self.class.generate_message(validation, :key => :equal_to, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             value = +value;

data/lib/validatious-on-rails/validatious/validators/numericality/greater_than_or_equal_to_validator.rb

@@ -10,7 +10,7 @@ module ValidatiousOnRails
           name = 'numericality-greater-than-or-equal-to'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :greater_than_or_equal_to)
+          self.message = self.class.generate_message(validation, :key => :greater_than_or_equal_to, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             value = +value;

data/lib/validatious-on-rails/validatious/validators/numericality/greater_than_validator.rb

@@ -10,7 +10,7 @@ module ValidatiousOnRails
           name = 'numericality-greater-than'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :greater_than)
+          self.message = self.class.generate_message(validation, :key => :greater_than, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             value = +value;

data/lib/validatious-on-rails/validatious/validators/numericality/less_than_or_equal_to_validator.rb

@@ -10,7 +10,7 @@ module ValidatiousOnRails
           name = 'numericality-less-than-or-equal-to'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :less_than_or_equal_to)
+          self.message = self.class.generate_message(validation, :key => :less_than_or_equal_to, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             value = +value;

data/lib/validatious-on-rails/validatious/validators/numericality/less_than_validator.rb

@@ -10,7 +10,7 @@ module ValidatiousOnRails
           name = 'numericality-less-than'
           super name, options
           self.params = ['count']
-          self.message = self.class.generate_message(validation, :key => :less_than)
+          self.message = self.class.generate_message(validation, :key => :less_than, :count => '{{count}}')
           self.accept_empty = validation.options[:allow_nil]
           self.fn = %{
             value = +value;

data/test/test_helper.rb

@@ -57,15 +57,15 @@ build_model :bogus_items do
   string :email
   string :file_path
   string :dummie
-  
+
   text    :body
   integer :variant
   boolean :signed
-  
+
   string :field_with_defaults
   string :field_with_client_side_validations
   string :field_without_client_side_validations
-  
+
   validates_presence_of :name, :body, :variant, :file_path, :dummie
   validates_uniqueness_of :name
   validates_confirmation_of :name
@@ -75,11 +75,12 @@ build_model :bogus_items do
     :name => 'url', :message => 'Invalid URL.'
   validates_inclusion_of :variant, :in => (1..5).to_a
   validates_exclusion_of :variant, :in => (6..10).to_a
-  
+  validates_length_of :url, :minimum => 10 
+
   validates_presence_of :field_with_defaults
   validates_presence_of :field_with_client_side_validations, :client_side => true
   validates_presence_of :field_without_client_side_validations, :client_side => false
-  
+
   # TODO: Test: If this is a validator makro, then it should not cause any issues.
   validates_craziness_of :name
 end

data/test/validatious_on_rails/validatious/validator_test.rb

@@ -57,4 +57,17 @@ class ValidatorTest < ::ActiveSupport::TestCase
     assert_equal expected_v2_validator.gsub(/[\n\s\t]/, ''), @custom_validator.to_js.gsub(/[\n\s\t]/, '')
   end
 
+  context "Message" do
+    test "I18n lookup" do
+      validator_klass = ValidatiousOnRails::Validatious::Validator
+      # For some reason can't raise this in tests. =S
+      # assert_raise(::I18n::MissingInterpolationArgument) {
+      #    validator_klass.generate_message :key => :too_short
+      #   }
+      assert_nothing_raised(::I18n::MissingInterpolationArgument) {
+          validator_klass.generate_message :key => :too_short, :count => '{{count}}'
+        }
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jonas Grimfelt