pho 0.7.2 → 0.7.3

data/CHANGES

@@ -1,5 +1,10 @@
 Brief notes on significant changes and additions in each release
 
+== Version 0.7.3
+
+* Fixed bug in Snapshot result parsing, now returns nil if no snapshot for store
+* Fixed bug in SparqlHelper when handling rows with no result binding
+
 == Version 0.7.2
 
 * Now parses full OAI response, support for listing records between dates and resumption tokens

data/Rakefile

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

data/lib/pho/snapshot.rb

@@ -45,7 +45,8 @@ module Pho
     #Class method to parse the RDF response from the API, e.g. as produced by the Store.get_snapshots method 
     #and create a new Snapshot object. At the moment the Platform only supports single snapshot.
     #
-    #If the response was an error, then an exception will be thrown
+    #If the response was an error, then an exception will be thrown. If no snapshot can be found, then
+    #the method returns nil
     #
     # storeuri:: URI of the store
     # content:: response from the API
@@ -55,6 +56,10 @@ module Pho
       root = doc.root
       
       store = REXML::XPath.first(root, "//*[@rdf:about='#{storeuri}']", Pho::Namespaces::MAPPING )
+      #not found if there's no snapshot for this store
+      if store == nil
+        return nil
+      end
       snapshot = REXML::XPath.first(store, "bf:snapshot", Pho::Namespaces::MAPPING)
       snapshot_url = snapshot.attributes["rdf:resource"] 
       snapshot_el = REXML::XPath.first(root, "//*[@rdf:about='#{snapshot_url}']", Pho::Namespaces::MAPPING )

data/lib/pho/sparql.rb

@@ -359,6 +359,9 @@ module Pho
         #
         #Note this will lose any type information, only the value of the bindings are returned 
         #
+        #Also note that if row has an empty binding for the selected variable, then this row will
+        #be dropped from the resulting array
+        #
         #query:: the SPARQL SELECT query
         #sparql_client:: a configured SparqlClient object
         def SparqlHelper.select_values(query, sparql_client)
@@ -366,7 +369,7 @@ module Pho
            v = results["head"]["vars"][0];
            values = [];
            results["results"]["bindings"].each do |binding|
-             values << binding[v]["value"]
+             values << binding[v]["value"] if binding[v]
            end
            return values           
         end

data/tests/tc_snapshots.rb

@@ -22,6 +22,12 @@ class SnapshotsTest < Test::Unit::TestCase
 </rdf:RDF>
 EOL
     
+  EMPTY = <<-EOL
+  <rdf:RDF
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" > 
+  </rdf:RDF>  
+EOL
+
   def teardown()
     
     f = File.join(Dir.tmpdir, "2009022213727.tar")
@@ -70,7 +76,7 @@ EOL
       assert_equal("30", snapshot.size)
       assert_equal("KB", snapshot.units)
   end
-             
+               
   def test_read_from_store_raises_exception()
 
     msg = HTTP::Message.new_response("")
@@ -103,4 +109,11 @@ EOL
     assert_equal(true, File.exists?( File.join(Dir.tmpdir, "20090222113727.tar" ) ) )        
   end
   
+  def test_empty_response()
+    snapshot = Pho::Snapshot.parse("http://api.talis.com/stores/testing", EMPTY)
+    
+    assert_nil( snapshot )
+ 
+  end
+  
 end

data/tests/tc_sparql_helper.rb

@@ -38,6 +38,20 @@ class SparqlHelperTest < Test::Unit::TestCase
   }  
   EOL
   
