caricature 0.5.0 → 0.6.0

data/doc/Caricature/MethodCallRecorder.html

@@ -59,15 +59,13 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000069">::new</a></li>
+					<li><a href="#M000078">::new</a></li>
 					
-					<li><a href="#M000072">#[]</a></li>
+					<li><a href="#M000080">#record_call</a></li>
 					
-					<li><a href="#M000070">#record_call</a></li>
+					<li><a href="#M000083">#size</a></li>
 					
-					<li><a href="#M000074">#size</a></li>
-					
-					<li><a href="#M000071">#was_called?</a></li>
+					<li><a href="#M000082">#was_called?</a></li>
 					
 				</ul>
 			</div>
@@ -229,7 +227,7 @@ key
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M000069"></a>
+				<a name="M000078"></a>
 
 				<div class="method-heading">
 				
@@ -252,9 +250,9 @@ recorder
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 94</span>
+<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 95</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
-      <span class="ruby-ivar">@method_calls</span> = {}
+      <span class="ruby-ivar">@method_calls</span> = {<span class="ruby-identifier">:instance</span> =<span class="ruby-operator">&gt;</span> {}, <span class="ruby-identifier">:class</span> =<span class="ruby-operator">&gt;</span> {} }      
     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
@@ -270,47 +268,13 @@ recorder
 			<h3 class="section-header">Public Instance Methods</h3>
 
 		
-			<div id="--method" class="method-detail ">
-				<a name="M000072"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">[]</span><span
-						class="method-args">(method_name)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					<p>
-indexer that gives you access to the recorded method by method name
-</p>
-					
-
-					
-					<div class="method-source-code"
-						id="--source">
-<pre>
-<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 118</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]</span>(<span class="ruby-identifier">method_name</span>)
-      <span class="ruby-identifier">method_calls</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-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-			</div>
-
-		
 			<div id="record-call-method" class="method-detail ">
-				<a name="M000070"></a>
+				<a name="M000080"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">record_call</span><span
-						class="method-args">(method_name, *args, &block)</span>
+						class="method-args">(method_name, mode=:instance, *args, &block)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -327,11 +291,11 @@ was called.
 					<div class="method-source-code"
 						id="record-call-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 99</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">record_call</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">block</span>)
+<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 100</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">record_call</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-operator">&amp;</span><span class="ruby-identifier">block</span>)
       <span class="ruby-identifier">mn_sym</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">method_calls</span>[<span class="ruby-identifier">mn_sym</span>] <span class="ruby-operator">||=</span> <span class="ruby-constant">MethodCallRecording</span>.<span class="ruby-identifier">new</span> <span class="ruby-identifier">method_name</span>
-      <span class="ruby-identifier">mc</span> = <span class="ruby-identifier">method_calls</span>[<span class="ruby-identifier">mn_sym</span>]
+      <span class="ruby-identifier">method_calls</span>[<span class="ruby-identifier">mode</span>][<span class="ruby-identifier">mn_sym</span>] <span class="ruby-operator">||=</span> <span class="ruby-constant">MethodCallRecording</span>.<span class="ruby-identifier">new</span> <span class="ruby-identifier">method_name</span>
+      <span class="ruby-identifier">mc</span> = <span class="ruby-identifier">method_calls</span>[<span class="ruby-identifier">mode</span>][<span class="ruby-identifier">mn_sym</span>]
       <span class="ruby-identifier">mc</span>.<span class="ruby-identifier">count</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
       <span class="ruby-identifier">mc</span>.<span class="ruby-identifier">add_argument_variation</span> <span class="ruby-identifier">args</span>, <span class="ruby-identifier">block</span> 
     <span class="ruby-keyword kw">end</span></pre>
@@ -344,7 +308,7 @@ was called.
 
 		
 			<div id="size-method" class="method-detail ">
-				<a name="M000074"></a>
+				<a name="M000083"></a>
 
 				<div class="method-heading">
 				
@@ -365,7 +329,7 @@ returns the number of different methods that has been recorderd
 					<div class="method-source-code"
 						id="size-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 123</span>
+<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 124</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">size</span>
       <span class="ruby-ivar">@method_calls</span>.<span class="ruby-identifier">size</span>
     <span class="ruby-keyword kw">end</span></pre>
@@ -378,12 +342,12 @@ returns the number of different methods that has been recorderd
 
 		
 			<div id="was-called--method" class="method-detail ">
-				<a name="M000071"></a>
+				<a name="M000082"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">was_called?</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>
@@ -400,9 +364,9 @@ constraints
 					<div class="method-source-code"
 						id="was-called--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/method_call_recorder.rb, line 108</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">was_called?</span>(<span class="ruby-identifier">method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-      <span class="ruby-identifier">mc</span> = <span class="ruby-identifier">method_calls</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/method_call_recorder.rb, line 109</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">was_called?</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">mc</span> = <span class="ruby-identifier">method_calls</span>[<span class="ruby-identifier">mode</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-keyword kw">if</span> <span class="ruby-identifier">mc</span>    
         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">mc</span>.<span class="ruby-identifier">find_argument_variations</span>(<span class="ruby-identifier">args</span>).<span class="ruby-identifier">first</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">args</span>        
       <span class="ruby-keyword kw">else</span>

data/doc/Caricature/MethodCallRecording.html

@@ -59,15 +59,15 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000061">::new</a></li>
+					<li><a href="#M000070">::new</a></li>
 					
-					<li><a href="#M000065">#add_argument_variation</a></li>
+					<li><a href="#M000074">#add_argument_variation</a></li>
 					
-					<li><a href="#M000062">#args</a></li>
+					<li><a href="#M000071">#args</a></li>
 					
-					<li><a href="#M000067">#find_argument_variations</a></li>
+					<li><a href="#M000076">#find_argument_variations</a></li>
 					
-					<li><a href="#M000063">#has_argument_variations?</a></li>
+					<li><a href="#M000073">#has_argument_variations?</a></li>
 					
 				</ul>
 			</div>
@@ -287,7 +287,7 @@ gets or sets the block for this method call
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M000061"></a>
+				<a name="M000070"></a>
 
 				<div class="method-heading">
 				
@@ -333,7 +333,7 @@ very least.
 
 		
 			<div id="add-argument-variation-method" class="method-detail ">
-				<a name="M000065"></a>
+				<a name="M000074"></a>
 
 				<div class="method-heading">
 				
@@ -368,7 +368,7 @@ add an argument variation
 
 		
 			<div id="args-method" class="method-detail ">
-				<a name="M000062"></a>
+				<a name="M000071"></a>
 
 				<div class="method-heading">
 				
@@ -402,7 +402,7 @@ add args
 
 		
 			<div id="find-argument-variations-method" class="method-detail ">
-				<a name="M000067"></a>
+				<a name="M000076"></a>
 
 				<div class="method-heading">
 				
@@ -437,7 +437,7 @@ finds an argument variation that matches the provided <tt>args</tt>
 
 		
 			<div id="has-argument-variations--method" class="method-detail ">
-				<a name="M000063"></a>
+				<a name="M000073"></a>
 
 				<div class="method-heading">
 				

data/doc/Caricature/RubyIsolator.html

@@ -59,13 +59,13 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000060">::new</a></li>
+					<li><a href="#M000075">::new</a></li>
 					
-					<li><a href="#M000068">#___super___</a></li>
+					<li><a href="#M000081">#___super___</a></li>
 					
-					<li><a href="#M000066">#create_isolation_for</a></li>
+					<li><a href="#M000079">#create_isolation_for</a></li>
 					
-					<li><a href="#M000064">#initialize_messenger</a></li>
+					<li><a href="#M000077">#initialize_messenger</a></li>
 					
 				</ul>
 			</div>
@@ -214,7 +214,7 @@ instance methods that are defined on the class.
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M000060"></a>
+				<a name="M000075"></a>
 
 				<div class="method-heading">
 				
@@ -235,7 +235,7 @@ implemented template method for creating Ruby isolations
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 150</span>
+<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 232</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">context</span>)
       <span class="ruby-keyword kw">super</span>
       <span class="ruby-identifier">klass</span> = <span class="ruby-ivar">@context</span>.<span class="ruby-identifier">subject</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:class_eval</span>) <span class="ruby-operator">?</span> <span class="ruby-ivar">@context</span>.<span class="ruby-identifier">subject</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@context</span>.<span class="ruby-identifier">subject</span>.<span class="ruby-identifier">class</span>
@@ -258,7 +258,7 @@ implemented template method for creating Ruby isolations
 
 		
 			<div id="-super--method" class="method-detail ">
-				<a name="M000068"></a>
+				<a name="M000081"></a>
 
 				<div class="method-heading">
 				
@@ -279,7 +279,7 @@ access to the proxied subject
 					<div class="method-source-code"
 						id="-super--source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 174</span>
+<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 256</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">___super___</span>
           <span class="ruby-identifier">isolation_context</span>.<span class="ruby-identifier">instance</span>
         <span class="ruby-keyword kw">end</span></pre>
@@ -292,7 +292,7 @@ access to the proxied subject
 
 		
 			<div id="create-isolation-for-method" class="method-detail ">
-				<a name="M000066"></a>
+				<a name="M000079"></a>
 
 				<div class="method-heading">
 				
@@ -313,7 +313,7 @@ creates the ruby isolator for the specified subject
 					<div class="method-source-code"
 						id="create-isolation-for-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 164</span>
+<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 246</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">create_isolation_for</span>(<span class="ruby-identifier">subj</span>)
       <span class="ruby-identifier">imembers</span> = <span class="ruby-ivar">@descriptor</span>.<span class="ruby-identifier">instance_members</span>
       <span class="ruby-identifier">cmembers</span> = <span class="ruby-ivar">@descriptor</span>.<span class="ruby-identifier">class_members</span>
@@ -342,7 +342,7 @@ creates the ruby isolator for the specified 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>
 
@@ -360,7 +360,7 @@ creates the ruby isolator for the specified subject
 
 		
 			<div id="initialize-messenger-method" class="method-detail ">
-				<a name="M000064"></a>
+				<a name="M000077"></a>
 
 				<div class="method-heading">
 				
@@ -381,7 +381,7 @@ initializes the messaging strategy for the isolator
 					<div class="method-source-code"
 						id="initialize-messenger-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 159</span>
+<span class="ruby-comment cmt"># File lib/caricature/isolator.rb, line 241</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize_messenger</span>
       <span class="ruby-ivar">@context</span>.<span class="ruby-identifier">messenger</span> = <span class="ruby-constant">RubyMessenger</span>.<span class="ruby-identifier">new</span> <span class="ruby-ivar">@context</span>.<span class="ruby-identifier">expectations</span>, <span class="ruby-ivar">@subject</span>
     <span class="ruby-keyword kw">end</span></pre>

data/doc/Caricature/RubyMessenger.html

@@ -28,8 +28,8 @@
 				<div class="section-body">
 					<ul>
 					
-						<li><a href="../lib/caricature/messaging_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
-							class="thickbox" title="lib/caricature/messaging.rb">lib/caricature/messaging.rb</a></li>
+						<li><a href="../lib/caricature/messenger_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
+							class="thickbox" title="lib/caricature/messenger.rb">lib/caricature/messenger.rb</a></li>
 					
 					</ul>
 				</div>
@@ -59,7 +59,7 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000051">#deliver</a></li>
+					<li><a href="#M000061">#internal_deliver</a></li>
 					
 				</ul>
 			</div>
@@ -191,17 +191,17 @@ Encapsulates sending messages to Ruby 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 ">
-				<a name="M000051"></a>
+			<div id="internal-deliver-method" class="method-detail ">
+				<a name="M000061"></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>
@@ -209,26 +209,27 @@ Encapsulates sending messages to Ruby isolations
 				<div class="method-description">
 					
 					<p>
-deliver the message to the receiving isolation
+implementation of the template method for looking up the expectation and/or
+returning a value
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="deliver-source">
+						id="internal-deliver-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/caricature/messaging.rb, line 29</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-keyword kw">nil</span>
-      <span class="ruby-keyword kw">end</span>
-    <span class="ruby-keyword kw">end</span></pre>
+<span class="ruby-comment cmt"># File lib/caricature/messenger.rb, line 43</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-keyword kw">nil</span>
+        <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/Caricature/RubyObjectDescriptor.html

@@ -59,9 +59,9 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000026">#initialize_class_members_for</a></li>
+					<li><a href="#M000024">#initialize_class_members_for</a></li>
 					
-					<li><a href="#M000024">#initialize_instance_members_for</a></li>
+					<li><a href="#M000023">#initialize_instance_members_for</a></li>
 					
 				</ul>
 			</div>
@@ -198,7 +198,7 @@ Describes a ruby object.
 
 		
 			<div id="initialize-class-members-for-method" class="method-detail ">
-				<a name="M000026"></a>
+				<a name="M000024"></a>
 
 				<div class="method-heading">
 				
@@ -233,7 +233,7 @@ Object.singleton_methods
 
 		
 			<div id="initialize-instance-members-for-method" class="method-detail ">
-				<a name="M000024"></a>
+				<a name="M000023"></a>
 
 				<div class="method-heading">
 				

data/doc/Caricature/TypeDescriptor.html

@@ -61,9 +61,9 @@
 					
 					<li><a href="#M000015">::new</a></li>
 					
-					<li><a href="#M000020">#initialize_class_members_for</a></li>
+					<li><a href="#M000019">#initialize_class_members_for</a></li>
 					
-					<li><a href="#M000018">#initialize_instance_members_for</a></li>
+					<li><a href="#M000017">#initialize_instance_members_for</a></li>
 					
 				</ul>
 			</div>
@@ -288,7 +288,7 @@ initializes a new instance of a type descriptor
 
 		
 			<div id="initialize-class-members-for-method" class="method-detail ">
-				<a name="M000020"></a>
+				<a name="M000019"></a>
 
 				<div class="method-heading">
 				
@@ -322,7 +322,7 @@ collects the class members of the provided type
 
 		
 			<div id="initialize-instance-members-for-method" class="method-detail ">
-				<a name="M000018"></a>
+				<a name="M000017"></a>
 
 				<div class="method-heading">
 				

data/doc/Caricature/Verification.html

@@ -59,17 +59,17 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000073">::new</a></li>
+					<li><a href="#M000084">::new</a></li>
 					
-					<li><a href="#M000077">#allow_any_arguments</a></li>
+					<li><a href="#M000088">#allow_any_arguments</a></li>
 					
-					<li><a href="#M000075">#any_args?</a></li>
+					<li><a href="#M000085">#any_args?</a></li>
 					
-					<li><a href="#M000078">#matches?</a></li>
+					<li><a href="#M000089">#matches?</a></li>
 					
-					<li><a href="#M000080">#successful?</a></li>
+					<li><a href="#M000091">#successful?</a></li>
 					
-					<li><a href="#M000076">#with</a></li>
+					<li><a href="#M000086">#with</a></li>
 					
 				</ul>
 			</div>
@@ -207,12 +207,12 @@ assertion
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M000073"></a>
+				<a name="M000084"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">new</span><span
-						class="method-args">(method_name, recorder)</span>
+						class="method-args">(method_name, recorder, mode=:instance)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -229,8 +229,8 @@ Initializes a new instance of a <tt>Verification</tt>
 						id="new-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/caricature/verification.rb, line 8</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">recorder</span>)
