wf4ever-rosrs-client 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/wf4ever/rosrs/session.rb

@@ -225,6 +225,20 @@ module ROSRS
       end
     end
 
+    def check_research_object(ro_uri)
+      code, reason = do_request_follow_redirect("GET", ro_uri,
+          :accept => "application/rdf+xml")
+
+      case code
+      when 200
+        true
+      when 404
+        false
+      else
+        error(code, "Error checking for RO #{ro_uri}: #{code} #{reason}")
+      end
+    end
+
     # ---------------------
     # Resource manipulation
     # ---------------------
@@ -468,16 +482,30 @@ module ROSRS
     # Enumerate annnotation URIs associated with a resource
     # (or all annotations for an RO)
     #
-    # Returns an array of annotation URIs
-    def get_annotation_stub_uris(ro_uri, resource_uri=nil)
+    # Returns an array of annotation statements
+    def get_annotation_statements(ro_uri, resource_uri=nil)
       manifesturi, manifest = get_manifest(ro_uri)
-      stuburis = []
-      manifest.query(:object => RDF::URI(resource_uri)) do |stmt|
+      statements = []
+
+      resource_uri = RDF::URI.parse(ro_uri).join(RDF::URI.parse(resource_uri)) if ro_uri
+
+      manifest.query(:object => resource_uri) do |stmt|
         if [RDF::AO.annotatesResource,RDF::RO.annotatesAggregatedResource].include?(stmt.predicate)
-          stuburis << stmt.subject
+          statements << stmt
         end
       end
-      stuburis
+      statements
+    end
+
+    ##
+    # Enumerate annnotation URIs associated with a resource
+    # (or all annotations for an RO)
+    #
+    # Returns an array of annotation URIs
+    def get_annotation_stub_uris(ro_uri, resource_uri=nil)
+      get_annotation_statements(ro_uri, resource_uri).map do |statement|
+        statement.subject
+      end
     end
 
     ##
@@ -510,6 +538,37 @@ module ROSRS
       body_uris.uniq
     end
 
+    ##
+    # Retrieve RDF graphs of all annnotations associated with a resource
+    # (or all annotations for an RO)
+    #
+    # Returns graph of merged annotations
+    def get_annotation_graphs(ro_uri, resource_uri=nil)
+      annotation_graphs = []
+      get_annotation_statements(ro_uri, resource_uri).each do |annotation_statement|
+        auri   = annotation_statement.subject
+        resuri = annotation_statement.object
+        code, reason, headers, buri, bodytext = do_request_follow_redirect("GET", auri, {})
+        if code == 200
+          content_type = headers['content-type'].split(';', 2)[0].strip.downcase
+          if ANNOTATION_CONTENT_TYPES.include?(content_type)
+            bodyformat = ANNOTATION_CONTENT_TYPES[content_type]
+            annotation_graphs << {
+              :stub         => auri,
+              :resource_uri => resuri,
+              :body_uri     => buri,
+              :body         => ROSRS::RDFGraph.new.load_data(bodytext, bodyformat)
+            }
+          else
+            warn("Warning: #{buri} has unrecognized content-type: #{content_type}")
+          end
+        else
+          error(code, "Failed to GET #{buri}: #{code} #{reason}")
+        end
+      end
+      annotation_graphs
+    end
+
     ##
     # Build RDF graph of all annnotations associated with a resource
     # (or all annotations for an RO)
@@ -669,4 +728,4 @@ module ROSRS
     end
 
   end
-end
+end

data/test/test_abstract_interaction.rb

@@ -1,5 +1,5 @@
 # Test suite for ROSRS_Session
-require 'helper'
+require File.dirname(__FILE__) + '/helper'
 
 
 class TestAbstractInteraction < Test::Unit::TestCase

data/test/test_rosrs_session.rb

@@ -1,5 +1,5 @@
 # Test suite for ROSRS_Session
-require 'helper'
+require File.dirname(__FILE__) + '/helper'
 
 
 class TestROSRSSession < Test::Unit::TestCase
@@ -23,6 +23,19 @@ class TestROSRSSession < Test::Unit::TestCase
   def setup
     @rouri = nil
     @rosrs = ROSRS::Session.new(Config.rosrs_api_uri, Config.authorization)
+
+    if VERSION < "1.9.1"
+      StringIO.class_eval do
+        def readpartial(*args)
+          result = read(*args)
+          if result.nil?
+            raise EOFError
+          else
+            result
+          end
+        end
+      end
+    end
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wf4ever-rosrs-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -150,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1897620124833097638
+      hash: -726066348641982817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: