flexmock 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33bb2c48e90a98ffbe177d885fdedd82aa7c7fc8
-  data.tar.gz: 2c6dfcfac4032dd6fdd3110c204f5c91939e4104
+  metadata.gz: 13e2dc8c4ffe7a4747a9ee08ee54ab70a9c48b1c
+  data.tar.gz: 71aea49728f74c048c92a37a000288ef381ea0f0
 SHA512:
-  metadata.gz: 74fdc213dda95788d74cfd973f2f7309611d0b21838c309d2c86a8013660f42057685d7f198498ff878f6fae34e3e4e3b27886ff5eb6e36a771bdfcca4e291fe
-  data.tar.gz: 558319ae76251ca95e1eaedd13114ecf77540e95160700595a01a07f86cb027cc84b4c64317518ae7a189b18431343d55254204756e87d91943df2c6913c34fb
+  metadata.gz: 445fe45046e1ebea766c096ddfcf1aa31eabe3b166efd1027523deca681f6bec19d4c5cda8cd5e8d3af259839e25b04951ca2bca1a4ef65951c20f97d4ef9f1b
+  data.tar.gz: 3d20d7e3ea5caf5052236e109fbcf31178154467a28b42362a63a8cec7ff9a94655ea72ee6a673719400b79a4a61d1aac3a342d2235c8016eaf0c1dfb600b107

data/README.md

@@ -16,6 +16,20 @@ You can install FlexMock with the following command.
  $ gem install flexmock
 ```
 
+## Changes
+
+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.1.0:
+
+ - added `#and_iterates` to fix some shortcomings of `#and_yield` without
+   breaking backward compatibility
+ - strict partial mocks (and "based mocks" if `FlexMock.partials_are_based` is
+   set to true) are now based on the object's singleton class, instead of its
+   class.
+
 ## Simple Example
 
 We have a data acquisition class (<code>TemperatureSampler</code>)
@@ -572,6 +586,15 @@ determining whether a given expectation matches or not.
 
   Alias for `and_yield( ... )`.
 
+* <b>and_iterates(<em>value1</em>, <em>value2></em>, ...)</b>
+
+  Declares that the mocked method will receive a block, and the mock
+  will iterate over the values given, calling the block once for each
+  value. Not providing a block will be an error. Providing more than one
+  `and_iterates` or `and_yield` clause one a single expectation will mean
+  that subsquent mock method calls will yield the values provided by the
+  additional `and_iterates`/`and_yield` clause.
+
 * <b>pass_thru</b>
 * <b>pass_thru { |<em>value</em>| .... }</b>
 

data/lib/flexmock/class_extensions.rb

@@ -1,17 +1,13 @@
-# Detecting whether a class has a definition for a method or not
-# changes between Ruby 1.8 and Ruby 1.9. We introduce the
-# "flexmock_defined?" method on class objects to have a portable way
-# to determine that.
-#
-# NOTE: responds_to? isn't appropriate. We don't care if the object
-#       responds to the method or not. We want to know if the class
-#       has a definition for the method. A subtle difference.
-#
 class Class
-
-  # Does a class directly define a method named "method_name"?
+  # Does a class directly defines an instance method named "method_name"?
+  #
+  # Unlike Ruby's Class#instance_methods or #method_defined?, it ignores methods
+  # that have been defined by flexmock's partial mock facility
   def flexmock_defined?(method_name)
-    instance_methods.include?(method_name.flexmock_as_name)
+    ancestors.any? do |m|
+      methods = m.instance_methods(false)
+      next if methods.include?(:__flexmock_proxy) # This is a partial mock module
+      m.instance_methods(false).include?(method_name.flexmock_as_name)
+    end
   end
-
 end

data/lib/flexmock/expectation.rb

@@ -116,7 +116,9 @@ class FlexMock
         block = args.last
         values = (@yield_queue.size == 1) ? @yield_queue.first : @yield_queue.shift
         if block && block.respond_to?(:call)
-          @return_value = block.call(*values)
+          values.each do |v|
+            @return_value = block.call(*v)
+          end
         else
           fail MockError, "No Block given to mock with 'and_yield' expectation"
         end
@@ -251,10 +253,30 @@ class FlexMock
     # An error is raised if the mocked method is not called with a
     # block.
     def and_yield(*yield_values)
-      @yield_queue << yield_values
+      @yield_queue << [yield_values]
     end
     alias :yields :and_yield
 
+    # Declare that the mocked method is expected to be given a block
+    # and that the block will iterate over the provided values.
+    # If the mock is called multiple times, mulitple
+    # <tt>and_iterates</tt> declarations can be used to supply different
+    # values on each call.
+    #
+    # The iteration is queued with the yield values provided with {#and_yield}.
+    #
+    # An error is raised if the mocked method is not called with a
+    # block.
+    #
+    # @example interaction of and_yield and and_iterates
+    #   mock.should_receive(:each).and_yield(10).and_iterates(1, 2, 3).and_yield(20)
+    #   mock.enum_for(:each).to_a # => [10]
+    #   mock.enum_for(:each).to_a # => [1,2,3]
+    #   mock.enum_for(:each).to_a # => [20]
+    #
+    def and_iterates(*yield_values)
+      @yield_queue << yield_values
+    end
 
     # :call-seq:
     #   and_raise(an_exception)

data/lib/flexmock/mock_builder.rb

@@ -95,7 +95,7 @@ class FlexMock
     # Set the base class if not defined and partials are based.
     def set_base_class(opts)
       if ! opts.base_class && opts.domain_obj && FlexMock.partials_are_based
-        opts.base_class = opts.domain_obj.class
+        opts.base_class = opts.domain_obj.singleton_class
       end
     end
 
@@ -110,7 +110,7 @@ class FlexMock
           if !opts.domain_obj
             raise ArgumentError, "cannot use :strict outside a partial mock"
           end
-          opts.base_class = opts.domain_obj.class
+          opts.base_class = opts.domain_obj.singleton_class
         else
           opts.base_class = args.shift
         end

data/lib/flexmock/version.rb

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

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Jim Weirich
 - Sylvain Joyeux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: minitest
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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
-  type: :development
+  name: simplecov
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: coveralls
   prerelease: false
+  type: :development
   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,10 +184,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing
 test_files: []
-has_rdoc: