pho 0.7.5 → 0.7.7

data/lib/pho.rb

@@ -6,6 +6,12 @@ require 'date'
 require 'rexml/document'
 require 'md5'
 
+#RDF.rb
+require 'rdf'
+require 'rdf/json'
+#this requires raptor parser
+require 'rdf/raptor'
+
 require 'pho/etags'
 require 'pho/store'
 require 'pho/snapshot'
@@ -23,10 +29,8 @@ require 'pho/changeset'
 require 'pho/sparql'
 require 'pho/enrichment'
 require 'pho/command_line'
-#Following depend on redland
-require 'pho/converter'
-require 'pho/rdf'
 require 'pho/oai'
+require 'pho/converter'
 
 if RUBY_VERSION < "1.8.7"
   class String

data/lib/pho/converter.rb

@@ -1,18 +1,8 @@
 module Pho
   
   #Resource Hashes
-  #
-  #Dependent on the redland ruby bindings  
   module ResourceHash
-
-    #TODO wrap Redland exceptions. Parser/Serializer contruction as well as parsing errors
-    
-    begin
-      require 'rdf/redland'
-    rescue LoadError
-      $stderr.puts "WARNING: Unable to load redland-ruby bindings. Changeset support unavailable"
-    end
-    
+        
     #Class for converting to and from resource hashes 
     class Converter
       
@@ -27,42 +17,45 @@ module Pho
       #Parse a string containing RDF/XML into a resource hash
       #
       # rdfxml: a String containing RDF/XML
-      def Converter.parse_rdfxml(rdfxml, base_uri)
-        return Converter.parse(rdfxml, base_uri, "rdfxml")
+      def Converter.parse_rdfxml(rdfxml)
+        return Converter.parse(rdfxml, :rdfxml)
       end
 
       #Parse a string containing N-Triples into a resource hash
       #
       # ntriples:: a String containing N-Triples
-      def Converter.parse_ntriples(ntriples, base_uri)
-        return Converter.parse(ntriples, base_uri, "ntriples")
+      def Converter.parse_ntriples(ntriples)
+        return Converter.parse(ntriples, :ntriples)
       end
 
       #Parse a string containing Turtle into a resource hash
       #
       # ntriples:: a String containing Turtle
-      def Converter.parse_turtle(turtle, base_uri)
-        return Converter.parse(turtle, base_uri, "turtle")
+      def Converter.parse_turtle(turtle)
+        return Converter.parse(turtle, :turtle)
       end
                               
       #Convert specified format into a ResourceHash
       #
-      # format:: one of rdfxml, ntriples, turtle
+      # format:: one of :rdfxml, :ntriples, :turtle
       # data:: String containing the data to be parsed
-      # base_uri:: base uri of the data
-      def Converter.parse(data, base_uri, format="rdfxml")
-        model = Redland::Model.new()
-        case format
-          when "rdfxml" then mime="application/rdf+xml"
-          when "json" then mime="application/json"
-          else mime=""     
+      def Converter.parse(data, format=:rdfxml)
+        graph = RDF::Graph.new()
+        io = StringIO.new( data )
+        
+        RDF::Reader.for(format).new(io) do |reader|
+          reader.each_statement do |statement|
+            graph << statement
+          end
+        end
+        
+        json = StringIO.new()
+        
+        RDF::Writer.for(:json).new(json) do |writer|
+          writer << graph
         end
         
-        parser = Redland::Parser.new(format, mime)
-        parser.parse_string_into_model(model, data, base_uri)
-        serializer = Redland::Serializer.new( "json", "application/json" )
-        json = serializer.model_to_string(Redland::Uri.new(base_uri), model)
-        return Converter.parse_json( json )        
+        return Converter.parse_json( json.string )        
       end
 
       #Serialize a resource hash as RDF-in-JSON

data/lib/pho/oai.rb

@@ -67,7 +67,8 @@ module Pho
         end
         records = []        
         responseDate = doc.root.get_elements("responseDate")[0].text
-        from = DateTime.parse( doc.root.get_elements("request")[0].attributes["from"] )
+        from = doc.root.get_elements("request")[0].attributes["from"]
+        from = DateTime.parse( from ) unless from == nil          
         to = doc.root.get_elements("request")[0].attributes["until"]
         to = DateTime.parse( to ) unless to == nil 
         REXML::XPath.each( doc.root,  "//oai:header", {"oai" => "http://www.openarchives.org/OAI/2.0/"} ) do |header|
@@ -100,14 +101,14 @@ module Pho
       # records = store.list_records
       # while records != nil
       #   #do something with retrieved records
-      #   records = Records.read_next_records(store, records.resumption_token 
+      #   records = Records.read_next_records(store, records.resumption_token)
       # end
       #
       #store:: the store
-      #records:: previously retrieved resumption_token
+      #resumption_token:: previously retrieved resumption_token
       def Records.read_next_records(store, resumption_token)
         #list is already complete
-        if records.resumption_token = nil
+        if resumption_token == nil
           return nil
         end
         return Records.read_from_store(store, nil, nil, token)

data/lib/pho/query_profile.rb

@@ -60,7 +60,12 @@ module Pho
       
       json = JSON.parse( resp.content )
 
-      label = json[qp_uri]["http:\/\/www.w3.org\/2000\/01\/rdf-schema#label"][0]["value"]
+      labels = json[qp_uri]["http:\/\/www.w3.org\/2000\/01\/rdf-schema#label"]
+      if labels != nil && labels.length > 0
+        label = labels[0]["value"]
+      else
+        label = "query profile"
+      end
       qp = QueryProfile.new(qp_uri, label)
       
       field_weights = json[qp_uri]["http:\/\/schemas.talis.com\/2006\/bigfoot\/configuration#fieldWeight"]

data/lib/pho/store.rb

@@ -193,7 +193,7 @@ module Pho
         u = self.build_uri("/services/sparql")    
       end
       
-      sparql_client = StoreSparqlClient.new(@self, u, @client)
+      sparql_client = StoreSparqlClient.new(self, u, @client)
       sparql_client.supports_rdf_json = true
       sparql_client.supports_sparql_json = true
       
@@ -446,22 +446,27 @@ module Pho
     # OAI
     #############
     
-    def list_records(from=nil, to=nil, resumption_token=nil)      
+    def list_records(from=nil, to=nil, resumption_token=nil)
       u = build_uri("/services/oai-pmh")
-      params = {"verb" => "ListRecords", "metadataPrefix" => "oai_dc"}
-      if from != nil
-        params["from"] = from.strftime("%Y-%m-%dT%H:%M:%SZ") if from.respond_to? :strftime
-        params["from"] = from.to_s if !from.respond_to? :strftime
-      end
-      if to != nil
-        params["until"] = to.strftime("%Y-%m-%dT%H:%M:%SZ") if to.respond_to? :strftime
-        params["until"] = to.to_s if !to.respond_to? :strftime
+    
+      params = {"verb" => "ListRecords"}
+      if resumption_token==nil then
+        params["metadataPrefix"] = "oai_dc"
+        if from != nil
+          params["from"] = from.strftime("%Y-%m-%dT%H:%M:%SZ") if from.respond_to? :strftime
+          params["from"] = from.to_s if !from.respond_to? :strftime
+        end
+        if to != nil
+          params["until"] = to.strftime("%Y-%m-%dT%H:%M:%SZ") if to.respond_to? :strftime
+          params["until"] = to.to_s if !to.respond_to? :strftime
+        end
+      else
+        params["resumptionToken"] = resumption_token if resumption_token != nil
       end
-      params["resumptionToken"] = resumption_token if resumption_token != nil
       response = @client.get(u, params)
       return response
     end
-        
+         
     #############
     # CONFIG
     #############

data/tests/tc_changeset_builder.rb

@@ -252,8 +252,8 @@ class ChangesetBuilderTest < Test::Unit::TestCase
   end
   
   def test_batch_changeset_with_list
-    coll_hash = Pho::ResourceHash::Converter.parse_rdfxml(COLLECTION, "http://www.example.com")
-    short_coll_hash = Pho::ResourceHash::Converter.parse_rdfxml(SHORT_COLLECTION, "http://www.example.com")
+    coll_hash = Pho::ResourceHash::Converter.parse_rdfxml(COLLECTION)
+    short_coll_hash = Pho::ResourceHash::Converter.parse_rdfxml(SHORT_COLLECTION)
     changesets = Pho::Update::ChangesetBuilder.build_batch(coll_hash, short_coll_hash, "Bob Bobson", "Because I can" )
     #2 because we've updated the head and tail of the list
     assert_equal(2, changesets.length)

data/tests/tc_converter.rb

@@ -43,7 +43,7 @@ class ConverterTest < Test::Unit::TestCase
   
   def test_parse_rdfxml
 
-    hash = Pho::ResourceHash::Converter.parse_rdfxml(SINGLE_RESOURCE_RDFXML, "http://www.example.org")
+    hash = Pho::ResourceHash::Converter.parse_rdfxml(SINGLE_RESOURCE_RDFXML)
     assert_not_nil(hash)
     assert_not_nil(hash["http://www.example.org"])
     
@@ -56,7 +56,7 @@ class ConverterTest < Test::Unit::TestCase
   
   def test_parse_ntriples
     
-    hash = Pho::ResourceHash::Converter.parse_ntriples(SINGLE_RESOURCE_NTRIPLES, "http://www.example.org")
+    hash = Pho::ResourceHash::Converter.parse_ntriples(SINGLE_RESOURCE_NTRIPLES)
     assert_not_nil(hash)
     assert_not_nil(hash["http://www.example.org"])
     
@@ -70,7 +70,7 @@ class ConverterTest < Test::Unit::TestCase
 
   def test_parse_turtle
     
-    hash = Pho::ResourceHash::Converter.parse_ntriples(SINGLE_RESOURCE_TURTLE, "http://www.example.org")
+    hash = Pho::ResourceHash::Converter.parse_ntriples(SINGLE_RESOURCE_TURTLE)
     assert_not_nil(hash)
     assert_not_nil(hash["http://www.example.org"])
     

data/tests/tc_oai.rb

@@ -105,7 +105,7 @@ EOL
   def test_request_with_token
     mc = mock()
     mc.expects(:set_auth)
-    mc.expects(:get).with("http://api.talis.com/stores/testing/services/oai-pmh", {"verb" => "ListRecords", "metadataPrefix" => "oai_dc", "resumptionToken" => "abc"} ).returns(
+    mc.expects(:get).with("http://api.talis.com/stores/testing/services/oai-pmh", {"verb" => "ListRecords", "resumptionToken" => "abc"} ).returns(
       HTTP::Message.new_response(LIST_RECORDS))
     
     store = Pho::Store.new("http://api.talis.com/stores/testing", "user", "pass", mc)

data/tests/tc_query_profile.rb

@@ -26,6 +26,26 @@ class QueryProfileTest < Test::Unit::TestCase
     }
   }  
 EOL
+
+  QP_JSON_NO_LABEL = <<-EOL
+  {
+    "http:\/\/api.talis.com\/stores\/testing\/config\/queryprofiles\/1" : {
+      "http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type" : [ { "value" : "http:\/\/schemas.talis.com\/2006\/bigfoot\/configuration#QueryProfile", "type" : "uri" } ],
+      "http:\/\/schemas.talis.com\/2006\/bigfoot\/configuration#fieldWeight" : [ 
+        { "value" : "http:\/\/api.talis.com\/stores\/testing\/config\/queryprofiles\/1#name", "type" : "uri" },
+        { "value" : "http:\/\/api.talis.com\/stores\/testing\/config\/queryprofiles\/1#nick", "type" : "uri" }
+      ]
+    },
+    "http:\/\/api.talis.com\/stores\/testing\/config\/queryprofiles\/1#nick" : {
+      "http:\/\/schemas.talis.com\/2006\/bigfoot\/configuration#weight" : [ { "value" : "1.0", "type" : "literal" } ],
+      "http:\/\/schemas.talis.com\/2006\/frame\/schema#name" : [ { "value" : "nick", "type" : "literal" } ]
+    },
+    "http:\/\/api.talis.com\/stores\/testing\/config\/queryprofiles\/1#name" : {
+      "http:\/\/schemas.talis.com\/2006\/bigfoot\/configuration#weight" : [ { "value" : "2.0", "type" : "literal" } ],
+      "http:\/\/schemas.talis.com\/2006\/frame\/schema#name" : [ { "value" : "name", "type" : "literal" } ]
+    }
+  }  
+EOL
   
   def setup
     @qp = Pho::QueryProfile.new("http://api.talis.com/stores/testing/config/queryprofiles/default", "test query profile")
@@ -134,7 +154,23 @@ EOL
     assert_expected_field_weighting(sorted[0], "name", "http://api.talis.com/stores/testing/config/queryprofiles/1#name", "2.0")
     assert_expected_field_weighting(sorted[1], "nick", "http://api.talis.com/stores/testing/config/queryprofiles/1#nick", "1.0")
   end  
