flexmock 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 471129d58809ac2dc9a53b22254f76e352f5b253
-  data.tar.gz: 3ac4914a786029b8cb1c10750b28f7de602c984b
+  metadata.gz: 16f8df99b548903abdd25fef26a98df2906448bf
+  data.tar.gz: 7ce30d1e5ada1a4d679e53db575bd3d942b8e836
 SHA512:
-  metadata.gz: dcab0eed825f701d642cce8286b9816b087b765beff23fe39205841e1289ecdfc80284a14d59cbbfb90a27d5050c50b25618fd5f27a6f9db4367e2b0b739360c
-  data.tar.gz: 8e97cc8946bb2fac86b6b69cb01dec2c42a2cb3aa67d0307dc696e94228bccd66f82cabe1a8c6bdb92b096ba91b3a6889b898e40af714cbc7c7d071b0496a4aa
+  metadata.gz: 7ff6a1a9172b9df71a8d5d3c8717304cad88d7947ea212c45417f53106001b71587879bfcd9684301440fc766db0a48552f5fc80b81dbd55e4d65c81acc55a23
+  data.tar.gz: e93acaa91ace46df1fd14ead3c4790b857a654fb901d6a4d08193eae607abf65eeefa78e199b5e034855c72752d5b7bb824aa2d88455b229c740842dc2e8871a

data/lib/flexmock/core.rb

@@ -45,7 +45,7 @@ class FlexMock
   include Ordering
 
   attr_reader :flexmock_name
-  attr_accessor :flexmock_container
+  attr_reader :flexmock_container_stack
 
   class << self
     attr_accessor :partials_are_based
@@ -54,21 +54,50 @@ class FlexMock
   self.partials_are_based = false
   self.partials_verify_signatures = false
 
+  # Null object for {#parent_mock}
+  class NullParentMock
+    def flexmock_expectations_for(sym)
+    end
+  end
+
   # Create a FlexMock object with the given name.  The name is used in
   # error messages.  If no container is given, create a new, one-off
   # container for this mock.
-  def initialize(name="unknown", container=nil)
+  def initialize(name="unknown", container=nil, parent: nil)
     @flexmock_name = name
     @flexmock_closed = false
+    @flexmock_container_stack = Array.new
     @expectations = Hash.new
-    @ignore_missing = false
     @verified = false
     @calls = []
     @base_class = nil
+    if parent
+      @ignore_missing = parent.ignore_missing?
+      @parent_mock = parent
+    else
+      @ignore_missing = false
+      @parent_mock = NullParentMock.new
+    end
     container = UseContainer.new if container.nil?
     container.flexmock_remember(self)
   end
 
+  def ignore_missing?
+    @ignore_missing
+  end
+
+  def flexmock_container
+    flexmock_container_stack.last
+  end
+
+  def push_flexmock_container(container)
+    flexmock_container_stack.push(container)
+  end
+
+  def pop_flexmock_container
+    flexmock_container_stack.pop
+  end
+
   # Return the inspection string for a mock.
   def inspect
     "<FlexMock:#{flexmock_name}>"
@@ -117,8 +146,8 @@ class FlexMock
     flexmock_wrap do
       if flexmock_closed?
         FlexMock.undefined
-      elsif handler = @expectations[sym]
-        handler.call(enhanced_args, call_record)
+      elsif exp = flexmock_expectations_for(sym)
+        exp.call(enhanced_args, call_record)
       elsif @base_class && @base_class.flexmock_defined?(sym)
         FlexMock.undefined
       elsif @ignore_missing
@@ -139,13 +168,14 @@ class FlexMock
 
   # Find the mock expectation for method sym and arguments.
   def flexmock_find_expectation(method_name, *args) # :nodoc:
-    exp = @expectations[method_name]
-    exp ? exp.find_expectation(*args) : nil
+    if exp = flexmock_expectations_for(method_name)
+      exp.find_expectation(*args)
+    end
   end
 
   # Return the expectation director for a method name.
   def flexmock_expectations_for(method_name) # :nodoc:
-    @expectations[method_name]
+    @expectations[method_name] || @parent_mock.flexmock_expectations_for(method_name)
   end
 
   def flexmock_base_class
@@ -183,9 +213,9 @@ class FlexMock
 
   # Override the built-in +method+ to include the mocked methods.
   def method(method_name)
-    @expectations[method_name] || super
+    flexmock_expectations_for(method_name) || super
   rescue NameError => ex
-    if @ignore_missing
+    if ignore_missing?
       proc { FlexMock.undefined }
     else
       raise ex
@@ -218,10 +248,11 @@ class FlexMock
   # Using +location+, define the expectations specified by +args+.
   def flexmock_define_expectation(location, *args)
     @last_expectation = EXP_BUILDER.parse_should_args(self, args) do |method_name|
-      @expectations[method_name] ||= ExpectationDirector.new(method_name)
+      exp = flexmock_expectations_for(method_name) || ExpectationDirector.new(method_name)
+      @expectations[method_name] = exp
       result = Expectation.new(self, method_name, location)
-      @expectations[method_name] << result
-      override_existing_method(method_name) if flexmock_respond_to?(method_name)
+      exp << result
+      override_existing_method(method_name) if flexmock_respond_to?(method_name, true)
       result = ExplicitNeeded.new(result, method_name, @base_class) if
         @base_class && ! @base_class.flexmock_defined?(method_name)
       result

data/lib/flexmock/expectation.rb

@@ -143,11 +143,6 @@ class FlexMock
       @count_validators.all? { |v| v.eligible?(@actual_count) }
     end
 
-    # Is this expectation constrained by any call counts?
-    def call_count_constrained?
-      ! @count_validators.empty?
-    end
-
     # Validate that the order
     def validate_order
       if @order_number

data/lib/flexmock/expectation_builder.rb

@@ -55,7 +55,7 @@ class FlexMock
       elsif names.size > 1
         create_demeter_chain(mock, names)
       else
-        fail "Empty list of names"
+        fail ArgumentError, "Empty list of names"
       end
     end
 

data/lib/flexmock/mock_container.rb

@@ -52,6 +52,7 @@ class FlexMock
     def flexmock_close
       flexmock_created_mocks.each do |m|
         m.flexmock_teardown
+        m.pop_flexmock_container
       end
       @flexmock_created_mocks = []
     end
@@ -127,7 +128,7 @@ class FlexMock
     def flexmock_remember(mocking_object)
       @flexmock_created_mocks ||= []
       @flexmock_created_mocks << mocking_object
-      mocking_object.flexmock_container = self
+      mocking_object.push_flexmock_container(self)
       mocking_object
     end
 

data/lib/flexmock/partial_mock.rb

@@ -28,27 +28,64 @@ class FlexMock
 
     attr_reader :mock
 
-    ProxyBox = Struct.new :proxy
+    # Boxing of the flexmock proxy
+    #
+    # It is managed as a stack in order to allow to setup containers recursively
+    # (as e.g. FlexMock.use( ... ) checks)
+    class ProxyBox
+      attr_reader :stack
+
+      Element = Struct.new :proxy, :container
+
+      def initialize
+        @stack = [Element.new]
+      end
+
+      # Tests whether the given container is the one on which the current proxy
+      # acts
+      def container
+        stack.last.container
+      end
+
+      def proxy
+        stack.last.proxy
+      end
+
+      def push(proxy, container)
+        stack.push(Element.new(proxy, container))
+      end
+
+      def pop
+        if !stack.empty?
+          stack.pop
+        end
+      end
+
+      def empty?
+        stack.size == 1
+      end
+    end
 
     # Make a partial mock proxy and install it on the target +obj+.
     def self.make_proxy_for(obj, container, name, safe_mode)
       name ||= "flexmock(#{obj.class.to_s})"
-      if ! proxy_defined_on?(obj)
-        mock = FlexMock.new(name, container)
-        proxy = PartialMockProxy.new(obj, mock, safe_mode)
-        if obj.instance_variable_defined?("@flexmock_proxy")
-          obj.instance_variable_get("@flexmock_proxy").proxy = proxy
-        else
-          obj.instance_variable_set("@flexmock_proxy", ProxyBox.new(proxy))
-        end
+      if !obj.instance_variable_defined?("@flexmock_proxy")
+        proxy_box = obj.instance_variable_set("@flexmock_proxy", ProxyBox.new)
+      else
+        proxy_box = obj.instance_variable_get("@flexmock_proxy")
       end
-      obj.instance_variable_get("@flexmock_proxy").proxy
-    end
 
-    # Is there a mock proxy defined on the domain object?
-    def self.proxy_defined_on?(obj)
-      obj.instance_variable_defined?("@flexmock_proxy") &&
-        obj.instance_variable_get("@flexmock_proxy").proxy
+      if proxy_box.container != container
+        if !proxy_box.empty?
+          parent_proxy, _ = proxy_box.proxy
+          parent_mock = parent_proxy.mock
+        end
+
+        mock  = FlexMock.new(name, container, parent: parent_mock)
+        proxy = PartialMockProxy.new(obj, mock, safe_mode, parent: parent_proxy)
+        proxy_box.push(proxy, container)
+      end
+      proxy_box.proxy
     end
 
     # The following methods are added to partial mocks so that they
@@ -62,14 +99,21 @@ class FlexMock
       :invoke_original
     ]
 
+    attr_reader :method_definitions
+
     # Initialize a PartialMockProxy object.
-    def initialize(obj, mock, safe_mode)
+    def initialize(obj, mock, safe_mode, parent: nil)
       @obj = obj
       @mock = mock
-      @method_definitions = {}
-      @methods_proxied = []
       @proxy_definition_module = nil
       @initialize_override = nil
