rspec-expectations 3.0.0 → 3.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTJkNmM4ZmNlYTk2M2QyOGIwNWU3MTI3ZGE2ZTQ0OWJhNWM2MTc5NQ==
-  data.tar.gz: !binary |-
-    YWExNzcwODcxZTBkZWY2MDIyMTI2ZjhjMTYwMjBlZDVkMWNiNjQ2Ng==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjdiYjlhYzI4ZDk5YTMyZjFjMjA4OWJlOTQ3MzgwODNhZGNjMWM3ZmZmM2Q0
-    NzU3MWFmMzIzYjI0OGE1NzlkZTBlMDI2NmY4ZWUwMjlmN2Y3MTFjODkzOGQ4
-    NWQ3NzBhMmQzNGQ2ZjNmZjQ1MjRmMWJjMjE4OTBhNDMyOGJjZTU=
-  data.tar.gz: !binary |-
-    MzIyOGQ2NjI3MzJmZjM5MTU1ZDdiOTFlZDY5NWMyN2RjOGE4NGNlNGRiYmZk
-    NWUxZmVkMTdhMGM5YjdiZmRmNWJmNmM0MDBmMWIyODhlZmM3MzIyYWY0ZmQx
-    NTJlYjVlZWQ0NzE4MzBiMjIxNDEyZTE3ZjE0ZDUxOGRkZDQ4MTE=
+SHA1:
+  metadata.gz: d379423e0b4e64ab171259aadfc7c135fc10e1a5
+  data.tar.gz: 801537a8f0cb606eaa4b814f32eecd39e09ed431
+SHA512:
+  metadata.gz: ca469b494c808f9f76aff95b1818459b1da61577825f6162e6fa4b5b33b4f9b8b728890da22388c177b2d05e04ca4b9378d528b1dfb02465a5679fef24084f8f
+  data.tar.gz: 9a97e088ce0fa1761ae2693d8cd61b42dcc3184f4137a4f578871d4df61c3c72f293aecfafd5e85eaf0e7d7179f6f18e7f46fa067626c6a0dd9043530b9cc857

data/Changelog.md

@@ -1,3 +1,13 @@
+### 3.0.1 / 2014-06-12
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.0...v3.0.1)
+
+Bug Fixes:
+
+* Add a missing `require` that would cause the `respond_to` matcher to
+  fail when used in a project where the rest of RSpec (e.g. core and
+  expecatations) weren't being used. (Myron Marston, #566)
+* Structs are no longer treated as arrays when diffed. (Jon Rowe, #576)
+
 ### 3.0.0 / 2014-06-01
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.0.0.rc1...v3.0.0)
 

data/README.md

@@ -1,4 +1,4 @@
-# RSpec Expectations [![Build Status](https://secure.travis-ci.org/rspec/rspec-expectations.png?branch=master)](http://travis-ci.org/rspec/rspec-expectations) [![Code Climate](https://codeclimate.com/github/rspec/rspec-expectations.png)](https://codeclimate.com/github/rspec/rspec-expectations) [![Inline docs](http://inch-pages.github.io/github/rspec/rspec-expectations.png)](http://inch-pages.github.io/github/rspec/rspec-expectations)
+# RSpec Expectations [![Build Status](https://secure.travis-ci.org/rspec/rspec-expectations.png?branch=master)](http://travis-ci.org/rspec/rspec-expectations) [![Code Climate](https://codeclimate.com/github/rspec/rspec-expectations.png)](https://codeclimate.com/github/rspec/rspec-expectations)
 
 RSpec::Expectations lets you express expected outcomes on an object in an
 example.
@@ -249,6 +249,27 @@ expect { |probe|
 }.to yield_successive_args( a_value < 2, 2, a_value > 2 )
 ```
 
+## Usage outside rspec-core
+
+You always need to load `rspec/expectations` even if you only want to use one part of the library:
+
+```ruby
+require 'rspec/expectations'
+```
+
+Then simply include `RSpec::Matchers` in any class:
+
+```ruby
+class MyClass
+  include RSpec::Matchers
+
+  def do_something(arg)
+    expect(arg).to be > 0
+    # do other stuff
+  end
+end
+```
+
 ## Also see
 
 * [http://github.com/rspec/rspec](http://github.com/rspec/rspec)

data/lib/rspec/expectations.rb

@@ -66,4 +66,3 @@ module RSpec
     ExpectationNotMetError = Class.new(::Exception)
   end
 end
-

data/lib/rspec/expectations/configuration.rb

@@ -65,9 +65,7 @@ module RSpec
         # Indicates whether or not diffs should be colored.
         # Delegates to rspec-core's color option if rspec-core
         # is loaded; otherwise you can set it here.
-        def color=(value)
-          @color = value
-        end
+        attr_writer :color
 
         # Indicates whether or not diffs should be colored.
         # Delegates to rspec-core's color option if rspec-core
@@ -103,10 +101,10 @@ module RSpec
       attr_writer :backtrace_formatter
       def backtrace_formatter
         @backtrace_formatter ||= if defined?(::RSpec.configuration.backtrace_formatter)
-         ::RSpec.configuration.backtrace_formatter
-        else
-          NullBacktraceFormatter
-        end
+                                   ::RSpec.configuration.backtrace_formatter
+                                 else
+                                   NullBacktraceFormatter
+                                 end
       end
 
       # @private
@@ -135,4 +133,3 @@ module RSpec
     configuration.reset_syntaxes_to_default
   end
 end
-

data/lib/rspec/expectations/expectation_target.rb

@@ -71,7 +71,7 @@ module RSpec
     private
 
       def prevent_operator_matchers(verb)
-        raise ArgumentError, "The expect syntax does not support operator matchers, " +
+        raise ArgumentError, "The expect syntax does not support operator matchers, " \
                              "so you must pass a matcher to `##{verb}`."
       end
     end
@@ -98,10 +98,9 @@ module RSpec
       def enforce_block_expectation(matcher)
         return if supports_block_expectations?(matcher)
 
-        raise ExpectationNotMetError,
-          "You must pass an argument rather than a block to use the provided " +
-          "matcher (#{description_of matcher}), or the matcher must implement " +
-          "`supports_block_expectations?`."
+        raise ExpectationNotMetError, "You must pass an argument rather than " \
+          "a block to use the provided matcher (#{description_of matcher}), or " \
+          "the matcher must implement `supports_block_expectations?`."
       end
 
       def supports_block_expectations?(matcher)
@@ -118,4 +117,3 @@ module RSpec
     end
   end
 end
-

data/lib/rspec/expectations/fail_with.rb

@@ -6,7 +6,7 @@ module RSpec
       # @private
       def differ
         RSpec::Support::Differ.new(
-          :object_preparer => lambda {|object| RSpec::Matchers::Composable.surface_descriptions_in(object) },
+          :object_preparer => lambda { |object| RSpec::Matchers::Composable.surface_descriptions_in(object) },
           :color => RSpec::Matchers.configuration.color?
         )
       end
@@ -19,18 +19,15 @@ module RSpec
       # Adds a diff to the failure message when `expected` and `actual` are
       # both present.
       def fail_with(message, expected=nil, actual=nil)
-        if !message
-          raise ArgumentError, "Failure message is nil. Does your matcher define the " +
+        unless message
+          raise ArgumentError, "Failure message is nil. Does your matcher define the " \
                                "appropriate failure_message[_when_negated] method to return a string?"
         end
 
         diff = differ.diff(actual, expected)
+        message = "#{message}\nDiff:#{diff}" unless diff.empty?
 
-        unless diff.empty?
-          message = "#{message}\nDiff:#{diff}"
-        end
-
-        raise RSpec::Expectations::ExpectationNotMetError.new(message)
+        raise RSpec::Expectations::ExpectationNotMetError, message
       end
     end
   end

data/lib/rspec/expectations/handler.rb

@@ -1,6 +1,5 @@
 module RSpec
   module Expectations
-
     # @private
     module ExpectationHelper
       def self.check_message(msg)
@@ -46,7 +45,7 @@ module RSpec
         matcher = ExpectationHelper.setup(self, initial_matcher, message)
 
         return ::RSpec::Matchers::BuiltIn::PositiveOperatorMatcher.new(actual) unless initial_matcher
-        matcher.matches?(actual, &block) or ExpectationHelper.handle_failure(matcher, message, :failure_message)
+        matcher.matches?(actual, &block) || ExpectationHelper.handle_failure(matcher, message, :failure_message)
       end
 
       def self.verb
@@ -68,7 +67,7 @@ module RSpec
         matcher = ExpectationHelper.setup(self, initial_matcher, message)
 
         return ::RSpec::Matchers::BuiltIn::NegativeOperatorMatcher.new(actual) unless initial_matcher
-        !(does_not_match?(matcher, actual, &block) or ExpectationHelper.handle_failure(matcher, message, :failure_message_when_negated))
+        !(does_not_match?(matcher, actual, &block) || ExpectationHelper.handle_failure(matcher, message, :failure_message_when_negated))
       end
 
       def self.does_not_match?(matcher, actual, &block)
@@ -160,4 +159,3 @@ module RSpec
     end
   end
 end
-

data/lib/rspec/expectations/minitest_integration.rb

@@ -9,8 +9,9 @@ Minitest::Test.class_eval do
   end
 end
 
-module RSpec::Expectations
-  remove_const :ExpectationNotMetError
-  ExpectationNotMetError = ::Minitest::Assertion
+module RSpec
+  module Expectations
+    remove_const :ExpectationNotMetError
+    ExpectationNotMetError = ::Minitest::Assertion
+  end
 end
-

data/lib/rspec/expectations/syntax.rb

@@ -23,19 +23,19 @@ module RSpec
       # Generates a deprecation warning for the given method if no warning
       # has already been issued.
       def warn_about_should_unless_configured(method_name)
-        if @warn_about_should
-          RSpec.deprecate(
-            "Using `#{method_name}` from rspec-expectations' old `:should` syntax without explicitly enabling the syntax",
-            :replacement => "the new `:expect` syntax or explicitly enable `:should`"
-          )
+        return unless @warn_about_should
 
-          @warn_about_should = false
-        end
+        RSpec.deprecate(
+          "Using `#{method_name}` from rspec-expectations' old `:should` syntax without explicitly enabling the syntax",
+          :replacement => "the new `:expect` syntax or explicitly enable `:should`"
+        )
+
+        @warn_about_should = false
       end
 
       # @api private
       # Enables the `should` syntax.
-      def enable_should(syntax_host = default_should_host)
+      def enable_should(syntax_host=default_should_host)
         @warn_about_should = false if syntax_host == default_should_host
         return if should_enabled?(syntax_host)
 
@@ -54,7 +54,7 @@ module RSpec
 
       # @api private
       # Disables the `should` syntax.
-      def disable_should(syntax_host = default_should_host)
+      def disable_should(syntax_host=default_should_host)
         return unless should_enabled?(syntax_host)
 
         syntax_host.module_exec do
@@ -65,7 +65,7 @@ module RSpec
 
       # @api private
       # Enables the `expect` syntax.
-      def enable_expect(syntax_host = ::RSpec::Matchers)
+      def enable_expect(syntax_host=::RSpec::Matchers)
         return if expect_enabled?(syntax_host)
 
         syntax_host.module_exec do
@@ -77,7 +77,7 @@ module RSpec
 
       # @api private
       # Disables the `expect` syntax.
-      def disable_expect(syntax_host = ::RSpec::Matchers)
+      def disable_expect(syntax_host=::RSpec::Matchers)
         return unless expect_enabled?(syntax_host)
 
         syntax_host.module_exec do
@@ -87,13 +87,13 @@ module RSpec
 
       # @api private
       # Indicates whether or not the `should` syntax is enabled.
-      def should_enabled?(syntax_host = default_should_host)
+      def should_enabled?(syntax_host=default_should_host)
         syntax_host.method_defined?(:should)
       end
 
       # @api private
       # Indicates whether or not the `expect` syntax is enabled.
-      def expect_enabled?(syntax_host = ::RSpec::Matchers)
+      def expect_enabled?(syntax_host=::RSpec::Matchers)
         syntax_host.method_defined?(:expect)
       end
     end

data/lib/rspec/expectations/version.rb

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

data/lib/rspec/matchers.rb

@@ -301,8 +301,7 @@ module RSpec
     # (e.g. be_empty), letting you choose the prefix that best suits the
     # predicate.
     def be(*args)
-      args.empty? ?
-        Matchers::BuiltIn::Be.new : equal(*args)
+      args.empty? ? Matchers::BuiltIn::Be.new : equal(*args)
     end
     alias_matcher :a_value, :be
 
@@ -322,7 +321,7 @@ module RSpec
     def be_an_instance_of(expected)
       BuiltIn::BeAnInstanceOf.new(expected)
     end
-    alias_method  :be_instance_of, :be_an_instance_of
+    alias_method :be_instance_of, :be_an_instance_of
     alias_matcher :an_instance_of, :be_an_instance_of
 
     # Passes if actual.kind_of?(expected)
@@ -335,7 +334,7 @@ module RSpec
     def be_a_kind_of(expected)
       BuiltIn::BeAKindOf.new(expected)
     end
-    alias_method  :be_kind_of, :be_a_kind_of
+    alias_method :be_kind_of, :be_a_kind_of
     alias_matcher :a_kind_of,  :be_a_kind_of
 
     # Passes if actual.between?(min, max). Works with any Comparable object,
@@ -702,7 +701,7 @@ module RSpec
     def raise_error(error=Exception, message=nil, &block)
       BuiltIn::RaiseError.new(error, message, &block)
     end
-    alias_method  :raise_exception,  :raise_error
+    alias_method :raise_exception,  :raise_error
 
     alias_matcher :a_block_raising,  :raise_error do |desc|
       desc.sub("raise", "a block raising")
@@ -895,12 +894,12 @@ module RSpec
 
     def method_missing(method, *args, &block)
       case method.to_s
-        when BE_PREDICATE_REGEX
-          BuiltIn::BePredicate.new(method, *args, &block)
-        when HAS_REGEX
-          BuiltIn::Has.new(method, *args, &block)
-        else
-          super
+      when BE_PREDICATE_REGEX
+        BuiltIn::BePredicate.new(method, *args, &block)
+      when HAS_REGEX
+        BuiltIn::Has.new(method, *args, &block)
+      else
+        super
       end
     end
 

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

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `all`.
       # Not intended to be instantiated directly.
       class All < BaseMatcher
-
         # @private
         attr_reader :matcher, :failed_objects
 
@@ -15,7 +14,7 @@ module RSpec
         end
 
         # @private
-        def does_not_match?(actual)
+        def does_not_match?(_actual)
           raise NotImplementedError, '`expect().not_to all( matcher )` is not supported.'
         end
 
@@ -38,7 +37,7 @@ module RSpec
 
       private
 
-        def match(_, actual)
+        def match(_expected, _actual)
           index_failed_objects
           failed_objects.empty?
         end
@@ -52,7 +51,7 @@ module RSpec
         end
 
         def failure_message_for_item(index, failure_message)
-          failure_message = indent_multiline_message( add_new_line_if_needed(failure_message) )
+          failure_message = indent_multiline_message(add_new_line_if_needed(failure_message))
           indent_multiline_message("object at index #{index} failed to match:#{failure_message}")
         end
 
@@ -71,7 +70,6 @@ module RSpec
           @matcher = @matcher.clone
           super
         end
-
       end
     end
   end

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

@@ -23,7 +23,7 @@ module RSpec
         # @private
         attr_reader :actual, :expected, :rescued_exception
 
-        def initialize(expected = UNDEFINED)
+        def initialize(expected=UNDEFINED)
           @expected = expected unless UNDEFINED.equal?(expected)
         end
 
@@ -98,9 +98,8 @@ module RSpec
       private
 
         def assert_ivars(*expected_ivars)
-          if (expected_ivars - present_ivars).any?
-            raise "#{self.class.name} needs to supply#{to_sentence expected_ivars}"
-          end
+          return unless (expected_ivars - present_ivars).any?
+          raise "#{self.class.name} needs to supply#{to_sentence expected_ivars}"
         end
 
         if RUBY_VERSION.to_f < 1.9

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

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `be_truthy`.
       # Not intended to be instantiated directly.
       class BeTruthy < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message
@@ -29,7 +28,6 @@ module RSpec
       # Provides the implementation for `be_falsey`.
       # Not intended to be instantiated directly.
       class BeFalsey < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message
@@ -53,7 +51,6 @@ module RSpec
       # Provides the implementation for `be_nil`.
       # Not intended to be instantiated directly.
       class BeNil < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message
@@ -75,7 +72,7 @@ module RSpec
 
       # @private
       module BeHelpers
-        private
+      private
 
         def args_to_s
           @args.empty? ? "" : parenthesize(inspected_args.join(', '))
@@ -86,7 +83,7 @@ module RSpec
         end
 
         def inspected_args
-          @args.collect{|a| a.inspect}
+          @args.map { |a| a.inspect }
         end
 
         def expected_to_sentence
@@ -104,7 +101,7 @@ module RSpec
       class Be < BaseMatcher
         include BeHelpers
 
-        def initialize(*args, &block)
+        def initialize(*args)
           @args = args
         end