rspec-mocks 3.0.0 → 3.1.0

data/lib/rspec/mocks/verifying_double.rb

@@ -3,7 +3,6 @@ require 'stringio'
 
 module RSpec
   module Mocks
-
     # @private
     module VerifyingDouble
       def respond_to?(message, include_private=false)
@@ -11,11 +10,11 @@ module RSpec
 
         method_ref = __mock_proxy.method_reference[message]
 
-        return case method_ref.visibility
-          when :public    then true
-          when :private   then include_private
-          when :protected then include_private || RUBY_VERSION.to_f < 2.0
-          else !method_ref.unimplemented?
+        case method_ref.visibility
+        when :public    then true
+        when :private   then include_private
+        when :protected then include_private || RUBY_VERSION.to_f < 2.0
+        else !method_ref.unimplemented?
         end
       end
 
@@ -74,8 +73,8 @@ module RSpec
 
       def __build_mock_proxy(order_group)
         VerifyingProxy.new(self, order_group, @name,
-          @doubled_module,
-          InstanceMethodReference
+                           @doubled_module,
+                           InstanceMethodReference
         )
       end
     end
@@ -88,6 +87,13 @@ module RSpec
       include TestDouble
       include VerifyingDouble
 
+      def as_stubbed_const(options={})
+        ConstantMutator.stub(@doubled_module.const_to_replace, self, options)
+        self
+      end
+
+    private
+
       def initialize(doubled_module, *args)
         @doubled_module = doubled_module
         super(doubled_module.description, *args)
@@ -95,15 +101,10 @@ module RSpec
 
       def __build_mock_proxy(order_group)
         VerifyingProxy.new(self, order_group, @name,
-          @doubled_module,
-          ObjectMethodReference
+                           @doubled_module,
+                           ObjectMethodReference
         )
       end
-
-      def as_stubbed_const(options = {})
-        ConstantMutator.stub(@doubled_module.const_to_replace, self, options)
-        self
-      end
     end
 
     # Similar to an InstanceVerifyingDouble, except that it verifies against
@@ -122,6 +123,5 @@ module RSpec
     class ClassVerifyingDouble < Module
       include ObjectVerifyingDoubleMethods
     end
-
   end
 end

data/lib/rspec/mocks/verifying_message_expecation.rb

@@ -2,13 +2,11 @@ RSpec::Support.require_rspec_support 'method_signature_verifier'
 
 module RSpec
   module Mocks
-
     # A message expectation that knows about the real implementation of the
     # message being expected, so that it can verify that any expectations
     # have the valid arguments.
     # @api private
     class VerifyingMessageExpectation < MessageExpectation
-
       # A level of indirection is used here rather than just passing in the
       # method itself, since method look up is expensive and we only want to
       # do it if actually needed.
@@ -27,26 +25,30 @@ module RSpec
       def with(*args, &block)
         unless ArgumentMatchers::AnyArgsMatcher === args.first
           expected_args = if ArgumentMatchers::NoArgsMatcher === args.first
-            []
-          elsif args.length > 0
-            args
-          else
-            # No arguments given, this will raise.
-            super
-          end
-
-          validate_arguments!(expected_args)
+                            []
+                          elsif args.length > 0
+                            args
+                          else
+                            # No arguments given, this will raise.
+                            super
+                          end
+
+          validate_expected_arguments!(expected_args)
         end
         super
       end
 
     private
 
-      def validate_arguments!(actual_args)
+      def validate_expected_arguments!(actual_args)
         return if method_reference.nil?
 
         method_reference.with_signature do |signature|
-          verifier = Support::MethodSignatureVerifier.new(signature, actual_args)
+          verifier = Support::LooseSignatureVerifier.new(
+            signature,
+            actual_args
+          )
+
           unless verifier.valid?
             # Fail fast is required, otherwise the message expecation will fail
             # as well ("expected method not called") and clobber this one.

data/lib/rspec/mocks/verifying_proxy.rb

@@ -3,7 +3,6 @@ RSpec::Support.require_rspec_mocks 'method_reference'
 
 module RSpec
   module Mocks
-
     # @private
     module VerifyingProxyMethods
       def add_stub(method_name, opts={}, &implementation)
@@ -22,21 +21,20 @@ module RSpec
       end
 
       def ensure_implemented(method_name)
-        if method_reference[method_name].unimplemented?
-          @error_generator.raise_unimplemented_error(
-            @doubled_module,
-            method_name
-          )
-        end
+        return unless method_reference[method_name].unimplemented?
+
+        @error_generator.raise_unimplemented_error(
+          @doubled_module,
+          method_name
+        )
       end
 
-      def ensure_publicly_implemented(method_name, object)
+      def ensure_publicly_implemented(method_name, _object)
         ensure_implemented(method_name)
         visibility = method_reference[method_name].visibility
 
-        unless visibility == :public
-          @error_generator.raise_non_public_error(method_name, visibility)
-        end
+        return if visibility == :public
+        @error_generator.raise_non_public_error(method_name, visibility)
       end
     end
 
@@ -54,7 +52,7 @@ module RSpec
     # isolation.
     #
     # @private
-    class VerifyingProxy < Proxy
+    class VerifyingProxy < TestDoubleProxy
       include VerifyingProxyMethods
 
       def initialize(object, order_group, name, doubled_module, method_reference_class)
@@ -132,10 +130,8 @@ module RSpec
 
       def validate_arguments!(actual_args)
         @method_reference.with_signature do |signature|
-          verifier = Support::MethodSignatureVerifier.new(signature, actual_args)
-          unless verifier.valid?
-            raise ArgumentError, verifier.error_message
-          end
+          verifier = Support::StrictSignatureVerifier.new(signature, actual_args)
+          raise ArgumentError, verifier.error_message unless verifier.valid?
         end
       end
     end

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.0.0'
+      STRING = '3.1.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Steven Baker
@@ -10,100 +10,112 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURqakNDQW5hZ0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJHTVJJd0VBWURWUVFEREFseWMz
-  QmwKWXkxa1pYWXhHekFaQmdvSmtpYUprL0lzWkFFWkZndG5iMjluYkdWbmIz
-  VndjekVUTUJFR0NnbVNKb21UOGl4awpBUmtXQTJOdmJUQWVGdzB4TXpFeE1E
-  Y3hPVFF5TlRsYUZ3MHhOREV4TURjeE9UUXlOVGxhTUVZeEVqQVFCZ05WCkJB
-  TU1DWEp6Y0dWakxXUmxkakViTUJrR0NnbVNKb21UOGl4a0FSa1dDMmR2YjJk
-  c1pXZHZkWEJ6TVJNd0VRWUsKQ1pJbWlaUHlMR1FCR1JZRFkyOXRNSUlCSWpB
-  TkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQpuaENlWm91
-  RExYV081NW5vK0VkWk5DdGpYamZKUTFYOVRiUGN2QkREMjlPeXBJVWNlMmgv
-  VmRLWEIyZ0k3WkhzCkY1TmtQZ2dzbFRFckdGbVdBdElpdXI3dTk0M1JWcUhP
-  c3lvSXN5MDY1RjlmQ3RyeWtrQSsyMmVsdlREaGE0SXoKUlVDdnVoUTNrbGF0
-  WWs0akYrY0d0MWpOT05OVmRMT2l5MGJNeW52Y003aG9WUTJBb213R3MrY0VP
-  V1EvNGRrRApKY05WM3FmekY1UUJjVEQyMzcyWE5NNTNiMjVuWVZRU1gyS0g1
-  RkY3QmhsS3lvdjMzYk9tMmdBOU0rbVdJdWpXCnFna3l4VmxmcmxFK1pCZ1Yz
-  d1huMUNvamcxTHBUcTM1eU9Bcmd3aW95cnd3bFpaSlI5am9OOXMvbkRrbGZy
-  NUEKK2R5RVRqRmM2Y21FUFdacnQyY0pCUUlEQVFBQm80R0dNSUdETUFrR0Ex
-  VWRFd1FDTUFBd0N3WURWUjBQQkFRRApBZ1N3TUIwR0ExVWREZ1FXQkJTVytX
-  RDdobjFzd0oxQTdpOHRidUZldU5DSkNqQWtCZ05WSFJFRUhUQWJnUmx5CmMz
-  QmxZeTFrWlhaQVoyOXZaMnhsWjI5MWNITXVZMjl0TUNRR0ExVWRFZ1FkTUJ1
-  QkdYSnpjR1ZqTFdSbGRrQm4KYjI5bmJHVm5iM1Z3Y3k1amIyMHdEUVlKS29a
-  SWh2Y05BUUVGQlFBRGdnRUJBSDI3akFaOHNEN3ZuWHVwajZZKwpCYUJkZkh0
-  Q2tGYXNsTEowYUt1TURJVlh3WXVLZnFvVzE1Y1pQRExtU0lFQnVRRk0zbHc2
-  ZC9oRUVMNFVvMmpaCkZ2dG1INU94aWZQRHpGeVV0Q0w0eXA2cWdOZS9YZjZz
-  RHNSZzZGbUtjcGdxQ3dOT21zVmlhZjBMUFNVSC9HWVEKM1Rlb3o4UUNhRGJE
-  N0FLc2ZmVDdlRHJuYkhuS3dlTzFYZGVtUkpDOTh1L3lZeG5Hek1TV0tFc24w
-  OWV0QmxaOQo3SDY3azVaM3VmNmNmTFpnVG9XTDZ6U2h6WlkzTnVuNXI3M1lz
-  TmYyL1FaT2U0VVplNHZmR3ZuNmJhdzUzeXM5CjF5SEMxQWNTWXB2aTJkQWJP
-  aUhUNWlRRitrcm00d3NlOEtjdFhnVE5uak1zSEVvR0t1bEpTMi9zWmw5MGpj
-  Q3oKbXVBPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2014-06-02 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMRIwEAYDVQQDDAlyc3Bl
+  Yy1kZXYxGzAZBgoJkiaJk/IsZAEZFgtnb29nbGVnb3VwczETMBEGCgmSJomT8ixk
+  ARkWA2NvbTAeFw0xMzExMDcxOTQyNTlaFw0xNDExMDcxOTQyNTlaMEYxEjAQBgNV
+  BAMMCXJzcGVjLWRldjEbMBkGCgmSJomT8ixkARkWC2dvb2dsZWdvdXBzMRMwEQYK
+  CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+  nhCeZouDLXWO55no+EdZNCtjXjfJQ1X9TbPcvBDD29OypIUce2h/VdKXB2gI7ZHs
+  F5NkPggslTErGFmWAtIiur7u943RVqHOsyoIsy065F9fCtrykkA+22elvTDha4Iz
+  RUCvuhQ3klatYk4jF+cGt1jNONNVdLOiy0bMynvcM7hoVQ2AomwGs+cEOWQ/4dkD
+  JcNV3qfzF5QBcTD2372XNM53b25nYVQSX2KH5FF7BhlKyov33bOm2gA9M+mWIujW
+  qgkyxVlfrlE+ZBgV3wXn1Cojg1LpTq35yOArgwioyrwwlZZJR9joN9s/nDklfr5A
+  +dyETjFc6cmEPWZrt2cJBQIDAQABo4GGMIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+  AgSwMB0GA1UdDgQWBBSW+WD7hn1swJ1A7i8tbuFeuNCJCjAkBgNVHREEHTAbgRly
+  c3BlYy1kZXZAZ29vZ2xlZ291cHMuY29tMCQGA1UdEgQdMBuBGXJzcGVjLWRldkBn
+  b29nbGVnb3Vwcy5jb20wDQYJKoZIhvcNAQEFBQADggEBAH27jAZ8sD7vnXupj6Y+
+  BaBdfHtCkFaslLJ0aKuMDIVXwYuKfqoW15cZPDLmSIEBuQFM3lw6d/hEEL4Uo2jZ
+  FvtmH5OxifPDzFyUtCL4yp6qgNe/Xf6sDsRg6FmKcpgqCwNOmsViaf0LPSUH/GYQ
+  3Teoz8QCaDbD7AKsffT7eDrnbHnKweO1XdemRJC98u/yYxnGzMSWKEsn09etBlZ9
+  7H67k5Z3uf6cfLZgToWL6zShzZY3Nun5r73YsNf2/QZOe4UZe4vfGvn6baw53ys9
+  1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
+  muA=
+  -----END CERTIFICATE-----
+date: 2014-09-05 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.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.3.15
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".document"
+- ".yardopts"
+- Changelog.md
+- License.txt
+- README.md
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
@@ -143,35 +155,30 @@ files:
 - lib/rspec/mocks/verifying_message_expecation.rb
 - lib/rspec/mocks/verifying_proxy.rb
 - lib/rspec/mocks/version.rb
-- README.md
-- License.txt
-- Changelog.md
-- .yardopts
-- .document
 homepage: http://github.com/rspec/rspec-mocks
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.0.0
+summary: rspec-mocks-3.1.0
 test_files: []
 has_rdoc: