active-triples 0.6.1 → 0.7.0

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = "0.6.1"
+  VERSION = "0.7.0".freeze
 end

data/spec/active_triples/configurable_spec.rb

@@ -9,6 +9,13 @@ describe ActiveTriples::Configurable do
     Object.send(:remove_const, "DummyConfigurable")
   end
 
+  it "should be okay if not configured" do
+    expect(DummyConfigurable.type).to eq nil
+  end
+  it "should be okay if configured to nil" do
+    DummyConfigurable.configure :type => nil
+    expect(DummyConfigurable.type).to eq []
+  end
   describe '#configure' do
     before do
       DummyConfigurable.configure base_uri: "http://example.org/base", type: RDF::RDFS.Class, rdf_label: RDF::DC.title
@@ -18,12 +25,21 @@ describe ActiveTriples::Configurable do
       expect(DummyConfigurable.base_uri).to eq "http://example.org/base"
     end
 
+    it "should be able to set multiple types" do
+      DummyConfigurable.configure type: [RDF::RDFS.Container, RDF::RDFS.ContainerMembershipProperty]
+      expect(DummyConfigurable.type).to contain_exactly(RDF::RDFS.Class, RDF::RDFS.Container, RDF::RDFS.ContainerMembershipProperty)
+    end
+
     it 'should set an rdf_label' do
       expect(DummyConfigurable.rdf_label).to eq RDF::DC.title
     end
 
     it 'should set a type' do
-      expect(DummyConfigurable.type).to eq RDF::RDFS.Class
+      expect(DummyConfigurable.type).to eq [RDF::RDFS.Class]
+    end
+    it "should be able to set multiple types" do
+      DummyConfigurable.configure type: RDF::RDFS.Container
+      expect(DummyConfigurable.type).to eq [RDF::RDFS.Class, RDF::RDFS.Container]
     end
   end
 
@@ -32,7 +48,7 @@ describe ActiveTriples::Configurable do
       expect(DummyConfigurable).to receive(:configure).with(type: RDF::RDFS.Class).and_call_original
       expect(Deprecation).to receive(:warn)
       DummyConfigurable.rdf_type(RDF::RDFS.Class)
-      expect(DummyConfigurable.type).to eq RDF::RDFS.Class
+      expect(DummyConfigurable.type).to eq [RDF::RDFS.Class]
     end
   end
 end

data/spec/active_triples/configuration_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+RSpec.describe ActiveTriples::Configuration do
+  subject { described_class.new(starting_hash) }
+  let(:starting_hash) { {} }
+  describe "[]" do
+    context "with bad config values" do
+      let(:starting_hash) { {:bad => 1} }
+      it "should not return them" do
+        expect(subject[:bad]).to be_nil
+      end
+    end
+    context "with good config values" do
+      let(:starting_hash) { {:type => 1} }
+      it "should return them" do
+        expect(subject[:type]).to eq 1
+      end
+    end
+  end
+
+  describe "to_h" do
+    context "with bad and good config" do
+      let(:starting_hash) do
+        {
+          :bad => 1,
+          :type => 2
+        }
+      end
+      it "should return only good ones" do
+        expect(subject.to_h).to eq ({:type => 2})
+      end
+    end
+  end
+
+  describe "#items" do
+    let(:starting_hash) { {:rdf_label => 1} }
+    it "should return a configuration item for each config" do
+      expect(subject.items.keys.length).to eq 1
+      expect(subject.items[:rdf_label]).to be_kind_of ActiveTriples::Configuration::Item
+    end
+  end
+
+  describe "#merge" do
+    let(:starting_hash) do
+      {
+        :rdf_label => RDF::SKOS.prefLabel,
+        :type => RDF::RDFS.Class
+      }
+    end
+    it "should override some values" do
+      new_hash = {:rdf_label => RDF::RDFS.label}
+      expect(subject.merge(new_hash)[:rdf_label]).to eq RDF::RDFS.label
+    end
+    it "should merge type" do
+      new_hash = {:type => RDF::RDFS.Container}
+      expect(subject.merge(new_hash)[:type]).to eq [RDF::RDFS.Class, RDF::RDFS.Container]
+    end
+  end
+end

