flexmock 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d8010b82bdccec43f2038e9b3698387e952027a
-  data.tar.gz: c034d8b46dec2354c06df15491213f1987d30309
+  metadata.gz: 98384ea13adbc6183d9341511891b3a9f8f03d45
+  data.tar.gz: 3590aed927dd2b5639cd89bc5ef4a94721cc019a
 SHA512:
-  metadata.gz: f3bde508002be38eced12ee24efe4ad0092556da26930bbec98b3aed7a631035d84c943d01da70411d60085f2eb48ba8ca98584be2617f8f7f6cbd1d858acab2
-  data.tar.gz: 69a04f543a8a55765c354e061a94f1234dbfe8dc3c3963e7beeeccba74c534226936a0a528e96793f1a0a2349a9ba9c86706085fe001a191a421dfe3ce2ef931
+  metadata.gz: 81593e3d1ac8834dfa7a2984a5673979b9a609cd2269711be7ddaa989f31542066bbec7a26b927f9d268a0880a332d26b7db70e642abac4aa24579cadc09c933
+  data.tar.gz: 157647079491431589151fd0a1297c7b78d8b179b73ff2e97fc2d7415cf3f8b25bf0985d5577b210490633291e83e2e4bdae57014ff2cc5140640ed28cb5f6bf

data/lib/flexmock/core.rb

@@ -106,6 +106,8 @@ class FlexMock
 
   # Handle missing methods by attempting to look up a handler.
   def method_missing(sym, *args, &block)
+    FlexMock.verify_mocking_allowed!
+
     enhanced_args = block_given? ? args + [block] : args
     call_record = CallRecord.new(sym, enhanced_args, block_given?)
     @calls << call_record

data/lib/flexmock/core_class_methods.rb

@@ -48,6 +48,34 @@ class FlexMock
       container.flexmock_teardown
     end
 
+    FORBID_MOCKING = :__flexmock_forbid_mocking
+
+    # Forbid mock calls to happen while the block is being evaluated
+    #
+    # @param [Object] mocking_forbidden_return the return value that should be
+    #   used if a mocking call has happened. If no mocking calls happened,
+    #   returns the return value of the block
+    def forbid_mocking(mocking_forbidden_return = nil)
+      current, Thread.current[FORBID_MOCKING] =
+          Thread.current[FORBID_MOCKING], true
+
+      catch(FORBID_MOCKING) do
+        return yield
+      end
+      mocking_forbidden_return
+
+    ensure
+      Thread.current[FORBID_MOCKING] = current
+    end
+
+    # Verify that mocking is allowed in the current context. Throws if it is
+    # not.
+    def verify_mocking_allowed!
+      if Thread.current[FORBID_MOCKING]
+        throw FORBID_MOCKING
+      end
+    end
+
     # Class method to format a method name and argument list as a nice
     # looking string.
     def format_call(sym, args)  # :nodoc:
@@ -58,7 +86,12 @@ class FlexMock
     # parenthesis).
     def format_args(args)
       if args
-        args.collect { |a| a.inspect }.join(', ')
+        args = args.map do |a|
+          FlexMock.forbid_mocking("<recursive call to mocked method in #inspect>") do
+            a.inspect
+          end
+        end
+        args.join(', ')
       else
         "*args"
       end

data/lib/flexmock/expectation_director.rb

@@ -39,8 +39,9 @@ class FlexMock
       exp = find_expectation(*args)
       call_record.expectation = exp if call_record
       FlexMock.check(
-        "no matching handler found for " +
-        FlexMock.format_call(@sym, args)) { !exp.nil? }
+        proc { "no matching handler found for " +
+               FlexMock.format_call(@sym, args) }
+      ) { !exp.nil? }
       returned_value = exp.verify_call(*args)
       returned_value
     end

data/lib/flexmock/partial_mock.rb

@@ -313,6 +313,7 @@ class FlexMock
       else
         proxy_module_eval <<-EOD
           def #{method_name}(*args, &block)
+            FlexMock.verify_mocking_allowed!
             __flexmock_proxy.mock.#{method_name}(*args, &block)
           end
         EOD

data/lib/flexmock/spy_describers.rb

@@ -3,7 +3,7 @@ class FlexMock
     module SpyDescribers
       def spy_description(spy, sym, args, options)
         result = "have received "
-        result << call_description(sym, args)
+        result << FlexMock.format_call(sym, args)
         result << times_description(options[:times])
         result << block_description(options[:with_block])
         result
@@ -19,7 +19,7 @@ class FlexMock
 
       def describe_spy(spy, sym, args, options, not_clause="")
         result = "expected "
-        result << call_description(sym, args)
+        result << FlexMock.format_call(sym, args)
         result << " to#{not_clause} be received by " << spy.inspect
         result << times_description(options[:times])
         result << block_description(options[:with_block])
@@ -44,7 +44,7 @@ class FlexMock
       def append_call_record(result, call_record)
         result <<
           "    " <<
-          call_description(call_record.method_name, call_record.args)
+          FlexMock.format_call(call_record.method_name, call_record.args)
         if call_record.expectation
           result <<
             " matched by " <<
@@ -79,13 +79,6 @@ class FlexMock
         end
       end
 
-      def call_description(sym, args)
-        if args
-          "#{sym}(#{args.map { |o| o.inspect }.join(', ')})"
-        else
-          "#{sym}(...)"
-        end
-      end
       extend SpyDescribers
     end
 

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -176,3 +176,4 @@ signing_key:
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing
 test_files: []
+has_rdoc: