active-triples 0.1.0 → 0.1.1

data/lib/active_triples/term.rb

@@ -38,17 +38,16 @@ module ActiveTriples
 
     def build(attributes={})
       new_subject = attributes.key?('id') ? attributes.delete('id') : RDF::Node.new
-      node = make_node(new_subject)
-      node.attributes = attributes
-      if parent.kind_of? List::ListResource
-        parent.list << node
-        return node
-      elsif node.kind_of? RDF::List
-        self.push node.rdf_subject
-        return node
-      end
-      self.push node
-      node
+      make_node(new_subject).tap do |node|
+        node.attributes = attributes
+        if parent.kind_of? List::ListResource
+          parent.list << node
+        elsif node.kind_of? RDF::List
+          self.push node.rdf_subject
+        else
+          self.push node
+        end
+      end
     end
 
     def first_or_create(attributes={})
@@ -74,7 +73,7 @@ module ActiveTriples
     end
 
     def type_property
-      {:multivalue => true, :predicate => RDF.type}
+      { :multivalue => true, :predicate => RDF.type }
     end
 
     def reset!
@@ -126,8 +125,7 @@ module ActiveTriples
       end
 
       def predicate
-        return property_config[:predicate] unless property.kind_of? RDF::URI
-        property
+        property.kind_of?(RDF::URI) ? property : property_config[:predicate]
       end
 
       def valid_datatype?(val)
@@ -136,9 +134,14 @@ module ActiveTriples
 
       # Converts an object to the appropriate class.
       def convert_object(value)
-        value = value.object if value.kind_of? RDF::Literal
-        value = make_node(value) if value.kind_of? RDF::Resource
-        value
+        case value
+        when RDF::Literal
+          value.object 
+        when RDF::Resource
+          make_node(value)
+        else
+          value
+        end
       end
 
       ##

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/active_triples/configurable_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+describe ActiveTriples::Configurable do
+  before do
+    class DummyConfigurable
+      extend ActiveTriples::Configurable
+    end
+  end
+  after do
+    Object.send(:remove_const, "DummyConfigurable")
+  end
+
+  describe '#configure' do
+    before do
+      DummyConfigurable.configure base_uri: "http://example.org/base", type: RDF::RDFS.Class, rdf_label: RDF::DC.title
+    end
+
+    it 'should set a base uri' do
+      expect(DummyConfigurable.base_uri).to eq "http://example.org/base"
+    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
+    end
+  end
+
+  describe '#rdf_type' do
+    it "should set the type the old way" do
+      DummyConfigurable.should_receive(:configure).with(type: RDF::RDFS.Class).and_call_original
+      DummyConfigurable.rdf_type(RDF::RDFS.Class)
+      expect(DummyConfigurable.type).to eq RDF::RDFS.Class
+    end
+  end
+end

data/spec/{rdf_list_spec.rb → active_triples/list_spec.rb}

@@ -39,27 +39,27 @@ describe ActiveTriples::List do
     subject { ds.elementList.build}
 
     it "should insert at the end" do
-      subject.should be_kind_of DemoList::List
-      subject.size.should == 0
+      expect(subject).to be_kind_of DemoList::List
+      expect(subject.size).to eq 0
       subject[1] = DemoList::List::TopicElement.new
-      subject.size.should == 2
+      expect(subject.size).to eq 2
     end
 
     it "should insert at the head" do
-      subject.should be_kind_of DemoList::List
-      subject.size.should == 0
+      expect(subject).to be_kind_of DemoList::List
+      expect(subject.size).to eq 0
       subject[0] = DemoList::List::TopicElement.new
-      subject.size.should == 1
+      expect(subject.size).to eq 1
     end
 
     describe "that has 4 elements" do
       before do
         subject[3] = DemoList::List::TopicElement.new
-        subject.size.should == 4
+        expect(subject.size).to eq 4
       end
       it "should insert in the middle" do
         subject[1] = DemoList::List::TopicElement.new
-        subject.size.should == 4
+        expect(subject.size).to eq 4
       end
     end
 
@@ -87,7 +87,7 @@ describe ActiveTriples::List do
   describe "an empty list" do
     subject { DemoList.new.elementList.build } 
     it "should have to_ary" do
-      subject.to_ary.should == []
+      expect(subject.to_ary).to eq []
     end
   end
 
@@ -97,17 +97,17 @@ describe ActiveTriples::List do
     let!(:topic) { list.topicElement.build }
 
     it "should have to_ary" do
-      list.to_ary.size.should == 1
-      list.to_ary.first.class.should == DemoList::List::TopicElement
+      expect(list.to_ary.size).to eq 1
+      expect(list.to_ary.first.class).to eq DemoList::List::TopicElement
     end
 
     it "should be able to be cleared" do
       list.topicElement.build
       list.topicElement.build
       list.topicElement.build
-      list.size.should == 4
+      expect(list.size).to eq 4
       list.clear
-      list.size.should == 0
+      expect(list.size).to eq 0
     end
   end
 
@@ -137,47 +137,59 @@ END
       subject
     end
     it "should have a subject" do
-      subject.rdf_subject.to_s.should == "http://example.org/foo"
+      expect(subject.rdf_subject.to_s).to eq "http://example.org/foo"
     end
 
     let (:list) { subject.elementList.first }
 
     it "should have fields" do
-      list.first.rdf_subject.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
-      list[1].should be_kind_of DemoList::List::TopicElement
-      list[1].elementValue.should == ["Relations with Mexican Americans"]
-      list[2].rdf_subject.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
-      list[3].should be_kind_of DemoList::List::TemporalElement
-      list[3].elementValue.should == ["20th century"]
+      expect(list.first.rdf_subject).to eq "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
+      expect(list[1]).to be_kind_of DemoList::List::TopicElement
+      expect(list[1].elementValue).to eq ["Relations with Mexican Americans"]
+      expect(list[2].rdf_subject).to eq "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
+      expect(list[3]).to be_kind_of DemoList::List::TemporalElement
+      expect(list[3].elementValue).to eq ["20th century"]
     end
 
     it "should have each" do
       foo = []
       list.each { |n| foo << n.class }
-      foo.should == [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
       ary = list.to_ary
-      ary.size.should == 4
-      ary[1].elementValue.should == ['Relations with Mexican Americans']
+      expect(ary.size).to eq 4
+      expect(ary[1].elementValue).to eq ['Relations with Mexican Americans']
     end
 
     it "should have size" do
-      list.size.should == 4
+      expect(list.size).to eq 4
     end
 
-    it "should update fields" do
-      list[3].elementValue = ["1900s"]
-      doc = Nokogiri::XML(subject.dump :rdfxml)
-      ns = {rdf: "http://www.w3.org/1999/02/22-rdf-syntax-ns#", mads: "http://www.loc.gov/mads/rdf/v1#"}
-      expect(doc.xpath('/rdf:RDF/mads:ComplexSubject/@rdf:about', ns).map(&:value)).to eq ["http://example.org/foo"]
-      expect(doc.xpath('//mads:ComplexSubject/mads:elementList/@rdf:parseType', ns).map(&:value)).to eq ["Collection"]
-      expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 1]/@rdf:about', ns).map(&:value)).to eq ["http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"]
-      expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 2]/mads:elementValue', ns).map(&:text)).to eq ["Relations with Mexican Americans"]
-      expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 3]/@rdf:about', ns).map(&:value)).to eq ["http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"]
-      expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 4]/mads:elementValue', ns).map(&:text)).to eq ["1900s"]
-    end
+
+    describe "updating fields" do
+      it "stores the values in a containing node" do
+        list[3].elementValue = ["1900s"]
+        doc = Nokogiri::XML(subject.dump :rdfxml)
+        ns = {rdf: "http://www.w3.org/1999/02/22-rdf-syntax-ns#", mads: "http://www.loc.gov/mads/rdf/v1#"}
+        expect(doc.xpath('/rdf:RDF/mads:ComplexSubject/@rdf:about', ns).map(&:value)).to eq ["http://example.org/foo"]
+        expect(doc.xpath('//mads:ComplexSubject/mads:elementList/@rdf:parseType', ns).map(&:value)).to eq ["Collection"]
+        expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 1]/@rdf:about', ns).map(&:value)).to eq ["http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"]
+        expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 2]/mads:elementValue', ns).map(&:text)).to eq ["Relations with Mexican Americans"]
+        expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 3]/@rdf:about', ns).map(&:value)).to eq ["http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"]
+        expect(doc.xpath('//mads:ComplexSubject/mads:elementList/*[position() = 4]/mads:elementValue', ns).map(&:text)).to eq ["1900s"]
+        expect(RDF::List.new(list.rdf_subject, subject.graph)).to be_valid
+      end
+
+      it "should be a valid list" do
+        list << "Val"
+        # TODO this is a workaround for https://github.com/projecthydra/active_fedora/issues/444
+        # remove the following line when #444 is closed.
+        list.resource.persist!
+        expect(RDF::List.new(list.rdf_subject, subject.graph)).to be_valid
+      end
+    end  
   end
 end
 