-  
+
+  def test_read_from_store_no_label
+    mc = mock()
+    mc.expects(:set_auth)
+    mc.expects(:get).with("http://api.talis.com/stores/testing/config/queryprofiles/1", anything, 
+    {"Accept" => "application/json"}).returns( HTTP::Message.new_response(QP_JSON_NO_LABEL) )
+   
+    store = Pho::Store.new("http://api.talis.com/stores/testing", "user", "pass", mc)
+    qp = Pho::QueryProfile.read_from_store(store)
+    
+    assert_not_nil(qp)
+    
+    assert_equal("http://api.talis.com/stores/testing/config/queryprofiles/1", qp.uri)
+    assert_equal("query profile", qp.label)
+    
+  end  
+    
   def test_get_by_name
         
     assert_expected_field_weighting(@qp.get_by_name("abstract"), "abstract", "http://api.talis.com/stores/testing/config/queryprofiles/default#abstract", 5.0)     

data/tests/ts_pho.rb

@@ -22,6 +22,5 @@ require 'tc_changeset.rb'
 require 'tc_changesets.rb'
 require 'tc_converter.rb'
 require 'tc_enrichment.rb'
-require 'tc_rdf_parser.rb'
 require 'tc_command_line.rb'
 require 'tc_oai.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pho
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Leigh Dodds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +01:00
+date: 2010-10-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,6 @@ files:
 - doc/rdoc/files/lib/pho/snapshot_rb.html
 - doc/rdoc/files/lib/pho/file_manager_rb.html
 - doc/rdoc/files/lib/pho/etags_rb.html
-- doc/rdoc/files/lib/pho/rdf_rb.html
 - doc/rdoc/files/lib/pho/converter_rb.html
 - doc/rdoc/files/lib/pho/changeset_rb.html
 - doc/rdoc/files/lib/pho/sparql_rb.html
@@ -139,7 +138,6 @@ files:
 - doc/rdoc/classes/Pho/CommandLine.html
 - doc/rdoc/classes/Pho/Enrichment.html
 - doc/rdoc/classes/Pho/FileManagement.html
-- doc/rdoc/classes/Pho/RDF/Parser.html
 - doc/rdoc/classes/Pho/Namespaces.html
 - doc/rdoc/classes/Pho/DatatypeProperty.html
 - doc/rdoc/classes/Pho/Update/LiteralStatement.html
@@ -156,12 +154,12 @@ files:
 - doc/rdoc/classes/Pho/QueryProfile.html
 - doc/rdoc/classes/Pho/JobUpdate.html
 - doc/rdoc/classes/Pho/ResourceHash.html
-- doc/rdoc/classes/Pho/RDF.html
 - doc/rdoc/classes/Pho/Analyzers.html
 - doc/rdoc/classes/Pho/ResourceHash/SetAlgebra.html
 - doc/rdoc/classes/Pho/ResourceHash/Converter.html
 - doc/rdoc/classes/Pho/FieldPredicateMap.html
 - doc/rdoc/classes/Pho/OAI/Record.html
+- doc/rdoc/classes/Pho/OAI/Statistics.html
 - doc/rdoc/classes/Pho/OAI/Records.html
 - doc/rdoc/classes/Pho/StoreSparqlClient.html
 - doc/rdoc/classes/Pho/Status.html
@@ -182,7 +180,6 @@ files:
 - tests/tc_status.rb
 - tests/tc_store_util.rb
 - tests/tc_command_line.rb
-- tests/tc_rdf_parser.rb
 - tests/tc_etags.rb
 - tests/tc_resource_hash.rb
 - tests/tc_facet.rb
@@ -216,7 +213,6 @@ files:
 - lib/pho/file_management.rb
 - lib/pho/job.rb
 - lib/pho/oai.rb
-- lib/pho/rdf.rb
 - lib/pho/converter.rb
 - lib/pho/resource_hash.rb
 - lib/pho/file_manager.rb

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

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Module: Pho::RDF</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" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Module</strong></td>
-          <td class="class-name-in-header">Pho::RDF</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/pho/rdf_rb.html">
-                lib/pho/rdf.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-Module containing general <a href="RDF.html">RDF</a> utilities and classes
-</p>
-<p>
-Dependent on the redland ruby bindings
-</p>
-
-    </div>
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Class <a href="RDF/Parser.html" class="link">Pho::RDF::Parser</a><br />
-
-    </div>
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>