carlosbrando-remarkable 2.2.10 → 2.3.0

data/Manifest.txt

@@ -20,7 +20,6 @@ lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb
 lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb
 lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb
 lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb
-lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb
 lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb
 lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb
 lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb
@@ -44,7 +43,7 @@ lib/remarkable/controller/macros/respond_with_content_type_matcher.rb
 lib/remarkable/controller/macros/respond_with_matcher.rb
 lib/remarkable/controller/macros/set_session_matcher.rb
 lib/remarkable/controller/macros/route_matcher.rb
-lib/remarkable/controller/macros/set_the_flash_to_matcher.rb
+lib/remarkable/controller/macros/set_the_flash_matcher.rb
 lib/remarkable/dsl.rb
 lib/remarkable/example/example_methods.rb
 lib/remarkable/helpers.rb
@@ -58,4 +57,4 @@ remarkable.gemspec
 script/console
 script/destroy
 script/generate
-tasks/rspec.rake
+

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.10'
+  VERSION = '2.3.0'
 end
 
 if ENV['RAILS_ENV'] == 'test' && defined?(Spec)

data/lib/remarkable/active_record/helpers.rb

@@ -38,7 +38,8 @@ module Remarkable # :nodoc:
           object = @spec ? @spec.instance_variable_get("@#{instance_variable_name_for(klass)}") : nil
           object ||= klass.new
         else
-          object_or_klass
+          object = @spec ? @spec.instance_variable_get("@#{instance_variable_name_for(object_or_klass.class)}") : nil
+          object || object_or_klass
         end
       end
 

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

@@ -6,26 +6,8 @@ module Remarkable # :nodoc:
 
         arguments :attribute, :behavior, :ranges
 
-        def low_message(message)
-          warn "[DEPRECATION] should_ensure_value_in_range.low_message is deprecated. " <<
-               "Use should_validate_inclusion_of.message instead."
-          @options[:low_message] = message
-          self
-        end
-
-        def high_message(message)
-          warn "[DEPRECATION] should_ensure_value_in_range.high_message is deprecated. " <<
-               "Use should_validate_inclusion_of.message instead."
-          @options[:high_message] = message
-          self
-        end
-
-        # TODO Low message and High message should be deprecated (not supported by
-        # Rails API). In this while, we have to hack message.
         def message(message)
-          @options[:high_message] = message
-          @options[:low_message]  = message
-          @options[:message]      = message
+          @options[:message] = message
           self
         end
 
@@ -55,7 +37,7 @@ module Remarkable # :nodoc:
 
         def less_than_minimum?
           return true unless @behavior == :inclusion
-          return true if bad?(@range.first - 1, :low_message)
+          return true if bad?(@range.first - 1)
 
           @missing = "allow #{@attribute} to be less than #{@range.first}"
           return false
@@ -63,7 +45,7 @@ module Remarkable # :nodoc:
 
         def more_than_maximum?
           return true unless @behavior == :inclusion
-          return true if bad?(@range.last + 1, :high_message)
+          return true if bad?(@range.last + 1)
           
           @missing = "allow #{@attribute} to be more than #{@range.last}"
           return false
@@ -71,7 +53,7 @@ module Remarkable # :nodoc:
 
         def less_than_maximum?
           return true unless @behavior == :exclusion
-          return true if bad?(@range.last - 1, :low_message)
+          return true if bad?(@range.last - 1)
 
           @missing = "allow #{@attribute} to be less than #{@range.last}"
           return false
@@ -79,21 +61,21 @@ module Remarkable # :nodoc:
 
         def more_than_minimum?
           return true unless @behavior == :exclusion
-          return true if bad?(@range.first + 1, :high_message)
+          return true if bad?(@range.first + 1)
           
           @missing = "allow #{@attribute} to be more than #{@range.first}"
           return false
         end
 
         def accepts_minimum?
-          return true if boundary?(@range.first, :low_message)
+          return true if boundary?(@range.first)
 
           @missing = create_boundary_message("allow #{@attribute} to be #{@range.first}")
           return false
         end
 
         def accepts_maximum?
-          return true if boundary?(@range.last, :high_message)
+          return true if boundary?(@range.last)
 
           @missing = create_boundary_message("allow #{@attribute} to be #{@range.last}")
           return false
@@ -125,36 +107,18 @@ module Remarkable # :nodoc:
           end
         end
 
-        def boundary?(value, message_sym)
+        def boundary?(value)
           if @behavior == :exclusion
-            bad?(value, message_sym)
+            bad?(value, :message)
           else
-            good?(value, message_sym)
+            good?(value, :message)
           end
         end
 
         def default_options
-          { :low_message  => @behavior,
-            :high_message => @behavior,
-            :message      => @behavior }
+          { :message => @behavior }
         end
       end
-
-      # TODO Deprecate this method, but not the matcher.
-      def ensure_value_in_range(attribute, range, *options) #:nodoc:
-        hash_options = options.extract_options!
-
-        warn "[DEPRECATION] should_ensure_value_in_range with :low_message is deprecated. " <<
-             "Use should_validate_inclusion_of with :message instead." if hash_options[:low_message]
-
-        warn "[DEPRECATION] should_ensure_value_in_range with :high_message is deprecated. " <<
-             "Use should_validate_inclusion_of with :message instead." if hash_options[:high_message]
-
-        warn "[DEPRECATION] should_ensure_value_in_range is deprecated. " <<
-             "Use should_validate_inclusion_of instead." if hash_options[:low_message].blank? && hash_options[:high_message].blank?
-
-        EnsureValueInRangeMatcher.new(attribute, :inclusion, range, *options)
-      end
     end
   end
 end

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

@@ -65,13 +65,6 @@ module Remarkable # :nodoc:
         ValidateAcceptanceOfMatcher.new(*attributes)
       end
 
-      # TODO Deprecate this method.
-      def require_acceptance_of(*attributes) #:nodoc:
-        warn "[DEPRECATION] should_require_acceptance_of is deprecated. " <<
-             "Use should_validate_acceptance_of instead."
-        ValidateAcceptanceOfMatcher.new(*attributes)
-      end
-
     end
   end
 end

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

@@ -28,12 +28,12 @@ module Remarkable # :nodoc:
       #   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!
 
+        # TODO Remove this until the next comment
         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]}."
+          warn "[DEPRECATION] Please use validate_exclusion_of(#{attribute.inspect}, :in => #{good_values.inspect}) " <<
+               "instead of validate_exclusion_of(#{attribute.inspect}, #{good_values.inspect[1..-2]})."
         end
 
         options[:in] ||= good_values

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

@@ -28,12 +28,12 @@ module Remarkable # :nodoc:
       #   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!
 
+        # TODO Remove this until the next comment
         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]}."
+          warn "[DEPRECATION] Please use validate_inclusion_of(#{attribute.inspect}, :in => #{good_values.inspect}) " <<
+               "instead of validate_inclusion_of(#{attribute.inspect}, #{good_values.inspect[1..-2]})."
         end
 
         options[:in] ||= good_values

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

@@ -127,7 +127,7 @@ module Remarkable # :nodoc:
         #
         def default_message_for(validation_type)
           return :message if @options[:message]
-          @options.key?(:is) ? :wrong_length : validation_type
+          @behavior == :is ? :wrong_length : validation_type
         end 
       end
 
@@ -184,34 +184,6 @@ module Remarkable # :nodoc:
         matcher
       end
       alias :validate_size_of :validate_length_of