data/spec/{rdf_nested_attributes_spec.rb → active_triples/nested_attributes_spec.rb}

@@ -100,14 +100,14 @@ describe "nesting attribute behavior" do
         subject { ComplexResource::PersonalName.new }
         it "should accept a hash" do
           subject.elementList_attributes =  [{ topicElement_attributes: {'0' => { elementValue:"Quantum Behavior" }, '1' => { elementValue:"Wave Function" }}}]
-          subject.elementList.first[0].elementValue.should == ["Quantum Behavior"]
-          subject.elementList.first[1].elementValue.should == ["Wave Function"]
+          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
 
         end
         it "should accept an array" do
           subject.elementList_attributes =  [{ topicElement_attributes: [{ elementValue:"Quantum Behavior" }, { elementValue:"Wave Function" }]}]
-          subject.elementList.first[0].elementValue.should == ["Quantum Behavior"]
-          subject.elementList.first[1].elementValue.should == ["Wave Function"]
+          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
         end
       end
 
@@ -118,10 +118,10 @@ describe "nesting attribute behavior" do
         end
 
         it 'should have attributes' do
-          subject.topic[0].elementList.first[0].elementValue.should == ["Cosmology"]
-          subject.topic[1].elementList.first[0].elementValue.should == ["Quantum Behavior"]
-          subject.personalName.first.elementList.first.fullNameElement.should == ["Jefferson, Thomas"]
-          subject.personalName.first.elementList.first.dateNameElement.should == ["1743-1826"]
+          expect(subject.topic[0].elementList.first[0].elementValue).to eq ["Cosmology"]
+          expect(subject.topic[1].elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(subject.personalName.first.elementList.first.fullNameElement).to eq ["Jefferson, Thomas"]
+          expect(subject.personalName.first.elementList.first.dateNameElement).to eq ["1743-1826"]
         end
         
         it 'should build nodes with ids' do
@@ -171,7 +171,7 @@ describe "nesting attribute behavior" do
       it "should update nested objects" do
         subject.parts_attributes= [{id: replace_object_id, label: "Universal Joint"}, {label:"Oil Pump"}, {id: remove_object_id, _destroy: '1', label: "bar1 uno"}]
 
-        subject.parts.map{|p| p.label.first}.should == ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
+        expect(subject.parts.map{|p| p.label.first}).to eq ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
 
       end
       it "create a new object when the id is provided" do

data/spec/{rdf_properties_spec.rb → active_triples/properties_spec.rb}

@@ -10,28 +10,6 @@ describe ActiveTriples::Properties do
     Object.send(:remove_const, "DummyProperties")
   end
 
-  describe '#map_predicates' do
-    before do
-      DummyProperties.map_predicates do |map|
-        map.title(:in => RDF::DC, :class_name => RDF::Literal) do |index|
-          index.as :facetable, :searchable
-        end
-      end
-    end
-
-    it 'should set a property' do
-      expect(DummyProperties.properties).to include :title
-    end
-
-    it "should set index behaviors" do
-      expect(DummyProperties.properties[:title][:behaviors]).to eq [:facetable, :searchable]
-    end
-
-    it "should set a class name" do
-      expect(DummyProperties.properties[:title][:class_name]).to eq RDF::Literal
-    end
-  end
-
   describe '#property' do
     it 'should set a property' do
       DummyProperties.property :title, :predicate => RDF::DC.title
@@ -59,7 +37,6 @@ describe ActiveTriples::Properties do
       DummyProperties.property :title, :predicate => RDF::DC.title, :class_name => "FakeClassName"
       expect(DummyProperties.properties[:title][:class_name]).to eq "FakeClassName"
     end
-
   end
 
   context "when using a subclass" do

data/spec/{rdf_resource_spec.rb → active_triples/resource_spec.rb}

@@ -22,7 +22,7 @@ describe ActiveTriples::Resource do
 
   describe 'rdf_subject' do
     it "should be a blank node if we haven't set it" do
-      expect(subject.rdf_subject.node?).to be_true
+      expect(subject.rdf_subject.node?).to be true
     end
 
     it "should be settable" do
@@ -43,15 +43,15 @@ describe ActiveTriples::Resource do
       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::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::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::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -70,7 +70,7 @@ describe ActiveTriples::Resource do
     context 'with a repository' do
       before do
         repository = RDF::Repository.new
-        subject.stub(:repository).and_return(repository)
+        allow(subject).to receive(:repository).and_return(repository)
       end
 
       context "when the object is new" do
@@ -123,8 +123,8 @@ describe ActiveTriples::Resource do
 
         before do
           @repo = RDF::Repository.new
-          subject.class.stub(:repository).and_return(nil)
-          subject.stub(:repository).and_return(@repo)
+          allow(subject.class).to receive(:repository).and_return(nil)
+          allow(subject).to receive(:repository).and_return(@repo)
           subject.title = "bla"
           subject.persist!
         end
@@ -156,8 +156,8 @@ describe ActiveTriples::Resource do
     subject { DummyLicense.new('http://example.org/cc')}
 
     it 'should return true' do
-      expect(subject.destroy!).to be_true
-      expect(subject.destroy).to be_true
+      expect(subject.destroy!).to be true
+      expect(subject.destroy).to be true
     end
     
     it 'should delete the graph' do
@@ -188,6 +188,15 @@ describe ActiveTriples::Resource do
     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')
+      d = DummyResource.new
+      d.relation = RDF::DC.type
+      expect { d.relation.first }.to raise_error "class_name for relation is a RDF::URI; must be a class"
+    end
+  end
+  
   describe 'attributes' do
     before do 
       subject.license = license

data/spec/pragmatic_context_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'pragmatic_context'
+
+describe 'PragmaticContext integration' do
+  before do
+    class DummyLicense < ActiveTriples::Resource
+      include PragmaticContext::Contextualizable
+      property :title, :predicate => RDF::DC.title
+
+      contextualize :title, :as => RDF::DC.title.to_s
+    end
+
+    class DummyResource < ActiveTriples::Resource
+      include PragmaticContext::Contextualizable
+
+      configure :type => RDF::URI('http://example.org/SomeClass')
+      property :license, :predicate => RDF::DC.license, :class_name => DummyLicense
+      property :title, :predicate => RDF::DC.title
+
+      contextualize :title, :as => RDF::DC.title.to_s
+      contextualize :license, :as => RDF::DC.license.to_s
+    end
+
+    license.title = 'cc'
+    subject.title = 'my resource'
+    subject.license = license
+    subject.license << RDF::Literal('Creative Commons')
+  end
+
+  after do
+    Object.send(:remove_const, "DummyResource") if Object
+    Object.send(:remove_const, "DummyLicense") if Object
+  end
+
+  subject { DummyResource.new('http://example.org/test') }
+  let(:license) { DummyLicense.new }
+
+  xit 'should output a valid jsonld representation of itself' do
+    g = RDF::Graph.new << JSON::LD::API.toRdf(subject.as_jsonld)
+    expect(subject == g).to be true
+  end
+
+  it 'should have contexts' do
+    expect(subject.as_jsonld['@context'].keys).to eq ["license", "title"]
+  end
+  
+  it 'should use context with dump' do
+    context = JSON.parse(subject.dump :jsonld)['@context']
+    subject.class.properties.keys.each do |prop|
+      expect(context).to include prop
+    end
+  end
+end