caricature 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/caricature.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{caricature}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Porto Carrero"]
-  s.date = %q{2009-05-19}
+  s.date = %q{2009-05-21}
   s.description = %q{This project aims to make interop between IronRuby objects and .NET objects easier. The idea is that it integrates nicely with bacon and later rspec and that it transparently lets you mock ironruby ojbects as well as CLR objects/interfaces. Caricature handles interfaces, interface inheritance, CLR objects, CLR object instances, Ruby classes and instances of Ruby classes.}
   s.email = %q{ivan@flanders.co.nz}
   s.extra_rdoc_files = [
@@ -89,6 +89,7 @@ Gem::Specification.new do |s|
      "doc/lib/caricature/isolation_rb.html",
      "doc/lib/caricature/isolator_rb.html",
      "doc/lib/caricature/messaging_rb.html",
+     "doc/lib/caricature/messenger_rb.html",
      "doc/lib/caricature/method_call_recorder_rb.html",
      "doc/lib/caricature/verification_rb.html",
      "doc/lib/caricature_rb.html",
@@ -107,6 +108,7 @@ Gem::Specification.new do |s|
      "lib/bin/Workarounds.pdb",
      "lib/caricature.rb",
      "lib/caricature/clr.rb",
+     "lib/caricature/clr/aspnet_mvc.rb",
      "lib/caricature/clr/descriptor.rb",
      "lib/caricature/clr/isolation.rb",
      "lib/caricature/clr/isolator.rb",
@@ -129,6 +131,7 @@ Gem::Specification.new do |s|
      "lib/core_ext/system/type.rb",
      "pkg/.gitignore",
      "pkg/caricature-0.1.0.gem",
+     "pkg/caricature-0.5.0.gem",
      "spec/bacon_helper.rb",
      "spec/bin/.gitignore",
      "spec/core_ext_spec.rb",

data/doc/Array.html

@@ -59,7 +59,7 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000079">#to_h</a></li>
+					<li><a href="#M000087">#to_h</a></li>
 					
 				</ul>
 			</div>
@@ -193,7 +193,7 @@
 
 		
 			<div id="to-h-method" class="method-detail ">
-				<a name="M000079"></a>
+				<a name="M000087"></a>
 
 				<div class="method-heading">
 				

data/doc/Caricature/ArgumentRecording.html

@@ -59,9 +59,9 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000057">::new</a></li>
+					<li><a href="#M000064">::new</a></li>
 					
-					<li><a href="#M000058">#==</a></li>
+					<li><a href="#M000066">#==</a></li>
 					
 				</ul>
 			</div>
@@ -264,7 +264,7 @@ the number of the call that has the following parameters
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M000057"></a>
+				<a name="M000064"></a>
 
 				<div class="method-heading">
 				
@@ -307,7 +307,7 @@ call count and the args as an <tt>Array</tt>
 
 		
 			<div id="--method" class="method-detail ">
-				<a name="M000058"></a>
+				<a name="M000066"></a>
 
 				<div class="method-heading">
 				

data/doc/Caricature/ClrClassMessenger.html

@@ -59,7 +59,7 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000010">#deliver</a></li>
+					<li><a href="#M000010">#internal_deliver</a></li>
 					
 				</ul>
 			</div>
@@ -191,17 +191,17 @@ Encapsulates sending messages to CLR class or instance isolations
 
 		<!-- Methods -->
 		
-		<div id="public-instance-method-details" class="method-section section">
-			<h3 class="section-header">Public Instance Methods</h3>
+		<div id="protected-instance-method-details" class="method-section section">
+			<h3 class="section-header">Protected Instance Methods</h3>
 
 		
-			<div id="deliver-method" class="method-detail ">
+			<div id="internal-deliver-method" class="method-detail ">
 				<a name="M000010"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">deliver</span><span
-						class="method-args">(method_name, return_type, *args, &b)</span>
+					<span class="method-name">internal_deliver</span><span
+						class="method-args">(mode, method_name, return_type, *args, &b)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -215,23 +215,23 @@ deliver the message to the receiving isolation
 
 					
 					<div class="method-source-code"
-						id="deliver-source">
+						id="internal-deliver-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/clr/messenger.rb, line 7</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">return_type</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>)
-      <span class="ruby-identifier">exp</span> = <span class="ruby-identifier">expectations</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">exp</span>
-        <span class="ruby-identifier">res</span> = <span class="ruby-identifier">instance</span>.<span class="ruby-identifier">__send__</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">super_before?</span>
-        <span class="ruby-identifier">res</span> = <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">execute</span> <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
-        <span class="ruby-identifier">res</span> = <span class="ruby-identifier">instance</span>.<span class="ruby-identifier">__send__</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">exp</span>.<span class="ruby-identifier">super_before?</span> <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">call_super?</span>
-        <span class="ruby-identifier">res</span>
-      <span class="ruby-keyword kw">else</span>
-        <span class="ruby-identifier">rt</span> = <span class="ruby-keyword kw">nil</span>
-        <span class="ruby-identifier">is_value_type</span> = <span class="ruby-identifier">return_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span> <span class="ruby-operator">!=</span> <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Void</span>.<span class="ruby-identifier">to_clr_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span>.<span class="ruby-identifier">is_value_type</span>
-        <span class="ruby-identifier">rt</span> = <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Activator</span>.<span class="ruby-identifier">create_instance</span>(<span class="ruby-identifier">return_type</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">is_value_type</span>
-        <span class="ruby-identifier">rt</span>
-      <span class="ruby-keyword kw">end</span>
-    <span class="ruby-keyword kw">end</span></pre>
+<span class="ruby-comment cmt"># File lib/caricature/clr/messenger.rb, line 9</span>
+      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">internal_deliver</span>(<span class="ruby-identifier">mode</span>, <span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">return_type</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>)
+        <span class="ruby-identifier">exp</span> = <span class="ruby-identifier">expectations</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">mode</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">exp</span>
+          <span class="ruby-identifier">res</span> = <span class="ruby-identifier">instance</span>.<span class="ruby-identifier">__send__</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">super_before?</span>
+          <span class="ruby-identifier">res</span> = <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">execute</span> <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
+          <span class="ruby-identifier">res</span> = <span class="ruby-identifier">instance</span>.<span class="ruby-identifier">__send__</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">exp</span>.<span class="ruby-identifier">super_before?</span> <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">call_super?</span>
+          <span class="ruby-identifier">res</span>
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-identifier">rt</span> = <span class="ruby-keyword kw">nil</span>
+          <span class="ruby-identifier">is_value_type</span> = <span class="ruby-identifier">return_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span> <span class="ruby-operator">!=</span> <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Void</span>.<span class="ruby-identifier">to_clr_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span>.<span class="ruby-identifier">is_value_type</span>
+          <span class="ruby-identifier">rt</span> = <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Activator</span>.<span class="ruby-identifier">create_instance</span>(<span class="ruby-identifier">return_type</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">is_value_type</span>
+          <span class="ruby-identifier">rt</span>
+        <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/Caricature/ClrInterfaceMessenger.html

@@ -59,7 +59,7 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000014">#deliver</a></li>
+					<li><a href="#M000014">#internal_deliver</a></li>
 					
 				</ul>
 			</div>
@@ -191,17 +191,17 @@ Encapsulates sending messages to CLR interface isolations
 
 		<!-- Methods -->
 		
-		<div id="public-instance-method-details" class="method-section section">
-			<h3 class="section-header">Public Instance Methods</h3>
+		<div id="protected-instance-method-details" class="method-section section">
+			<h3 class="section-header">Protected Instance Methods</h3>
 
 		
-			<div id="deliver-method" class="method-detail ">
+			<div id="internal-deliver-method" class="method-detail ">
 				<a name="M000014"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">deliver</span><span
-						class="method-args">(method_name, return_type, *args, &b)</span>
+					<span class="method-name">internal_deliver</span><span
+						class="method-args">(mode, method_name, return_type, *args, &b)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -215,20 +215,20 @@ deliver the message to the receiving isolation
 
 					
 					<div class="method-source-code"
-						id="deliver-source">
+						id="internal-deliver-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/clr/messenger.rb, line 28</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">return_type</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>)
-      <span class="ruby-identifier">exp</span> = <span class="ruby-identifier">expectations</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">exp</span>
-        <span class="ruby-identifier">res</span> = <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">execute</span> <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
-        <span class="ruby-identifier">res</span>
-      <span class="ruby-keyword kw">else</span>
-        <span class="ruby-identifier">rt</span> = <span class="ruby-keyword kw">nil</span>
-        <span class="ruby-identifier">rt</span> = <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Activator</span>.<span class="ruby-identifier">create_instance</span>(<span class="ruby-identifier">return_type</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">return_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span> <span class="ruby-operator">!=</span> <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Void</span>.<span class="ruby-identifier">to_clr_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span>.<span class="ruby-identifier">is_value_type</span>
-        <span class="ruby-identifier">rt</span>
-      <span class="ruby-keyword kw">end</span>
-    <span class="ruby-keyword kw">end</span></pre>
+<span class="ruby-comment cmt"># File lib/caricature/clr/messenger.rb, line 32</span>
+      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">internal_deliver</span>(<span class="ruby-identifier">mode</span>, <span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">return_type</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>)
+        <span class="ruby-identifier">exp</span> = <span class="ruby-identifier">expectations</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">mode</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">exp</span>
+          <span class="ruby-identifier">res</span> = <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">execute</span> <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>
+          <span class="ruby-identifier">res</span>
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-identifier">rt</span> = <span class="ruby-keyword kw">nil</span>
+          <span class="ruby-identifier">rt</span> = <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Activator</span>.<span class="ruby-identifier">create_instance</span>(<span class="ruby-identifier">return_type</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">return_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span> <span class="ruby-operator">!=</span> <span class="ruby-constant">System</span><span class="ruby-operator">::</span><span class="ruby-constant">Void</span>.<span class="ruby-identifier">to_clr_type</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">return_type</span>.<span class="ruby-identifier">is_value_type</span>
+          <span class="ruby-identifier">rt</span>
+        <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/Caricature/ClrIsolator.html

@@ -351,7 +351,7 @@ subject
           <span class="ruby-identifier">define_cmethod</span> <span class="ruby-identifier">mn</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-operator">*</span><span class="ruby-identifier">args</span><span class="ruby-operator">|</span>
             <span class="ruby-identifier">b</span> = <span class="ruby-keyword kw">nil</span>
             <span class="ruby-identifier">b</span> = <span class="ruby-constant">Proc</span>.<span class="ruby-identifier">new</span> { <span class="ruby-keyword kw">yield</span> } <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
-            <span class="ruby-identifier">isolation_context</span>.<span class="ruby-identifier">send_message</span>(<span class="ruby-identifier">mn</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>)
+            <span class="ruby-identifier">isolation_context</span>.<span class="ruby-identifier">send_class_message</span>(<span class="ruby-identifier">mn</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span>)
           <span class="ruby-keyword kw">end</span>
         <span class="ruby-keyword kw">end</span>
 

data/doc/Caricature/Expectation.html

@@ -61,15 +61,15 @@
 					
 					<li><a href="#M000031">::new</a></li>
 					
-					<li><a href="#M000035">#call_super?</a></li>
+					<li><a href="#M000036">#call_super?</a></li>
 					
-					<li><a href="#M000036">#execute</a></li>
+					<li><a href="#M000037">#execute</a></li>
 					
 					<li><a href="#M000032">#has_error_args?</a></li>
 					
 					<li><a href="#M000033">#has_return_value?</a></li>
 					
-					<li><a href="#M000034">#super_before?</a></li>
+					<li><a href="#M000035">#super_before?</a></li>
 					
 				</ul>
 			</div>
@@ -333,7 +333,7 @@ Initializes a new instance of an expectation
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 98</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 101</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">error_args</span>, <span class="ruby-identifier">return_value</span>, <span class="ruby-identifier">super_mode</span>)
       <span class="ruby-ivar">@method_name</span>, <span class="ruby-ivar">@args</span>, <span class="ruby-ivar">@error_args</span>, <span class="ruby-ivar">@return_value</span>, <span class="ruby-ivar">@super</span> =
               <span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">error_args</span>, <span class="ruby-identifier">return_value</span>, <span class="ruby-identifier">super_mode</span>
@@ -354,7 +354,7 @@ Initializes a new instance of an expectation
 
 		
 			<div id="call-super--method" class="method-detail ">
-				<a name="M000035"></a>
+				<a name="M000036"></a>
 
 				<div class="method-heading">
 				
@@ -375,7 +375,7 @@ indicates whether super needs to be called somewhere
 					<div class="method-source-code"
 						id="call-super--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 120</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 123</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">call_super?</span>
       <span class="ruby-operator">!</span><span class="ruby-ivar">@super</span>.<span class="ruby-identifier">nil?</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -388,7 +388,7 @@ indicates whether super needs to be called somewhere
 
 		
 			<div id="execute-method" class="method-detail ">
-				<a name="M000036"></a>
+				<a name="M000037"></a>
 
 				<div class="method-heading">
 				
@@ -409,7 +409,7 @@ executes this expectation with its configuration
 					<div class="method-source-code"
 						id="execute-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 125</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 128</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">execute</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">margs</span>)
       <span class="ruby-identifier">ags</span> = <span class="ruby-identifier">any_args?</span> <span class="ruby-value">? </span>(<span class="ruby-identifier">margs</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-value">? </span><span class="ruby-operator">:</span><span class="ruby-identifier">any</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">margs</span>) <span class="ruby-operator">:</span> <span class="ruby-identifier">args</span>
       <span class="ruby-identifier">raise</span> <span class="ruby-operator">*</span><span class="ruby-ivar">@error_args</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">has_error_args?</span>
@@ -446,7 +446,7 @@ indicates whether this expecation will raise an event.
 					<div class="method-source-code"
 						id="has-error-args--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 105</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 108</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">has_error_args?</span>
       <span class="ruby-operator">!</span><span class="ruby-ivar">@error_args</span>.<span class="ruby-identifier">nil?</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -480,7 +480,7 @@ indicates whether this expectation will return a value.
 					<div class="method-source-code"
 						id="has-return-value--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 110</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 113</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">has_return_value?</span>
       <span class="ruby-operator">!</span><span class="ruby-ivar">@return_value</span>.<span class="ruby-identifier">nil?</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -493,7 +493,7 @@ indicates whether this expectation will return a value.
 
 		
 			<div id="super-before--method" class="method-detail ">
-				<a name="M000034"></a>
+				<a name="M000035"></a>
 
 				<div class="method-heading">
 				
@@ -514,7 +514,7 @@ call the super before the expectation
 					<div class="method-source-code"
 						id="super-before--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 115</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 118</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">super_before?</span>
       <span class="ruby-ivar">@super</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">:before</span>
     <span class="ruby-keyword kw">end</span></pre>

data/doc/Caricature/ExpectationBuilder.html

@@ -59,9 +59,9 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000038">::new</a></li>
+					<li><a href="#M000040">::new</a></li>
 					
-					<li><a href="#M000040">#build</a></li>
+					<li><a href="#M000042">#build</a></li>
 					
 				</ul>
 			</div>
@@ -210,7 +210,7 @@ and usage of the expectation
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M000038"></a>
+				<a name="M000040"></a>
 
 				<div class="method-heading">
 				
@@ -232,7 +232,7 @@ passed into the block to allow only certain operations in the block.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 142</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 145</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">method_name</span>)
       <span class="ruby-ivar">@method_name</span>, <span class="ruby-ivar">@return_value</span>, <span class="ruby-ivar">@super</span>, <span class="ruby-ivar">@block</span>, <span class="ruby-ivar">@error_args</span>, <span class="ruby-ivar">@args</span>, <span class="ruby-ivar">@any_args</span> = 
               <span class="ruby-identifier">method_name</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>, [], <span class="ruby-keyword kw">true</span>
@@ -252,7 +252,7 @@ passed into the block to allow only certain operations in the block.
 
 		
 			<div id="build-method" class="method-detail ">
-				<a name="M000040"></a>
+				<a name="M000042"></a>
 
 				<div class="method-heading">
 				
@@ -273,7 +273,7 @@ build up the expectation with the provided arguments
 					<div class="method-source-code"
 						id="build-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 150</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 153</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">build</span>
       <span class="ruby-constant">Expectation</span>.<span class="ruby-identifier">new</span> <span class="ruby-ivar">@method_name</span>, <span class="ruby-ivar">@args</span>, <span class="ruby-ivar">@error_args</span>, <span class="ruby-ivar">@return_value</span>, <span class="ruby-ivar">@super</span>
     <span class="ruby-keyword kw">end</span></pre>

data/doc/Caricature/ExpectationSyntax.html

@@ -56,13 +56,13 @@
 					
 					<li><a href="#M000027">#raise</a></li>
 					
-					<li><a href="#M000025">#return</a></li>
+					<li><a href="#M000026">#return</a></li>
 					
 					<li><a href="#M000029">#super_after</a></li>
 					
 					<li><a href="#M000028">#super_before</a></li>
 					
-					<li><a href="#M000023">#with</a></li>
+					<li><a href="#M000025">#with</a></li>
 					
 				</ul>
 			</div>
@@ -222,7 +222,7 @@ for the specified arguments
 					<div class="method-source-code"
 						id="any-args--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 71</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 74</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">any_args?</span>
       <span class="ruby-ivar">@any_args</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -257,7 +257,7 @@ arguments
 					<div class="method-source-code"
 						id="raise-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 54</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 57</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">raise</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
       <span class="ruby-ivar">@error_args</span> = <span class="ruby-identifier">args</span>
       <span class="ruby-keyword kw">self</span>
@@ -271,7 +271,7 @@ arguments
 
 		
 			<div id="return-method" class="method-detail ">
-				<a name="M000025"></a>
+				<a name="M000026"></a>
 
 				<div class="method-heading">
 				
@@ -293,7 +293,7 @@ the block you provide to this method.
 					<div class="method-source-code"
 						id="return-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 47</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 50</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">return</span>(<span class="ruby-identifier">value</span>=<span class="ruby-keyword kw">nil</span>)
       <span class="ruby-ivar">@return_value</span> = <span class="ruby-identifier">value</span>
       <span class="ruby-ivar">@return_value</span> <span class="ruby-operator">||=</span> <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
@@ -330,7 +330,7 @@ execution
 					<div class="method-source-code"
 						id="super-after-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 65</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 68</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">super_after</span>
       <span class="ruby-ivar">@super</span> = <span class="ruby-identifier">:after</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -365,7 +365,7 @@ exectution
 					<div class="method-source-code"
 						id="super-before-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 60</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 63</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">super_before</span>
       <span class="ruby-ivar">@super</span> = <span class="ruby-identifier">:before</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -378,7 +378,7 @@ exectution
 
 		
 			<div id="with-method" class="method-detail ">
-				<a name="M000023"></a>
+				<a name="M000025"></a>
 
 				<div class="method-heading">
 				
@@ -401,7 +401,7 @@ any arguments
 					<div class="method-source-code"
 						id="with-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 39</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 42</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">with</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
       <span class="ruby-ivar">@any_args</span> = <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">args</span>.<span class="ruby-identifier">first</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">:any</span>
       <span class="ruby-ivar">@args</span> = <span class="ruby-identifier">args</span>

data/doc/Caricature/Expectations.html

@@ -61,9 +61,9 @@
 					
 					<li><a href="#M000016">::new</a></li>
 					
-					<li><a href="#M000017">#<<</a></li>
+					<li><a href="#M000018">#add_expectation</a></li>
 					
-					<li><a href="#M000019">#find</a></li>
+					<li><a href="#M000020">#find</a></li>
 					
 				</ul>
 			</div>
@@ -225,7 +225,8 @@ initializes a new empty instance of the <tt>Expectation</tt> collection
 <pre>
 <span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 8</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
-      <span class="ruby-ivar">@inner</span> = []
+      <span class="ruby-ivar">@instance_expectations</span> = []
+      <span class="ruby-ivar">@class_expectations</span> = []
     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
@@ -241,13 +242,13 @@ initializes a new empty instance of the <tt>Expectation</tt> collection
 			<h3 class="section-header">Public Instance Methods</h3>
 
 		
-			<div id="--method" class="method-detail ">
-				<a name="M000017"></a>
+			<div id="add-expectation-method" class="method-detail ">
+				<a name="M000018"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">&lt;&lt;</span><span
-						class="method-args">(expectation)</span>
+					<span class="method-name">add_expectation</span><span
+						class="method-args">(expectation, mode=:instance)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -262,11 +263,12 @@ collection.
 
 					
 					<div class="method-source-code"
-						id="--source">
+						id="add-expectation-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 13</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-operator">&lt;&lt;</span>(<span class="ruby-identifier">expectation</span>)
-      <span class="ruby-ivar">@inner</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">expectation</span>
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 14</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_expectation</span>(<span class="ruby-identifier">expectation</span>, <span class="ruby-identifier">mode</span>=<span class="ruby-identifier">:instance</span>)
+      <span class="ruby-ivar">@instance_expectations</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">expectation</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">mode</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">:class</span>
+      <span class="ruby-ivar">@class_expectations</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">expectation</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">mode</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">:class</span>
     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
@@ -277,12 +279,12 @@ collection.
 
 		
 			<div id="find-method" class="method-detail ">
-				<a name="M000019"></a>
+				<a name="M000020"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">find</span><span
-						class="method-args">(method_name, *args)</span>
+						class="method-args">(method_name, mode=:instance, *args)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -304,9 +306,10 @@ also return the first result it can find.
 					<div class="method-source-code"
 						id="find-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 22</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">find</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-      <span class="ruby-identifier">candidates</span> = <span class="ruby-ivar">@inner</span>.<span class="ruby-identifier">select</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">exp</span><span class="ruby-operator">|</span> <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">method_name</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">method_name</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">to_sym</span> }
+<span class="ruby-comment cmt"># File lib/caricature/expectation.rb, line 24</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">find</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-identifier">mode</span>=<span class="ruby-identifier">:instance</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
+      <span class="ruby-identifier">expectations</span> = <span class="ruby-identifier">mode</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">:class</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@class_expectations</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@instance_expectations</span>
+      <span class="ruby-identifier">candidates</span> = <span class="ruby-identifier">expectations</span>.<span class="ruby-identifier">select</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">exp</span><span class="ruby-operator">|</span> <span class="ruby-identifier">exp</span>.<span class="ruby-identifier">method_name</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">to_sym</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">method_name</span>.<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">to_sym</span> }
       <span class="ruby-identifier">is_single</span> = <span class="ruby-identifier">args</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">args</span>.<span class="ruby-identifier">first</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">:any</span> <span class="ruby-operator">||</span> (<span class="ruby-identifier">candidates</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">==</span> <span class="ruby-value">1</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">candidates</span>.<span class="ruby-identifier">first</span>.<span class="ruby-identifier">any_args?</span>)
       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">candidates</span>.<span class="ruby-identifier">first</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">is_single</span>