rr 0.1.1 → 0.1.2

data/CHANGES

@@ -1,3 +1,7 @@
+* 0.1.2
+- Scenario#returns also accepts an argument
+- Implemented Scenario#yields
+
 * 0.1.1
 - Trim the backtrace for Rspec and Test::Unit
 - Rspec and Test::Unit integration fixes

data/README

@@ -43,3 +43,19 @@ Here is RR compared to other mock frameworks:
   User.should_receive(:find).with('42').and_return(jane) # Rspec
   User.expects(:find).with('42').returns {jane} # Mocha
   mock(User).find('42') {jane} # RR
+
+== Special Thanks To
+With any development effort, there are countless people who have contributed
+to making it possible. We all are standing on the shoulders of giants.
+* Pivotal Labs for sponsoring RR development
+* Parker Thompson for pairing with me
+* Felix Morio for pairing with me
+* David Chelimsky for encouragement to make the RR framework, for developing
+  the Rspec mock framework, and syntax ideas
+* Gerald Meszaros for his excellent book "xUnit Test Patterns"
+* Dan North for syntax ideas
+* Jim Weirich for developing Flexmock, the first Terse ruby mock framework
+* James Mead for developing Mocha
+* Aslak Hellesoy for Developing Rspec
+* Stephen Baker for Developing Rspec
+* Dave Astels for some BDD inspiration

data/Rakefile

@@ -21,7 +21,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.1.1"
+PKG_VERSION = "0.1.2"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/rr/scenario_example.rb

@@ -167,13 +167,57 @@ describe Scenario, "#ordered?" do
   end
 end
 
+describe Scenario, "#yields" do
+  it_should_behave_like "RR::Scenario"
+
+  it "returns self" do
+    @scenario.yields(:baz).should === @scenario
+  end
+
+  it "yields the passed in argument to the call block when there is no returns value set" do
+    @scenario.with_any_args.yields(:baz)
+    passed_in_block_arg = nil
+    @object.foobar {|arg| passed_in_block_arg = arg}.should == nil
+    passed_in_block_arg.should == :baz
+  end
+
+  it "yields the passed in argument to the call block when there is a no returns value set" do
+    @scenario.with_any_args.yields(:baz).returns(:return_value)
+
+    passed_in_block_arg = nil
+    @object.foobar {|arg| passed_in_block_arg = arg}.should == :return_value
+    passed_in_block_arg.should == :baz
+  end
+
+  it "sets return value when block passed in" do
+    @scenario.with_any_args.yields {:return_value}
+    @object.foobar {}.should == :return_value
+  end
+end
+
 describe Scenario, "#returns" do
   it_should_behave_like "RR::Scenario"
 
-  it "sets the value of the method" do
+  it "returns self" do
     @scenario.returns {:baz}.should === @scenario
+    @scenario.returns(:baz).should === @scenario
+  end
+
+  it "sets the value of the method when passed a block" do
+    @scenario.returns {:baz}
     @scenario.call.should == :baz
   end
+
+  it "sets the value of the method when passed an argument" do
+    @scenario.returns(:baz)
+    @scenario.call.should == :baz
+  end
+
+  it "raises an error when both argument and block is passed in" do
+    proc do
+      @scenario.returns(:baz) {:another}
+    end.should raise_error(ArgumentError, "returns cannot accept both an argument and a block")
+  end
 end
 
 describe Scenario, "#implemented_by" do
@@ -278,6 +322,14 @@ describe Scenario, "#call implemented by a proc" do
     block = @object.foobar(1, 2) {|a, b| [b, a]}
     block.call(3, 4).should == [4, 3]
   end
+
+  it "raises ArgumentError when yields was called and no block passed in" do
+    @scenario.with(1, 2).yields(55)
+
+    proc do
+      @object.foobar(1, 2)
+    end.should raise_error(ArgumentError, "A Block must be passed into the method call when using yields")
+  end
 end
 
 describe Scenario, "#call implemented by a method" do

data/lib/rr/scenario.rb

@@ -11,6 +11,7 @@ module RR
       @argument_expectation = nil
       @times_called_expectation = nil
       @times_called = 0
+      @yields = nil
     end
 
     # Scenario#with creates an ArgumentEqualityError for the
@@ -113,10 +114,35 @@ module RR
       @ordered
     end
 
-    # Scenario#returns causes Scenario to return the return value of
+    # Scenario#returns accepts an argument value or a block.
+    # It will raise an ArgumentError if both are passed in.
+    #
+    # Passing in a block causes Scenario to return the return value of
     # the passed in block.
-    def returns(&implementation)
-      implemented_by implementation
+    #
+    # Passing in an argument causes Scenario to return the argument.
+    def returns(value=nil, &implementation)
+      raise ArgumentError, "returns cannot accept both an argument and a block" if value && implementation
+      if value
+        implemented_by proc {value}
+      else
+        implemented_by implementation
+      end
+    end
+
+    # Scenario#yields sets the Scenario to invoke a passed in block when
+    # the Scenario is called.
+    # An Expection will be raised if no block is passed in when the
+    # Scenario is called.
+    #
+    # Passing in a block sets the return value.
+    #
+    #   mock(subject).method_name.yields(yield_arg1, yield_arg2) {return_value}
+    #   subject.method_name {|yield_arg1, yield_arg2|}
+    def yields(*args, &returns)
+      @yields = args
+      returns(&returns) if returns
+      self
     end
 
     # Scenario#implemented_by sets the implementation of the Scenario.
@@ -141,6 +167,12 @@ module RR
     def call(*args, &block)
       @times_called_expectation.verify_input if @times_called_expectation
       @space.verify_ordered_scenario(self) if ordered?
+      if @yields
+        unless block
+          raise ArgumentError, "A Block must be passed into the method call when using yields"
+        end
+        block.call(*@yields)
+      end
       return nil unless @implementation
 
       if @implementation.is_a?(Method)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 date: 2007-07-08 00:00:00 -07:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: