active-triples 0.8.1 → 0.8.2

data/lib/active_triples/repositories.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   ##
   # Defines module methods for registering an RDF::Repository for
@@ -26,9 +27,10 @@ module ActiveTriples
     #
     # @return [RDF::Repository] gives the original repository on success
     #
-    # @raise [RuntimeError] raised if the repository is not an `RDF::Repository`
+    # @raise [ArgumentError] raised if the repository is not an `RDF::Repository`
     def add_repository(name, repo)
-      raise "Repositories must be an RDF::Repository" unless repo.kind_of? RDF::Repository
+      raise ArgumentError, "Repositories must be an RDF::Repository" unless 
+        repo.kind_of? RDF::Repository
       repositories[name] = repo
     end
     module_function :add_repository

data/lib/active_triples/resource.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'deprecation'
 
 module ActiveTriples

data/lib/active_triples/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   ##
   # Super class which provides a simple property DSL for defining property ->

data/lib/active_triples/undefined_property_error.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module ActiveTriples
+  ##
+  # An error class to be raised when attempting to reflect on an undefined 
+  # property.
+  #
+  # @example
+  #   begin 
+  #     my_source.set_value(:fake_property, 'blah')
+  #   rescue ActiveTriples::UndefinedPropertyError => e
+  #     e.property => 'fake_property'
+  #     e.klass => 'MySourceClass'
+  #   end
+  #   
+  class UndefinedPropertyError < ArgumentError
+    attr_reader :property, :klass
+
+    def initialize(property, klass)
+      @property = property
+      @klass = klass
+    end
+
+    def message
+      "The property `#{@property}` is not defined on class '#{@klass}'"
+    end
+  end
+end

data/lib/active_triples/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
-  VERSION = "0.8.1".freeze
+  VERSION = "0.8.2".freeze
 end

data/spec/active_triples/configurable_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe ActiveTriples::Configurable do
@@ -22,7 +23,7 @@ describe ActiveTriples::Configurable do
 
   describe '#configure' do
     before do
-      DummyConfigurable.configure base_uri: "http://example.org/base", type: RDF::RDFS.Class, rdf_label: RDF::DC.title
+      DummyConfigurable.configure base_uri: "http://example.org/base", type: RDF::RDFS.Class, rdf_label: RDF::Vocab::DC.title
     end
 
     it 'should set a base uri' do
@@ -35,7 +36,7 @@ describe ActiveTriples::Configurable do
     end
 
     it 'should set an rdf_label' do
-      expect(DummyConfigurable.rdf_label).to eq RDF::DC.title
+      expect(DummyConfigurable.rdf_label).to eq RDF::Vocab::DC.title
     end
 
     it 'should set a type' do

data/spec/active_triples/configuration_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe ActiveTriples::Configuration do
@@ -43,7 +44,7 @@ RSpec.describe ActiveTriples::Configuration do
   describe "#merge" do
     let(:starting_hash) do
       {
-        :rdf_label => RDF::SKOS.prefLabel,
+        :rdf_label => RDF::Vocab::SKOS.prefLabel,
         :type => RDF::RDFS.Class
       }
     end

data/spec/active_triples/extension_strategy_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe ActiveTriples::ExtensionStrategy do
@@ -6,7 +7,7 @@ RSpec.describe ActiveTriples::ExtensionStrategy do
   describe ".apply" do
     it "should copy the property to the asset" do
       asset = build_asset
-      property = build_property("name", {:predicate => RDF::DC.title})
+      property = build_property("name", {:predicate => RDF::Vocab::DC.title})
 
       subject.apply(asset, property)
 

data/spec/active_triples/identifiable_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'active_model'
 
@@ -19,12 +20,12 @@ describe ActiveTriples::Identifiable do
     before do
       class MyResource
         include ActiveTriples::RDFSource
-        property :relation, predicate: RDF::DC.relation, class_name: 'ActiveExample'
+        property :relation, predicate: RDF::Vocab::DC.relation, class_name: 'ActiveExample'
       end
 
-      klass.property :title, predicate: RDF::DC.title
-      klass.property :identifier, predicate: RDF::DC.identifier
-      klass.property :description, predicate: RDF::DC.description
+      klass.property :title, predicate: RDF::Vocab::DC.title
+      klass.property :identifier, predicate: RDF::Vocab::DC.identifier
+      klass.property :description, predicate: RDF::Vocab::DC.description
 
       subject.resource.title = 'Moomin Valley in November'
       subject.resource.identifier = 'moomvember'
@@ -84,7 +85,7 @@ describe ActiveTriples::Identifiable do
 
     describe '::properties' do
       before do
-        klass.property :title, :predicate => RDF::DC.title
+        klass.property :title, :predicate => RDF::Vocab::DC.title
       end
       it 'can be set' do
         expect(klass.properties).to include 'title'
@@ -116,7 +117,7 @@ describe ActiveTriples::Identifiable do
         end
 
         it 'does not effect other classes' do
-          klass.property :identifier, :predicate => RDF::DC.identifier
+          klass.property :identifier, :predicate => RDF::Vocab::DC.identifier
           expect(ActiveExampleTwo.properties).to be_empty
         end
       end
@@ -140,11 +141,6 @@ describe ActiveTriples::Identifiable do
         it 'has a parent' do
           expect(parent.relation.first.parent).to eq parent
         end
-
-        it 'has a parent after reload' do
-          parent.relation.node_cache = {}
-          expect(parent.relation.first.parent).to eq parent
-        end
       end
     end
 

data/spec/active_triples/list_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'nokogiri'
 require 'linkeddata'
@@ -31,10 +32,6 @@ describe ActiveTriples::List do
       expect(subject.subject).not_to eq RDF.nil
     end
 
-    it 'has a non-nil subject' do
-      expect(subject.subject).not_to eq RDF.nil
-    end
-
     it 'has type of rdf:List' do
       expect(subject.type.first).to eq RDF.List
     end

data/spec/active_triples/nested_attributes_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe "nesting attribute behavior" do
@@ -28,7 +29,7 @@ describe "nesting attribute behavior" do
           include ActiveTriples::RDFSource
           property :topic, predicate: DummyMADS.Topic, class_name: "Topic"
           property :personalName, predicate: DummyMADS.PersonalName, class_name: "PersonalName"
-          property :title, predicate: RDF::DC.title
+          property :title, predicate: RDF::Vocab::DC.title
 
 
           accepts_nested_attributes_for :topic, :personalName
@@ -149,12 +150,12 @@ describe "nesting attribute behavior" do
       before do
         class SpecResource
           include ActiveTriples::RDFSource
-          property :parts, predicate: RDF::DC.hasPart, :class_name=>'Component'
+          property :parts, predicate: RDF::Vocab::DC.hasPart, :class_name=>'Component'
           accepts_nested_attributes_for :parts, allow_destroy: true
 
           class Component
             include ActiveTriples::RDFSource
-            property :label, predicate: RDF::DC.title
+            property :label, predicate: RDF::Vocab::DC.title
           end
         end
 

data/spec/active_triples/persistable_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveTriples::Persistable do
@@ -5,7 +6,9 @@ describe ActiveTriples::Persistable do
 
   let(:klass) { Class.new { include ActiveTriples::Persistable } }
 
-  let(:statement) { RDF::Statement(RDF::Node.new, RDF::DC.title, 'Moomin') }
+  let(:statement) do
+    RDF::Statement(RDF::Node.new, RDF::Vocab::DC.title, 'Moomin')
+  end
 
   it 'raises an error with no #graph implementation' do
     expect { subject << statement }.to raise_error(NameError, /graph/)

data/spec/active_triples/persistence_strategies/parent_strategy_spec.rb

@@ -1,25 +1,121 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveTriples::ParentStrategy do
   subject { described_class.new(rdf_source) }
   let(:rdf_source) { BasicPersistable.new }
-
+  
   shared_context 'with a parent' do
+    let(:parent) { BasicPersistable.new }
+
     before do
       subject.parent = parent
-    end
 
-    let(:parent) { BasicPersistable.new }
+      rdf_source.set_persistence_strategy(described_class)
+      rdf_source.persistence_strategy.parent = parent
+    end
   end
 
   context 'with a parent' do
     include_context 'with a parent'
     it_behaves_like 'a persistence strategy'
+
+    describe '#persisted?' do
+      context 'before persist!' do
+        it 'returns false' do
+          expect(subject).not_to be_persisted
+        end
+      end
+
+      context 'after persist!' do
+        context "when the parent is not persisted" do
+          before { subject.persist! }
+          it { is_expected.not_to be_persisted }
+        end
+
+        context "when the parent is persisted" do
+          before do
+            allow(parent).to receive(:persisted?).and_return(true)
+            subject.persist!
+          end
+          it { is_expected.to be_persisted }
+        end
+      end
+    end
+  end
+
+  describe '#destroy' do
+    include_context 'with a parent'
+
+    before do
+      rdf_source.insert(*statements)
+      subject.persist!
+    end
+    
+    let(:statements) do
+      [RDF::Statement(subject.source.rdf_subject, RDF::Vocab::DC.title, 'moomin'),
+       RDF::Statement(:node, RDF::Vocab::DC.relation, subject.source.rdf_subject),
+       RDF::Statement(:node, RDF::Vocab::DC.relation, :other_node)]
+    end
+
+    it 'removes graph from the parent' do
+      subject.destroy
+      
+      statements.each do |statement|
+        expect(subject.parent.statements).not_to have_statement statement
+      end
+    end
+
+    it 'removes subjects from parent' do
+      subject.destroy
+      expect(subject.parent).not_to have_subject(rdf_source)
+    end
+
+    it 'removes objects from parent' do
+      subject.destroy
+      expect(subject.parent).not_to have_object(rdf_source)
+    end
+  end
+
+  describe '#ancestors' do
+    it 'raises NilParentError when enumerating' do
+      expect { subject.ancestors.next }
+        .to raise_error described_class::NilParentError
+    end
+
+    context 'with parent' do
+      include_context 'with a parent'
+      
+      it 'gives the parent' do
+        expect(subject.ancestors).to contain_exactly(parent)
+      end
+
+      context 'and nested parents' do
+        let(:parents) do
+          [double('second', persistence_strategy: double('strategy2')), 
+           double('third', persistence_strategy: double('strategy3'))]
+        end
+        let(:last) { double('last', persistence_strategy: double('last_strategy')) }
+        
+        it 'gives all ancestors' do
+          allow(parent.persistence_strategy)
+            .to receive(:parent).and_return(parents.first)
+          allow(parents.first.persistence_strategy)
+            .to receive(:parent).and_return(parents[1])
+          allow(parents[1].persistence_strategy)
+            .to receive(:parent).and_return(last)
+          
+          expect(subject.ancestors)
+            .to contain_exactly(*(parents << parent << last))
+        end
+      end
+    end
   end
 
   describe '#final_parent' do
     it 'raises an error with no parent' do
-      expect { subject.final_parent }.to raise_error described_class::NilParentError
+      expect { subject.final_parent }
+        .to raise_error described_class::NilParentError
     end
 
     context 'with single parent' do
@@ -32,22 +128,20 @@ describe ActiveTriples::ParentStrategy do
 
     context 'with parent chain' do
       include_context 'with a parent'
-      let(:last) { double('last') }
+      let(:last) { double('last', persistence_strategy: nil) }
 
       it 'gives last parent terminating when no futher parents given' do
-        allow(parent).to receive(:parent).and_return(last)
+        allow(parent.persistence_strategy).to receive(:parent).and_return(last)
         expect(subject.final_parent).to eq last
       end
 
       it 'gives last parent terminating parent is nil' do
-        allow(parent).to receive(:parent).and_return(last)
-        allow(last).to receive(:parentt).and_return(nil)
+        allow(parent.persistence_strategy).to receive(:parent).and_return(last)
         expect(subject.final_parent).to eq last
       end
 
       it 'gives last parent terminating parent is same as current' do
-        allow(parent).to receive(:parent).and_return(last)
-        allow(last).to receive(:parentt).and_return(last)
+        allow(parent.persistence_strategy).to receive(:parent).and_return(last)
         expect(subject.final_parent).to eq last
       end
     end
@@ -83,7 +177,8 @@ describe ActiveTriples::ParentStrategy do
       include_context 'with a parent'
 
       it 'writes to #final_parent graph' do
-        rdf_source << RDF::Statement.new(RDF::Node.new, RDF::DC.title, 'moomin')
+        rdf_source << [RDF::Node.new, RDF::Vocab::DC.title, 'moomin']
+
         subject.persist!
         expect(subject.final_parent.statements)
           .to contain_exactly *rdf_source.statements
@@ -91,3 +186,38 @@ describe ActiveTriples::ParentStrategy do
     end
   end
 end
+
+describe ActiveTriples::ParentStrategy::Ancestors do
+  subject { described_class.new(rdf_source) }
+
+  let(:rdf_source) { BasicPersistable.new }
+
+  describe '#each' do
+    it 'raises NilParentError' do
+      expect { subject.each }
+        .to raise_error ActiveTriples::ParentStrategy::NilParentError
+    end
+
+    context 'with parents' do
+      let(:parent) { BasicPersistable.new }
+      let(:last) { BasicPersistable.new }
+      
+      before do
+        parent.set_persistence_strategy(ActiveTriples::ParentStrategy)
+        parent.persistence_strategy.parent = last
+        rdf_source.set_persistence_strategy(ActiveTriples::ParentStrategy)
+        rdf_source.persistence_strategy.parent = parent
+      end
+      
+      it { expect(subject.each).to be_a Enumerator }
+      
+      it 'enumerates ancestors' do
+        expect(subject.each).to contain_exactly(parent, last)
+      end
+
+      it 'yields ancestors' do
+        expect { |b| subject.each(&b) }.to yield_successive_args(parent, last)
+      end
+    end
+  end
+end

data/spec/active_triples/persistence_strategies/persistence_strategy_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveTriples::PersistenceStrategy do

data/spec/active_triples/persistence_strategies/repository_strategy_spec.rb

@@ -1,19 +1,40 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ActiveTriples::RepositoryStrategy do
   subject { described_class.new(rdf_source) }
-  let(:rdf_source) { ActiveTriples::Resource.new }
+  let(:source_class) { class MySource; include ActiveTriples::RDFSource; end }
+  let(:rdf_source) { source_class.new }
 
   let(:statement) do
-    RDF::Statement.new(rdf_source.to_term, RDF::DC.title, 'moomin')
+    RDF::Statement.new(rdf_source.to_term, RDF::Vocab::DC.title, 'moomin')
   end
 
   it_behaves_like 'a persistence strategy'
 
+
+  describe '#persisted?' do
+    context 'before persist!' do
+      it 'returns false' do
+        expect(subject).not_to be_persisted
+      end
+    end
+
+    context 'after persist!' do
+      it 'returns true' do
+        subject.persist!
+        expect(subject).to be_persisted
+      end
+    end
+  end
+
   shared_context 'with repository' do
+    let(:repo) { RDF::Repository.new }
     before do
-      allow(subject.obj.singleton_class).to receive(:repository)
-                                             .and_return(:my_repo)
+      source_class.configure repository: :my_repo
+
+      allow(ActiveTriples::Repositories.repositories)
+        .to receive(:[]).with(:my_repo).and_return(repo)
     end
   end
 
@@ -33,7 +54,7 @@ describe ActiveTriples::RepositoryStrategy do
 
     it 'leaves other resources unchanged' do
       subject.repository <<
-        RDF::Statement(RDF::Node.new, RDF::DC.title, 'snorkmaiden')
+        RDF::Statement(RDF::Node.new, RDF::Vocab::DC.title, 'snorkmaiden')
       expect { subject.destroy }
         .not_to change { subject.repository.count }
     end
@@ -45,7 +66,7 @@ describe ActiveTriples::RepositoryStrategy do
 
       context 'with subjects' do
         before do
-          subject.obj.set_subject! RDF::URI('http://example.org/moomin')
+          subject.source.set_subject! RDF::URI('http://example.org/moomin')
         end
 
         include_examples 'destroy resource'
@@ -80,13 +101,7 @@ describe ActiveTriples::RepositoryStrategy do
 
     context 'with unknown content in repo' do
       include_context 'with repository' do
-        before do
-          allow(ActiveTriples::Repositories.repositories)
-            .to receive(:[]).with(:my_repo).and_return(repo)
-          repo << statement
-        end
-
-        let(:repo) { RDF::Repository.new }
+        before { repo << statement }
       end
     end
   end
@@ -103,16 +118,16 @@ describe ActiveTriples::RepositoryStrategy do
     context 'with repository configured' do
       include_context 'with repository'
 
-      let(:repo) { double('repo') }
-
       it 'when repository is not registered raises an error' do
+        source_class.configure repository: :no_repo
+
+        allow(ActiveTriples::Repositories.repositories)
+          .to receive(:[]).with(:no_repo).and_call_original
         expect { subject.repository }
           .to raise_error ActiveTriples::RepositoryNotFoundError
       end
 
       it 'gets repository' do
-        allow(ActiveTriples::Repositories.repositories)
-          .to receive(:[]).with(:my_repo).and_return(repo)
         expect(subject.repository).to eq repo
       end
     end