lib/muack/modifier.rb in muack-0.7.3 vs lib/muack/modifier.rb in muack-1.0.0

@@ -1,45 +1,57 @@
 
+require 'muack/block'
 require 'muack/error'
 
 module Muack
   class Modifier < Struct.new(:mock, :defi)
     # Public API
+    def times number
+      if mock.__mock_class == Stub
+        raise StubHasNoTimes.new(object, defi, number)
+      end
+
+      if number >= 1
+        (number - 1).times{ mock.__mock_defis_push(defi) }
+      elsif number == 0
+        mock.__mock_defis_pop(defi)
+      else
+        raise "What would you expect from calling a method #{number} times?"
+      end
+      self
+    end
+
+    # Public API
     def with_any_args
       defi.args = [WithAnyArgs]
       self
     end
 
     # Public API
-    def returns val=nil, &block
-      defi.block = block || lambda{ val }
+    def returns opts={}, &block
+      defi.returns = create_block(block, opts)
       self
     end
 
     # Public API
-    def proxy
-      defi.proxy = true
+    def peek_args opts={}, &block
+      defi.peek_args = create_block(block, opts)
       self
     end
 
     # Public API
-    def times number
-      if mock.__mock_class == Stub
-        raise StubHasNoTimes.new(object, defi, number)
-      end
-
-      if number >= 1
-        (number - 1).times{ mock.__mock_defis_push(defi) }
-      elsif number == 0
-        mock.__mock_defis_pop(defi)
-      else
-        raise "What would you expect from calling a method #{number} times?"
-      end
+    def peek_return opts={}, &block
+      defi.peek_return = create_block(block, opts)
       self
     end
 
     # Public API
     def object
       mock.object
+    end
+
+    private
+    def create_block block, opts
+      if opts[:instance_exec] then Block.new(block) else block end
     end
   end
 end