Allow URI or string URI to be passed to Annotation.resume

Author: elrayle

README.md

@@ -122,6 +122,43 @@ puts stb.dump :ttl
 <http://example.org/term/engineering> a <http://www.w3.org/ns/oa#SemanticTag> .
 ```
 
+*Resume annotation of unknown type.*
+```
+## Using RDF::URI
+# Create the annotations first using previous examples.
+a1 = LD4L::OpenAnnotationRDF::Annotation.resume(RDF::URI('http://localhost/c10'))
+# => #<LD4L::OpenAnnotationRDF::CommentAnnotation:0x3fdd8267adc8(default)>
+
+a2 = LD4L::OpenAnnotationRDF::Annotation.resume(RDF::URI('http://localhost/t10'))
+# => #<LD4L::OpenAnnotationRDF::TagAnnotation:0x3fdd826073f0(default)>
+
+a3 = LD4L::OpenAnnotationRDF::Annotation.resume(RDF::URI('http://localhost/st10'))
+# => #<LD4L::OpenAnnotationRDF::SemanticTagAnnotation:0x3fdd8259c7a8(default)>
+
+
+## Using string URI
+# Create the annotations first using previous examples.
+a1 = LD4L::OpenAnnotationRDF::Annotation.resume('http://localhost/c10')
+# => #<LD4L::OpenAnnotationRDF::CommentAnnotation:0x3fdd8267adc8(default)>
+
+a2 = LD4L::OpenAnnotationRDF::Annotation.resume('http://localhost/t10')
+# => #<LD4L::OpenAnnotationRDF::TagAnnotation:0x3fdd826073f0(default)>
+
+a3 = LD4L::OpenAnnotationRDF::Annotation.resume('http://localhost/st10')
+# => #<LD4L::OpenAnnotationRDF::SemanticTagAnnotation:0x3fdd8259c7a8(default)>
+
+
+## Using localname expanded using configured base_uri
+# Create the annotations first using previous examples.
+a1 = LD4L::OpenAnnotationRDF::Annotation.resume('c10')
+# => #<LD4L::OpenAnnotationRDF::CommentAnnotation:0x3fdd8267adc8(default)>
+
+a2 = LD4L::OpenAnnotationRDF::Annotation.resume('t10')
+# => #<LD4L::OpenAnnotationRDF::TagAnnotation:0x3fdd826073f0(default)>
+
+a3 = LD4L::OpenAnnotationRDF::Annotation.resume('st10')
+# => #<LD4L::OpenAnnotationRDF::SemanticTagAnnotation:0x3fdd8259c7a8(default)>
+```
 
 ### Configurations
 

lib/ld4l/open_annotation_rdf/annotation.rb

@@ -17,11 +17,9 @@ class << self; attr_reader :localname_prefix end
       property :annotatedAt, :predicate => RDFVocabularies::OA.annotatedAt, :cast => false   # :type => xsd:dateTime    # the time Annotation was created
       property :motivatedBy, :predicate => RDFVocabularies::OA.motivatedBy, :cast => false   # comes from RDFVocabularies::OA ontology
 
-      def self.resume(*args)
-        return nil      unless args.kind_of?(Array) && args.size > 0 && args.first.kind_of?(RDF::URI)
-
-        rdf_subject = args.first
-        a = new(rdf_subject)
+      def self.resume(uri_or_str)
+        # Let ActiveTriples::Resource validate uri_or_str when creating new Annotation
+        a = new(uri_or_str)
 
         # get motivatedBy
         m = a.get_values(:motivatedBy)
@@ -30,17 +28,17 @@ def self.resume(*args)
         # motivatedBy is set
         m_uri = m.first
         # currently only support commenting and tagging
-        return LD4L::OpenAnnotationRDF::CommentAnnotation.new(rdf_subject) if m_uri == RDFVocabularies::OA.commenting
+        return LD4L::OpenAnnotationRDF::CommentAnnotation.new(uri_or_str) if m_uri == RDFVocabularies::OA.commenting
         return a                                                       unless m_uri == RDFVocabularies::OA.tagging
 
         # Tagging can be TagAnnotation or SemanticTagAnnotation.  Only way to tell is by checking type of body.
-        sta = LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new(rdf_subject)
+        sta = LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new(uri_or_str)
         stb = sta.getBody
-        return sta                                           if stb.type.include?(RDFVocabularies::OA.SemanticTag)
+        return sta                          if stb.type.include?(RDFVocabularies::OA.SemanticTag)
 
-        ta = LD4L::OpenAnnotationRDF::TagAnnotation.new(rdf_subject)
+        ta = LD4L::OpenAnnotationRDF::TagAnnotation.new(uri_or_str)
         tb = ta.getBody
-        return ta                                            if tb.type.include?(RDFVocabularies::OA.Tag)
+        return ta                           if tb.type.include?(RDFVocabularies::OA.Tag)
 
         # can't match to a known annotation type, so return as generic annotation
         return a

spec/ld4l/open_annotation_rdf/annotation_spec.rb

@@ -183,7 +183,7 @@
       ca.persist!
       expect(ca).to be_persisted
       uri = ca.rdf_subject
-      
+
       a = LD4L::OpenAnnotationRDF::Annotation.resume(uri)
       expect(a).to be_a_kind_of(LD4L::OpenAnnotationRDF::CommentAnnotation)
       expect(a.hasTarget.first.rdf_subject.to_s).to eq "http://example.org/bibref/br3"