rspec-expectations 3.5.0 → 3.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 564420270880a852a9f86af59b32445beff85990
-  data.tar.gz: 68e50116cd97b1137f8ed688de17db436464b7b5
+  metadata.gz: 8232b582b397e192208eb5c3e081b83076aa59d9
+  data.tar.gz: 4caa2e9acf45b659b2bf3ecce7e1a1a92d14090a
 SHA512:
-  metadata.gz: 18a464c2ffba3b59d6c998419b36462177b5246fd9a66cb73c693358b9985bdffeb6fd4cafc97beff928ced458cb4e70fd78731b2e35a2e7f0aca89d4b1a0e0e
-  data.tar.gz: b56c7c4cad9670fdf2925a700de34f1be6f14d2d197a12efba71f4f816e0a9a3f4f7c172c019b46ccab5344fe464362642ca53cbe522143fde63ad99d038978b
+  metadata.gz: a7575c7bb5042e69e5bd46bc17a0e52740fbe6b05942c9d4f1d164ea78624725bda93cc15b3dd84cae7bd128e6099c628f80e8fd74d49108b98a19c9c3241bd1
+  data.tar.gz: 64c465f4842fb35b020c6dd71c1469c0614467cfcbd488d6e476121d7d2ef108dfca836c9266db6206c37570345b1c7d9e20e47aa8f81dc68ab5c4124e98cfef

data/Changelog.md

@@ -1,7 +1,17 @@
+### 3.6.0.beta1 / 2016-10-09
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0...v3.6.0.beta1)
+
+Bug Fixes:
+
+* Fix `contain_exactly` to work correctly with ranges. (Myron Marston, #940)
+* Fix `change` to work correctly with sets. (Marcin Gajewski, #939)
+
 ### 3.5.0 / 2016-07-01
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta4...v3.5.0)
 
-**No user facing changes since beta4**
+Enhancements:
+
+* Add support for keyword arguments to the `respond_to` matcher. (Rob Smith, #915).
 
 ### 3.5.0.beta4 / 2016-06-05
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta3...v3.5.0.beta4)

data/lib/rspec/expectations/expectation_target.rb

@@ -48,7 +48,7 @@ module RSpec
 
       # Defines instance {ExpectationTarget} instance methods. These are defined
       # in a module so we can include it in `Minitest::Expectation` when
-      # `rspec/expectations/minitest_integration` is laoded in order to
+      # `rspec/expectations/minitest_integration` is loaded in order to
       # support usage with Minitest.
       module InstanceMethods
         # Runs the given expectation, passing if `matcher` returns true.

data/lib/rspec/expectations/fail_with.rb

@@ -1,10 +1,18 @@
 module RSpec
   module Expectations
     class << self
+      # @private
+      class Differ
+        # @private
+        OBJECT_PREPARER = lambda do |object|
+          RSpec::Matchers::Composable.surface_descriptions_in(object)
+        end
+      end
+
       # @private
       def differ
         RSpec::Support::Differ.new(
-          :object_preparer => lambda { |object| RSpec::Matchers::Composable.surface_descriptions_in(object) },
+          :object_preparer => Differ::OBJECT_PREPARER,
           :color => RSpec::Matchers.configuration.color?
         )
       end

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.5.0'
+      STRING = '3.6.0.beta1'
     end
   end
 end

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

@@ -1,6 +1,7 @@
 module RSpec
   module Matchers
     module BuiltIn
+      # rubocop:disable ClassLength
       # @api private
       # Provides the implementation for `contain_exactly` and `match_array`.
       # Not intended to be instantiated directly.
@@ -85,7 +86,7 @@ module RSpec
         def convert_actual_to_an_array
           if actual.respond_to?(:to_ary)
             @actual = actual.to_ary
-          elsif should_enumerate?(actual) && actual.respond_to?(:to_a)
+          elsif actual.respond_to?(:to_a) && !to_a_disallowed?(actual)
             @actual = actual.to_a
           else
             return false
@@ -98,6 +99,19 @@ module RSpec
           array
         end
 
+        if RUBY_VERSION == "1.8.7"
+          def to_a_disallowed?(object)
+            case object
+            when NilClass, String then true
+            else Kernel == RSpec::Support.method_handle_for(object, :to_a).owner
+            end
+          end
+        else
+          def to_a_disallowed?(object)
+            NilClass === object
+          end
+        end
+
         def missing_items
           @missing_items ||= best_solution.unmatched_expected_indexes.map do |index|
             expected[index]
@@ -281,6 +295,7 @@ module RSpec
           end
         end
       end
+      # rubocop:enable ClassLength
     end
   end
 end

data/lib/rspec/matchers/composable.rb

@@ -130,8 +130,6 @@ module RSpec
           object.clone
         elsif Hash === object
           Hash[with_matchers_cloned(object.to_a)]
-        elsif Struct === object || unreadable_io?(object)
-          object
         elsif should_enumerate?(object)
           object.map { |subobject| with_matchers_cloned(subobject) }
         else
@@ -139,24 +137,10 @@ module RSpec
         end
       end
 
-      if String.ancestors.include?(Enumerable) # 1.8.7
-        # :nocov:
-        # Strings are not enumerable on 1.9, and on 1.8 they are an infinitely
-        # nested enumerable: since ruby lacks a character class, it yields
-        # 1-character strings, which are themselves enumerable, composed of a
-        # a single 1-character string, which is an enumerable, etc.
-        #
-        # @api private
-        def should_enumerate?(item)
-          return false if String === item
-          Enumerable === item && !(Range === item) && item.none? { |subitem| subitem.equal?(item) }
-        end
-        # :nocov:
-      else
-        # @api private
-        def should_enumerate?(item)
-          Enumerable === item && !(Range === item) && item.none? { |subitem| subitem.equal?(item) }
-        end
+      # @api private
+      # We should enumerate arrays as long as they are not recursive.
+      def should_enumerate?(item)
+        Array === item && item.none? { |subitem| subitem.equal?(item) }
       end
 
       # @api private

data/lib/rspec/matchers/english_phrasing.rb

@@ -7,7 +7,7 @@ module RSpec
       #     split_words(:banana_creme_pie) #=> "banana creme pie"
       #
       def self.split_words(sym)
-        sym.to_s.gsub(/_/, ' ')
+        sym.to_s.tr('_', ' ')
       end
 
       # @note The returned string has a leading space except

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0.beta1
 platform: ruby
 authors:
 - Steven Baker
@@ -45,22 +45,22 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0.beta1
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.5.0
+summary: rspec-expectations-3.6.0.beta1
 test_files: []
 has_rdoc: