rspec-expectations 3.5.0.beta4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d95b80f9a64a43b6e1f0e95dcc4e2dfd0cfa1af
-  data.tar.gz: 7afd8be35cbcab028f3099e393c67dd762535b10
+  metadata.gz: 564420270880a852a9f86af59b32445beff85990
+  data.tar.gz: 68e50116cd97b1137f8ed688de17db436464b7b5
 SHA512:
-  metadata.gz: 26f7c1f25f63e1af63acff047c324213d4c564c37e11f25210552ac3e5006026788b4ea74deeb8b84faf2e5faad4c92430c3b590437ae3f6e73d5ceefd54e6c7
-  data.tar.gz: b6946ee2b2fd09495f45b08977a44c22b1a91721b54092f5a1a16c4210886a5df876d3fe1792f305dca932e7448831c8acf1890908c338690777766d36455c4a
+  metadata.gz: 18a464c2ffba3b59d6c998419b36462177b5246fd9a66cb73c693358b9985bdffeb6fd4cafc97beff928ced458cb4e70fd78731b2e35a2e7f0aca89d4b1a0e0e
+  data.tar.gz: b56c7c4cad9670fdf2925a700de34f1be6f14d2d197a12efba71f4f816e0a9a3f4f7c172c019b46ccab5344fe464362642ca53cbe522143fde63ad99d038978b

data/Changelog.md

@@ -1,5 +1,7 @@
-### 3.5 Development
-[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta4...master)
+### 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**
 
 ### 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/version.rb

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

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

@@ -10,6 +10,9 @@ module RSpec
         def initialize(*names)
           @names = names
           @expected_arity = nil
+          @expected_keywords = []
+          @unlimited_arguments = nil
+          @arbitrary_keywords = nil
         end
 
         # @api public
@@ -22,6 +25,43 @@ module RSpec
           self
         end
 
+        # @api public
+        # Specifies keyword arguments, if any.
+        #
+        # @example
+        #   expect(obj).to respond_to(:message).with_keywords(:color, :shape)
+        # @example with an expected number of arguments
+        #   expect(obj).to respond_to(:message).with(3).arguments.and_keywords(:color, :shape)
+        def with_keywords(*keywords)
+          @expected_keywords = keywords
+          self
+        end
+        alias :and_keywords :with_keywords
+
+        # @api public
+        # Specifies that the method accepts any keyword, i.e. the method has
+        #   a splatted keyword parameter of the form **kw_args.
+        #
+        # @example
+        #   expect(obj).to respond_to(:message).with_any_keywords
+        def with_any_keywords
+          @arbitrary_keywords = true
+          self
+        end
+        alias :and_any_keywords :with_any_keywords
+
+        # @api public
+        # Specifies that the number of arguments has no upper limit, i.e. the
+        #   method has a splatted parameter of the form *args.
+        #
+        # @example
+        #   expect(obj).to respond_to(:message).with_unlimited_arguments
+        def with_unlimited_arguments
+          @unlimited_arguments = true
+          self
+        end
+        alias :and_unlimited_arguments :with_unlimited_arguments
+
         # @api public
         # No-op. Intended to be used as syntactic sugar when using `with`.
         #
@@ -70,15 +110,50 @@ module RSpec
         end
 
         def matches_arity?(actual, name)
-          return true unless @expected_arity
+          expectation = Support::MethodSignatureExpectation.new
+
+          if @expected_arity.is_a?(Range)
+            expectation.min_count = @expected_arity.min
+            expectation.max_count = @expected_arity.max
+          else
+            expectation.min_count = @expected_arity
+          end
+
+          expectation.keywords = @expected_keywords
+          expectation.expect_unlimited_arguments = @unlimited_arguments
+          expectation.expect_arbitrary_keywords  = @arbitrary_keywords
+
+          return true if expectation.empty?
 
           signature = Support::MethodSignature.new(Support.method_handle_for(actual, name))
-          Support::StrictSignatureVerifier.new(signature, Array.new(@expected_arity)).valid?
+
+          Support::StrictSignatureVerifier.new(signature).with_expectation(expectation).valid?
         end
 
         def with_arity
-          return "" unless @expected_arity
-          " with #{@expected_arity} argument#{@expected_arity == 1 ? '' : 's'}"
+          str = ''
+          str << " with #{with_arity_string}" if @expected_arity
+          str << " #{str.length == 0 ? 'with' : 'and'} #{with_keywords_string}" if @expected_keywords && @expected_keywords.count > 0
+          str << " #{str.length == 0 ? 'with' : 'and'} unlimited arguments" if @unlimited_arguments
+          str << " #{str.length == 0 ? 'with' : 'and'} any keywords" if @arbitrary_keywords
+          str
+        end
+
+        def with_arity_string
+          "#{@expected_arity} argument#{@expected_arity == 1 ? '' : 's'}"
+        end
+
+        def with_keywords_string
+          kw_str = case @expected_keywords.count
+                   when 1
+                     @expected_keywords.first.inspect
+                   when 2
+                     @expected_keywords.map(&:inspect).join(' and ')
+                   else
+                     "#{@expected_keywords[0...-1].map(&:inspect).join(', ')}, and #{@expected_keywords.last.inspect}"
+          end
+
+          "keyword#{@expected_keywords.count == 1 ? '' : 's'} #{kw_str}"
         end
 
         def pp_names

data/lib/rspec/matchers/english_phrasing.rb

@@ -37,6 +37,22 @@ module RSpec
           " #{items[0...-1].join(', ')}, and #{items[-1]}"
         end
       end
+
+      if RUBY_VERSION == '1.8.7'
+        # Not sure why, but on travis on 1.8.7 we have gotten these warnings:
+        # lib/rspec/matchers/english_phrasing.rb:28: warning: default `to_a' will be obsolete
+        # So it appears that `Array` can trigger that (e.g. by calling `to_a` on the passed object?)
+        # So here we replace `Kernel#Array` with our own warning-free implementation for 1.8.7.
+        # @private
+        # rubocop:disable Style/MethodName
+        def self.Array(obj)
+          case obj
+          when Array then obj
+          else [obj]
+          end
+        end
+        # rubocop:enable Style/MethodName
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta4
+  version: 3.5.0
 platform: ruby
 authors:
 - Steven Baker
@@ -45,22 +45,22 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-07-01 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.beta4
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta4
+        version: 3.5.0
 - !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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.5.0.beta4
+summary: rspec-expectations-3.5.0
 test_files: []
 has_rdoc: