orangutan 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 2
+:patch: 3
 :major: 0

data/lib/orangutan/chantek.rb

@@ -4,7 +4,7 @@ require 'orangutan/call'
 
 module Orangutan 
   class Chantek
-    attr_reader :calls
+    attr_reader :calls, :stubs
   
     def initialize
       @calls = []
@@ -21,8 +21,8 @@ module Orangutan
             snake = m_info.name.scan(/[A-Z][a-z0-9]*/).map {|a|a.downcase}.join('_').to_sym
             define_method snake do |*args|
               yield_container, return_container = __react__(snake, args)
-              yield yield_container.value if yield_container && block_given?
-              __return__(method, return_container)
+              yield *yield_container.value if yield_container && block_given?
+              return __return__(method, return_container)
             end
           end
         end
@@ -45,6 +45,7 @@ module Orangutan
             return expectation if expectation.matches?(method, *args)
         end
       end
+      nil
     end
   end
 end

data/lib/orangutan/expectation.rb

@@ -5,6 +5,12 @@ module Orangutan
   class Expectation
     attr_reader :return_container, :yield_container, :raiser
     
+    def initialize
+      @return_container = nil
+      @yield_container = nil
+      @raiser = nil
+    end
+    
     def receives method
       @method = method
       self
@@ -15,12 +21,12 @@ module Orangutan
       self
     end
   
-    def return value
+    def return *value
       @return_container = Container.new value
       self
     end
     
-    def yield value
+    def yield *value
       @yield_container = Container.new value
       self
     end

data/lib/orangutan/stub_base.rb

@@ -8,13 +8,13 @@ module Orangutan
 
     def method_missing method, *args
       yield_container, return_container = __react__(method, args)
-      yield yield_container.value if yield_container && block_given?
+      yield *yield_container.value if yield_container && block_given?
       __return__(method, return_container)
     end
   private
     def __return__ method, return_container
-      return return_container.value if return_container
-      return @parent.stub(:"#{@name}/#{method}") if @recursive
+      return *return_container.value if return_container
+      return @parent.stub(:"#{@name}/#{method}", :recursive => true) if @recursive
       nil
     end
   

data/orangutan.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orangutan}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Ryall"]
-  s.date = %q{2009-05-10}
+  s.date = %q{2009-05-11}
   s.description = %q{A mocking library that supports creation of ironruby mock objects (in addition to pure ruby ones)}
   s.email = %q{mark@ryall.name}
   s.extra_rdoc_files = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
      "lib/orangutan.rb",
      "lib/orangutan/call.rb",
      "lib/orangutan/chantek.rb",
-     "lib/orangutan/clean_slate.rb",
      "lib/orangutan/container.rb",
      "lib/orangutan/expectation.rb",
      "lib/orangutan/raiser.rb",

data/spec/spec_chantek.rb

@@ -21,17 +21,40 @@ describe Orangutan::Chantek, 'creating ruby stubs' do
     @o.when(:foo).receives(:bar).return('baz')
     @foo.bar.should == 'baz'
   end
+  
+  it 'should allow multiple method return values to be stubbed' do
+    @o.when(:foo).receives(:bar).return('baz', 'bat')
+    @foo.bar.should == ['baz', 'bat']
+  end
 
   it 'should allow method return values to be stubbed for method invocations with specific arguments' do
     @o.when(:foo).receives(:bar).with(7).return('baz')
     @foo.bar(7).should == 'baz'
   end
+
+  it 'should not match method invocations with incorrect specific arguments' do
+    @o.when(:foo).receives(:bar).with(7).return('baz')
+    @foo.bar(8).should == nil
+  end
+
+  it 'should allow method return values to be stubbed for method invocations with multiple specific arguments' do
+    @o.when(:foo).receives(:bar).with(7,8).return('baz')
+    @foo.bar(7,8).should == 'baz'
+  end
   
   it 'should allow stubbed methods to yield' do
     @o.when(:foo).receives(:bar).with(7).yield('baz')
-    a = nil
-    @foo.bar(7) {|s| a = s}
-    a.should == 'baz'
+    @foo.bar(7) do |v|
+      v.should == 'baz'
+    end
+  end
+
+  it 'should allow stubbed methods to yield multiple values' do
+    @o.when(:foo).receives(:bar).with(7).yield('baz', 'bar')
+    @foo.bar(7) do |a,b|
+      a.should == 'baz'
+      b.should == 'bar'
+    end
   end
 
   it 'should allow stubbed methods to yield nils' do

data/spec/spec_chantek_recurse.rb

@@ -1,3 +1,5 @@
+require 'orangutan'
+
 module Orangutan
   describe Chantek, 'creating recursive ruby stubs' do
     before do
@@ -20,5 +22,10 @@ module Orangutan
       @o.calls[0].should == Call.new(:foo, :bar,[])
       @o.calls[1].should == Call.new(:"foo/bar", :baz,[])
     end
+
+    it "should create recursive stubs" do
+      @foo.a.b.c
+      @o.stubs.keys.should == [:foo, :"foo/a", :"foo/a/b", :"foo/a/b/c"]
+    end
   end
 end

data/spec/spec_expectation.rb

@@ -26,8 +26,12 @@ module Orangutan
       @e.yield_container.should == nil
     end
   
-    it 'should store yield_value' do
-      @e.yield(1).yield_container.should == Container.new(1)
+    it 'should store yield value' do
+      @e.yield(1).yield_container.should == Container.new([1])
+    end
+
+    it 'should store multiple yield values' do
+      @e.yield(1,2).yield_container.should == Container.new([1,2])
     end
     
     it 'should not return by default' do
@@ -35,7 +39,11 @@ module Orangutan
     end
     
     it 'should store return value' do
-      @e.return(1).return_container.should == Container.new(1)
+      @e.return(1).return_container.should == Container.new([1])
+    end
+
+    it 'should store multiple return values' do
+      @e.return(1,2).return_container.should == Container.new([1,2])
     end
     
     it 'should not raise by default' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orangutan
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mark Ryall
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 +10:00
+date: 2009-05-11 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ files:
 - lib/orangutan.rb
 - lib/orangutan/call.rb
 - lib/orangutan/chantek.rb
-- lib/orangutan/clean_slate.rb
 - lib/orangutan/container.rb
 - lib/orangutan/expectation.rb
 - lib/orangutan/raiser.rb

data/lib/orangutan/clean_slate.rb

@@ -1,32 +0,0 @@
-module Orangutan
-  class CleanSlate
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-
-    def initialize name, parent, recursive
-      @name, @parent, @recursive = name, parent, recursive
-    end
-
-    def method_missing method, *args
-      yield_container, return_container = __react__(method, args)
-      yield yield_container.value if yield_container && block_given?
-      __return__(method, return_container)
-    end
-  private
-    def __return__ method, return_container
-      return return_container.value if return_container
-      return @parent.stub(:"@name/method") if @recursive
-      nil
-    end
-  
-    def __react__ method, args
-      yield_container, return_value = nil, nil
-      @parent.calls << Orangutan::Call.new(@name, method, args)
-      first_match = @parent.first_match(@name, method, args)
-      if first_match
-        first_match.raiser.execute if first_match.raiser
-        yield_container, return_value =  first_match.yield_container, first_match.return_value 
-      end
-      return yield_container, return_value
-    end
-  end
-end