rspec-expectations 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd7955a9011398c45ea3e013003f609e10a45d3
-  data.tar.gz: ef807b08b3196f44fbdb0713c932e9a4fa55b5e4
+  metadata.gz: 55fe7e69aa2f95c64cc33b1805bbd01569c0c269
+  data.tar.gz: 1315e9e9bb890c7088a2ba123fe0ad8af077f2a8
 SHA512:
-  metadata.gz: 748b7325cf0703054bb349274b192f958f1a4e86d42089ea1583eb93180ae4a22be0c90ed19e578d5dee32ec241c12a932e262df09b74c426a4295495433d21c
-  data.tar.gz: d108d4262782769604c8d343dfa0b5aefe0f119237ca820422b836b45ccbe846e872c71f34324e733fd09ca398b1268945d2a680fa0e6aae7e976491aa9ec8dc
+  metadata.gz: 20496ddf5da00c886e02c27353860d953803fe33d76603955c8398758a8f86d05e3a3245e460fca389dd82ba012ee609f8d7b2cf92166b4568e17ab98f4d769e
+  data.tar.gz: 75767f0423ca2911f4161091aac4bc5b66e8b9deb01eb9490e00da0277ee036ab06be3d1f9f63930394fc46c426818227852f2f90a04c98288e7d69ca2ecad95

data.tar.gz.sig

@@ -1,2 +1 @@
-��ͅnUE�%Y�������>����bf�9O� 34��$Mަl���-'�_���?]��ߞ��q2��ν��l?N��O)�H{G}N��v�^�4rv�E��+�gb��h}*1v�3��ӷ�*J����>�D/x[��1Ŀ����4��w���X
.J��Y����e6[��oQ���<�~S�bt��✃͹,�4���m��ح�0x��&�&k>�
-��0����O{���yv�w}ۯ�
+O/Cs����jt��V��l��鋫���'Rz��0��BYQ��a5���fѻNGnB�����fվ~4�h��ăl�g

data/Changelog.md

@@ -1,3 +1,14 @@
+### 3.1.2 / 2014-09-26
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.1.1...v3.1.2)
+
+Bug Fixes:
+
+* Fix `define_negated_matcher` so that matchers that support fluent
+  interfaces continue to be negated after you use the chained method.
+  (Myron Marston, #656)
+* Fix `define_negated_matcher` so that the matchers fail with an
+  appropriate failure message. (Myron Marston, #659)
+
 ### 3.1.1 / 2014-09-15
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.1.0...v3.1.1)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.1.1'
+      STRING = '3.1.2'
     end
   end
 end

data/lib/rspec/matchers/aliased_matcher.rb

@@ -23,8 +23,8 @@ module RSpec
       # used.
       def method_missing(*)
         return_val = super
-        return return_val unless return_val.respond_to?(:description)
-        AliasedMatcher.new(return_val, @description_block)
+        return return_val unless RSpec::Matchers.is_a_matcher?(return_val)
+        self.class.new(return_val, @description_block)
       end
 
       # Provides the description of the aliased matcher. Aliased matchers
@@ -80,6 +80,37 @@ module RSpec
       def does_not_match?(*args, &block)
         @base_matcher.matches?(*args, &block)
       end
+
+      def failure_message
+        optimal_failure_message(__method__, :failure_message_when_negated)
+      end
+
+      def failure_message_when_negated
+        optimal_failure_message(__method__, :failure_message)
+      end
+
+    private
+
+      DefaultFailureMessages = BuiltIn::BaseMatcher::DefaultFailureMessages
+
+      # For a matcher that uses the default failure messages, we prefer to
+      # use the override provided by the `description_block`, because it
+      # includes the phrasing that the user has expressed a preference for
+      # by going through the effort of defining a negated matcher.
+      #
+      # However, if the override didn't actually change anything, then we
+      # should return the opposite failure message instead -- the overriden
+      # message is going to be confusing if we return it as-is, as it represents
+      # the non-negated failure message for a negated match (or vice versa).
+      def optimal_failure_message(same, inverted)
+        if DefaultFailureMessages.has_default_failure_messages?(@base_matcher)
+          base_message = @base_matcher.__send__(same)
+          overriden    = @description_block.call(base_message)
+          return overriden if overriden != base_message
+        end
+
+        @base_matcher.__send__(inverted)
+      end
     end
   end
 end

data/lib/rspec/matchers/built_in/base_matcher.rb

@@ -52,26 +52,6 @@ module RSpec
           end
         end
 
-        # @api private
-        # Provides a good generic failure message. Based on `description`.
-        # When subclassing, if you are not satisfied with this failure message
-        # you often only need to override `description`.
-        # @return [String]
-        def failure_message
-          assert_ivars :@actual
-          "expected #{@actual.inspect} to #{description}"
-        end
-
-        # @api private
-        # Provides a good generic negative failure message. Based on `description`.
-        # When subclassing, if you are not satisfied with this failure message
-        # you often only need to override `description`.
-        # @return [String]
-        def failure_message_when_negated
-          assert_ivars :@actual
-          "expected #{@actual.inspect} not to #{description}"
-        end
-
         # @api private
         # Generates a "pretty" description using the logic in {Pretty}.
         # @return [String]
@@ -114,6 +94,38 @@ module RSpec
         else
           alias present_ivars instance_variables
         end
+
+        # @api private
+        # Provides default implementations of failure messages, based on the `description`.
+        module DefaultFailureMessages
+          # @api private
+          # Provides a good generic failure message. Based on `description`.
+          # When subclassing, if you are not satisfied with this failure message
+          # you often only need to override `description`.
+          # @return [String]
+          def failure_message
+            "expected #{actual.inspect} to #{description}"
+          end
+
+          # @api private
+          # Provides a good generic negative failure message. Based on `description`.
+          # When subclassing, if you are not satisfied with this failure message
+          # you often only need to override `description`.
+          # @return [String]
+          def failure_message_when_negated
+            "expected #{actual.inspect} not to #{description}"
+          end
+
+          # @private
+          def self.has_default_failure_messages?(matcher)
+            matcher.method(:failure_message).owner == self &&
+            matcher.method(:failure_message_when_negated).owner == self
+          rescue NameError
+            false
+          end
+        end
+
+        include DefaultFailureMessages
       end
     end
   end

data/lib/rspec/matchers/dsl.rb

@@ -245,6 +245,8 @@ module RSpec
       # override any of these using the {RSpec::Matchers::DSL::Macros Macros} methods
       # from within an `RSpec::Matchers.define` block.
       module DefaultImplementations
+        include BuiltIn::BaseMatcher::DefaultFailureMessages
+
         # @api private
         # Used internally by objects returns by `should` and `should_not`.
         def diffable?
@@ -256,16 +258,6 @@ module RSpec
           "#{name_to_sentence}#{to_sentence expected}#{chained_method_clause_sentences}"
         end
 
-        # The default failure message for positive expectations.
-        def failure_message
-          "expected #{actual.inspect} to #{description}"
-        end
-
-        # The default failure message for negative expectations.
-        def failure_message_when_negated
-          "expected #{actual.inspect} not to #{description}"
-        end
-
         # Matchers do not support block expectations by default. You
         # must opt-in.
         def supports_block_expectations?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Steven Baker
@@ -33,7 +33,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -205,6 +205,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.1.1
+summary: rspec-expectations-3.1.2
 test_files: []
 has_rdoc: