active-triples 0.8.1 → 0.8.2

data/spec/active_triples/repositories_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 describe ActiveTriples::Repositories do
   subject { ActiveTriples::Repositories }
@@ -15,7 +16,8 @@ describe ActiveTriples::Repositories do
     end
 
     it 'should throw an error if passed something that is not a repository' do
-      expect{subject.add_repository :name, :not_a_repo}.to raise_error
+      expect{subject.add_repository :name, :not_a_repo}
+        .to raise_error ArgumentError
     end
   end
 

data/spec/active_triples/resource_spec.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveTriples::Resource do
-  it_behaves_like 'an ActiveModel'
+  it_behaves_like 'an ActiveModel' do
+    let(:am_lint_class) { described_class }
+  end
+
   before do
     class DummyLicense < ActiveTriples::Resource
-      property :title, :predicate => RDF::DC.title
+      property :title, :predicate => RDF::Vocab::DC.title
     end
 
     class DummyResource < ActiveTriples::Resource
       configure :type => RDF::URI('http://example.org/SomeClass')
-      property :license, :predicate => RDF::DC.license, :class_name => DummyLicense
-      property :title, :predicate => RDF::DC.title
+      property :license, :predicate => RDF::Vocab::DC.license, :class_name => DummyLicense
+      property :title, :predicate => RDF::Vocab::DC.title
     end
   end
   after do
@@ -22,7 +26,29 @@ describe ActiveTriples::Resource do
 
   describe '#property' do
     it 'raises error when set directly on Resource' do
-      expect { ActiveTriples::Resource.property :blah, :predicate => RDF::DC.title }.to raise_error
+      expect { ActiveTriples::Resource.property :p, predicate: RDF::Vocab::DC.title }
+        .to raise_error 'Properties not definable directly on ' \
+                        'ActiveTriples::Resource, use a subclass'
+    end
+  end
+
+  describe 'setting properties' do
+    before do
+      class DummyWithClass < ActiveTriples::Resource
+        configure :type => RDF::URI('http://example.org/DummyClass')
+      end
+    end
+
+    after { Object.send(:remove_const, "DummyWithClass") }
+
+    it 'should replace property value when Resource class has a rdf type' do
+      dl1 = DummyWithClass.new('http://example.org/dl1')
+      dl2 = DummyWithClass.new('http://example.org/dl2')
+
+      subject.title = dl1
+      expect( subject.title ).to eq [dl1]
+      subject.title = dl2
+      expect( subject.title ).to eq [dl2]
     end
   end
 
@@ -42,22 +68,22 @@ describe ActiveTriples::Resource 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
 
@@ -67,7 +93,8 @@ describe ActiveTriples::Resource do
       end
 
       it 'should not be settable' do
-        expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }.to raise_error
+        expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }
+          .to raise_error 'Refusing update URI when one is already assigned!'
       end
     end
 
@@ -292,14 +319,14 @@ describe ActiveTriples::Resource do
 
     it "should warn when the repo doesn't exist" do
       allow(DummyLicense).to receive(:repository).and_return('repo2')
-      expect { subject }.to raise_error ActiveTriples::RepositoryNotFoundError, 'The class DummyLicense expects a repository called repo2, but none was declared'
+      expect { subject }.to raise_error ActiveTriples::RepositoryNotFoundError
     end
   end
 
   describe '#destroy!' do
     before do
       subject.title = 'Creative Commons'
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { DummyLicense.new('http://example.org/cc')}
@@ -315,33 +342,30 @@ describe ActiveTriples::Resource do
     end
 
     context 'with a parent' do
-      before do
-        parent.license = subject
-      end
+      before { parent.license = subject }
 
       let(:parent) do
         DummyResource.new('http://example.org/moomi')
       end
 
-      it 'should empty the graph and remove it from the parent' do
-        subject.destroy
-        expect(parent.license).to be_empty
+      it 'empties the graph and removes it from the parent' do
+        expect { parent.license.first.destroy! }
+          .to change { parent.license.empty? }.to true
       end
 
-      it 'should remove its whole graph from the parent' do
-        subject.destroy
-        subject.each_statement do |s|
-          expect(parent.statements).not_to include s
-        end
+      it 'removes its whole graph from the parent' do
+        statements = subject.statements.to_a
+        parent.license.first.destroy
+        statements.each { |s| expect(parent.statements).not_to include s }
       end
     end
   end
 
   describe 'class_name' do
     it 'should raise an error when not a class or string' do
-      DummyResource.property :relation, :predicate => RDF::DC.relation, :class_name => RDF::URI('http://example.org')
+      DummyResource.property :relation, :predicate => RDF::Vocab::DC.relation, :class_name => RDF::URI('http://example.org')
       d = DummyResource.new
-      d.relation = RDF::DC.type
+      d.relation = RDF::Vocab::DC.type
       expect { d.relation.first }.to raise_error "class_name for relation is a RDF::URI; must be a class"
     end
 
@@ -391,29 +415,29 @@ describe ActiveTriples::Resource 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
 
@@ -434,69 +458,6 @@ describe ActiveTriples::Resource do
     end
   end
 
-  describe 'array setters' do
-    before do
-      DummyResource.property :aggregates, :predicate => RDF::DC.relation
-    end
-
-    it "should be empty array if we haven't set it" do
-      expect(subject.aggregates).to match_array([])
-    end
-
-    context "when set to a URI" do
-      let(:aggregates_uri) { RDF::URI("http://example.org/b1") }
-      before do
-        subject.aggregates = aggregates_uri
-      end
-      it "produce an ActiveTriple::Resource" do
-        expect(subject.aggregates.first).to be_a ActiveTriples::Resource
-      end
-      it "should have an ID accessor" do
-        expect(subject.aggregates_ids).to eq [aggregates_uri]
-      end
-    end
-
-    it "should be settable" do
-      subject.aggregates = RDF::URI("http://example.org/b1")
-      expect(subject.aggregates.first.rdf_subject).to eq RDF::URI("http://example.org/b1")
-      ['id']
-    end
-
-    context 'with values' do
-      let(:bib1) { RDF::URI("http://example.org/b1") }
-      let(:bib2) { RDF::URI("http://example.org/b2") }
-      let(:bib3) { RDF::URI("http://example.org/b3") }
-
-      before do
-        subject.aggregates = bib1
-        subject.aggregates << bib2
-        subject.aggregates << bib3
-      end
-
-      it 'raises error when trying to set nil value' do
-        expect { subject.aggregates[1] = nil }.to raise_error /value must be an RDF URI, Node, Literal, or a valid datatype/
-      end
-
-      it "should be changeable for multiple values" do
-        new_bib1 = RDF::URI("http://example.org/b1_NEW")
-        new_bib3 = RDF::URI("http://example.org/b3_NEW")
-
-        aggregates = subject.aggregates.dup
-        aggregates[0] = new_bib1
-        aggregates[2] = new_bib3
-        subject.aggregates = aggregates
-
-        expect(subject.aggregates[0].rdf_subject).to eq new_bib1
-        expect(subject.aggregates[1].rdf_subject).to eq bib2
-        expect(subject.aggregates[2].rdf_subject).to eq new_bib3
-      end
-
-      it "raises an error for out of bounds index" do
-        expect { subject.aggregates[4] = 'blah' }.to raise_error IndexError
-      end
-    end
-  end
-
   describe 'child nodes' do
     it 'should return an object of the correct class when the value is a URI' do
       subject.license = DummyLicense.new('http://example.org/license')
@@ -516,22 +477,22 @@ describe ActiveTriples::Resource do
 
   describe '#set_value' do
     it 'should set a value in the graph' do
-      subject.set_value(RDF::DC.title, 'Comet in Moominland')
-      subject.query(:subject => subject.rdf_subject, :predicate => RDF::DC.title).each_statement do |s|
+      subject.set_value(RDF::Vocab::DC.title, 'Comet in Moominland')
+      subject.query(:subject => subject.rdf_subject, :predicate => RDF::Vocab::DC.title).each_statement do |s|
         expect(s.object.to_s).to eq 'Comet in Moominland'
       end
     end
 
     context "when given a URI" do
       before do
-        subject.set_value(RDF::DC.title, RDF::URI("http://opaquenamespace.org/jokes/1"))
+        subject.set_value(RDF::Vocab::DC.title, RDF::URI("http://opaquenamespace.org/jokes/1"))
       end
       it "should return a resource" do
         expect(subject.title.first).to be_kind_of(ActiveTriples::RDFSource)
       end
       context "and it's configured to not cast" do
         before do
-          subject.class.property :title, predicate: RDF::DC.title, cast: false
+          subject.class.property :title, predicate: RDF::Vocab::DC.title, cast: false
         end
         it "should return a URI" do
           expect(subject.title.first).to be_kind_of(RDF::URI)
@@ -559,20 +520,21 @@ describe ActiveTriples::Resource do
       expect(subject.title).to eq ['Comet in Moominland']
     end
 
-    it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
-      expect{subject.set_value(RDF::DC.title, Object.new)}.to raise_error
+    it "raise an error if the value is not a Term" do
+      expect{ subject.set_value(RDF::Vocab::DC.title, Object.new) }
+        .to raise_error ActiveTriples::Relation::ValueError
     end
 
     it "should be able to accept a subject" do
-      expect{subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::DC.title, 'Comet in Moominland')}.not_to raise_error
-      expect(subject.query(:subject => RDF::URI("http://opaquenamespace.org/jokes"), :predicate => RDF::DC.title).statements.to_a.length).to eq 1
+      expect{subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::Vocab::DC.title, 'Comet in Moominland')}.not_to raise_error
+      expect(subject.query(:subject => RDF::URI("http://opaquenamespace.org/jokes"), :predicate => RDF::Vocab::DC.title).statements.to_a.length).to eq 1
     end
   end
 
   describe '#[]=' do
     it 'should set a value in the graph' do