+
+      if parent
+        @method_definitions = parent.method_definitions.dup
+      else
+        @method_definitions = {}
+      end
+
       unless safe_mode
         add_mock_method(:should_receive)
         MOCK_METHODS.each do |sym|
@@ -85,6 +129,14 @@ class FlexMock
       @mock
     end
 
+    def push_flexmock_container(container)
+      @mock.push_flexmock_container(container)
+    end
+
+    def pop_flexmock_container
+      @mock.pop_flexmock_container
+    end
+
     # :call-seq:
     #    should_receive(:method_name)
     #    should_receive(:method1, method2, ...)
@@ -119,9 +171,20 @@ class FlexMock
       flexmock_invoke_original(m, args)
     end
 
+    # Whether the given method's original definition has been stored
+    def has_original_method?(m)
+      @method_definitions.has_key?(m)
+    end
+
+    # Whether the given method is already being proxied
+    def has_proxied_method?(m)
+      @proxy_definition_module &&
+          @proxy_definition_module.method_defined?(m)
+    end
+
     def flexmock_define_expectation(location, *args)
       EXP_BUILDER.parse_should_args(self, args) do |method_name|
-        if !@methods_proxied.include?(method_name)
+        if !has_proxied_method?(method_name) && !has_original_method?(method_name)
           hide_existing_method(method_name)
         end
         ex = @mock.flexmock_define_expectation(location, method_name)
@@ -278,7 +341,7 @@ class FlexMock
         end
         if @obj.instance_variable_defined?(:@flexmock_proxy) &&
             (box = @obj.instance_variable_get(:@flexmock_proxy))
-          box.proxy = nil
+          box.pop
         end
         @obj = nil
       end
@@ -358,9 +421,8 @@ class FlexMock
     # Stow the existing method definition so that it can be recovered
     # later.
     def stow_existing_definition(method_name)
-      if !@methods_proxied.include?(method_name)
+      if !@method_definitions.has_key?(method_name)
         @method_definitions[method_name] = target_class_eval { instance_method(method_name) }
-        @methods_proxied << method_name
       end
       @method_definitions[method_name]
     rescue NameError
@@ -390,6 +452,5 @@ class FlexMock
     def detached?
       @obj.nil?
     end
-
   end
 end

data/lib/flexmock/validators.rb

@@ -213,18 +213,28 @@ class FlexMock
     # @param [Array] args
     # @raise ValidationFailed
     def validate(args)
+      args = args.dup
       kw_args = Hash.new
+
+      last_is_proc = false
+      begin
+        if args.last.kind_of?(Proc)
+          args.pop
+          last_is_proc = true
+        end
+      rescue NoMethodError
+      end
+
+      last_is_kw_hash = false
       if expects_keyword_arguments?
         last_is_kw_hash =
-            begin
-                args.last.kind_of?(Hash)
-            rescue NoMethodError
-                false
-            end
+          begin
+            args.last.kind_of?(Hash)
+          rescue NoMethodError
+          end
 
         if last_is_kw_hash
-          kw_args = args[-1]
-          args = args[0..-2]
+          kw_args = args.pop
         elsif requires_keyword_arguments?
           raise ValidationFailed, "#{@exp} expects keyword arguments but none were provided"
         end
@@ -232,12 +242,34 @@ class FlexMock
 
       # There is currently no way to disambiguate "given a block" from "given a
       # proc as last argument" ... give some leeway in this case
+      positional_count = args.size
+
+      if required_arguments > positional_count
+        if requires_keyword_arguments?
+          raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{positional_count}"
+        end
+
+        if (required_arguments - positional_count) == 1 && (last_is_kw_hash || last_is_proc)
+          if last_is_kw_hash
+            last_is_kw_hash = false
+            kw_args = Hash.new
+          else
+            last_is_proc = false
+          end
+          positional_count += 1
+        elsif (required_arguments - positional_count) == 2 && (last_is_kw_hash && last_is_proc)
+          last_is_kw_hash = false
+          kw_args = Hash.new
+          last_is_proc = false
+          positional_count += 2
+        else
+          raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{positional_count}"
+        end
+      end
 
-      if required_arguments > args.size
-        raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{args.size}"
-      elsif !splat? && (required_arguments + optional_arguments) < args.size
-        if !args.last.kind_of?(Proc) || (required_arguments + optional_arguments) < args.size - 1
-          raise ValidationFailed, "#{@exp} expects at most #{required_arguments + optional_arguments} positional arguments but got #{args.size}"
+      if !splat? && (required_arguments + optional_arguments) < positional_count
+        if !last_is_proc || (required_arguments + optional_arguments) < positional_count - 1
+          raise ValidationFailed, "#{@exp} expects at most #{required_arguments + optional_arguments} positional arguments but got #{positional_count}"
         end
       end
 

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.3.0"
+    VERSION = "2.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest