flexmock 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e2dc8c4ffe7a4747a9ee08ee54ab70a9c48b1c
-  data.tar.gz: 71aea49728f74c048c92a37a000288ef381ea0f0
+  metadata.gz: 02acabaf029650f80ab19aed17459f6007aac4d8
+  data.tar.gz: 2efb9677abaeb434ec840ce5ad2d174101d333c1
 SHA512:
-  metadata.gz: 445fe45046e1ebea766c096ddfcf1aa31eabe3b166efd1027523deca681f6bec19d4c5cda8cd5e8d3af259839e25b04951ca2bca1a4ef65951c20f97d4ef9f1b
-  data.tar.gz: 3d20d7e3ea5caf5052236e109fbcf31178154467a28b42362a63a8cec7ff9a94655ea72ee6a673719400b79a4a61d1aac3a342d2235c8016eaf0c1dfb600b107
+  metadata.gz: 210118eb5a0f18106cb0c3d9ba35b2db3792cbd694a7db7ded0aecebef98607cb5fe763f2e3a2607551b604960c10e820c6d5e3c94308e33430db0ca075bb453
+  data.tar.gz: 2abbd364c49ab6f5b392fbff175b15ee5ccb07602ce337530f68886e157940e0349a87ffc696affa2877fd821985bbdd522a406b5c0e2239b34958a4ad5c5457

data/CHANGES

@@ -1,5 +1,7 @@
 = Changes for FlexMock
 
+SINCE 2.1.0, CHANGES ARE LISTED IN THE README
+
 == Version 2.0.0
 
 * bump to 2.0 to mark the change of maintainership. I hope I won't disappoint.

data/README.md

@@ -22,6 +22,14 @@ Only significant changes (new APIs, deprecated APIs or backward-compatible
 changes) are documented here, a.k.a. minor or major version bumps. If you want a
 detailed changelog, go over the commit log in github (it's pretty low-traffic)
 
+2.2.0:
+
+ - #new_instances now mocks the #initialize method instead of mocking after the
+   allocation was done. This allows to do mock methods called by #initialize
+   itself. Behaviour when the allocator is explicitely provided is left
+   unchanged, which means that the old behaviour is still available by passing
+   :new to new_instances.
+
 2.1.0:
 
  - added `#and_iterates` to fix some shortcomings of `#and_yield` without
@@ -916,7 +924,7 @@ MiniTest for asserting that mocked methods are actually called.
   Specify the number of times a matching method should have been
   invoked. `nil` (or omitted) means any number of times.
 
-* <b>with_block: <em>true/false/nil</em>
+* <b>with_block: <em>true/false/nil</em></b>
 
   Is a block required on the invocation? `true` means the method must
   be invoked with a block. `false` means the method must have been
@@ -972,7 +980,7 @@ spy behavior.
 
 *Modifiers for `have_received`*
 
-* <b>with(<em>args</em>)
+* <b>with(<em>args</em>)</b>
 
   If a `with` modifier is given, only messages with matching arguments
   are considered. _args_ can be any of the argument matches mentioned

data/lib/flexmock/partial_mock.rb

@@ -68,6 +68,7 @@ class FlexMock
       @method_definitions = {}
       @methods_proxied = []
       @proxy_definition_module = nil
+      @initialize_override = nil
       unless safe_mode
         add_mock_method(:should_receive)
         MOCK_METHODS.each do |sym|
@@ -156,8 +157,14 @@ class FlexMock
       fail ArgumentError, "new_instances requires a Class to stub" unless
         Class === @obj
       location = caller
-      allocators = [:new] if allocators.empty?
+      allocators = [:initialize] if allocators.empty?
+
       expectation_recorder = ExpectationRecorder.new
+
+      if allocators.delete(:initialize)
+        initialize_stub(expectation_recorder, block)
+      end
+
       allocators.each do |allocate_method|
         flexmock_define_expectation(location, allocate_method).and_return { |*args|
           create_new_mocked_object(
@@ -167,6 +174,45 @@ class FlexMock
       expectation_recorder
     end
 
+    # Stubs the #initialize method on a class
+    def initialize_stub(recorder, expectations_block)
+      if !@initialize_override
+        expectation_blocks    = @initialize_expectation_blocks = Array.new
+        expectation_recorders = @initialize_expectation_recorders = Array.new
+        @initialize_override = Module.new do
+          define_method :initialize do |*args, &block|
+            if self.class.respond_to?(:__flexmock_proxy) && (mock = self.class.__flexmock_proxy)
+              container = mock.flexmock_container
+              mock = container.flexmock(self)
+              expectation_blocks.each do |b|
+                b.call(mock)
+              end
+              expectation_recorders.each do |r|
+                r.apply(mock)
+              end
+            end
+            super(*args, &block)
+          end
+        end
+        @obj.prepend @initialize_override
+      end
+      if expectations_block
+        @initialize_expectation_blocks    << expectations_block
+      end
+      @initialize_expectation_recorders << recorder
+    end
+
+    def initialize_stub?
+      !!@initialize_override
+    end
+
+    def initialize_stub_remove
+      if initialize_stub?
+        @initialize_expectation_blocks.clear
+        @initialize_expectation_recorders.clear
+      end
+    end
+
     # Create a new mocked object.
     #
     # The mocked object is created using the following steps:
@@ -206,6 +252,7 @@ class FlexMock
     # Remove all traces of the mocking framework from the existing object.
     def flexmock_teardown
       if ! detached?
+        initialize_stub_remove
         proxy_module_eval do
           methods = instance_methods(false).to_a
           methods.each do |m|
@@ -268,7 +315,7 @@ class FlexMock
       if !@proxy_definition_module
         obj = @obj
         @proxy_definition_module = m = Module.new do
-          define_method(:__flexmock_proxy) do
+          define_method("__flexmock_proxy") do
             if box = obj.instance_variable_get(:@flexmock_proxy)
               box.proxy
             end

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
 end

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jim Weirich
 - Sylvain Joyeux
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.0
-  name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: coveralls
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n    FlexMock is a extremely simple mock object class compatible\n\
-  \    with the Minitest framework.  Although the FlexMock's\n    interface is simple,\
-  \ it is very flexible.\n  "
+description: "\n    FlexMock is a extremely simple mock object class compatible\n
+  \   with the Minitest framework.  Although the FlexMock's\n    interface is simple,
+  it is very flexible.\n  "
 email: sylvain.joyeux@m4x.org
 executables: []
 extensions: []
@@ -169,7 +169,7 @@ homepage: https://github.com/doudou/flexmock
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -184,9 +184,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing
 test_files: []