-      subject[RDF::DC.title] = 'Comet in Moominland'
-      subject.query(:subject => subject.rdf_subject, :predicate => RDF::DC.title).each_statement do |s|
+      subject[RDF::Vocab::DC.title] = 'Comet in Moominland'
+      subject.query(:subject => subject.rdf_subject, :predicate => RDF::Vocab::DC.title).each_statement do |s|
         expect(s.object.to_s).to eq 'Comet in Moominland'
       end
     end
@@ -583,7 +545,8 @@ describe ActiveTriples::Resource do
     end
 
     it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
-      expect { subject[RDF::DC.title] = Object.new }.to raise_error
+      expect { subject[RDF::Vocab::DC.title] = Object.new }
+        .to raise_error ActiveTriples::Relation::ValueError
     end
   end
 
@@ -593,7 +556,7 @@ describe ActiveTriples::Resource do
     end
 
     it 'should return values for a predicate uri' do
-      expect(subject.get_values(RDF::DC.title)).to eq ['Comet in Moominland', 'Finn Family Moomintroll']
+      expect(subject.get_values(RDF::Vocab::DC.title)).to eq ['Comet in Moominland', 'Finn Family Moomintroll']
     end
 
     it 'should return values for a registered predicate symbol' do
@@ -602,7 +565,7 @@ describe ActiveTriples::Resource do
 
     it "should return values for other subjects if asked" do
       expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq []
-      subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::DC.title, 'Comet in Moominland')
+      subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::Vocab::DC.title, 'Comet in Moominland')
       expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq ["Comet in Moominland"]
     end
 
@@ -610,21 +573,20 @@ describe ActiveTriples::Resource do
       let(:literal1) { RDF::Literal.new("test", :language => :en) }
       let(:literal2) { RDF::Literal.new("test", :language => :fr) }
       before do
-        subject.set_value(RDF::DC.title, [literal1, literal2])
+        subject.set_value(RDF::Vocab::DC.title, [literal1, literal2])
       end
       context "and literals are not requested" do
         it "should return a string" do
           # Should this de-duplicate?
-          expect(subject.get_values(RDF::DC.title)).to eq ["test", "test"]
+          expect(subject.get_values(RDF::Vocab::DC.title)).to eq ["test", "test"]
         end
       end
       context "and literals are requested" do
         it "should return literals" do
-          expect(subject.get_values(RDF::DC.title, :literal => true)).to eq [literal1, literal2]
+          expect(subject.get_values(RDF::Vocab::DC.title, :literal => true)).to eq [literal1, literal2]
         end
       end
     end
-
   end
 
   describe '#[]' do
@@ -633,7 +595,7 @@ describe ActiveTriples::Resource do
     end
 
     it 'should return values for a predicate uri' do
-      expect(subject[RDF::DC.title]).to eq ['Comet in Moominland', 'Finn Family Moomintroll']
+      expect(subject[RDF::Vocab::DC.title]).to eq ['Comet in Moominland', 'Finn Family Moomintroll']
     end
 
     it 'should return values for a registered predicate symbol' do
@@ -642,7 +604,7 @@ describe ActiveTriples::Resource do
 
     it "should return values for other subjects if asked" do
       expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq []
-      subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::DC.title, 'Comet in Moominland')
+      subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::Vocab::DC.title, 'Comet in Moominland')
       expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq ["Comet in Moominland"]
     end
   end
@@ -664,34 +626,15 @@ describe ActiveTriples::Resource do
     end
   end
 
-  describe '#rdf_label' do
-    it 'should return an array of label values' do
-      expect(subject.rdf_label).to be_kind_of Array
-    end
-
-    it 'should return the default label values' do
-      subject.title = 'Comet in Moominland'
-      expect(subject.rdf_label).to eq ['Comet in Moominland']
-    end
-
-    it 'should prioritize configured label values' do
-      custom_label = RDF::URI('http://example.org/custom_label')
-      subject.class.configure :rdf_label => custom_label
-      subject << RDF::Statement(subject.rdf_subject, custom_label, RDF::Literal('New Label'))
-      subject.title = 'Comet in Moominland'
-      expect(subject.rdf_label).to eq ['New Label']
-    end
-  end
-
   describe 'editing the graph' do
     it 'should write properties when statements are added' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, 'Comet in Moominland')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, 'Comet in Moominland')
       expect(subject.title).to include 'Comet in Moominland'
     end
 
     it 'should delete properties when statements are removed' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, 'Comet in Moominland')
-      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::DC.title, 'Comet in Moominland')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, 'Comet in Moominland')
+      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, 'Comet in Moominland')
       expect(subject.title).to eq []
     end
   end
@@ -701,19 +644,19 @@ describe ActiveTriples::Resource do
       class DummyPerson
         include ActiveTriples::RDFSource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foaf_name, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foaf_name, :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
         include ActiveTriples::RDFSource
         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
 
-      DummyResource.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      DummyResource.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { DummyResource.new }