ld4l-open_annotation_rdf 0.1.0 → 0.2.0

data/spec/ld4l/open_annotation_rdf/comment_annotation_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
+  after do
+    ActiveTriples::Repositories.repositories[LD4L::OpenAnnotationRDF::CommentAnnotation.repository].clear!
+  end
+
   subject { LD4L::OpenAnnotationRDF::CommentAnnotation.new }
 
   describe 'rdf_subject' do
@@ -21,22 +25,22 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
     describe 'when changing subject' do
       before do
-        subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland'))
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject)
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land')
+        subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland'))
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject)
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land')
         subject.set_subject! RDF::URI('http://example.org/moomin')
       end
 
       it 'should update graph subjects' do
-        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland')))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland')))).to be true
       end
 
       it 'should update graph objects' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject))).to be true
       end
 
       it 'should leave other uris alone' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land'))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -57,8 +61,8 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
   # -------------------------------------------------
 
   describe 'type' do
-    it "should be an RDFVocabularies::OA.Annotation" do
-      expect(subject.type.first.value).to eq RDFVocabularies::OA.Annotation.value
+    it "should be an RDF::Vocab::OA.Annotation" do
+      expect(subject.type.first.value).to eq RDF::Vocab::OA.Annotation.value
     end
   end
 
@@ -172,18 +176,18 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
   describe 'motivatedBy' do
     it "should be OA.commenting if we haven't set it" do
-      expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting
+      expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting
     end
 
     it "should be settable" do
-      subject.motivatedBy = RDFVocabularies::OA.describing
-      expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.describing
+      subject.motivatedBy = RDF::Vocab::OA.describing
+      expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.describing
     end
 
     it "should be changeable" do
-      subject.motivatedBy = RDFVocabularies::OA.describing
-      subject.motivatedBy = RDFVocabularies::OA.classifying
-      expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.classifying
+      subject.motivatedBy = RDF::Vocab::OA.describing
+      subject.motivatedBy = RDF::Vocab::OA.classifying
+      expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.classifying
     end
   end
 
@@ -215,7 +219,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
       context "when it is saved" do
         before do
-          subject.motivatedBy = RDFVocabularies::OA.commenting
+          subject.motivatedBy = RDF::Vocab::OA.commenting
           subject.persist!
         end
 
@@ -225,7 +229,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
         context "and then modified" do
           before do
-            subject.motivatedBy = RDFVocabularies::OA.tagging
+            subject.motivatedBy = RDF::Vocab::OA.tagging
           end
 
           it "should return true" do
@@ -238,7 +242,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
           end
 
           it "should reset the motivatedBy" do
-            expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting.to_s
+            expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting.to_s
           end
 
           it "should be persisted" do
@@ -260,7 +264,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
           # Create inmemory repository
           @repo = RDF::Repository.new
           ActiveTriples::Repositories.repositories[:default] = @repo
-          subject.motivatedBy = RDFVocabularies::OA.commenting
+          subject.motivatedBy = RDF::Vocab::OA.commenting
           result
         end
 
@@ -274,7 +278,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
         it "should delete from the repository" do
           subject.reload
-          expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting.to_s
+          expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting.to_s
           subject.motivatedBy = []
           expect(subject.motivatedBy).to eq []
           subject.persist!
@@ -301,7 +305,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
   describe '#destroy!' do
     before do
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { LD4L::OpenAnnotationRDF::CommentAnnotation.new('123') }
@@ -391,29 +395,29 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
     context 'with unmodeled data' do
       before do
-        subject << RDF::Statement(subject.rdf_subject, RDF::DC.contributor, 'Tove Jansson')
-        subject << RDF::Statement(subject.rdf_subject, RDF::DC.relation, RDF::URI('http://example.org/moomi'))
+        subject << RDF::Statement(subject.rdf_subject, RDF::Vocab::DC.contributor, 'Tove Jansson')
+        subject << RDF::Statement(subject.rdf_subject, RDF::Vocab::DC.relation, RDF::URI('http://example.org/moomi'))
         node = RDF::Node.new
-        subject << RDF::Statement(RDF::URI('http://example.org/moomi'), RDF::DC.relation, node)
-        subject << RDF::Statement(node, RDF::DC.title, 'bnode')
+        subject << RDF::Statement(RDF::URI('http://example.org/moomi'), RDF::Vocab::DC.relation, node)
+        subject << RDF::Statement(node, RDF::Vocab::DC.title, 'bnode')
       end
 
       it 'should include data with URIs as attribute names' do
-        expect(subject.attributes[RDF::DC.contributor.to_s]).to eq ['Tove Jansson']
+        expect(subject.attributes[RDF::Vocab::DC.contributor.to_s]).to eq ['Tove Jansson']
       end
 
       it 'should return generic Resources' do
-        expect(subject.attributes[RDF::DC.relation.to_s].first).to be_a ActiveTriples::Resource
+        expect(subject.attributes[RDF::Vocab::DC.relation.to_s].first).to be_a ActiveTriples::Resource
       end
 
       it 'should build deep data for Resources' do
-        expect(subject.attributes[RDF::DC.relation.to_s].first.get_values(RDF::DC.relation).
-                   first.get_values(RDF::DC.title)).to eq ['bnode']
+        expect(subject.attributes[RDF::Vocab::DC.relation.to_s].first.get_values(RDF::Vocab::DC.relation).
+                   first.get_values(RDF::Vocab::DC.title)).to eq ['bnode']
       end
 
       it 'should include deep data in serializable_hash' do
-        expect(subject.serializable_hash[RDF::DC.relation.to_s].first.get_values(RDF::DC.relation).
-                   first.get_values(RDF::DC.title)).to eq ['bnode']
+        expect(subject.serializable_hash[RDF::Vocab::DC.relation.to_s].first.get_values(RDF::Vocab::DC.relation).
+                   first.get_values(RDF::Vocab::DC.title)).to eq ['bnode']
       end
     end
 
@@ -490,13 +494,13 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
 
   describe 'editing the graph' do
     it 'should write properties when statements are added' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.motivatedBy, 'commenting')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.motivatedBy, 'commenting')
       expect(subject.motivatedBy).to include 'commenting'
     end
 
     it 'should delete properties when statements are removed' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.annotatedBy, 'John Smith')
-      subject.delete RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.annotatedBy, 'John Smith')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.annotatedBy, 'John Smith')
+      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.annotatedBy, 'John Smith')
       expect(subject.annotatedBy).to eq []
     end
   end
@@ -505,18 +509,18 @@ describe 'LD4L::OpenAnnotationRDF::CommentAnnotation' do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foafname, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foafname, :predicate => RDF::Vocab::FOAF.name
+        property :publications, :predicate => RDF::Vocab::FOAF.publications, :class_name => 'DummyDocument'
+        property :knows, :predicate => RDF::Vocab::FOAF.knows, :class_name => DummyPerson
       end
 
       class DummyDocument < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Document')
-        property :title, :predicate => RDF::DC.title
-        property :creator, :predicate => RDF::DC.creator, :class_name => 'DummyPerson'
+        property :title, :predicate => RDF::Vocab::DC.title
+        property :creator, :predicate => RDF::Vocab::DC.creator, :class_name => 'DummyPerson'
       end
 
-      LD4L::OpenAnnotationRDF::CommentAnnotation.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      LD4L::OpenAnnotationRDF::CommentAnnotation.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { LD4L::OpenAnnotationRDF::CommentAnnotation.new }
@@ -569,8 +573,10 @@ END
       document1.creator = [person1, person2]
       document2.creator = person1
       person1.knows = person2
+      person2.knows = person1
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.foafname).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foafname)
+          .to satisfy { |names| ['Alice', 'Bob'].include? names.first }
     end
   end
 end

data/spec/ld4l/open_annotation_rdf/comment_body_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
-require 'ld4l/open_annotation_rdf/vocab/dctypes'
-require 'ld4l/open_annotation_rdf/vocab/oa'
-
 
 describe 'LD4L::OpenAnnotationRDF::CommentBody' do
 