-      <span class="ruby-ivar">@method_name</span>, <span class="ruby-ivar">@args</span>, <span class="ruby-ivar">@any_args</span>, <span class="ruby-ivar">@recorder</span> = <span class="ruby-identifier">method_name</span>, [], <span class="ruby-keyword kw">true</span>, <span class="ruby-identifier">recorder</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">recorder</span>, <span class="ruby-identifier">mode</span>=<span class="ruby-identifier">:instance</span>)
+      <span class="ruby-ivar">@method_name</span>, <span class="ruby-ivar">@args</span>, <span class="ruby-ivar">@any_args</span>, <span class="ruby-ivar">@recorder</span>, <span class="ruby-ivar">@mode</span> = <span class="ruby-identifier">method_name</span>, [], <span class="ruby-keyword kw">true</span>, <span class="ruby-identifier">recorder</span>, <span class="ruby-identifier">mode</span>
     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
@@ -247,7 +247,7 @@ Initializes a new instance of a <tt>Verification</tt>
 
 		
 			<div id="allow-any-arguments-method" class="method-detail ">
-				<a name="M000077"></a>
+				<a name="M000088"></a>
 
 				<div class="method-heading">
 				
@@ -282,7 +282,7 @@ allow any arguments ignore the argument constraint
 
 		
 			<div id="any-args--method" class="method-detail ">