data/spec/active_triples/identifiable_spec.rb

@@ -5,11 +5,11 @@ describe ActiveTriples::Identifiable do
   before do
     class ActiveExample
       include ActiveTriples::Identifiable
-      
+
       def self.property(*args)
         prop = args.first
 
-        define_method prop.to_s do 
+        define_method prop.to_s do
           resource.get_values(prop)
         end
 
@@ -34,7 +34,8 @@ describe ActiveTriples::Identifiable do
     let(:parent) { MyResource.new }
 
     before do
-      class MyResource < ActiveTriples::Resource
+      class MyResource
+        include ActiveTriples::RDFSource
         property :relation, predicate: RDF::DC.relation, class_name: 'ActiveExample'
       end
 
@@ -56,7 +57,7 @@ describe ActiveTriples::Identifiable do
   context 'without implementation' do
     describe '::from_uri' do
       it 'raises a NotImplementedError' do
-       expect{ klass.from_uri(RDF::URI('http://example.org/blah')) }.to raise_error NotImplementedError 
+       expect{ klass.from_uri(RDF::URI('http://example.org/blah')) }.to raise_error NotImplementedError
       end
     end
 
@@ -66,7 +67,7 @@ describe ActiveTriples::Identifiable do
       end
     end
   end
-    
+
   context 'with implementation' do
     before do
       class ActiveExample
@@ -82,7 +83,7 @@ describe ActiveTriples::Identifiable do
         def self.property(*args)
           prop = args.first
 
-          define_method prop.to_s do 
+          define_method prop.to_s do
             resource.get_values(prop)
           end
 
@@ -97,7 +98,7 @@ describe ActiveTriples::Identifiable do
 
       subject.id = '123'
     end
-    
+
     describe '::properties' do
       before do
         klass.property :title, :predicate => RDF::DC.title
@@ -115,7 +116,7 @@ describe ActiveTriples::Identifiable do
         subject.title << 'Finn Family Moomintroll'
         expect(subject.resource.title).to eq ['Finn Family Moomintroll']
       end
-      
+
       it 'returns correct values in property getters' do
         subject.resource.title = 'Finn Family Moomintroll'
         expect(subject.title).to eq subject.resource.title
@@ -152,18 +153,18 @@ describe ActiveTriples::Identifiable do
 
       context 'with relationships' do
         include_context 'with data'
-        
+
         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
-    
+
     describe '#rdf_subject' do
       it 'has a subject' do
         expect(subject.rdf_subject).to eq 'http://example.org/ns/123'

data/spec/active_triples/list_spec.rb

@@ -49,7 +49,7 @@ describe ActiveTriples::List do
         subject.clear
         subject << 1
       end
-      
+
       it 'has a type of rdf:List' do
         expect(subject.type.first).to eq RDF.List
       end
@@ -70,17 +70,20 @@ describe ActiveTriples::List do
         property :TopicElement
         property :TemporalElement
       end
-      class DemoList < ActiveTriples::Resource
+      class DemoList
+        include ActiveTriples::RDFSource
         property :elementList, :predicate => MADS.elementList, :class_name => 'DemoList::List'
         class List < ActiveTriples::List
           property :topicElement, :predicate => MADS.TopicElement, :class_name => 'DemoList::List::TopicElement'
           property :temporalElement, :predicate => MADS.TemporalElement, :class_name => 'DemoList::List::TemporalElement'
 
-          class TopicElement < ActiveTriples::Resource
+          class TopicElement
+            include ActiveTriples::RDFSource
             configure :type => MADS.TopicElement
             property :elementValue, :predicate => MADS.elementValue
           end
-          class TemporalElement < ActiveTriples::Resource
+          class TemporalElement
+            include ActiveTriples::RDFSource
             configure :type => MADS.TemporalElement
             property :elementValue, :predicate => MADS.elementValue
           end
@@ -143,7 +146,7 @@ describe ActiveTriples::List do
     end
 
     describe "an empty list" do
-      subject { DemoList.new.elementList.build } 
+      subject { DemoList.new.elementList.build }
       it "should have to_ary" do
         expect(subject.to_ary).to eq []
       end
@@ -151,7 +154,7 @@ describe ActiveTriples::List do
 
     describe "a list that has a constructed element" do
       let(:ds) { DemoList.new('http://example.org/foo') }
-      let(:list) { ds.elementList.build } 
+      let(:list) { ds.elementList.build }
       let!(:topic) { list.topicElement.build }
 
       it "should have to_ary" do
@@ -222,7 +225,10 @@ END
       it "should have each" do
         foo = []
         list.each { |n| foo << n.class }
-        expect(foo).to eq [ActiveTriples::Resource, DemoList::List::TopicElement, ActiveTriples::Resource, DemoList::List::TemporalElement]
+        expect(foo).to eq [ActiveTriples::Resource,
+                           DemoList::List::TopicElement,
+                           ActiveTriples::Resource,
+                           DemoList::List::TemporalElement]
       end
 
       it "should have to_ary" do

data/spec/active_triples/nested_attributes_spec.rb

@@ -24,7 +24,8 @@ describe "nesting attribute behavior" do
           property :DateNameElement
         end
 
-        class ComplexResource < ActiveTriples::Resource
+        class ComplexResource
+          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
@@ -32,11 +33,13 @@ describe "nesting attribute behavior" do
 
           accepts_nested_attributes_for :topic, :personalName
 
-          class Topic < ActiveTriples::Resource
+          class Topic
+            include ActiveTriples::RDFSource
             property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexResource::ElementList"
             accepts_nested_attributes_for :elementList
           end
-          class PersonalName < ActiveTriples::Resource
+          class PersonalName
+            include ActiveTriples::RDFSource
             property :elementList, predicate: DummyMADS.elementList, class_name: "ComplexResource::ElementList"
             property :extraProperty, predicate: DummyMADS.elementValue, class_name: "ComplexResource::Topic"
             accepts_nested_attributes_for :elementList, :extraProperty
@@ -51,7 +54,8 @@ describe "nesting attribute behavior" do
             property :elementValue, predicate: DummyMADS.elementValue
             accepts_nested_attributes_for :topicElement
           end
-          class MadsTopicElement < ActiveTriples::Resource
+          class MadsTopicElement
+            include ActiveTriples::RDFSource
             configure :type => DummyMADS.TopicElement
             property :elementValue, predicate: DummyMADS.elementValue
           end
@@ -143,11 +147,13 @@ describe "nesting attribute behavior" do
 
     context "a simple model" do
       before do
-        class SpecResource < ActiveTriples::Resource
+        class SpecResource
+          include ActiveTriples::RDFSource
           property :parts, predicate: RDF::DC.hasPart, :class_name=>'Component'
           accepts_nested_attributes_for :parts, allow_destroy: true
 
-          class Component < ActiveTriples::Resource
+          class Component
+            include ActiveTriples::RDFSource
             property :label, predicate: RDF::DC.title
           end
         end

data/spec/active_triples/properties_spec.rb

@@ -12,11 +12,21 @@ describe ActiveTriples::Properties do
   end
 
   describe '#property' do
-    it 'should set a property' do
+    it 'should set a property as a NodeConfig' do
       DummyProperties.property :title, :predicate => RDF::DC.title
       expect(DummyProperties.reflect_on_property(:title)).to be_kind_of ActiveTriples::NodeConfig
     end
 
+    it 'should set the correct property' do
+      DummyProperties.property :title, :predicate => RDF::DC.title
+      expect(DummyProperties.reflect_on_property(:title).predicate).to eql RDF::DC.title
+    end
+
+    it 'should set the correct property from string' do
+      DummyProperties.property :title, :predicate => RDF::DC.title.to_s
+      expect(DummyProperties.reflect_on_property(:title).predicate).to eql RDF::DC.title
+    end
+
     it 'should set index behaviors' do
       DummyProperties.property :title, :predicate => RDF::DC.title do |index|
         index.as :facetable, :searchable
@@ -44,6 +54,14 @@ describe ActiveTriples::Properties do
       expect { DummyProperties.property :type, :predicate => RDF::DC.type }.to raise_error ArgumentError
     end
 
