pho 0.5 → 0.6

data/doc/rdoc/classes/Pho/DatatypeProperty.html

@@ -92,8 +92,8 @@ Captures information about a mapped datatype from a Field Predicate Map
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000120">new</a>&nbsp;&nbsp;
-      <a href="#M000121">to_rdf</a>&nbsp;&nbsp;
+      <a href="#M000138">new</a>&nbsp;&nbsp;
+      <a href="#M000139">to_rdf</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -133,7 +133,7 @@ Short name for the property
           <td class="context-item-name">property_uri</td>
           <td class="context-item-value">&nbsp;[R]&nbsp;</td>
           <td class="context-item-desc">
-RDF predicate URI for the mapped property
+<a href="RDF.html">RDF</a> predicate URI for the mapped property
 
 </td>
         </tr>
@@ -155,19 +155,19 @@ URI for this mapping
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000120" class="method-detail">
-        <a name="M000120"></a>
+      <div id="method-M000138" class="method-detail">
+        <a name="M000138"></a>
 
         <div class="method-heading">
-          <a href="#M000120" class="method-signature">
+          <a href="#M000138" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(uri, property_uri, name, analyzer=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000120-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000120-source">
+            onclick="toggleCode('M000138-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000138-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/field_predicate_map.rb, line 64</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">property_uri</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">analyzer</span>=<span class="ruby-keyword kw">nil</span>)
@@ -183,19 +183,19 @@ URI for this mapping
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000121" class="method-detail">
-        <a name="M000121"></a>
+      <div id="method-M000139" class="method-detail">
+        <a name="M000139"></a>
 
         <div class="method-heading">
-          <a href="#M000121" class="method-signature">
+          <a href="#M000139" class="method-signature">
           <span class="method-name">to_rdf</span><span class="method-args">(ns=true)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Convert this object into an RDF representation. Generates a simple
-rdf:Description, optionally including namespaces
+Convert this object into an <a href="RDF.html">RDF</a> representation.
+Generates a simple rdf:Description, optionally including namespaces
 </p>
 <table>
 <tr><td valign="top">ns:</td><td>include namespace declarations
@@ -203,8 +203,8 @@ rdf:Description, optionally including namespaces
 </td></tr>
 </table>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000121-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000121-source">
+            onclick="toggleCode('M000139-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000139-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/field_predicate_map.rb, line 73</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_rdf</span>(<span class="ruby-identifier">ns</span>=<span class="ruby-keyword kw">true</span>)

data/doc/rdoc/classes/Pho/Enrichment.html

@@ -95,7 +95,7 @@ endpoints and services
     <div id="class-list">
       <h3 class="section-bar">Classes and Modules</h3>
 
-      Class <a href="Enrichment/ResourceEnricher.html" class="link">Pho::Enrichment::ResourceEnricher</a><br />
+      Class <a href="Enrichment/StoreEnricher.html" class="link">Pho::Enrichment::StoreEnricher</a><br />
 
     </div>
 

data/doc/rdoc/classes/Pho/Enrichment/{ResourceEnricher.html → StoreEnricher.html}

@@ -5,7 +5,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>Class: Pho::Enrichment::ResourceEnricher</title>
+  <title>Class: Pho::Enrichment::StoreEnricher</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
@@ -50,7 +50,7 @@
         <table class="header-table">
         <tr class="top-aligned-row">
           <td><strong>Class</strong></td>
-          <td class="class-name-in-header">Pho::Enrichment::ResourceEnricher</td>
+          <td class="class-name-in-header">Pho::Enrichment::StoreEnricher</td>
         </tr>
         <tr class="top-aligned-row">
             <td><strong>In:</strong></td>
@@ -86,10 +86,10 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000072">enrich</a>&nbsp;&nbsp;
-      <a href="#M000070">infer</a>&nbsp;&nbsp;
-      <a href="#M000071">merge</a>&nbsp;&nbsp;
-      <a href="#M000069">new</a>&nbsp;&nbsp;
+      <a href="#M000075">enrich</a>&nbsp;&nbsp;
+      <a href="#M000073">infer</a>&nbsp;&nbsp;
+      <a href="#M000074">merge</a>&nbsp;&nbsp;
+      <a href="#M000072">new</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -129,12 +129,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000070" class="method-detail">
-        <a name="M000070"></a>
+      <div id="method-M000073" class="method-detail">
+        <a name="M000073"></a>
 
         <div class="method-heading">
-          <a href="#M000070" class="method-signature">
-          <span class="method-name">infer</span><span class="method-args">(store, query)</span>
+          <a href="#M000073" class="method-signature">
+          <span class="method-name">infer</span><span class="method-args">(store, query, &amp;block)</span>
           </a>
         </div>
       
@@ -144,32 +144,38 @@ Enrich a store against itself
 </p>
 <p>
 For the common case where a store needs to be enriched against itself by
-inferring <a href="ResourceEnricher.html#M000069">new</a> data from old
-using a CONSTRUCT query
+inferring <a href="StoreEnricher.html#M000072">new</a> data from old using
+a CONSTRUCT query
 </p>
-<pre>
- store:: the store to be updated
- query:: the SPARQL CONSTRUCT query to be used to infer the new data
-</pre>
+<table>
+<tr><td valign="top">store:</td><td>the store to be updated
+
+</td></tr>
+<tr><td valign="top">query:</td><td>the SPARQL CONSTRUCT query to be used to <a
+href="StoreEnricher.html#M000073">infer</a> the <a
+href="StoreEnricher.html#M000072">new</a> data
+
+</td></tr>
+</table>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000070-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000070-source">
+            onclick="toggleCode('M000073-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000073-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 27</span>
-      <span class="ruby-keyword kw">def</span> <span class="ruby-constant">ResourceEnricher</span>.<span class="ruby-identifier">infer</span>(<span class="ruby-identifier">store</span>, <span class="ruby-identifier">query</span>)
-        <span class="ruby-identifier">enricher</span> = <span class="ruby-constant">ResourceEnricher</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">store</span>, <span class="ruby-identifier">store</span>.<span class="ruby-identifier">sparql_client</span>() )
-        <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">enricher</span>.<span class="ruby-identifier">merge</span>( <span class="ruby-identifier">query</span> )
+<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 28</span>
+      <span class="ruby-keyword kw">def</span> <span class="ruby-constant">StoreEnricher</span>.<span class="ruby-identifier">infer</span>(<span class="ruby-identifier">store</span>, <span class="ruby-identifier">query</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
+        <span class="ruby-identifier">enricher</span> = <span class="ruby-constant">StoreEnricher</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">store</span>, <span class="ruby-identifier">store</span>.<span class="ruby-identifier">sparql_client</span>() )
+        <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">enricher</span>.<span class="ruby-identifier">merge</span>( <span class="ruby-identifier">query</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span> )
       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000069" class="method-detail">
-        <a name="M000069"></a>
+      <div id="method-M000072" class="method-detail">
+        <a name="M000072"></a>
 
         <div class="method-heading">
-          <a href="#M000069" class="method-signature">
+          <a href="#M000072" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(store, sparql_client)</span>
           </a>
         </div>
@@ -178,15 +184,20 @@ using a CONSTRUCT query
           <p>
 Constructor
 </p>
-<pre>
- store:: the store containing resource(s) to enrich
- sparql_client:: SparqlClient object to be used as client for retrieving enrichments
-</pre>
+<table>
+<tr><td valign="top">store:</td><td>the store containing resource(s) to <a
+href="StoreEnricher.html#M000075">enrich</a>
+
+</td></tr>
+<tr><td valign="top">sparql_client:</td><td>SparqlClient object to be used as client for retrieving enrichments
+
+</td></tr>
+</table>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000069-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000069-source">
+            onclick="toggleCode('M000072-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000072-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 15</span>
+<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 16</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">store</span>, <span class="ruby-identifier">sparql_client</span>)
           <span class="ruby-ivar">@store</span> = <span class="ruby-identifier">store</span>
           <span class="ruby-ivar">@sparql_client</span> = <span class="ruby-identifier">sparql_client</span>  
@@ -198,12 +209,12 @@ Constructor
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000072" class="method-detail">
-        <a name="M000072"></a>
+      <div id="method-M000075" class="method-detail">
+        <a name="M000075"></a>
 
         <div class="method-heading">
-          <a href="#M000072" class="method-signature">
-          <span class="method-name">enrich</span><span class="method-args">(locator_query, enrichment_query)</span>
+          <a href="#M000075" class="method-signature">
+          <span class="method-name">enrich</span><span class="method-args">(locator_query, enrichment_query, callback=nil) {|:query, query_response| ...}</span>
           </a>
         </div>
       
@@ -231,28 +242,110 @@ of the query to the metabox. <a href="../Enrichment.html">Enrichment</a>
 queries should therefore be CONSTRUCT or DESCRIBE queries. The SPARQL
 protocol request will be sent with an Accept header of application/rdf+xml
 </p>
+<p>
+The method supports a callback object that can be provided as an optional
+parameter to the query. If provided then then object should respond to
+either or both of the following methods:
+</p>
+<pre>
+  pre_process(rdf_xml)
+  post_process(resp, rdf_xml)
+</pre>
+<p>
+The first of these is invoked after each enrichment query has been executed
+on the configured SPARQL endpoint. It is intended to support additional
+filtering or annotation. If the <tt>pre_process</tt> method returns nil,
+then no data will be written to the store, otherwise the return value is
+substituted instead of the original value.
+</p>
+<p>
+The second callback method, <tt>post_process</tt> is called after data has
+been written to the store and provides access to the response from the
+store, and the <a href="../RDF.html">RDF</a>/XML data that had been
+attempted to be stored. As the request may have been un-successful, code
+should check the status on the HTTPMessage parameter.
+</p>
 <pre>
- locator_query:: query to locate resources to be enriched
- enrichment_query:: query to be used to enrich the resource
+  class MyCallback
+     def pre_process(rdf)
+       if !should_store?(rdf)
+         return nil
+       end
+       return rdf
+     end
+     def post_process(resp, rdf)
+       puts &quot;Store returned #{resp.status} when storing: #{rdf}&quot;
+     end
+  end
+  callback = MyCallback.new()
+  enricher.enrich(&quot;SELECT ?item WHERE { ?item a ex:Class } LIMIT 10&quot;, &quot;DESCRIBE ?item&quot;, callback)
+</pre>
+<p>
+The callback support is primarily intended to support filtering and
+notification of activities. For simple logging purposes, the method also
+supports a block parameter. This is invoked after each enrichment query,
+and each store response. The block can receive two values: the first is a
+symbol (either +:query+ or +:store+) indicating the source of the response,
+and the response object itself. E.g:
+</p>
+<pre>
+  enricher.enrich(&quot;SELECT ?item WHERE { ?item a ex:Class } LIMIT 10&quot;, &quot;DESCRIBE ?item&quot;) do |source, resp|
+    if source == :query
+      puts &quot;Enrichment query returned #{resp.status}&quot;
+    else
+      puts &quot;Store returned #{resp.status} when storing data&quot;
+    end
+  end
 </pre>
+<table>
+<tr><td valign="top">locator_query:</td><td>query to locate resources to be enriched
+
+</td></tr>
+<tr><td valign="top">enrichment_query:</td><td>query to be used to <a href="StoreEnricher.html#M000075">enrich</a> the
+resource
+
+</td></tr>
+<tr><td valign="top">callback:</td><td>optional callback object
+
+</td></tr>
+</table>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000072-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000072-source">
+            onclick="toggleCode('M000075-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000075-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 62</span>
-      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">enrich</span>(<span class="ruby-identifier">locator_query</span>, <span class="ruby-identifier">enrichment_query</span>)
+<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 108</span>
+      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">enrich</span>(<span class="ruby-identifier">locator_query</span>, <span class="ruby-identifier">enrichment_query</span>, <span class="ruby-identifier">callback</span>=<span class="ruby-keyword kw">nil</span>)
           <span class="ruby-identifier">results</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Sparql</span><span class="ruby-operator">::</span><span class="ruby-constant">SparqlHelper</span>.<span class="ruby-identifier">select</span>(<span class="ruby-identifier">locator_query</span>, <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">sparql_client</span>() )
           <span class="ruby-identifier">bindings</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Sparql</span><span class="ruby-operator">::</span><span class="ruby-constant">SparqlHelper</span>.<span class="ruby-identifier">results_to_query_bindings</span>(<span class="ruby-identifier">results</span>)
           <span class="ruby-identifier">bindings</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">binding</span><span class="ruby-operator">|</span>
             <span class="ruby-identifier">bound_query</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Sparql</span><span class="ruby-operator">::</span><span class="ruby-constant">SparqlHelper</span>.<span class="ruby-identifier">apply_initial_bindings</span>(<span class="ruby-identifier">enrichment_query</span>, <span class="ruby-identifier">binding</span>)
 
-            <span class="ruby-identifier">result</span> = <span class="ruby-ivar">@sparql_client</span>.<span class="ruby-identifier">query</span>(<span class="ruby-identifier">bound_query</span>, <span class="ruby-value str">&quot;application/rdf+xml&quot;</span>)
+            <span class="ruby-comment cmt">#TODO counting numbers of requests and responses?</span>
+            <span class="ruby-identifier">query_response</span> = <span class="ruby-ivar">@sparql_client</span>.<span class="ruby-identifier">query</span>(<span class="ruby-identifier">bound_query</span>, <span class="ruby-value str">&quot;application/rdf+xml&quot;</span>)           
             
-            <span class="ruby-comment cmt">#TODO error handling and callbacks            </span>
-            <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">result</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">==</span> <span class="ruby-value">200</span>
-              <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_data</span>( <span class="ruby-identifier">result</span>.<span class="ruby-identifier">content</span> )  
-            <span class="ruby-keyword kw">end</span>        
+            <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+              <span class="ruby-keyword kw">yield</span> <span class="ruby-operator">:</span><span class="ruby-identifier">query</span>, <span class="ruby-identifier">query_response</span>
+            <span class="ruby-keyword kw">end</span>
             
+            <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">query_response</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">==</span> <span class="ruby-value">200</span>                            
+              <span class="ruby-identifier">result</span> = <span class="ruby-identifier">query_response</span>.<span class="ruby-identifier">content</span>              
+              <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">callback</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">callback</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:pre_process</span>)
+                <span class="ruby-identifier">result</span> = <span class="ruby-identifier">callback</span>.<span class="ruby-identifier">pre_process</span>(<span class="ruby-identifier">result</span>)
+              <span class="ruby-keyword kw">end</span>
+                                 
+              <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">result</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>                
+                <span class="ruby-identifier">store_response</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_data</span>( <span class="ruby-identifier">result</span> )                
+                <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">callback</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">callback</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:post_process</span>)
+                  <span class="ruby-identifier">callback</span>.<span class="ruby-identifier">post_process</span>(<span class="ruby-identifier">store_response</span>, <span class="ruby-identifier">result</span>)
+                <span class="ruby-keyword kw">end</span>
+                
+                <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+                  <span class="ruby-keyword kw">yield</span> <span class="ruby-operator">:</span><span class="ruby-identifier">store</span>, <span class="ruby-identifier">store_response</span>
+                <span class="ruby-keyword kw">end</span>                
+              <span class="ruby-keyword kw">end</span>
+              
+            <span class="ruby-keyword kw">end</span>
+          <span class="ruby-comment cmt">#end each binding</span>
           <span class="ruby-keyword kw">end</span>
       <span class="ruby-keyword kw">end</span>
 </pre>
@@ -260,12 +353,12 @@ protocol request will be sent with an Accept header of application/rdf+xml
         </div>
       </div>
 
-      <div id="method-M000071" class="method-detail">
-        <a name="M000071"></a>
+      <div id="method-M000074" class="method-detail">
+        <a name="M000074"></a>
 
         <div class="method-heading">
-          <a href="#M000071" class="method-signature">
-          <span class="method-name">merge</span><span class="method-args">(query)</span>
+          <a href="#M000074" class="method-signature">
+          <span class="method-name">merge</span><span class="method-args">(query) {|resp, data| ...}</span>
           </a>
         </div>
       
@@ -274,20 +367,27 @@ protocol request will be sent with an Accept header of application/rdf+xml
 Execute the provided query against the configured SPARQL endpoint and store
 the results in the Platform <a href="../Store.html">Store</a>
 </p>
-<pre>
- query:: the SPARQL CONSTRUCT or DESCRIBE query to execute
-</pre>
+<table>
+<tr><td valign="top">query:</td><td>the SPARQL CONSTRUCT or DESCRIBE query to execute
+
+</td></tr>
+</table>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000071-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000071-source">
+            onclick="toggleCode('M000074-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000074-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 36</span>
+<span class="ruby-comment cmt"># File lib/pho/enrichment.rb, line 37</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">merge</span>(<span class="ruby-identifier">query</span>)
         <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@sparql_client</span>.<span class="ruby-identifier">query</span>( <span class="ruby-identifier">query</span>, <span class="ruby-value str">&quot;application/rdf+xml&quot;</span> )
         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">!=</span> <span class="ruby-value">200</span>
            <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unable to execute query. Response: #{resp.status} #{resp.reason} #{resp.content}&quot;</span>  
         <span class="ruby-keyword kw">end</span>
-        <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_data</span>( <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">content</span> )
+        <span class="ruby-identifier">data</span> = <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">content</span>
+        <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_data</span>( <span class="ruby-identifier">data</span> )
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+          <span class="ruby-keyword kw">yield</span> <span class="ruby-identifier">resp</span>, <span class="ruby-identifier">data</span>
+        <span class="ruby-keyword kw">end</span>
+        
         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">resp</span>        
       <span class="ruby-keyword kw">end</span>
 </pre>

data/doc/rdoc/classes/Pho/Etags.html

@@ -92,12 +92,12 @@ Simple mechanism for managing etags
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000174">add</a>&nbsp;&nbsp;
-      <a href="#M000175">add_from_response</a>&nbsp;&nbsp;
-      <a href="#M000176">get</a>&nbsp;&nbsp;
-      <a href="#M000177">has_tag?</a>&nbsp;&nbsp;
-      <a href="#M000172">new</a>&nbsp;&nbsp;
-      <a href="#M000173">save</a>&nbsp;&nbsp;
+      <a href="#M000194">add</a>&nbsp;&nbsp;
+      <a href="#M000195">add_from_response</a>&nbsp;&nbsp;
+      <a href="#M000196">get</a>&nbsp;&nbsp;
+      <a href="#M000197">has_tag?</a>&nbsp;&nbsp;
+      <a href="#M000192">new</a>&nbsp;&nbsp;
+      <a href="#M000193">save</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -137,19 +137,19 @@ Simple mechanism for managing etags
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000172" class="method-detail">
-        <a name="M000172"></a>
+      <div id="method-M000192" class="method-detail">
+        <a name="M000192"></a>
 
         <div class="method-heading">
-          <a href="#M000172" class="method-signature">
+          <a href="#M000192" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(file = nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000172-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000172-source">
+            onclick="toggleCode('M000192-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000192-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/etags.rb, line 11</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">file</span> = <span class="ruby-keyword kw">nil</span>)
@@ -167,19 +167,19 @@ Simple mechanism for managing etags
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000174" class="method-detail">
-        <a name="M000174"></a>
+      <div id="method-M000194" class="method-detail">
+        <a name="M000194"></a>
 
         <div class="method-heading">
-          <a href="#M000174" class="method-signature">
+          <a href="#M000194" class="method-signature">
           <span class="method-name">add</span><span class="method-args">(uri, tag)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000174-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000174-source">
+            onclick="toggleCode('M000194-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000194-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/etags.rb, line 34</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">tag</span>)     
@@ -193,19 +193,19 @@ Simple mechanism for managing etags
         </div>
       </div>
 
-      <div id="method-M000175" class="method-detail">
-        <a name="M000175"></a>
+      <div id="method-M000195" class="method-detail">
+        <a name="M000195"></a>
 
         <div class="method-heading">
-          <a href="#M000175" class="method-signature">
+          <a href="#M000195" class="method-signature">
           <span class="method-name">add_from_response</span><span class="method-args">(uri, response)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000175-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000175-source">
+            onclick="toggleCode('M000195-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000195-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/etags.rb, line 41</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_from_response</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">response</span>)
@@ -216,19 +216,19 @@ Simple mechanism for managing etags
         </div>
       </div>
 
-      <div id="method-M000176" class="method-detail">
-        <a name="M000176"></a>
+      <div id="method-M000196" class="method-detail">
+        <a name="M000196"></a>
 
         <div class="method-heading">
-          <a href="#M000176" class="method-signature">
+          <a href="#M000196" class="method-signature">
           <span class="method-name">get</span><span class="method-args">(uri)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000176-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000176-source">
+            onclick="toggleCode('M000196-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000196-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/etags.rb, line 45</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">get</span>(<span class="ruby-identifier">uri</span>)
@@ -239,19 +239,19 @@ Simple mechanism for managing etags
         </div>
       </div>
 
-      <div id="method-M000177" class="method-detail">
-        <a name="M000177"></a>
+      <div id="method-M000197" class="method-detail">
+        <a name="M000197"></a>
 
         <div class="method-heading">
-          <a href="#M000177" class="method-signature">
+          <a href="#M000197" class="method-signature">
           <span class="method-name">has_tag?</span><span class="method-args">(uri)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000177-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000177-source">
+            onclick="toggleCode('M000197-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000197-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/etags.rb, line 49</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">has_tag?</span>(<span class="ruby-identifier">uri</span>)
@@ -262,19 +262,19 @@ Simple mechanism for managing etags
         </div>
       </div>
 
-      <div id="method-M000173" class="method-detail">
-        <a name="M000173"></a>
+      <div id="method-M000193" class="method-detail">
+        <a name="M000193"></a>
 
         <div class="method-heading">
-          <a href="#M000173" class="method-signature">
+          <a href="#M000193" class="method-signature">
           <span class="method-name">save</span><span class="method-args">(other=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000173-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000173-source">
+            onclick="toggleCode('M000193-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000193-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/etags.rb, line 20</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">save</span>(<span class="ruby-identifier">other</span>=<span class="ruby-keyword kw">nil</span>)