+  RESULTS_NO_BINDING = <<-EOL
+  {  
+   "head": {  "vars": [ "name" ]  } ,  
+    
+   "results": {    
+        "bindings": [     
+           { } ,     
+           {   "name": { "type": "literal" , "value": "Apollo 11 SIVB" }
+           }   
+        ]  
+    }
+  }  
+  EOL
+    
   ASK_RESULTS = <<-EOL
   {    
     "head": {},
@@ -133,6 +147,15 @@ class SparqlHelperTest < Test::Unit::TestCase
       assert_equal( 3, results.length )
   end        
 
+  def test_select_values_with_empty_binding
+      mc = mock()
+      mc.expects(:select).with(SELECT_QUERY, Pho::Sparql::SPARQL_RESULTS_JSON).returns(
+        HTTP::Message.new_response(RESULTS_NO_BINDING) )
+      results = Pho::Sparql::SparqlHelper.select_values(SELECT_QUERY, mc)
+      assert_not_nil( results )
+      assert_equal( 1 , results.length )
+  end
+    
   def test_select_single_value
       mc = mock()
       mc.expects(:select).with(SELECT_QUERY, Pho::Sparql::SPARQL_RESULTS_JSON).returns(

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pho
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Leigh Dodds
@@ -14,65 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +01:00
+date: 2010-06-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 3
-        - 1
         version: 2.1.3.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 3
         version: 1.1.3
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 5
         version: 0.9.5
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
         version: "1.16"
-  type: :runtime
-  version_requirements: *id004
+    version: 
 description: Ruby client for the Talis Platform
 email: leigh.dodds@talis.com
 executables: 
@@ -88,139 +67,64 @@ files:
 - CHANGES
 - bin/talis_store
 - doc/index.html
-- doc/rdoc/fr_method_index.html
-- doc/rdoc/rdoc-style.css
-- doc/rdoc/fr_file_index.html
-- doc/rdoc/fr_class_index.html
-- doc/rdoc/classes/Pho/RDF.html
-- doc/rdoc/classes/Pho/Etags.html
-- doc/rdoc/classes/Pho/FileManagement.html
-- doc/rdoc/classes/Pho/Jobs.html
-- doc/rdoc/classes/Pho/RDF/Parser.html
-- doc/rdoc/classes/Pho/StoreSparqlClient.html
-- doc/rdoc/classes/Pho/DatatypeProperty.html
-- doc/rdoc/classes/Pho/Facet.html
-- doc/rdoc/classes/Pho/JobUpdate.html
-- doc/rdoc/classes/Pho/OAI/Record.html
-- doc/rdoc/classes/Pho/OAI/Records.html
-- doc/rdoc/classes/Pho/Enrichment.html
-- doc/rdoc/classes/Pho/RDFCollection.html
-- doc/rdoc/classes/Pho/OAI.html
-- doc/rdoc/classes/Pho/CommandLine.html
-- doc/rdoc/classes/Pho/Job.html
-- doc/rdoc/classes/Pho/Status.html
-- doc/rdoc/classes/Pho/QueryProfile.html
-- doc/rdoc/classes/Pho/Snapshot.html
-- doc/rdoc/classes/Pho/FieldWeighting.html
-- doc/rdoc/classes/Pho/Sparql/SparqlClient.html
-- doc/rdoc/classes/Pho/Sparql/SparqlHelper.html
-- doc/rdoc/classes/Pho/Namespaces.html
-- doc/rdoc/classes/Pho/ResourceHash.html
-- doc/rdoc/classes/Pho/FileManagement/FileManager.html
-- doc/rdoc/classes/Pho/FileManagement/AbstractFileManager.html
-- doc/rdoc/classes/Pho/FileManagement/RDFManager.html
-- doc/rdoc/classes/Pho/Sparql.html
-- doc/rdoc/classes/Pho/Enrichment/StoreEnricher.html
-- doc/rdoc/classes/Pho/Store.html
-- doc/rdoc/classes/Pho/Facet/Results.html
-- doc/rdoc/classes/Pho/Facet/Term.html
-- doc/rdoc/classes/Pho/ResourceHash/SetAlgebra.html
-- doc/rdoc/classes/Pho/ResourceHash/Converter.html
-- doc/rdoc/classes/Pho/Analyzers.html
-- doc/rdoc/classes/Pho/FieldPredicateMap.html
-- doc/rdoc/classes/Pho/Update.html
-- doc/rdoc/classes/Pho/Update/Changesets.html
-- doc/rdoc/classes/Pho/Update/ChangesetBuilder.html
-- doc/rdoc/classes/Pho/Update/Changeset.html
-- doc/rdoc/classes/Pho/Update/Statement.html
-- doc/rdoc/classes/Pho/Update/LiteralStatement.html
-- doc/rdoc/classes/Pho/Update/ResourceStatement.html
-- doc/rdoc/classes/Pho/Update/ChangesetHelper.html
-- doc/rdoc/classes/String.html
-- doc/rdoc/classes/Pho.html
-- doc/rdoc/files/README.html
-- doc/rdoc/files/lib/pho_rb.html
-- doc/rdoc/files/lib/pho/changeset_rb.html
-- doc/rdoc/files/lib/pho/changeset_builder_rb.html
-- doc/rdoc/files/lib/pho/enrichment_rb.html
-- doc/rdoc/files/lib/pho/resource_hash_rb.html
-- doc/rdoc/files/lib/pho/file_management_rb.html
-- doc/rdoc/files/lib/pho/job_rb.html
-- doc/rdoc/files/lib/pho/sparql_rb.html
-- doc/rdoc/files/lib/pho/oai_rb.html
-- doc/rdoc/files/lib/pho/rdf_collection_rb.html
-- doc/rdoc/files/lib/pho/rdf_rb.html
-- doc/rdoc/files/lib/pho/query_profile_rb.html
-- doc/rdoc/files/lib/pho/etags_rb.html
-- doc/rdoc/files/lib/pho/snapshot_rb.html
-- doc/rdoc/files/lib/pho/field_predicate_map_rb.html
-- doc/rdoc/files/lib/pho/file_manager_rb.html
-- doc/rdoc/files/lib/pho/store_rb.html
-- doc/rdoc/files/lib/pho/facet_rb.html
-- doc/rdoc/files/lib/pho/converter_rb.html
-- doc/rdoc/files/lib/pho/status_rb.html
-- doc/rdoc/files/lib/pho/command_line_rb.html
-- doc/rdoc/files/CHANGES.html
-- doc/rdoc/index.html
-- doc/rdoc/created.rid
-- tests/tc_facet.rb
-- tests/tc_changesets.rb
 - tests/tc_enrichment.rb
-- tests/tc_metabox.rb
-- tests/tc_store_util.rb
-- tests/tc_contentbox.rb
+- tests/tc_job.rb
+- tests/tc_changesets.rb
 - tests/tc_sparql.rb
-- tests/tc_changeset_builder.rb
-- tests/tc_rdf_collection.rb
-- tests/tc_rdf_parser.rb
-- tests/tc_command_line.rb
-- tests/ts_pho.rb
+- tests/tc_sparql_helper.rb
 - tests/tc_oai.rb
+- tests/tc_changeset.rb
+- 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_sparql_helper.rb
+- tests/tc_facet.rb
+- tests/tc_metabox.rb
 - tests/tc_jobcontrol.rb
-- tests/tc_snapshots.rb
-- tests/tc_job.rb
-- tests/tc_search.rb
-- tests/tc_file_manager.rb
-- tests/tc_status.rb
-- tests/tc_changeset.rb
+- tests/ts_pho.rb
+- tests/tc_contentbox.rb
+- tests/tc_changeset_builder.rb
+- tests/tc_rdf_collection.rb
 - tests/tc_converter.rb
-- tests/tc_etags.rb
 - tests/tc_field_predicate_map.rb
+- tests/tc_search.rb
 - tests/tc_query_profile.rb
+- tests/tc_snapshots.rb
+- tests/tc_file_manager.rb
+- examples/status.rb
+- examples/sparql.rb
+- examples/sparql_construct_hash.rb
 - examples/linkeddata/proxy.rb
+- examples/contentbox.rb
 - examples/sparql_select.rb
-- examples/calais/dump.rb
-- examples/calais/enlighten.rb
 - examples/calais/bio.txt
+- examples/calais/enlighten.rb
+- examples/calais/dump.rb
 - examples/calais/output.rdf
-- examples/status.rb
-- examples/sparql.rb
 - examples/sinatra/viewer.rb
-- examples/sparql_construct_hash.rb
-- examples/contentbox.rb
-- lib/pho.rb
+- lib/pho/status.rb
+- lib/pho/command_line.rb
+- lib/pho/sparql.rb
 - lib/pho/changeset_builder.rb
+- lib/pho/file_management.rb
+- lib/pho/job.rb
+- lib/pho/oai.rb
 - lib/pho/rdf.rb
-- lib/pho/file_manager.rb
-- lib/pho/etags.rb
-- lib/pho/enrichment.rb
-- lib/pho/command_line.rb
-- lib/pho/status.rb
-- lib/pho/rdf_collection.rb
 - lib/pho/converter.rb
-- lib/pho/store.rb
-- lib/pho/field_predicate_map.rb
-- lib/pho/sparql.rb
 - lib/pho/resource_hash.rb
+- lib/pho/file_manager.rb
+- lib/pho/snapshot.rb
+- lib/pho/store.rb
+- lib/pho/rdf_collection.rb
 - lib/pho/changeset.rb
-- lib/pho/oai.rb
-- lib/pho/file_management.rb
-- lib/pho/facet.rb
 - lib/pho/query_profile.rb
-- lib/pho/job.rb
-- lib/pho/snapshot.rb
+- lib/pho/facet.rb
+- lib/pho/enrichment.rb
+- lib/pho/etags.rb
+- lib/pho/field_predicate_map.rb
+- lib/pho.rb
 has_rdoc: true
 homepage: http://pho.rubyforge.net
 licenses: []
@@ -238,22 +142,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 5
       version: 1.8.5
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: pho
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Talis Platform