-
-      # TODO This one is for shoulda compatibility. Deprecate it?
-      def ensure_length_of(*attributes) #:nodoc:
-        warn "[DEPRECATION] should_ensure_length_of is deprecated. " <<
-             "Use should_validate_length_of instead."
-        validate_length_of(*attributes)
-      end
-
-      # TODO Deprecate me
-      def ensure_length_in_range(attribute, range, options = {}) #:nodoc:
-        warn "[DEPRECATION] should_ensure_length_in_range is deprecated. " <<
-             "Use should_validate_length_of(#{attribute.inspect}, :in => #{range.inspect}) instead."
-        ValidateLengthOfMatcher.new(:within, range, attribute, options)
-      end
-
-      # TODO Deprecate me
-      def ensure_length_at_least(attribute, range, options = {}) #:nodoc:
-        warn "[DEPRECATION] should_ensure_length_at_least is deprecated. " <<
-             "Use should_validate_length_of(#{attribute.inspect}, :minimum => #{range.inspect}) instead."
-        ValidateLengthOfMatcher.new(:minimum, range, attribute, options)
-      end
-
-      # TODO Deprecate me
-      def ensure_length_is(attribute, range, options = {}) #:nodoc:
-        warn "[DEPRECATION] should_ensure_length_is is deprecated. " <<
-             "Use should_validate_length_of(#{attribute.inspect}, :is => #{range.inspect}) instead."
-        ValidateLengthOfMatcher.new(:is, range, attribute, options)
-      end
     end
   end
 end

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

@@ -215,20 +215,6 @@ module Remarkable # :nodoc:
       def validate_numericality_of(*attributes)
         ValidateNumericalityOfMatcher.new(*attributes)
       end
-
-      # TODO Deprecate me
-      def only_allow_numeric_values_for(*attributes) #:nodoc:
-        warn "[DEPRECATION] should_only_allow_numeric_values_for is deprecated. " <<
-             "Use should_validate_numericality_of instead."
-        ValidateNumericalityOfMatcher.new(*attributes)
-      end
-
-      # TODO Deprecate me
-      def only_allow_numeric_or_blank_values_for(*attributes)
-        warn "[DEPRECATION] should_only_allow_numeric_or_blank_values_for is deprecated. " <<
-             "Use should_validate_numericality_of with :allow_blank => true instead."
-        ValidateNumericalityOfMatcher.new(*attributes).allow_blank
-      end
     end
   end
 end

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

@@ -42,13 +42,6 @@ module Remarkable # :nodoc:
         ValidatePresenceOfMatcher.new(*attributes)
       end
 
-      # TODO Deprecate me
-      def require_attributes(*attributes) #:nodoc:
-        warn "[DEPRECATION] should_require_attributes is deprecated. " <<
-             "Use should_validate_presence_of instead."
-        ValidatePresenceOfMatcher.new(*attributes)
-      end
-
     end
   end
 end

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

@@ -8,21 +8,13 @@ module Remarkable # :nodoc:
         optional :case_sensitive, :default => true
 
         assertions :find_first_object?, :have_attribute?, :case_sensitive?,
-                   :valid_when_changing_scoped_attribute?, :find_nil_object?,
-                   :allow_nil?, :find_blank_object?, :allow_blank?
+                   :valid_when_changing_scoped_attribute?, :allow_nil?, :allow_blank?
 
         def scope(scope)
           @options[:scope] = [*scope].compact
           self
         end
 
-        # TODO Deprecate this
-        #
-        def scoped_to(scoped)
-          warn "[DEPRECATION] scoped_to is deprecated. Use only scope instead."
-          scope(scoped)
-        end
-
         def description
           message = "require unique "
 
@@ -49,12 +41,7 @@ module Remarkable # :nodoc:
         end
 
         def after_initialize
-          if @options[:scoped_to] # TODO Deprecate scoped_to
-            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
-          end
+          @options[:scope] = [*@options[:scope]].compact
         end
 
         # Tries to find an object in the database.
@@ -79,28 +66,6 @@ module Remarkable # :nodoc:
           false
         end
 
-        # Tries to find an object where the given attribute is nil.
-        # This is required to test if the validation allows nil.
-        #
-        def find_nil_object?
-          return true unless @options.key? :allow_nil
-          return true if subject_class.find(:first, :conditions => "#{@attribute} IS NULL")
-
-          @missing = "can't find #{subject_class} with #{@attribute} nil"
-          false
-        end
-
-        # Tries to find an object where the given attribute is blank.
-        # This is required to test if the validation allows blank.
-        #
-        def find_blank_object?
-          return true unless @options.key? :allow_blank
-          return true if subject_class.find(:first, :conditions => "#{@attribute} = ''")
-
-          @missing = "can't find #{subject_class} with #{@attribute} blank"
-          false
-        end
-
         # Check if the attribute given is valid and if the validation fails
         # for equal values.
         #
@@ -162,6 +127,20 @@ module Remarkable # :nodoc:
           (@existing.send(scope) || 999).next
         end
 
+        # Change the existing object attribute to nil to run allow nil validation.
+        #
+        def allow_nil?
+          @existing.update_attribute(@attribute, nil)
+          super
+        end
+
+        # Change the existing object attribute to blank to run allow blank validation.
+        #
+        def allow_blank?
+          @existing.update_attribute(@attribute, '')
+          super
+        end
+
         def expectation
           message = "that the #{subject_name} can be saved if "
 
@@ -180,8 +159,7 @@ module Remarkable # :nodoc:
       #
       # Requires an existing record in the database. If you supply :allow_nil as
       # option, you need to have in the database a record with the given attribute
-      # nil and another with the given attribute not nil. The same is required for
-      # allow_blank option.
+      # not nil. The same is required for allow_blank option.
       #
       # If an instance variable has been created in the setup named after the
       # model being tested, then this method will use that.  Otherwise, it will
@@ -206,13 +184,6 @@ module Remarkable # :nodoc:
       def validate_uniqueness_of(*attributes)
         ValidateUniquenessOfMatcher.new(*attributes)
       end
-      
-      #TODO Deprecate this alias, the deprecation warning is the matcher
-      def require_unique_attributes(*attributes)
-        warn "[DEPRECATION] should_require_unique_attributes is deprecated. " <<
-             "Use should_validate_uniqueness_of instead."
-        validate_uniqueness_of(*attributes)
-      end
     end
   end
 end

data/lib/remarkable/controller/README.markdown

@@ -94,11 +94,15 @@ h2. set_session
 
 Macro that creates a test asserting that a value returned from the session is correct. You can given a string to compare to or a proc which will be evaluated.
 
+Options:
+
+    * :to - A string or a proc which is evaluated and compared with the retrieved session variable.
+
 Example:
 
-  should_set_session(:user_id, proc { @user.id })
+  should_set_session(:user_id, :to => proc { @user.id })
   should_set_session(:user_id){ @user.id }
-  it { should set_session(:message, 'Free stuff') }
+  it { should set_session(:message, :to => 'Free stuff') }
 
 h2. route
 
@@ -119,18 +123,22 @@ Examples:
   it { should route(:get, "/users/1/posts/1",
     :controller => :posts, :action => :show, :id => 1, :user_id => 1) }</code></pre>
 
-h2. set_the_flash_to
+h2. set_the_flash
 
 Macro that creates a test asserting that the flash contains the given value. val can be a String, a Regex, or nil (indicating that the flash should not be set).
 
+Options:
+
+    * :to - A value to check if it exists in flash or not.
+
 Example:
 
-<pre><code>  should_set_the_flash_to "Thank you for placing this order."
-  should_set_the_flash_to /created/i
+<pre><code>  should_set_the_flash :to => "Thank you for placing this order."
+  should_set_the_flash :to => /created/i
   should_not set_the_flash
 
-  it { should set_the_flash_to("Thank you for placing this order.") }
-  it { should set_the_flash_to(/created/i) }
+  it { should set_the_flash.to("Thank you for placing this order.") }
+  it { should set_the_flash.to(/created/i) }
   it { should_not set_the_flash }</code></pre>
 
 h2. redirect_to

data/lib/remarkable/controller/macros.rb

@@ -22,8 +22,7 @@ module Remarkable # :nodoc:
           elsif url.is_a?(Proc)
             self.instance_eval &url
           else
-            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
+            url
           end
 
           response.should redirect_to(redirect_url)
@@ -37,8 +36,7 @@ module Remarkable # :nodoc:
           elsif url.is_a?(Proc)
             self.instance_eval &url
           else
-            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
+            url
           end
 
           response.should_not redirect_to(redirect_url)

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

@@ -11,7 +11,6 @@ module Remarkable # :nodoc:
           @names            = names
           @options[:equals] = block if block_given?
 
-          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)
           warn "[DEPRECATION] :equals option is deprecated in should_assign_to. Please give :with instead."        if @options[:equals]
           warn "[DEPRECATION] :class option is deprecated in should_assign_to. Please give :with_kind_of instead." if @options[:class]
 
@@ -66,9 +65,7 @@ module Remarkable # :nodoc:
         def is_equals_expected_value?
           return true unless @options[:with]
 
-          expected_value = if @options[:with].is_a?(String)
-            @spec.instance_eval(@options[:with]) rescue @options[:with]
-          elsif @options[:with].is_a?(Proc)
+          expected_value = if @options[:with].is_a?(Proc)
             @spec.instance_eval &@options[:with]
           else
             @options[:with]

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

@@ -10,6 +10,11 @@ module Remarkable # :nodoc:
           @expected = block if block_given?
         end
 
+        def to(value)
+          @expected = value
+          self
+        end
+
         def matches?(subject)
           @subject = subject
 
@@ -34,8 +39,7 @@ module Remarkable # :nodoc:
           expected_value = if @expected.is_a?(Proc)
             @spec.instance_eval &@expected
           else
-            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
+            @expected
           end
           return true if @session[@key] == expected_value
 
@@ -57,13 +61,18 @@ module Remarkable # :nodoc:
       end
 
       def set_session(key, expected=nil, &block)
+        expected = if expected.is_a?(Hash)
+          expected[:to]
+        elsif expected
+          warn "[DEPRECATION] set_session(#{key.inspect}, #{expected.inspect}) is deprecated. " <<
+               "Please use set_session(#{key.inspect}, :to => #{expected.inspect})"
+          expected
+        else
+          expected
+        end
+        
         SetSessionMatcher.new(key, expected, &block)
       end
-
-      def return_from_session(*args, &block)
-        warn "[DEPRECATION] should_return_from_session is deprecated. Use should_set_session instead."
-        set_session(*args, &block)
-      end
     end
   end
 end

data/lib/remarkable/controller/macros/{set_the_flash_to_matcher.rb → set_the_flash_matcher.rb}

@@ -1,11 +1,23 @@
 module Remarkable # :nodoc:
   module Controller # :nodoc:
     module Matchers # :nodoc:
-      class SetTheFlashTo < Remarkable::Matcher::Base
+      class SetTheFlash < Remarkable::Matcher::Base
         include Remarkable::Controller::Helpers
         
         def initialize(val)
+          @val = if val.is_a?(Hash)
+            val[:to]
+          elsif val
+            warn "[DEPRECATION] set_the_flash(#{val.inspect}) is deprecated, please use set_the_flash(:to => #{val.inspect}) instead"
+            val
+          else
+            val
+          end
+        end
+
+        def to(val)
           @val = val
+          self
         end
 
         def matches?(subject)
@@ -36,7 +48,7 @@ module Remarkable # :nodoc:
             return true if assert_contains(@flash.values, @val)
             @missing = "not have #{@val} in the flash"
           else
-            return true if @flash == {}
+            return true if @flash.blank?
             @missing = "flash is not empty"
           end
           return false
@@ -51,10 +63,14 @@ module Remarkable # :nodoc:
         end
       end
 
-      def set_the_flash_to(val = '')
-        SetTheFlashTo.new(val)
+      def set_the_flash(val={:to=>''})
+        SetTheFlash.new(val)
+      end
+
+      def set_the_flash_to(val={:to=>''})
+        warn "[DEPRECATION] set_the_flash_to matcher is deprecated, please use set_the_flash instead"
+        SetTheFlash.new(val)
       end
-      alias_method :set_the_flash, :set_the_flash_to
     end
   end
 end

data/remarkable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "2.2.10"
+  s.version = "2.3.0"
 
   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"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{}
   s.email = ["eduardobrando@gmail.com", "jose.valim@gmail.com", "dc.rec1@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "init.rb", "lib/remarkable.rb", "lib/remarkable/active_record/README.markdown", "lib/remarkable/active_record/active_record.rb", "lib/remarkable/active_record/helpers.rb", "lib/remarkable/active_record/macros.rb", "lib/remarkable/active_record/macros/associations/association_matcher.rb", "lib/remarkable/active_record/macros/callbacks/callback_matcher.rb", "lib/remarkable/active_record/macros/database/have_db_column_matcher.rb", "lib/remarkable/active_record/macros/database/index_matcher.rb", "lib/remarkable/active_record/macros/validations/allow_mass_assignment_of_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_list_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_range_matcher.rb", "lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb", "lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_exclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_format_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_inclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_presence_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb", "lib/remarkable/assertions.rb", "lib/remarkable/controller/README.markdown", "lib/remarkable/controller/controller.rb", "lib/remarkable/controller/helpers.rb", "lib/remarkable/controller/macros.rb", "lib/remarkable/controller/macros/assign_matcher.rb", "lib/remarkable/controller/macros/filter_params_matcher.rb", "lib/remarkable/controller/macros/metadata_matcher.rb", "lib/remarkable/controller/macros/render_with_layout_matcher.rb", "lib/remarkable/controller/macros/respond_with_content_type_matcher.rb", "lib/remarkable/controller/macros/respond_with_matcher.rb", "lib/remarkable/controller/macros/set_session_matcher.rb", "lib/remarkable/controller/macros/route_matcher.rb", "lib/remarkable/controller/macros/set_the_flash_to_matcher.rb", "lib/remarkable/dsl.rb", "lib/remarkable/example/example_methods.rb", "lib/remarkable/helpers.rb", "lib/remarkable/inflections.rb", "lib/remarkable/matcher_base.rb", "lib/remarkable/private_helpers.rb", "lib/remarkable/rails.rb", "lib/remarkable/rails/extract_options.rb", "rails/init.rb", "remarkable.gemspec", "script/console", "script/destroy", "script/generate", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "init.rb", "lib/remarkable.rb", "lib/remarkable/active_record/README.markdown", "lib/remarkable/active_record/active_record.rb", "lib/remarkable/active_record/helpers.rb", "lib/remarkable/active_record/macros.rb", "lib/remarkable/active_record/macros/associations/association_matcher.rb", "lib/remarkable/active_record/macros/callbacks/callback_matcher.rb", "lib/remarkable/active_record/macros/database/have_db_column_matcher.rb", "lib/remarkable/active_record/macros/database/index_matcher.rb", "lib/remarkable/active_record/macros/validations/allow_mass_assignment_of_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_list_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_range_matcher.rb", "lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb", "lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_exclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_format_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_inclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_presence_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb", "lib/remarkable/assertions.rb", "lib/remarkable/controller/README.markdown", "lib/remarkable/controller/controller.rb", "lib/remarkable/controller/helpers.rb", "lib/remarkable/controller/macros.rb", "lib/remarkable/controller/macros/assign_matcher.rb", "lib/remarkable/controller/macros/filter_params_matcher.rb", "lib/remarkable/controller/macros/metadata_matcher.rb", "lib/remarkable/controller/macros/render_with_layout_matcher.rb", "lib/remarkable/controller/macros/respond_with_content_type_matcher.rb", "lib/remarkable/controller/macros/respond_with_matcher.rb", "lib/remarkable/controller/macros/set_session_matcher.rb", "lib/remarkable/controller/macros/route_matcher.rb", "lib/remarkable/controller/macros/set_the_flash_matcher.rb", "lib/remarkable/dsl.rb", "lib/remarkable/example/example_methods.rb", "lib/remarkable/helpers.rb", "lib/remarkable/inflections.rb", "lib/remarkable/matcher_base.rb", "lib/remarkable/private_helpers.rb", "lib/remarkable/rails.rb", "lib/remarkable/rails/extract_options.rb", "rails/init.rb", "remarkable.gemspec", "script/console", "script/destroy", "script/generate"]
   s.has_rdoc = true
   s.homepage = %q{http://www.nomedojogo.com/2008/11/18/shoulda-for-rspec-is-remarkable/}
   s.post_install_message = %q{PostInstall.txt}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carlosbrando-remarkable
 version: !ruby/object:Gem::Version 
-  version: 2.2.10
+  version: 2.3.0
 platform: ruby
 authors: 
 - Carlos Brando
@@ -91,7 +91,6 @@ files:
 - lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb
 - lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb
 - lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb
-- lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb
 - lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb
 - lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb
 - lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb
@@ -115,7 +114,7 @@ files:
 - lib/remarkable/controller/macros/respond_with_matcher.rb
 - lib/remarkable/controller/macros/set_session_matcher.rb
 - lib/remarkable/controller/macros/route_matcher.rb
-- lib/remarkable/controller/macros/set_the_flash_to_matcher.rb
+- lib/remarkable/controller/macros/set_the_flash_matcher.rb
 - lib/remarkable/dsl.rb
 - lib/remarkable/example/example_methods.rb
 - lib/remarkable/helpers.rb
@@ -129,7 +128,6 @@ files:
 - script/console
 - script/destroy
 - script/generate
-- tasks/rspec.rake
 has_rdoc: true
 homepage: http://www.nomedojogo.com/2008/11/18/shoulda-for-rspec-is-remarkable/
 post_install_message: PostInstall.txt

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

@@ -1,51 +0,0 @@
-module Remarkable # :nodoc:
-  module ActiveRecord # :nodoc:
-    module Matchers # :nodoc:
-      class ProtectAttributes < Remarkable::Matcher::Base
-        def initialize(*attributes)
-          attributes.extract_options!
-          @attributes = attributes
-        end
-
-        def matches?(subject)
-          @subject = subject
-
-          assert_matcher_for(@attributes) do |attribute|
-            @attribute = attribute
-            protect_from_mass_updates?
-          end
-        end
-
-        def description
-          "protect #{@attributes.to_sentence} from mass updates"
-        end
-        
-        private
-        
-        def protect_from_mass_updates?
-          attribute  = @attribute.to_sym
-          protected  = subject_class.protected_attributes || []
-          accessible = subject_class.accessible_attributes || []
-
-          return true if !protected.empty?  && protected.include?(attribute.to_s)
-          return true if !accessible.empty? && !accessible.include?(attribute.to_s)
-
-          @missing = accessible.empty? ? "#{subject_class} is protecting #{protected.to_a.to_sentence}, but not #{attribute}." :
-                                         "#{subject_class} has made #{attribute} accessible"
-          return false
-        end
-        
-        def expectation
-          "that #{@attribute} cannot be set on mass update"
-        end
-      end
-
-      # TODO Deprecate this method and the matcher.
-      def protect_attributes(*attributes) #:nodoc:
-        warn "[DEPRECATION] should_protect_attributes is deprecated. " <<
-             "Use should_not_allow_mass_assignment_of instead."
-        ProtectAttributes.new(*attributes)
-      end
-    end
-  end
-end