+    it 'raises error when defining properties with no predicate' do
+      expect { DummyProperties.property :type }.to raise_error ArgumentError
+    end
+
+    it 'raises error when defining properties with a non-Roesource predicate' do
+      expect { DummyProperties.property :type, :predicate => 123 }.to raise_error ArgumentError
+    end
+
     it 'raises error when defining properties already have method setters' do
       DummyProperties.send :define_method, :type=, lambda { }
       expect { DummyProperties.property :type, :predicate => RDF::DC.type }.to raise_error ArgumentError

data/spec/active_triples/rdf_source_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ActiveTriples::RDFSource do
+  let(:dummy_source) { Class.new { include described_class } }
+end

data/spec/active_triples/{term_spec.rb → relation_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
 require 'rdf/isomorphic'
 
-describe ActiveTriples::Term do
+describe ActiveTriples::Relation do
 
   describe "#rdf_subject" do
     let(:parent_resource) { double("parent resource", reflections: {}) }
 
     subject { described_class.new(parent_resource, double("value args") ) }
 
-    context "when term has 0 value arguments" do
+    context "when relation has 0 value arguments" do
       before { subject.value_arguments = double(length: 0) }
       it "should raise an error" do
         expect { subject.send(:rdf_subject) }.to raise_error
@@ -26,13 +26,13 @@ describe ActiveTriples::Term do
         expect { subject.rdf_subject }.to raise_error NoMethodError
       end
     end
-    context "when term has 2 value arguments" do
+    context "when relation has 2 value arguments" do
       before { subject.value_arguments = double(length: 2, first: "first") }
       it "should return the first value argument" do
         expect(subject.send(:rdf_subject) ).to eq "first"
       end
     end
-    context "when term has 3 value arguments" do
+    context "when relation has 3 value arguments" do
       before { subject.value_arguments = double(length: 3) }
       it "should raise an error" do
         expect { subject.send(:rdf_subject)  }.to raise_error
@@ -69,14 +69,15 @@ describe ActiveTriples::Term do
       after { Object.send(:remove_const, :DummyResource) }
       let(:resource) { DummyResource.new }
       context "and the resource class does not include RDF::Isomorphic" do
-        before { class DummyResource < ActiveTriples::Resource; end }
+        before { class DummyResource; include ActiveTriples::RDFSource; end }
         it "should be false" do
           expect(subject.send(:valid_datatype?, resource)).to be false
         end
       end
       context "and the resource class includes RDF:Isomorphic" do
         before do
-          class DummyResource < ActiveTriples::Resource
+          class DummyResource
+            include ActiveTriples::RDFSource
             include RDF::Isomorphic
           end
         end
@@ -86,7 +87,8 @@ describe ActiveTriples::Term do
       end
       context "and the resource class includes RDF::Isomorphic and aliases :== to :isomorphic_with?" do
         before do
-          class DummyResource < ActiveTriples::Resource
+          class DummyResource
+            include ActiveTriples::RDFSource
             include RDF::Isomorphic
             alias_method :==, :isomorphic_with?
           end

data/spec/active_triples/repositories_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 describe ActiveTriples::Repositories do
-  subject {ActiveTriples::Repositories}
+  subject { ActiveTriples::Repositories }
 
   after(:each) do
     subject.clear_repositories!
@@ -32,17 +32,20 @@ describe ActiveTriples::Repositories do
     end
 
     before do
-      class DummyResource1 < ActiveTriples::Resource
+      class DummyResource1
+        include ActiveTriples::RDFSource
         configure :base_uri => "http://example.org/r1/",
                   :type => RDF::URI("http://example.org/SomeClass"),
                   :repository => :repo1
       end
-      class DummyResource2 < ActiveTriples::Resource
+      class DummyResource2
+        include ActiveTriples::RDFSource
         configure :base_uri => "http://example.org/r2/",
                   :type => RDF::URI("http://example.org/SomeClass"),
                   :repository => :repo2
       end
-      class DummyResource3 < ActiveTriples::Resource
+      class DummyResource3
+        include ActiveTriples::RDFSource
         configure :base_uri => "http://example.org/r3/",
                   :type => RDF::URI("http://example.org/SomeClass"),
                   :repository => :repo3