pho 0.7.5 → 0.7.7

data/CHANGES

@@ -1,5 +1,26 @@
 Brief notes on significant changes and additions in each release
 
+== Version 0.7.7
+
+* Included bug fixes from @kiyanwang into OAI support. Now properly handles resumption 
+  tokens.
+  
+* Added dependency on RDF.rb, rdf/json, rdf/raptor. Changed Pho::Converter to use this 
+  code.
+  
+* Removed Pho::RDF.Parser -- just use RDF.rb and its plugins. Submission of ntriples 
+  to platform store can now be done directly on store object.
+  
+* Working to remove dependency on Redland Ruby bindings, also remove unnecessary parsing/converting 
+  code as Ruby RDF libraries have improved and Platform now supports wider range of RDF serialisations
+  
+* Fixed bug in store.sparql_client, reference to @self rather than self
+
+== Version 0.7.6
+
+* Fixed bug in QueryProfile.read_from_store which was expecting an rdfs:label 
+  to always be present
+
 == Version 0.7.5
 
 * Added Pho::OAI::Statistics class to get basic metrics from the OAI service

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/clean'
 
 NAME = "pho"
-VER = "0.7.5"
+VER = "0.7.7"
 
 RDOC_OPTS = ['--quiet', '--title', 'Pho (Talis Platform Client) Reference', '--main', 'README']
 

data/doc/rdoc/classes/Pho.html

@@ -82,10 +82,6 @@
                 <a href="../files/lib/pho/oai_rb.html">
                 lib/pho/oai.rb
                 </a>
-        <br />
-                <a href="../files/lib/pho/rdf_rb.html">
-                lib/pho/rdf.rb
-                </a>
         <br />
                 <a href="../files/lib/pho/converter_rb.html">
                 lib/pho/converter.rb
@@ -177,7 +173,6 @@ TODO put together proper test suite for this
 Module <a href="Pho/Facet.html" class="link">Pho::Facet</a><br />
 Module <a href="Pho/FileManagement.html" class="link">Pho::FileManagement</a><br />
 Module <a href="Pho/OAI.html" class="link">Pho::OAI</a><br />
-Module <a href="Pho/RDF.html" class="link">Pho::RDF</a><br />
 Module <a href="Pho/ResourceHash.html" class="link">Pho::ResourceHash</a><br />
 Module <a href="Pho/Sparql.html" class="link">Pho::Sparql</a><br />
 Module <a href="Pho/Update.html" class="link">Pho::Update</a><br />

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

@@ -92,24 +92,24 @@ Class that implements the command-line behaviour
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000129">add_mapping</a>&nbsp;&nbsp;
-      <a href="#M000130">add_weight</a>&nbsp;&nbsp;
-      <a href="#M000118">backup</a>&nbsp;&nbsp;
-      <a href="#M000123">describe</a>&nbsp;&nbsp;
-      <a href="#M000127">fpmap</a>&nbsp;&nbsp;
-      <a href="#M000113">new</a>&nbsp;&nbsp;
-      <a href="#M000115">password</a>&nbsp;&nbsp;
-      <a href="#M000128">queryprofile</a>&nbsp;&nbsp;
-      <a href="#M000120">reindex</a>&nbsp;&nbsp;
-      <a href="#M000121">reset</a>&nbsp;&nbsp;
-      <a href="#M000122">restore</a>&nbsp;&nbsp;
-      <a href="#M000119">snapshot</a>&nbsp;&nbsp;
-      <a href="#M000124">sparql</a>&nbsp;&nbsp;
-      <a href="#M000117">status</a>&nbsp;&nbsp;
-      <a href="#M000125">store</a>&nbsp;&nbsp;
-      <a href="#M000116">storename</a>&nbsp;&nbsp;
-      <a href="#M000126">upload</a>&nbsp;&nbsp;
-      <a href="#M000114">username</a>&nbsp;&nbsp;
+      <a href="#M000125">add_mapping</a>&nbsp;&nbsp;
+      <a href="#M000126">add_weight</a>&nbsp;&nbsp;
+      <a href="#M000114">backup</a>&nbsp;&nbsp;
+      <a href="#M000119">describe</a>&nbsp;&nbsp;
+      <a href="#M000123">fpmap</a>&nbsp;&nbsp;
+      <a href="#M000109">new</a>&nbsp;&nbsp;
+      <a href="#M000111">password</a>&nbsp;&nbsp;
+      <a href="#M000124">queryprofile</a>&nbsp;&nbsp;
+      <a href="#M000116">reindex</a>&nbsp;&nbsp;
+      <a href="#M000117">reset</a>&nbsp;&nbsp;
+      <a href="#M000118">restore</a>&nbsp;&nbsp;
+      <a href="#M000115">snapshot</a>&nbsp;&nbsp;
+      <a href="#M000120">sparql</a>&nbsp;&nbsp;
+      <a href="#M000113">status</a>&nbsp;&nbsp;
+      <a href="#M000121">store</a>&nbsp;&nbsp;
+      <a href="#M000112">storename</a>&nbsp;&nbsp;
+      <a href="#M000122">upload</a>&nbsp;&nbsp;
+      <a href="#M000110">username</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -131,19 +131,19 @@ Class that implements the command-line behaviour
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000113" class="method-detail">
-        <a name="M000113"></a>
+      <div id="method-M000109" class="method-detail">
+        <a name="M000109"></a>
 
         <div class="method-heading">
-          <a href="#M000113" class="method-signature">
+          <a href="#M000109" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(opts, env, store=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000113-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000113-source">
+            onclick="toggleCode('M000109-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000109-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 6</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">opts</span>, <span class="ruby-identifier">env</span>, <span class="ruby-identifier">store</span>=<span class="ruby-keyword kw">nil</span>)
@@ -171,19 +171,19 @@ Class that implements the command-line behaviour
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000129" class="method-detail">
-        <a name="M000129"></a>
+      <div id="method-M000125" class="method-detail">
+        <a name="M000125"></a>
 
         <div class="method-heading">
-          <a href="#M000129" class="method-signature">
+          <a href="#M000125" class="method-signature">
           <span class="method-name">add_mapping</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000129-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000129-source">
+            onclick="toggleCode('M000125-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000125-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 252</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_mapping</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
@@ -207,19 +207,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000130" class="method-detail">
-        <a name="M000130"></a>
+      <div id="method-M000126" class="method-detail">
+        <a name="M000126"></a>
 
         <div class="method-heading">
-          <a href="#M000130" class="method-signature">
+          <a href="#M000126" class="method-signature">
           <span class="method-name">add_weight</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000130-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000130-source">
+            onclick="toggleCode('M000126-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000126-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 269</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_weight</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
@@ -243,19 +243,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000118" class="method-detail">
-        <a name="M000118"></a>
+      <div id="method-M000114" class="method-detail">
+        <a name="M000114"></a>
 
         <div class="method-heading">
-          <a href="#M000118" class="method-signature">
+          <a href="#M000114" class="method-signature">
           <span class="method-name">backup</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000118-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000118-source">
+            onclick="toggleCode('M000114-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000114-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 52</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">backup</span>()
@@ -277,19 +277,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000123" class="method-detail">
-        <a name="M000123"></a>
+      <div id="method-M000119" class="method-detail">
+        <a name="M000119"></a>
 
         <div class="method-heading">
-          <a href="#M000123" class="method-signature">
+          <a href="#M000119" class="method-signature">
           <span class="method-name">describe</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000123-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000123-source">
+            onclick="toggleCode('M000119-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000119-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 115</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">describe</span>()
@@ -306,19 +306,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000127" class="method-detail">
-        <a name="M000127"></a>
+      <div id="method-M000123" class="method-detail">
+        <a name="M000123"></a>
 
         <div class="method-heading">
-          <a href="#M000127" class="method-signature">
+          <a href="#M000123" class="method-signature">
           <span class="method-name">fpmap</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000127-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000127-source">
+            onclick="toggleCode('M000123-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000123-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 203</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fpmap</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
@@ -354,19 +354,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000115" class="method-detail">
-        <a name="M000115"></a>
+      <div id="method-M000111" class="method-detail">
+        <a name="M000111"></a>
 
         <div class="method-heading">
-          <a href="#M000115" class="method-signature">
+          <a href="#M000111" class="method-signature">
           <span class="method-name">password</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000115-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000115-source">
+            onclick="toggleCode('M000111-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000111-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 31</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">password</span>()
@@ -379,19 +379,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000128" class="method-detail">
-        <a name="M000128"></a>
+      <div id="method-M000124" class="method-detail">
+        <a name="M000124"></a>
 
         <div class="method-heading">
-          <a href="#M000128" class="method-signature">
+          <a href="#M000124" class="method-signature">
           <span class="method-name">queryprofile</span><span class="method-args">(out=$stdout)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000128-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000128-source">
+            onclick="toggleCode('M000124-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000124-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 232</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">queryprofile</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
@@ -418,19 +418,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000120" class="method-detail">
-        <a name="M000120"></a>
+      <div id="method-M000116" class="method-detail">
+        <a name="M000116"></a>
 
         <div class="method-heading">
-          <a href="#M000120" class="method-signature">
+          <a href="#M000116" class="method-signature">
           <span class="method-name">reindex</span><span class="method-args">()</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('M000116-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000116-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 77</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reindex</span>()
@@ -449,19 +449,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000121" class="method-detail">
-        <a name="M000121"></a>
+      <div id="method-M000117" class="method-detail">
+        <a name="M000117"></a>
 
         <div class="method-heading">
-          <a href="#M000121" class="method-signature">
+          <a href="#M000117" class="method-signature">
           <span class="method-name">reset</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <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('M000117-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000117-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 89</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset</span>()
@@ -478,19 +478,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000122" class="method-detail">
-        <a name="M000122"></a>
+      <div id="method-M000118" class="method-detail">
+        <a name="M000118"></a>
 
         <div class="method-heading">
-          <a href="#M000122" class="method-signature">
+          <a href="#M000118" class="method-signature">
           <span class="method-name">restore</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000122-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000122-source">
+            onclick="toggleCode('M000118-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000118-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 99</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restore</span>()
@@ -513,19 +513,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000119" class="method-detail">
-        <a name="M000119"></a>
+      <div id="method-M000115" class="method-detail">
+        <a name="M000115"></a>
 
         <div class="method-heading">
-          <a href="#M000119" class="method-signature">
+          <a href="#M000115" class="method-signature">
           <span class="method-name">snapshot</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000119-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000119-source">
+            onclick="toggleCode('M000115-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000115-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 67</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">snapshot</span>()
@@ -542,19 +542,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000124" class="method-detail">
-        <a name="M000124"></a>
+      <div id="method-M000120" class="method-detail">
+        <a name="M000120"></a>
 
         <div class="method-heading">
-          <a href="#M000124" class="method-signature">
+          <a href="#M000120" class="method-signature">
           <span class="method-name">sparql</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000124-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000124-source">
+            onclick="toggleCode('M000120-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000120-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 125</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sparql</span>()
@@ -572,19 +572,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000117" class="method-detail">
-        <a name="M000117"></a>
+      <div id="method-M000113" class="method-detail">
+        <a name="M000113"></a>
 
         <div class="method-heading">
-          <a href="#M000117" class="method-signature">
+          <a href="#M000113" class="method-signature">
           <span class="method-name">status</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000117-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000117-source">
+            onclick="toggleCode('M000113-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000113-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 47</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>()
@@ -596,19 +596,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000125" class="method-detail">
-        <a name="M000125"></a>
+      <div id="method-M000121" class="method-detail">
+        <a name="M000121"></a>
 
         <div class="method-heading">
-          <a href="#M000125" class="method-signature">
+          <a href="#M000121" class="method-signature">
           <span class="method-name">store</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000125-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000125-source">
+            onclick="toggleCode('M000121-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000121-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 136</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span>()
@@ -649,19 +649,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000116" class="method-detail">
-        <a name="M000116"></a>
+      <div id="method-M000112" class="method-detail">
+        <a name="M000112"></a>
 
         <div class="method-heading">
-          <a href="#M000116" class="method-signature">
+          <a href="#M000112" class="method-signature">
           <span class="method-name">storename</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000116-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000116-source">
+            onclick="toggleCode('M000112-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000112-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 37</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storename</span>()      
@@ -678,19 +678,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000126" class="method-detail">
-        <a name="M000126"></a>
+      <div id="method-M000122" class="method-detail">
+        <a name="M000122"></a>
 
         <div class="method-heading">
-          <a href="#M000126" class="method-signature">
+          <a href="#M000122" class="method-signature">
           <span class="method-name">upload</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000126-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000126-source">
+            onclick="toggleCode('M000122-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000122-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 170</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">upload</span>()
@@ -730,19 +730,19 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000114" class="method-detail">
-        <a name="M000114"></a>
+      <div id="method-M000110" class="method-detail">
+        <a name="M000110"></a>
 
         <div class="method-heading">
-          <a href="#M000114" class="method-signature">
+          <a href="#M000110" class="method-signature">
           <span class="method-name">username</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000114-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000114-source">
+            onclick="toggleCode('M000110-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000110-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 25</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">username</span>()