-				<a name="M000075"></a>
+				<a name="M000085"></a>
 
 				<div class="method-heading">
 				
@@ -316,7 +316,7 @@ indicates whether this verification can be for any arguments
 
 		
 			<div id="matches--method" class="method-detail ">
-				<a name="M000078"></a>
+				<a name="M000089"></a>
 
 				<div class="method-heading">
 				
@@ -350,7 +350,7 @@ figure out if this argument variation matches the provided args.
 
 		
 			<div id="successful--method" class="method-detail ">
-				<a name="M000080"></a>
+				<a name="M000091"></a>
 
 				<div class="method-heading">
 				
@@ -374,7 +374,7 @@ indicate that this method verification is successful
 <span class="ruby-comment cmt"># File lib/caricature/verification.rb, line 36</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">successful?</span>
       <span class="ruby-identifier">a</span> = <span class="ruby-identifier">any_args?</span> <span class="ruby-value">? </span>[<span class="ruby-identifier">:any</span>] <span class="ruby-operator">:</span> <span class="ruby-ivar">@args</span>
-      <span class="ruby-ivar">@recorder</span>.<span class="ruby-identifier">was_called?</span>(<span class="ruby-ivar">@method_name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span>)
+      <span class="ruby-ivar">@recorder</span>.<span class="ruby-identifier">was_called?</span>(<span class="ruby-ivar">@method_name</span>, <span class="ruby-ivar">@mode</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span>)
     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
@@ -385,7 +385,7 @@ indicate that this method verification is successful
 
 		
 			<div id="with-method" class="method-detail ">
-				<a name="M000076"></a>
+				<a name="M000086"></a>
 
 				<div class="method-heading">
 				

data/doc/Caricature.html

@@ -52,8 +52,8 @@
 						<li><a href="./lib/caricature/isolator_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
 							class="thickbox" title="lib/caricature/isolator.rb">lib/caricature/isolator.rb</a></li>
 					
-						<li><a href="./lib/caricature/messaging_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
-							class="thickbox" title="lib/caricature/messaging.rb">lib/caricature/messaging.rb</a></li>
+						<li><a href="./lib/caricature/messenger_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
+							class="thickbox" title="lib/caricature/messenger.rb">lib/caricature/messenger.rb</a></li>
 					
 						<li><a href="./lib/caricature/method_call_recorder_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
 							class="thickbox" title="lib/caricature/method_call_recorder.rb">lib/caricature/method_call_recorder.rb</a></li>

data/doc/Class.html

@@ -59,9 +59,9 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M000081">#demodulize</a></li>
+					<li><a href="#M000090">#demodulize</a></li>
 					
-					<li><a href="#M000082">#is_clr_type?</a></li>
+					<li><a href="#M000092">#is_clr_type?</a></li>
 					
 				</ul>
 			</div>
@@ -195,7 +195,7 @@
 
 		
 			<div id="demodulize-method" class="method-detail ">
-				<a name="M000081"></a>
+				<a name="M000090"></a>
 
 				<div class="method-heading">
 				
@@ -229,7 +229,7 @@ removes all the modules from this class name
 
 		
 			<div id="is-clr-type--method" class="method-detail ">
-				<a name="M000082"></a>
+				<a name="M000092"></a>
 
 				<div class="method-heading">