carlosbrando-remarkable 2.2.8 → 2.2.9

data/lib/remarkable.rb

@@ -2,10 +2,10 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Remarkable
-  VERSION = '2.2.8'
+  VERSION = '2.2.9'
 end
 
-if ENV['RAILS_ENV'] == 'test'
+if ENV['RAILS_ENV'] == 'test' && defined?(Spec)
   require 'spec/rails'
 end
 

data/lib/remarkable/active_record/helpers.rb

@@ -213,14 +213,14 @@ module Remarkable # :nodoc:
       def error_message_from_model(model, attribute, message) #:nodoc:
         if message.is_a? Symbol
           message = if Object.const_defined?(:I18n) # Rails >= 2.2
-            model.errors.generate_message(attribute, message, :count => '__count__')
+            model.errors.generate_message(attribute, message, :count => '12345')
           else # Rails <= 2.1
-            ::ActiveRecord::Errors.default_error_messages[message] % '__count__'
+            ::ActiveRecord::Errors.default_error_messages[message] % 12345
           end
 
-          if message =~ /__count__/
+          if message =~ /12345/
             message = Regexp.escape(message)
-            message.gsub!('__count__', '\d+')
+            message.gsub!('12345', '\d+')
             message = /#{message}/
           end
         end

data/lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb

@@ -21,6 +21,14 @@ module Remarkable # :nodoc:
 
         private
 
+        def allow_nil?
+          super(default_message_for(:number))
+        end
+
+        def allow_blank?
+          super(default_message_for(:number))
+        end
+
         # Check equal_to? for each given option
         #
         def equal_to_for_each_option?
@@ -43,7 +51,7 @@ module Remarkable # :nodoc:
         end
 
         def only_allow_numeric_values?
-          return true if bad?("abcd")
+          return true if bad?("abcd", default_message_for(:number))
 
           @missing = "allow non-numeric values for #{@attribute}"
           false
@@ -51,7 +59,7 @@ module Remarkable # :nodoc:
 
         def only_integer?
           message = "allow non-integer values for #{@attribute}"
-          assert_bad_or_good_if_key(:only_integer, valid_value_for_test.to_f, message, :message)
+          assert_bad_or_good_if_key(:only_integer, valid_value_for_test.to_f, message, default_message_for(:number))
         end
 
         def allow_even?
@@ -119,9 +127,9 @@ module Remarkable # :nodoc:
 
         def default_options
           options = {
-            :message => :not_a_number,
             :odd_message => :odd,
-            :even_message => :even
+            :even_message => :even,
+            :number_message => :not_a_number
           }
 
           NUMERIC_COMPARISIONS.each do |key|
@@ -137,11 +145,11 @@ module Remarkable # :nodoc:
         # and so on.
         #
         def default_message_for(key)
-          @options[:message] == :not_a_number ? :"#{key}_message" : :message
+          @options[:message] ? :message : :"#{key}_message"
         end
 
         def expectation
-          default_message + "for #{@attribute}"
+          default_message + " for #{@attribute}"
         end
 
         def default_message

data/remarkable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "2.2.8"
+  s.version = "2.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carlos Brando", "Jos\303\251 Valim", "Diego Carrion"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carlosbrando-remarkable
 version: !ruby/object:Gem::Version 
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors: 
 - Carlos Brando