+  after do
+    ActiveTriples::Repositories.repositories[LD4L::OpenAnnotationRDF::CommentAnnotation.repository].clear!
+  end
+
   subject { LD4L::OpenAnnotationRDF::CommentBody.new }
 
   describe 'rdf_subject' do
@@ -24,22 +25,22 @@ describe 'LD4L::OpenAnnotationRDF::CommentBody' do
 
     describe 'when changing subject' do
       before do
-        subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland'))
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject)
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land')
+        subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland'))
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject)
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land')
         subject.set_subject! RDF::URI('http://example.org/moomin')
       end
 
       it 'should update graph subjects' do
-        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland')))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland')))).to be true
       end
 
       it 'should update graph objects' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject))).to be true
       end
 
       it 'should leave other uris alone' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land'))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -62,57 +63,57 @@ describe 'LD4L::OpenAnnotationRDF::CommentBody' do
   describe 'type' do
     it "should be set to text and ContentAsText from new" do
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 2
-      expect(expected_results).to include RDFVocabularies::DCTYPES.Text
-      expect(expected_results).to include RDFVocabularies::CNT.ContentAsText
+      expect(expected_results).to include RDF::Vocab::DCMIType.Text
+      expect(expected_results).to include RDF::Vocab::CNT.ContentAsText
     end
 
     it "should be settable" do
-      subject.type = RDFVocabularies::DCTYPES.Text
+      subject.type = RDF::Vocab::DCMIType.Text
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 1
-      expect(expected_results).to include RDFVocabularies::DCTYPES.Text
+      expect(expected_results).to include RDF::Vocab::DCMIType.Text
     end
 
     it "should be settable to multiple values" do
-      t = [RDFVocabularies::DCTYPES.Text, RDFVocabularies::CNT.ContentAsText]
+      t = [RDF::Vocab::DCMIType.Text, RDF::Vocab::CNT.ContentAsText]
       subject.set_value(:type,t)
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 2
-      expect(expected_results).to include RDFVocabularies::DCTYPES.Text
-      expect(expected_results).to include RDFVocabularies::CNT.ContentAsText
+      expect(expected_results).to include RDF::Vocab::DCMIType.Text
+      expect(expected_results).to include RDF::Vocab::CNT.ContentAsText
     end
 
     it "should be changeable" do
-      subject.type = RDFVocabularies::DCTYPES.Text
-      subject.type = RDFVocabularies::CNT.ContentAsText
+      subject.type = RDF::Vocab::DCMIType.Text
+      subject.type = RDF::Vocab::CNT.ContentAsText
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 1
-      expect(expected_results).to include RDFVocabularies::CNT.ContentAsText
+      expect(expected_results).to include RDF::Vocab::CNT.ContentAsText
     end
 
     it "should be changeable for multiple values" do
-      t = [RDFVocabularies::DCTYPES.Text, RDFVocabularies::CNT.ContentAsText]
+      t = [RDF::Vocab::DCMIType.Text, RDF::Vocab::CNT.ContentAsText]
       subject.set_value(:type,t)
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 2
-      expect(expected_results).to include RDFVocabularies::DCTYPES.Text
-      expect(expected_results).to include RDFVocabularies::CNT.ContentAsText
+      expect(expected_results).to include RDF::Vocab::DCMIType.Text
+      expect(expected_results).to include RDF::Vocab::CNT.ContentAsText
 
       t = subject.get_values(:type).to_a
-      t[0] = RDFVocabularies::OA.Tag           # dummy type for testing
-      t[1] = RDFVocabularies::OA.SemanticTag   # dummy type for testing
+      t[0] = RDF::Vocab::OA.Tag           # dummy type for testing
+      t[1] = RDF::Vocab::OA.SemanticTag   # dummy type for testing
       subject.set_value(:type,t)
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 2
-      expect(expected_results).to include RDFVocabularies::OA.Tag
-      expect(expected_results).to include RDFVocabularies::OA.SemanticTag
+      expect(expected_results).to include RDF::Vocab::OA.Tag
+      expect(expected_results).to include RDF::Vocab::OA.SemanticTag
     end
   end
 
@@ -259,7 +260,7 @@ describe 'LD4L::OpenAnnotationRDF::CommentBody' do
 
   describe '#destroy!' do
     before do
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { LD4L::OpenAnnotationRDF::CommentBody.new('456')}
@@ -296,13 +297,13 @@ describe 'LD4L::OpenAnnotationRDF::CommentBody' do
 
   describe 'editing the graph' do
     it 'should write properties when statements are added' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::CNT.chars, 'Great book!')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::CNT.chars, 'Great book!')
       expect(subject.content).to include 'Great book!'
     end
 
     it 'should delete properties when statements are removed' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::CNT.chars, 'Great book!')
-      subject.delete RDF::Statement.new(subject.rdf_subject, RDFVocabularies::CNT.chars, 'Great book!')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::CNT.chars, 'Great book!')
+      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::Vocab::CNT.chars, 'Great book!')
       expect(subject.content).to eq []
     end
   end
@@ -311,18 +312,18 @@ describe 'LD4L::OpenAnnotationRDF::CommentBody' do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foafname, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foafname, :predicate => RDF::Vocab::FOAF.name
+        property :publications, :predicate => RDF::Vocab::FOAF.publications, :class_name => 'DummyDocument'
+        property :knows, :predicate => RDF::Vocab::FOAF.knows, :class_name => DummyPerson
       end
 
       class DummyDocument < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Document')
-        property :title, :predicate => RDF::DC.title
-        property :creator, :predicate => RDF::DC.creator, :class_name => 'DummyPerson'
+        property :title, :predicate => RDF::Vocab::DC.title
+        property :creator, :predicate => RDF::Vocab::DC.creator, :class_name => 'DummyPerson'
       end
 
-      LD4L::OpenAnnotationRDF::CommentBody.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      LD4L::OpenAnnotationRDF::CommentBody.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { LD4L::OpenAnnotationRDF::CommentBody.new }
@@ -375,8 +376,10 @@ END
       document1.creator = [person1, person2]
       document2.creator = person1
       person1.knows = person2
+      person2.knows = person1
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.foafname).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foafname)
+          .to satisfy { |names| ['Alice', 'Bob'].include? names.first }
     end
   end
 end

data/spec/ld4l/open_annotation_rdf/configuration_spec.rb

@@ -7,7 +7,7 @@ describe 'LD4L::OpenAnnotationRDF' do
       context "when base_uri is not configured" do
         before do
           class DummyAnnotation < LD4L::OpenAnnotationRDF::Annotation
-            configure :type => RDFVocabularies::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
+            configure :type => RDF::Vocab::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
           end
         end
         after do
@@ -24,7 +24,7 @@ describe 'LD4L::OpenAnnotationRDF' do
             config.base_uri = "http://localhost/test_slash/"
           end
           class DummyAnnotation < LD4L::OpenAnnotationRDF::Annotation
-            configure :type => RDFVocabularies::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
+            configure :type => RDF::Vocab::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
           end
         end
         after do
@@ -43,7 +43,7 @@ describe 'LD4L::OpenAnnotationRDF' do
             config.base_uri = "http://localhost/test_no_slash"
           end
           class DummyAnnotation < LD4L::OpenAnnotationRDF::Annotation
-            configure :type => RDFVocabularies::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
+            configure :type => RDF::Vocab::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
           end
         end
         after do
@@ -86,7 +86,7 @@ describe 'LD4L::OpenAnnotationRDF' do
       context "when minter is nil" do
         before do
           class DummyAnnotation < LD4L::OpenAnnotationRDF::Annotation
-            configure :type => RDFVocabularies::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
+            configure :type => RDF::Vocab::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
           end
         end
         after do
@@ -108,7 +108,7 @@ describe 'LD4L::OpenAnnotationRDF' do
             config.localname_minter = lambda { |prefix=""| prefix+'_configured_'+SecureRandom.uuid }
           end
           class DummyAnnotation < LD4L::OpenAnnotationRDF::Annotation
-            configure :type => RDFVocabularies::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
+            configure :type => RDF::Vocab::OA.Annotation, :base_uri => LD4L::OpenAnnotationRDF.configuration.base_uri, :repository => :default
           end
         end
         after do

data/spec/ld4l/open_annotation_rdf/semantic_tag_annotation_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
-# TODO: Uses CommentBody as the annotation body, which is wrong.  Should be URI into controlled vocabulary.
-
 describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
+  after do
+    ActiveTriples::Repositories.repositories[LD4L::OpenAnnotationRDF::CommentAnnotation.repository].clear!
+  end
+
   subject { LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new }
 
   describe 'rdf_subject' do
@@ -23,22 +25,22 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
     describe 'when changing subject' do
       before do
-        subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland'))
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject)
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land')
+        subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland'))
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject)
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land')
         subject.set_subject! RDF::URI('http://example.org/moomin')
       end
 
       it 'should update graph subjects' do
-        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland')))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland')))).to be true
       end
 
       it 'should update graph objects' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject))).to be true
       end
 
       it 'should leave other uris alone' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land'))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -59,8 +61,8 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
   # -------------------------------------------------
 
   describe 'type' do
-    it "should be an RDFVocabularies::OA.Annotation" do
-      expect(subject.type.first.value).to eq RDFVocabularies::OA.Annotation.value
+    it "should be an RDF::Vocab::OA.Annotation" do
+      expect(subject.type.first.value).to eq RDF::Vocab::OA.Annotation.value
     end
   end
 
@@ -221,18 +223,18 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
   describe 'motivatedBy' do
     it "should be OA.tagging if we haven't set it" do
-      expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.tagging
+      expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.tagging
     end
 
     it "should be settable" do
-      subject.motivatedBy = RDFVocabularies::OA.describing
-      expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.describing
+      subject.motivatedBy = RDF::Vocab::OA.describing
+      expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.describing
     end
 
     it "should be changeable" do
-      subject.motivatedBy = RDFVocabularies::OA.describing
-      subject.motivatedBy = RDFVocabularies::OA.classifying
-      expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.classifying
+      subject.motivatedBy = RDF::Vocab::OA.describing
+      subject.motivatedBy = RDF::Vocab::OA.classifying
+      expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.classifying
     end
   end
 
@@ -264,7 +266,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
       context "when it is saved" do
         before do
-          subject.motivatedBy = RDFVocabularies::OA.commenting
+          subject.motivatedBy = RDF::Vocab::OA.commenting
           subject.persist!
         end
 
@@ -274,7 +276,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
         context "and then modified" do
           before do
-            subject.motivatedBy = RDFVocabularies::OA.tagging
+            subject.motivatedBy = RDF::Vocab::OA.tagging
           end
 
           it "should return true" do
@@ -287,7 +289,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
           end
 
           it "should reset the motivatedBy" do
-            expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting.to_s
+            expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting.to_s
           end
 
           it "should be persisted" do
@@ -309,7 +311,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
           # Create inmemory repository
           @repo = RDF::Repository.new
           ActiveTriples::Repositories.repositories[:default] = @repo
-          subject.motivatedBy = RDFVocabularies::OA.commenting
+          subject.motivatedBy = RDF::Vocab::OA.commenting
           result
         end
 
@@ -323,7 +325,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
         it "should delete from the repository" do
           subject.reload
-          expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting.to_s
+          expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting.to_s
           subject.motivatedBy = []
           expect(subject.motivatedBy).to eq []
           subject.persist!
@@ -351,7 +353,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
   describe '#destroy!' do
     before do
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('123') }
@@ -441,29 +443,29 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
     context 'with unmodeled data' do
       before do
-        subject << RDF::Statement(subject.rdf_subject, RDF::DC.contributor, 'Tove Jansson')
-        subject << RDF::Statement(subject.rdf_subject, RDF::DC.relation, RDF::URI('http://example.org/moomi'))
+        subject << RDF::Statement(subject.rdf_subject, RDF::Vocab::DC.contributor, 'Tove Jansson')
+        subject << RDF::Statement(subject.rdf_subject, RDF::Vocab::DC.relation, RDF::URI('http://example.org/moomi'))
         node = RDF::Node.new
-        subject << RDF::Statement(RDF::URI('http://example.org/moomi'), RDF::DC.relation, node)
-        subject << RDF::Statement(node, RDF::DC.title, 'bnode')
+        subject << RDF::Statement(RDF::URI('http://example.org/moomi'), RDF::Vocab::DC.relation, node)
+        subject << RDF::Statement(node, RDF::Vocab::DC.title, 'bnode')
       end
 
       it 'should include data with URIs as attribute names' do
-        expect(subject.attributes[RDF::DC.contributor.to_s]).to eq ['Tove Jansson']
+        expect(subject.attributes[RDF::Vocab::DC.contributor.to_s]).to eq ['Tove Jansson']
       end
 
       it 'should return generic Resources' do
-        expect(subject.attributes[RDF::DC.relation.to_s].first).to be_a ActiveTriples::Resource
+        expect(subject.attributes[RDF::Vocab::DC.relation.to_s].first).to be_a ActiveTriples::Resource
       end
 
       it 'should build deep data for Resources' do
-        expect(subject.attributes[RDF::DC.relation.to_s].first.get_values(RDF::DC.relation).
-                   first.get_values(RDF::DC.title)).to eq ['bnode']
+        expect(subject.attributes[RDF::Vocab::DC.relation.to_s].first.get_values(RDF::Vocab::DC.relation).
+                   first.get_values(RDF::Vocab::DC.title)).to eq ['bnode']
       end
 
       it 'should include deep data in serializable_hash' do
-        expect(subject.serializable_hash[RDF::DC.relation.to_s].first.get_values(RDF::DC.relation).
-                   first.get_values(RDF::DC.title)).to eq ['bnode']
+        expect(subject.serializable_hash[RDF::Vocab::DC.relation.to_s].first.get_values(RDF::Vocab::DC.relation).
+                   first.get_values(RDF::Vocab::DC.title)).to eq ['bnode']
       end
     end
 
@@ -540,13 +542,13 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
 
   describe 'editing the graph' do
     it 'should write properties when statements are added' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.motivatedBy, 'commenting')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.motivatedBy, 'commenting')
       expect(subject.motivatedBy).to include 'commenting'
     end
 
     it 'should delete properties when statements are removed' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.annotatedBy, 'John Smith')
-      subject.delete RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.annotatedBy, 'John Smith')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.annotatedBy, 'John Smith')
+      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.annotatedBy, 'John Smith')
       expect(subject.annotatedBy).to eq []
     end
   end
@@ -555,18 +557,18 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagAnnotation' do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foafname, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foafname, :predicate => RDF::Vocab::FOAF.name
+        property :publications, :predicate => RDF::Vocab::FOAF.publications, :class_name => 'DummyDocument'
+        property :knows, :predicate => RDF::Vocab::FOAF.knows, :class_name => DummyPerson
       end
 
       class DummyDocument < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Document')
-        property :title, :predicate => RDF::DC.title
-        property :creator, :predicate => RDF::DC.creator, :class_name => 'DummyPerson'
+        property :title, :predicate => RDF::Vocab::DC.title
+        property :creator, :predicate => RDF::Vocab::DC.creator, :class_name => 'DummyPerson'
       end
 
-      LD4L::OpenAnnotationRDF::SemanticTagAnnotation.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      LD4L::OpenAnnotationRDF::SemanticTagAnnotation.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new }
@@ -619,8 +621,10 @@ END
       document1.creator = [person1, person2]
       document2.creator = person1
       person1.knows = person2
+      person2.knows = person1
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.foafname).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foafname)
+          .to satisfy { |names| ['Alice', 'Bob'].include? names.first }
     end
   end
 end