pho 0.7.4 → 0.7.5

data/lib/pho.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'yaml'
 require 'date'
 require 'rexml/document'
+require 'md5'
 
 require 'pho/etags'
 require 'pho/store'

data/lib/pho/field_predicate_map.rb

@@ -134,7 +134,7 @@ module Pho
         return fpmap        
     end    
 
-    #Create a DatatypeProperty instance, automatically assigning a unique identifier to it, and adding
+    #Create a DatatypeProperty instance, automatically assigning a unique identifier to it, and 
     #validating the supplied data to ensure it matches the platform rules
     def FieldPredicateMap.create_mapping(store, property_uri, name, analyzer=nil)
         check_value("property_uri", property_uri)
@@ -150,6 +150,16 @@ module Pho
         return DatatypeProperty.new(mapping_uri, property_uri, name, analyzer)        
     end        
     
+    #Create a DatatypeProperty instance, automatically assigning a unique identifier to it, and 
+    #validating the supplied data to ensure it matches the platform rules.
+    #
+    #Then automatically appends it to the provided fpmap instance
+    def FieldPredicateMap.add_mapping(fpmap, store, property_uri, name, analyzer=nil)
+      mapping = create_mapping(store, property_uri, name, analyzer)
+      fpmap << mapping
+      return mapping
+    end
+      
     def initialize(uri, label, datatype_properties = [])
       @uri = uri
       @label = label
@@ -162,7 +172,7 @@ module Pho
     def <<(obj)
       @datatype_properties << obj
     end
-
+      
     #Lookup the name mapped to the specified uri
     #
     #uri:: the property uri to search for 
@@ -265,11 +275,12 @@ module Pho
     
     private
       def FieldPredicateMap.get_suffix(uri)
-        candidate_suffix = uri.split("/").last
-        if candidate_suffix.index("#") != -1
-          return candidate_suffix.split("#").last
-        end
-        return candidate_suffix
+        return Digest::MD5.hexdigest(uri)
+#        candidate_suffix = uri.split("/").last
+#        if candidate_suffix.index("#") != -1
+#          return candidate_suffix.split("#").last
+#        end
+#        return candidate_suffix
       end
       
       def FieldPredicateMap.check_value(name, val)

data/lib/pho/oai.rb

@@ -3,6 +3,31 @@ module Pho
   #OAI-PMH Support
   module OAI
   
+    #Access basic store statistics via the OAI interface    
+    class Statistics
+      
+      #Datestamp of last updated record in the store
+      #
+      #This reads the OAI-PMH interface and retrieves the datestamp of the most
+      #recently updated item
+      def Statistics.last_updated(store)
+        records = Records.read_from_store(store)
+        return records.records[0].datestamp
+      end
+      
+      #Number of entities in the store. This includes all resources in both the 
+      #metabox AND the contentbox
+      def Statistics.num_of_entities(store)
+        records = Records.read_from_store(store)
+        if records.resumption_token != nil
+          return records.list_size
+        else 
+          return records.records.length
+        end
+      end
+      
+    end
+    
     class Record
       
         attr_reader :identifier

data/tests/tc_command_line.rb

@@ -198,7 +198,7 @@ EOL
       mc = mock()
       mc.expects(:build_uri).with("/config/fpmaps/1").returns( "http://api.talis.com/stores/testing/config/fpmaps/1" )
       mc.expects(:get_field_predicate_map).returns( HTTP::Message.new_response(TEST_FPMAP) )
-      mc.expects(:build_uri).with("/config/fpmaps/1#test").returns( "http://api.talis.com/stores/testing/config/fpmaps/1#test" )
+      mc.expects(:build_uri).with("/config/fpmaps/1##{Digest::MD5.hexdigest("http://www.example.org/test")}").returns( "http://api.talis.com/stores/testing/config/fpmaps/1##{Digest::MD5.hexdigest("http://www.example.org/test")}" )
       mc.expects(:put_field_predicate_map).returns( HTTP::Message.new_response("") )
       
       @opts["field"] = "test"

data/tests/tc_field_predicate_map.rb

@@ -253,31 +253,62 @@ EOL
   end
   
   def test_create_mapping_with_slash_uri
+    digest = Digest::MD5.hexdigest("http://www.example.org/ns/title")
     mc = mock()
     mc.stub_everything
-    mc.expects(:build_uri).with("/config/fpmaps/1#title").returns("http://api.talis.com/stores/testing/config/fpmaps/1#title")
+    mc.expects(:build_uri).with("/config/fpmaps/1##{digest}").returns("http://api.talis.com/stores/testing/config/fpmaps/1##{digest}")
     
     mapping = Pho::FieldPredicateMap.create_mapping(mc, "http://www.example.org/ns/title", "title")
     assert_not_nil(mapping)
-    assert_equal("http://api.talis.com/stores/testing/config/fpmaps/1#title", mapping.uri)
+    assert_equal("http://api.talis.com/stores/testing/config/fpmaps/1##{digest}", mapping.uri)
     assert_equal("http://www.example.org/ns/title", mapping.property_uri)
     assert_equal("title", mapping.name)
     assert_equal(nil, mapping.analyzer)    
   end
 
   def test_create_mapping_with_hash_uri
+    digest = Digest::MD5.hexdigest("http://www.example.org/ns/things#document")
     mc = mock()
     mc.stub_everything
-    mc.expects(:build_uri).with("/config/fpmaps/1#document").returns("http://api.talis.com/stores/testing/config/fpmaps/1#document")
+    mc.expects(:build_uri).with("/config/fpmaps/1##{digest}").returns("http://api.talis.com/stores/testing/config/fpmaps/1##{digest}")
     
     mapping = Pho::FieldPredicateMap.create_mapping(mc, "http://www.example.org/ns/things#document", "document", Pho::Analyzers::DUTCH)
     assert_not_nil(mapping)
-    assert_equal("http://api.talis.com/stores/testing/config/fpmaps/1#document", mapping.uri)
+    assert_equal("http://api.talis.com/stores/testing/config/fpmaps/1##{digest}", mapping.uri)
     assert_equal("http://www.example.org/ns/things#document", mapping.property_uri)
     assert_equal("document", mapping.name)
     assert_equal(Pho::Analyzers::DUTCH, mapping.analyzer)    
   end
-  
+
+  def test_add_mapping
+    digest = Digest::MD5.hexdigest("http://www.example.org/ns/things#document")
+    mc = mock()
+    mc.stub_everything
+    mc.expects(:build_uri).with("/config/fpmaps/1##{digest}").returns("http://api.talis.com/stores/testing/config/fpmaps/1##{digest}")
+    
+    fpmap = Pho::FieldPredicateMap.new("http://api.talis.com/stores/testing/fpmaps/1#mapping", "Test Mapping")
+    
+    mapping = Pho::FieldPredicateMap.add_mapping(fpmap, mc, "http://www.example.org/ns/things#document", "document", Pho::Analyzers::DUTCH)
+    assert_not_nil(mapping)
+    assert_equal("http://api.talis.com/stores/testing/config/fpmaps/1##{digest}", mapping.uri)
+    assert_equal("http://www.example.org/ns/things#document", mapping.property_uri)
+    assert_equal("document", mapping.name)
+    assert_equal(Pho::Analyzers::DUTCH, mapping.analyzer)        
+  end
+
+  def test_add_mapping_with_similar_uri_suffix
+    mc = mock()
+    mc.stub_everything
+    mc.expects(:build_uri).with("/config/fpmaps/1##{Digest::MD5.hexdigest("http://www.example.org/ns/things#document")}").returns(
+      "http://api.talis.com/stores/testing/config/fpmaps/1##{Digest::MD5.hexdigest("http://www.example.org/ns/things#document")}")
+        
+    fpmap = Pho::FieldPredicateMap.new("http://api.talis.com/stores/testing/fpmaps/1#mapping", "Test Mapping")
+    
+    mapping = Pho::FieldPredicateMap.add_mapping(fpmap, mc, "http://www.example.org/ns/things#document", "document", Pho::Analyzers::DUTCH)
+    assert_equal("http://api.talis.com/stores/testing/config/fpmaps/1##{Digest::MD5.hexdigest("http://www.example.org/ns/things#document")}", mapping.uri)
+      
+  end
+     
   def test_create_mapping_with_invalid_name
     assert_raise RuntimeError do
       Pho::FieldPredicateMap.create_mapping(nil, "http://www.example.org/ns/things#document", "12345")

data/tests/tc_oai.rb

@@ -135,4 +135,41 @@ EOL
     assert_equal(0, results.cursor)
     assert_equal("b2FpX2RjfDEwMHwxOTcwLTAxLTAxVDAwOjAwOjAwWnwyMDEwLTA0LTA0VDEzOjU0OjMyWg==", results.resumption_token)
   end  
+  
+  def test_statistics_last_updated
+    mc = mock()
+    mc.expects(:set_auth)
+    mc.expects(:get).with("http://api.talis.com/stores/testing/services/oai-pmh", {"verb" => "ListRecords", "metadataPrefix" => "oai_dc"} ).returns(
+      HTTP::Message.new_response(LIST_RECORDS))
+    
+    store = Pho::Store.new("http://api.talis.com/stores/testing", "user", "pass", mc)
+
+    updated = Pho::OAI::Statistics.last_updated(store)    
+    assert_equal(DateTime.parse("2010-03-19T12:57:06Z"), updated)    
+  end
+
+  def test_statistics_num_entities
+    mc = mock()
+    mc.expects(:set_auth)
+    mc.expects(:get).with("http://api.talis.com/stores/testing/services/oai-pmh", {"verb" => "ListRecords", "metadataPrefix" => "oai_dc"} ).returns(
+      HTTP::Message.new_response(LIST_RECORDS))
+    
+    store = Pho::Store.new("http://api.talis.com/stores/testing", "user", "pass", mc)
+  
+    size = Pho::OAI::Statistics.num_of_entities(store)    
+    assert_equal(2, size)    
+  end    
+
+  def test_statistics_num_entities_with_resumption
+    mc = mock()
+    mc.expects(:set_auth)
+    mc.expects(:get).with("http://api.talis.com/stores/testing/services/oai-pmh", {"verb" => "ListRecords", "metadataPrefix" => "oai_dc"} ).returns(
+      HTTP::Message.new_response(LIST_RECORDS_WITH_TOKEN))
+    
+    store = Pho::Store.new("http://api.talis.com/stores/testing", "user", "pass", mc)
+  
+    size = Pho::OAI::Statistics.num_of_entities(store)    
+    assert_equal(6151294, size)    
+  end  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pho
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Leigh Dodds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +01:00
+date: 2010-09-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency