rspec-mocks 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16d5f671e68051be014fb930e9980f5a0c19d5ee
-  data.tar.gz: b035e939d0afc695e7b03485f1edc2356c5b0bc0
+  metadata.gz: f9d8779911a17ba0cd7be286a331dbce8a9eb16d
+  data.tar.gz: 95b80b746108385aa0dbcdb3e33bc1800c7acef4
 SHA512:
-  metadata.gz: 46ba65b5222400961866c699044adba07374c0a2c241e2f011e2eb55b8fdfc3c167db0f371a925a06704ac6d209e1400a1802c45d94ea25ae38142bcf396c9bc
-  data.tar.gz: 617ae574ebe247f7b2ee1c6a45a94fb200006b56dd8c98ec536d655622a85749e0a10985e491e47709a744ebc450d494d591b5367c91bd89cc3f0001e6f95c9b
+  metadata.gz: e0bd6fa86ce798e51d04e3930bea991d7d7f7641017aadd486e6c1d46cc88b365ea62c79b95d475202b227fbb24e05a977f80e61b2183ca4a40219568b144a88
+  data.tar.gz: 7c38636d51a47b79e4880edc845c4ec2c18294b39a1ec123d4bcad3b371ca52f3f1137f170f20dc1904c04ce35597650447f9168db886adf07444217b878492e

data/Changelog.md

@@ -1,3 +1,11 @@
+### 3.1.1 / 2014-09-18
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.1.0...v3.1.1)
+
+Bug Fixes:
+
+* Prevent included modules being detected as prepended modules on Ruby 2.0
+  when using `any_instance_of(...)`. (Tony Novak, #781)
+
 ### 3.1.0 / 2014-09-04
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.0.4...v3.1.0)
 

data/lib/rspec/mocks/any_instance/recorder.rb

@@ -248,7 +248,7 @@ module RSpec
 
         if Support::RubyFeatures.module_prepends_supported?
           def allow_no_prepended_module_definition_of(method_name)
-            prepended_modules = @klass.ancestors.take_while { |mod| !(Class === mod) }
+            prepended_modules = RSpec::Mocks::Proxy.prepended_modules_of(@klass)
             problem_mod = prepended_modules.find { |mod| mod.method_defined?(method_name) }
             return unless problem_mod
 

data/lib/rspec/mocks/proxy.rb

@@ -205,17 +205,18 @@ module RSpec
       end
 
       if Support::RubyFeatures.module_prepends_supported?
-        def prepended_modules_of_singleton_class
-          @prepended_modules_of_singleton_class ||= begin
-            singleton_class = @object.singleton_class
-            ancestors       = singleton_class.ancestors
+        def self.prepended_modules_of(klass)
+          ancestors = klass.ancestors
 
-            # `|| 0` is necessary for Ruby 2.0, where the singleton class
-            # is only in the ancestor list when there are prepended modules.
-            singleton_index = ancestors.index(singleton_class) || 0
+          # `|| 0` is necessary for Ruby 2.0, where the singleton class
+          # is only in the ancestor list when there are prepended modules.
+          singleton_index = ancestors.index(klass) || 0
 
-            ancestors[0, singleton_index]
-          end
+          ancestors[0, singleton_index]
+        end
+
+        def prepended_modules_of_singleton_class
+          @prepended_modules_of_singleton_class ||= RSpec::Mocks::Proxy.prepended_modules_of(@object.singleton_class)
         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.1.0'
+      STRING = '3.1.1'
     end
   end
 end

metadata

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