carlosbrando-remarkable 2.2.6 → 2.2.7

data/lib/remarkable/active_record/helpers.rb

@@ -52,7 +52,7 @@ module Remarkable # :nodoc:
       # It checks for the key, if it exists and it's true, tests that the value
       # given is bad, otherwise tests that the value is good.
       #
-      def assert_bad_or_good_if_key(key, value, missing, message_key = :message, count_for_interpolation = 0)
+      def assert_bad_or_good_if_key(key, value, missing, message_key = :message)
         return true unless @options.key? key
 
         if @options[key]
@@ -70,14 +70,14 @@ module Remarkable # :nodoc:
       # It checks for the key, if it exists and it's true, tests that the value
       # given is good, otherwise tests that the value is bad.
       #
-      def assert_good_or_bad_if_key(key, value, missing, message_key = :message, count_for_interpolation = 0)
+      def assert_good_or_bad_if_key(key, value, missing, message_key = :message)
         return true unless @options.key? key
 
         if @options[key]
-          return true if good?(value, message_key, count_for_interpolation)
+          return true if good?(value, message_key)
           missing = 'not ' + missing
         else
-          return true if bad?(value, message_key, count_for_interpolation)
+          return true if bad?(value, message_key)
         end
 
         @missing = missing
@@ -89,9 +89,9 @@ module Remarkable # :nodoc:
       # Notice that it checks for @options[:message], so be sure that this option
       # is properly set.
       #
-      def allow_nil?(message_key = :message, count_for_interpolation = 0)
+      def allow_nil?(message_key = :message)
         message = "allow #{@attribute} be set to nil"
-        assert_good_or_bad_if_key(:allow_nil, nil, message, message_key, count_for_interpolation)
+        assert_good_or_bad_if_key(:allow_nil, nil, message, message_key)
       end
 
       # Default allow_blank? validation.
@@ -99,25 +99,25 @@ module Remarkable # :nodoc:
       # Notice that it checks for @options[:message], so be sure that this option
       # is properly set.
       #
-      def allow_blank?(message_key = :message, count_for_interpolation = 0)
+      def allow_blank?(message_key = :message)
         message = "allow #{@attribute} be set to blank"
-        assert_good_or_bad_if_key(:allow_blank, '', message, message_key, count_for_interpolation)
+        assert_good_or_bad_if_key(:allow_blank, '', message, message_key)
       end
 
       # Shortcut for assert_good_value.
       # Please notice that it has instance variables hard coded. So do not use
       # it if you are trying to assert another instance besides @subject.
       #
-      def good?(value, message_sym = :message, count_for_interpolation = 0)
-        assert_good_value(@subject, @attribute, value, @options[message_sym], count_for_interpolation)
+      def good?(value, message_sym = :message)
+        assert_good_value(@subject, @attribute, value, @options[message_sym])
       end
 
       # Shortcut for assert_bad_value.
       # Please notice that it has instance variables hard coded. So do not use
       # it if you are trying to assert another instance besides @subject.
       #
-      def bad?(value, message_sym = :message, count_for_interpolation = 0)
-        assert_bad_value(@subject, @attribute, value, @options[message_sym], count_for_interpolation)
+      def bad?(value, message_sym = :message)
+        assert_bad_value(@subject, @attribute, value, @options[message_sym])
       end
 
       # Asserts that an Active Record model validates with the passed
@@ -137,13 +137,13 @@ module Remarkable # :nodoc:
       #   @product = Product.new(:tangible => false)
       #   assert_good_value(Product, :price, "0")
       #
-      def assert_good_value(object_or_klass, attribute, value, error_message_to_avoid = //, count_for_interpolation = 0) # :nodoc:
+      def assert_good_value(object_or_klass, attribute, value, error_message_to_avoid = //) # :nodoc:
         object = get_instance_of(object_or_klass)
         object.send("#{attribute}=", value)
 
         return true if object.valid?
 
-        error_message_to_avoid = error_message_from_model(object, attribute, error_message_to_avoid, count_for_interpolation)
+        error_message_to_avoid = error_message_from_model(object, attribute, error_message_to_avoid)
 
         assert_does_not_contain(object.errors.on(attribute), error_message_to_avoid)
       end
@@ -165,14 +165,14 @@ module Remarkable # :nodoc:
       #   @product = Product.new(:tangible => true)
       #   assert_bad_value(Product, :price, "0")
       #
-      def assert_bad_value(object_or_klass, attribute, value, error_message_to_expect = :invalid, count_for_interpolation = 0) # :nodoc:
+      def assert_bad_value(object_or_klass, attribute, value, error_message_to_expect = :invalid) # :nodoc:
         object = get_instance_of(object_or_klass)
         object.send("#{attribute}=", value)
         
         return false if object.valid?
         return false unless object.errors.on(attribute)
 
-        error_message_to_expect = error_message_from_model(object, attribute, error_message_to_expect, count_for_interpolation)
+        error_message_to_expect = error_message_from_model(object, attribute, error_message_to_expect)
 
         assert_contains(object.errors.on(attribute), error_message_to_expect)
       end
@@ -207,18 +207,25 @@ module Remarkable # :nodoc:
       #   Using the underlying mechanism inside ActiveRecord makes us free from
       #   all thos errors.
       #
-      # The count value is used to do interpolation.
+      # We replace {{count}} interpolation for __count__ which later is
+      # replaced by a regexp which contains \d+.
       #
-      def error_message_from_model(model, attribute, message, count_value = 0)
+      def error_message_from_model(model, attribute, message) #:nodoc:
         if message.is_a? Symbol
-          if Object.const_defined?(:I18n) # Rails >= 2.2
-            model.errors.generate_message(attribute, message, :count => count_value)
+          message = if Object.const_defined?(:I18n) # Rails >= 2.2
+            model.errors.generate_message(attribute, message, :count => '__count__')
           else # Rails <= 2.1
-            ::ActiveRecord::Errors.default_error_messages[message] % count_value
+            ::ActiveRecord::Errors.default_error_messages[message] % '__count__'
+          end
+
+          if message =~ /__count__/
+            message = Regexp.escape(message)
+            message.gsub!('__count__', '\d+')
+            message = /#{message}/
           end
-        else
-          message
         end
+
+        message
       end
 
     end

data/lib/remarkable/active_record/macros/database/have_db_column_matcher.rb

@@ -10,7 +10,7 @@ module Remarkable # :nodoc:
 
         # TODO: remove it
         def of_type(type)
-          warn "[DEPRECATION] option of_type is deprecated. Use type instead."
+          warn "[DEPRECATION] option of_type is deprecated in have_db_column. Use type instead."
           @options[:type] = type
           self
         end

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

@@ -13,6 +13,7 @@ module Remarkable # :nodoc:
       #
       # Options:
       #
+      # * <tt>:in</tt> - values to test exclusion.
       # * <tt>:allow_nil</tt> - when supplied, validates if it allows nil or not.
       # * <tt>:allow_blank</tt> - when supplied, validates if it allows blank or not.
       # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
@@ -20,12 +21,27 @@ module Remarkable # :nodoc:
       #
       # Example:
       #
-      #   it { should validate_exclusion_of(:username, "admin", "user") }
-      #   it { should_not validate_exclusion_of(:username, "clark_kent", "peter_park") }
+      #   it { should validate_exclusion_of(:username, :in => ["admin", "user"]) }
+      #   it { should validate_exclusion_of(:age, :in => 30..60) }
       #
-      #   it { should validate_exclusion_of(:age, 30..60) }
+      #   should_validate_exclusion_of :username, :in => ["admin", "user"]
+      #   should_validate_exclusion_of :age, :in => 30..60
       #
       def validate_exclusion_of(attribute, *good_values)
+        # TODO Remove this until the next comment
+        options = good_values.extract_options!
+
+        unless options.key?(:in) || good_values.empty?
+          warn "[DEPRECATION] Please use validate_exclusion_of #{attribute.inspect}, :in => #{good_values[0..-2].inspect} " <<
+               "instead of validate_exclusion_of #{attribute.inspect}, #{good_values[0..-2].inspect[1..-2]}."
+        end
+
+        options[:in] ||= good_values
+
+        # From now on is what should be the actual method.
+        good_values = [options.delete(:in)].flatten.compact
+        good_values << options
+
         if good_values.first.is_a? Range
           EnsureValueInRangeMatcher.new(attribute, :exclusion, *good_values)
         else

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

@@ -13,6 +13,7 @@ module Remarkable # :nodoc:
       #
       # Options:
       #
+      # * <tt>:in</tt> - values to test inclusion.
       # * <tt>:allow_nil</tt> - when supplied, validates if it allows nil or not.
       # * <tt>:allow_blank</tt> - when supplied, validates if it allows blank or not.
       # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
@@ -20,12 +21,27 @@ module Remarkable # :nodoc:
       #
       # Example:
       #
-      #   it { should validate_inclusion_of(:isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0") }
-      #   it { should_not validate_inclusion_of(:isbn, "bad 1", "bad 2") }
-      #
+      #   it { should validate_inclusion_of(:size, :in => ["S", "M", "L", "XL"]) }
       #   it { should validate_inclusion_of(:age, 18..100) }
       #
+      #   should_validate_inclusion_of :size, :in => ["S", "M", "L", "XL"]
+      #   should_validate_inclusion_of :age, :in => 18..100
+      #
       def validate_inclusion_of(attribute, *good_values)
+        # TODO Remove this until the next comment
+        options = good_values.extract_options!
+
+        unless options.key?(:in) || good_values.empty?
+          warn "[DEPRECATION] Please use validate_inclusion_of #{attribute.inspect}, :in => #{good_values[0..-2].inspect} " <<
+               "instead of validate_inclusion_of #{attribute.inspect}, #{good_values[0..-2].inspect[1..-2]}."
+        end
+
+        options[:in] ||= good_values
+
+        # From now on is what should be the actual method.
+        good_values = [options.delete(:in)].flatten.compact
+        good_values << options
+
         if good_values.first.is_a? Range
           EnsureValueInRangeMatcher.new(attribute, :inclusion, *good_values)
         else

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

@@ -70,16 +70,16 @@ module Remarkable # :nodoc:
         end
 
         def allow_nil?
-          super(:short_message, @options[:minimum])
+          super(:short_message)
         end
 
         def allow_blank?
-          super(:short_message, @options[:minimum])
+          super(:short_message)
         end
 
         def less_than_min_length?
           return true if @behavior == :maximum || @options[:minimum] <= 0
-          return true if bad?(value_for_length(@options[:minimum] - 1), :short_message, @options[:minimum])
+          return true if bad?(value_for_length(@options[:minimum] - 1), :short_message)
 
           @missing = "allow #{@attribute} to be less than #{@options[:minimum]} chars long"
           return false
@@ -87,7 +87,7 @@ module Remarkable # :nodoc:
 
         def exactly_min_length?
           return true if @behavior == :maximum || @options[:minimum] <= 0
-          return true if good?(value_for_length(@options[:minimum]), :short_message, @options[:minimum])
+          return true if good?(value_for_length(@options[:minimum]), :short_message)
 
           @missing = "not allow #{@attribute} to be exactly #{@options[:minimum]} chars long"
           return false
@@ -95,7 +95,7 @@ module Remarkable # :nodoc:
 
         def more_than_max_length?
           return true if @behavior == :minimum
-          return true if bad?(value_for_length(@options[:maximum] + 1), :long_message, @options[:maximum])
+          return true if bad?(value_for_length(@options[:maximum] + 1), :long_message)
 
           @missing = "allow #{@attribute} to be more than #{@options[:maximum]} chars long"
           return false
@@ -103,7 +103,7 @@ module Remarkable # :nodoc:
 
         def exactly_max_length?
           return true if @behavior == :minimum || @options[:minimum] == @options[:maximum]
-          return true if good?(value_for_length(@options[:maximum]), :long_message, @options[:maximum])
+          return true if good?(value_for_length(@options[:maximum]), :long_message)
 
           @missing = "not allow #{@attribute} to be exactly #{@options[:maximum]} chars long"
           return false

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

@@ -66,7 +66,7 @@ module Remarkable # :nodoc:
 
         def equal_to?(key, add = 0)
           return true unless @options.key?(key)
-          return true if good?(@options[key] + add, default_message_for(key), @options[key])
+          return true if good?(@options[key] + add, default_message_for(key))
 
           @missing = "did not allow value equals to #{@options[key]} for #{@attribute}"
           false
@@ -74,7 +74,7 @@ module Remarkable # :nodoc:
 
         def more_than_maximum?(key, add = 0)
           return true unless @options.key?(key)
-          return true if bad?(@options[key] + add, default_message_for(key), @options[key])
+          return true if bad?(@options[key] + add, default_message_for(key))
 
           # We should do @options[key] + add - 1 to adjust messages in less_than cases.
           @missing = "allowed value #{@options[key] + add} which is more than #{@options[key] + add - 1} for #{@attribute}"
@@ -83,7 +83,7 @@ module Remarkable # :nodoc:
 
         def less_than_minimum?(key, add = 0)
           return true unless @options.key?(key)
-          return true if bad?(@options[key] + add, default_message_for(key), @options[key])
+          return true if bad?(@options[key] + add, default_message_for(key))
 
           # We should do @options[key] + add + 1 to adjust messages in greater_than cases.
           @missing = "allowed value #{@options[key] + add} which is less than #{@options[key] + add + 1} for #{@attribute}"

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

@@ -50,7 +50,7 @@ module Remarkable # :nodoc:
 
         def after_initialize
           if @options[:scoped_to] # TODO Deprecate scoped_to
-            warn "[DEPRECATION] :scoped_to is deprecated. Use :scope instead."
+            warn "[DEPRECATION] :scoped_to is deprecated in should_validate_uniqueness_of. Use :scope instead."
             @options[:scope] = [*@options.delete(:scoped_to)].compact
           else
             @options[:scope] = [*@options[:scope]].compact

data/lib/remarkable/controller/macros/assign_matcher.rb

@@ -9,7 +9,7 @@ module Remarkable # :nodoc:
           @names            = names
           @options[:equals] = block if block_given?
 
-          warn "[DEPRECATION] Strings given in :equals to assign_to won't be evaluated anymore. You can give procs or use blocks instead." if @options[:equals].is_a?(String)
+          warn "[DEPRECATION] Strings given in :equals to should_assign_to won't be evaluated anymore. You can give procs or use blocks instead." if @options[:equals].is_a?(String)
         end
 
         def matches?(subject)

data/lib/remarkable/controller/macros/set_session_matcher.rb

@@ -34,7 +34,7 @@ module Remarkable # :nodoc:
           expected_value = if @expected.is_a?(Proc)
             @spec.instance_eval &@expected
           else
-            warn "[DEPRECATION] Strings given to set_session won't be evaluated anymore. Give a block or a proc instead."
+            warn "[DEPRECATION] Strings given to should_set_session won't be evaluated anymore. Give a block or a proc instead."
             @spec.instance_eval(@expected) rescue @expected
           end
           return true if @session[@key] == expected_value
@@ -61,7 +61,7 @@ module Remarkable # :nodoc:
       end
 
       def return_from_session(*args, &block)
-        warn "[DEPRECATION] return_from_session is deprecated. Use set_session instead."
+        warn "[DEPRECATION] should_return_from_session is deprecated. Use should_set_session instead."
         set_session(*args, &block)
       end
     end

data/lib/remarkable/controller/macros.rb

@@ -22,7 +22,7 @@ module Remarkable # :nodoc:
           elsif url.is_a?(Proc)
             self.instance_eval &url
           else
-            warn "[DEPRECATION] Strings given to redirect_to won't be evaluated anymore. Give a proc or a block instead." if url.is_a?(String)
+            warn "[DEPRECATION] Strings given to should_redirect_to won't be evaluated anymore. Give a proc or a block instead." if url.is_a?(String)
             self.instance_eval(url) rescue url
           end
 
@@ -37,7 +37,7 @@ module Remarkable # :nodoc:
           elsif url.is_a?(Proc)
             self.instance_eval &url
           else
-            warn "[DEPRECATION] Strings given to redirect_to won't be evaluated anymore. Give a proc or a block instead." if url.is_a?(String)
+            warn "[DEPRECATION] Strings given to should_not_redirect_to won't be evaluated anymore. Give a proc or a block instead." if url.is_a?(String)
             self.instance_eval(url) rescue url
           end
 

data/lib/remarkable.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Remarkable
-  VERSION = '2.2.4'
+  VERSION = '2.2.7'
 end
 
 if ENV['RAILS_ENV'] == 'test'

data/remarkable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "2.2.6"
+  s.version = "2.2.7"
 
   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.6
+  version: 2.2.7
 platform: ruby
 authors: 
 - Carlos Brando