active-fedora 8.7.0 → 9.0.0.beta1

data/spec/integration/belongs_to_association_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   before do
-    class Library < ActiveFedora::Base 
+    class Library < ActiveFedora::Base
       has_many :books
     end
 
-    class Book < ActiveFedora::Base 
-      belongs_to :library, property: :has_constituent
+    class Book < ActiveFedora::Base
+      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
     end
     class SpecialInheritedBook < Book
     end
@@ -25,12 +25,19 @@ describe ActiveFedora::Base do
   describe "setting the id property" do
     it "should store it" do
       book.library_id = library.id
-      expect(book.library_id).to eq(library.id)
+      expect(book.library_id).to eq library.id
+    end
+
+    it "should mark it as changed" do
+      expect {
+        book.library_id = library.id
+      }.to change { book.changed? }.from(false).to(true)
     end
 
     describe "reassigning the parent_id" do
       let(:library2) { Library.create}
       before { book.library = library2 }
+
       it "should update the object" do
         expect(book.library).to eq library2 # cause the association to set @loaded
         library_proxy = book.send(:association_instance_get, :library)
@@ -43,19 +50,14 @@ describe ActiveFedora::Base do
 
     it "should be settable via []=" do
       book[:library_id] = library.id
-      expect(book.library_id).to eq(library.id)
-    end
-
-    it "safely handles invalid data" do
-      book[:library_id] = 'bad:identifier'
-      expect(book.library).to be_nil
+      expect(book.library_id).to eq library.id
     end
   end
 
   describe "getting the id property" do
     it "should be accessable via []" do
       book[:library_id] = library.id
-      expect(book[:library_id]).to eq(library.id)
+      expect(book[:library_id]).to eq library.id
     end
   end
 
@@ -84,19 +86,23 @@ describe ActiveFedora::Base do
   describe "casting inheritance detailed test cases" do
     before :all do
       class SimpleObject < ActiveFedora::Base
-        belongs_to :simple_collection, property: :is_part_of, class_name: 'SimpleCollection'
-        belongs_to :complex_collection, property: :is_part_of, class_name: 'ComplexCollection'
+        belongs_to :simple_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleCollection'
+        belongs_to :complex_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexCollection'
       end
 
       class ComplexObject < SimpleObject
+        belongs_to :simple_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleCollection'
+        belongs_to :complex_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexCollection'
       end
 
       class SimpleCollection < ActiveFedora::Base
-        has_many :objects, property: :is_part_of, class_name: 'SimpleObject'
-        has_many :complex_objects, property: :is_part_of, class_name: 'ComplexObject'
+        has_many :objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleObject', autosave: true
+        has_many :complex_objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexObject', autosave: true
       end
 
       class ComplexCollection < SimpleCollection
+        has_many :objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleObject', autosave: true
+        has_many :complex_objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexObject', autosave: true
       end
 
     end
@@ -108,73 +114,77 @@ describe ActiveFedora::Base do
     end
 
     describe "saving between the before and after hooks" do
-      before do
-        @simple_collection = SimpleCollection.create
-        @complex_collection = ComplexCollection.create
-
-        @simple_object = SimpleObject.create
-        @simple_object_second = SimpleObject.create
-        @simple_object_third = SimpleObject.create
-        @complex_object = ComplexObject.create
-        @complex_object_second = ComplexObject.create
-
-        #Need to add the simpler cmodel here as currently inheritance support is read-only.
-        #See ActiveFedora pull request 207 on how to do this programmatically.
-        @complex_object.add_relationship(:has_model, @complex_object.class.superclass.to_class_uri)
-        @complex_collection.add_relationship(:has_model, @complex_collection.class.superclass.to_class_uri)
-
-        @simple_collection.objects = [@simple_object, @simple_object_second, @complex_object]
-        @simple_collection.save!
-        @complex_collection.objects = [@simple_object_third, @complex_object_second]
-        @complex_collection.save!
-        @complex_object.save!
-        @simple_object.save!
-        @simple_object_second.save!
+      context "Add a complex_object into a simple_collection" do
+        before do
+          @simple_collection = SimpleCollection.create
+          @complex_collection = ComplexCollection.create
+          @complex_object = ComplexObject.create
+          @simple_collection.objects = [@complex_object]
+          @simple_collection.save!
+          @complex_collection.save!
+        end
+        it "should have added the inverse relationship for the correct class" do
+          expect(@complex_object.simple_collection).to be_instance_of SimpleCollection
+          expect(@complex_object.complex_collection).to be_nil
+        end
       end
 
-
-      it "casted association methods should work and return the most complex class" do
-
-        expect(@complex_object.simple_collection).to be_instance_of SimpleCollection
-        expect(@complex_object.complex_collection).to be_nil
-
-        expect(@complex_object_second.simple_collection).to be_instance_of ComplexCollection
-        expect(@complex_object_second.complex_collection).to be_instance_of ComplexCollection
-
-        expect(@simple_object.simple_collection).to be_instance_of SimpleCollection
-        expect(@simple_object.complex_collection).to be_nil
-
-        expect(@simple_object_second.simple_collection).to be_instance_of SimpleCollection
-        expect(@simple_object_second.complex_collection).to be_nil
-
-        expect(@simple_object_third.simple_collection).to be_instance_of ComplexCollection
-        expect(@simple_object_third.complex_collection).to be_instance_of ComplexCollection
-
-        expect(@simple_collection.objects.size).to eq(3)
-        expect(@simple_collection.objects[0]).to be_instance_of SimpleObject
-        expect(@simple_collection.objects[1]).to be_instance_of SimpleObject
-        expect(@simple_collection.objects[2]).to be_instance_of ComplexObject
-
-        expect(@complex_collection.objects.size).to eq(2)
-        expect(@complex_collection.objects[0]).to be_instance_of SimpleObject
-        expect(@complex_collection.objects[1]).to be_instance_of ComplexObject
-
+      context "Add a complex_object into a complex_collection" do
+        before do
+          @complex_collection = ComplexCollection.create
+          @complex_object = ComplexObject.create
+          @complex_collection.objects = [@complex_object] # this sticks it into the :objects association, but since it is a ComplexObject it should also be fetched by :complex_collection association
+          @complex_collection.save
+        end
+
+        it "should have added the inverse relationship for the correct class" do
+          expect(@complex_object.complex_collection).to be_instance_of ComplexCollection
+          expect(@complex_object.reload.simple_collection).to be_instance_of ComplexCollection
+        end
       end
 
-      it "specified ending relationships should ignore classes not specified" do
-        expect(@simple_collection.complex_objects.size).to eq(1)
-        expect(@simple_collection.complex_objects[0]).to be_instance_of ComplexObject
-        expect(@simple_collection.complex_objects[1]).to be_nil
-
-        expect(@complex_collection.complex_objects.size).to eq(1)
-        expect(@complex_collection.complex_objects[0]).to be_instance_of ComplexObject
-        expect(@complex_collection.complex_objects[1]).to be_nil
+      context "Adding mixed types on a base class with a filtered has_many relationship" do
+        before do
+          @simple_collection = SimpleCollection.create
+          @complex_object = ComplexObject.create
+          @simple_object = SimpleObject.create
+          @simple_collection.objects = [@complex_object, @simple_object]
+          @simple_collection.save!
+        end
+        it "ignores objects who's classes aren't specified" do
+          expect(@simple_collection.complex_objects.size).to eq 1
+          expect(@simple_collection.complex_objects[0]).to be_instance_of ComplexObject
+          expect(@simple_collection.complex_objects[1]).to be_nil
+
+          expect(@simple_collection.objects.size).to eq 2
+          expect(@simple_collection.objects[0]).to be_instance_of ComplexObject
+          expect(@simple_collection.objects[1]).to be_instance_of SimpleObject
+
+          expect(@simple_object.simple_collection).to be_instance_of SimpleCollection
+          expect(@simple_object.complex_collection).to be_nil
+        end
       end
 
-      after do
-        @simple_object.delete
-        @simple_object_second.delete
-        @complex_object.delete
+      context "Adding mixed types on a subclass with a filtered has_many relationship" do
+        before do
+          @complex_collection = ComplexCollection.create
+          @complex_object = ComplexObject.create
+          @simple_object = SimpleObject.create
+          @complex_collection.objects = [@complex_object, @simple_object]
+          @complex_collection.save!
+        end
+        it "ignores objects who's classes aren't specified" do
+          expect(@complex_collection.complex_objects.size).to eq 1
+          expect(@complex_collection.complex_objects[0]).to be_instance_of ComplexObject
+          expect(@complex_collection.complex_objects[1]).to be_nil
+
+          expect(@complex_collection.objects.size).to eq 2
+          expect(@complex_collection.objects[0]).to be_instance_of ComplexObject
+          expect(@complex_collection.objects[1]).to be_instance_of SimpleObject
+
+          expect(@simple_object.complex_collection).to be_instance_of ComplexCollection
+          expect(@simple_object.reload.simple_collection).to be_instance_of ComplexCollection
+        end
       end
     end
   end

data/spec/integration/bug_spec.rb

@@ -30,13 +30,13 @@ describe 'bugs' do
     @test_object.someData.fubar=['initial']
     @test_object.save!
 
-    x = FooHistory.find(@test_object.pid)
+    x = FooHistory.find(@test_object.id)
     x.someData.fubar = ["replacement"] # set a new value
     x.save!
 
 
-    x = FooHistory.find(@test_object.pid)
-    expect(x.someData.fubar).to eq(["replacement"]) # recall the value
+    x = FooHistory.find(@test_object.id)
+    expect(x.someData.fubar).to eq ["replacement"] # recall the value
     x.save
   end
 end

data/spec/integration/collection_association_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   before do
-    class Library < ActiveFedora::Base 
+    class Library < ActiveFedora::Base
       has_many :books
     end
     class Book < ActiveFedora::Base
-      belongs_to :library, property: :has_member
+      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasMember
     end
   end
   let(:library) { Library.create! }
@@ -20,10 +20,10 @@ describe ActiveFedora::Base do
   end
   describe "load_from_solr" do
     it "should set rows to count, if not specified" do
-      expect(library.books(response_format: :solr).size).to eq(2)
+      expect(library.books(response_format: :solr).size).to eq 2
     end
     it "should limit rows returned if option passed" do
-      expect(library.books(response_format: :solr, rows: 1).size).to eq(1)
+      expect(library.books(response_format: :solr, rows: 1).size).to eq 1
     end
   end
 

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -2,24 +2,23 @@ require 'spec_helper'
 
 describe "Nested Rdf Objects" do
   describe "without type" do
-    before(:each) do
+    before do
       class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :parts, predicate: RDF::DC.hasPart, class_name: 'Component'
+        property :parts, predicate: ::RDF::DC.hasPart, class_name: 'Component'
 
         class Component < ActiveTriples::Resource
-          property :label, predicate: RDF::DC.title
+          property :label, predicate: ::RDF::DC.title
         end
       end
 
     end
 
-    after(:each) do
+    after do
       Object.send(:remove_const, :SpecDatastream)
     end
 
-    let (:ds) do
-      test_obj = ActiveFedora::Base.new(pid: 'test:124')
-      ds = SpecDatastream.new(test_obj, 'descMd')
+    let(:ds) do
+      ds = SpecDatastream.new('http://localhost:8983/fedora/rest/test/test:124/descMd')
     end
 
     describe "#new_record?" do
@@ -30,9 +29,9 @@ describe "Nested Rdf Objects" do
 
       it "should not be new when it's loaded from fedora" do
         ds.content = '_:g70324142325120 <http://purl.org/dc/terms/title> "Alternator" .
-<info:fedora/test:124> <http://purl.org/dc/terms/hasPart> _:g70324142325120 .'
+<http://localhost:8983/fedora/rest/test/test:124> <http://purl.org/dc/terms/hasPart> _:g70324142325120 .'
         ds.resource.persist!
-        expect(ds.parts.first).not_to be_new_record
+        expect(ds.parts.first).to_not be_new_record
       end
     end
 
@@ -40,24 +39,24 @@ describe "Nested Rdf Objects" do
       comp = SpecDatastream::Component.new(ds.graph)
       comp.label = ["Alternator"]
       ds.parts = comp
-      expect(ds.parts.first.label).to eq(["Alternator"])
+      expect(ds.parts.first.label).to eq ["Alternator"]
     end
 
     it "should be able to replace attributes" do
       v = ds.parts.build(label: 'Alternator')
-      expect(ds.parts.first.label).to eq(['Alternator'])
+      expect(ds.parts.first.label).to eq ['Alternator']
       ds.parts.first.label = ['Distributor']
-      expect(ds.parts.first.label).to eq(['Distributor'])
+      expect(ds.parts.first.label).to eq ['Distributor']
     end
 
     it "should be able to replace objects" do
       ds.parts.build(label: 'Alternator')
       ds.parts.build(label: 'Distributor')
-      expect(ds.parts.size).to eq(2)
+      expect(ds.parts.size).to eq 2
       comp = SpecDatastream::Component.new(ds.graph)
       comp.label = "Injector port"
       ds.parts = [comp]
-      expect(ds.parts.size).to eq(1)
+      expect(ds.parts.size).to eq 1
     end
 
     it "should be able to nest many complex objects" do
@@ -66,8 +65,8 @@ describe "Nested Rdf Objects" do
       comp2 = SpecDatastream::Component.new ds.graph
       comp2.label = ["Crankshaft"]
       ds.parts = [comp1, comp2]
-      expect(ds.parts.first.label).to eq(["Alternator"])
-      expect(ds.parts.last.label).to eq(["Crankshaft"])
+      expect(ds.parts.first.label).to eq ["Alternator"]
+      expect(ds.parts.last.label).to eq ["Crankshaft"]
     end
 
     it "should be able to clear complex objects" do
@@ -77,51 +76,51 @@ describe "Nested Rdf Objects" do
       comp2.label = ["Crankshaft"]
       ds.parts = [comp1, comp2]
       ds.parts = []
-      expect(ds.parts).to eq([])
+      expect(ds.parts).to eq []
     end
 
     it "should load complex objects" do
       ds.content = <<END
 _:g70350851837440 <http://purl.org/dc/terms/title> "Alternator" .
-<info:fedora/test:124> <http://purl.org/dc/terms/hasPart> _:g70350851837440 .
-<info:fedora/test:124> <http://purl.org/dc/terms/hasPart> _:g70350851833380 .
+<http://localhost:8983/fedora/rest/test/test:124> <http://purl.org/dc/terms/hasPart> _:g70350851837440 .
+<http://localhost:8983/fedora/rest/test/test:124> <http://purl.org/dc/terms/hasPart> _:g70350851833380 .
 _:g70350851833380 <http://purl.org/dc/terms/title> "Crankshaft" .
 END
-      expect(ds.parts.first.label).to eq(["Alternator"])
+      expect(ds.parts.first.label).to eq ["Alternator"]
     end
 
     it "should build complex objects when a parent node doesn't exist" do
       part = ds.parts.build
       expect(part).to be_kind_of SpecDatastream::Component
       part.label = "Wheel bearing"
-      expect(ds.parts.first.label).to eq(['Wheel bearing'])
+      expect(ds.parts.first.label).to eq ['Wheel bearing']
     end
 
     it "should not create a child node when hitting the accessor" do
       ds.parts
       expect(ds.parts.first).to be_nil
-      expect(ds.serialize).to eq('')
+      expect(ds.serialize).to eq ''
     end
 
     it "should build complex objects when a parent node exists" do
       part = ds.parts.build
       expect(part).to be_kind_of SpecDatastream::Component
       part.label = "Wheel bearing"
-      expect(ds.parts.first.label).to eq(['Wheel bearing'])
+      expect(ds.parts.first.label).to eq ['Wheel bearing']
     end
 
     describe "#first_or_create" do
       it "should return a result if the predicate exists" do
         part1 = ds.parts.build
         part2 = ds.parts.build
-        expect(ds.parts.first_or_create).to eq(part1)
+        expect(ds.parts.first_or_create).to eq part1
       end
 
       it "should create a new result if the predicate doesn't exist" do
-        expect(ds.parts).to eq([])
+        expect(ds.parts).to eq []
         part = ds.parts.first_or_create(label: 'Front control arm bushing')
-        expect(part.label).to eq(['Front control arm bushing'])
-        expect(ds.parts).to eq([part])
+        expect(part.label).to eq ['Front control arm bushing']
+        expect(ds.parts).to eq [part]
       end
 
     end
@@ -132,11 +131,11 @@ END
     describe "one class per assertion" do
       before(:each) do
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
-          property :mediator, predicate: RDF::DC.mediator, class_name: 'MediatorUser'
+          property :mediator, predicate: ::RDF::DC.mediator, class_name: 'MediatorUser'
 
           class MediatorUser < ActiveTriples::Resource
-            configure type: RDF::DC.AgentClass
-            property :title, predicate: RDF::DC.title
+            configure type: ::RDF::DC.AgentClass
+            property :title, predicate: ::RDF::DC.title
           end
         end
       end
@@ -144,37 +143,33 @@ END
       after(:each) do
         Object.send(:remove_const, :SpecDatastream)
       end
-
-      let (:ds) do
-        mock_obj = double(:mock_obj, pid: 'test:124', :new_record? => true)
-        ds = SpecDatastream.new(mock_obj, 'descMd')
-      end
+      let (:ds) { SpecDatastream.new('http://localhost:8983/fedora/rest/test/test:124/descMd') }
 
 
       it "should store the type of complex objects when type is specified" do
         comp = SpecDatastream::MediatorUser.new ds.graph
         comp.title = ["Doctor"]
         ds.mediator = comp
-        expect(ds.mediator.first.type.first).to be_instance_of RDF::URI
-        expect(ds.mediator.first.type.first.to_s).to eq("http://purl.org/dc/terms/AgentClass")
-        expect(ds.mediator.first.title.first).to eq('Doctor')
+        expect(ds.mediator.first.type.first).to be_instance_of ::RDF::URI
+        expect(ds.mediator.first.type.first.to_s).to eq "http://purl.org/dc/terms/AgentClass"
+        expect(ds.mediator.first.title.first).to eq 'Doctor'
       end
 
       it "should add the type of complex object when it is not provided" do
         ds.content = <<END
   _:g70350851837440 <http://purl.org/dc/terms/title> "Mediation Person" .
-  <info:fedora/test:124> <http://purl.org/dc/terms/mediator> _:g70350851837440 .
+  <http://localhost:8983/fedora/rest/test/test:124> <http://purl.org/dc/terms/mediator> _:g70350851837440 .
 END
-        expect(ds.mediator.first.type.first.to_s).to eq("http://purl.org/dc/terms/AgentClass")
+        expect(ds.mediator.first.type.first.to_s).to eq "http://purl.org/dc/terms/AgentClass"
       end
 
       it "should add load the type of complex objects when provided (superceeding what is specified by the class)" do
         ds.content = <<END
   _:g70350851837440 <http://purl.org/dc/terms/title> "Mediation Orgainzation" .
   _:g70350851837440 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.ebu.ch/metadata/ontologies/ebucore#Organisation> .
-  <info:fedora/test:124> <http://purl.org/dc/terms/mediator> _:g70350851837440 .
+  <http://localhost:8983/fedora/rest/test/test:124> <http://purl.org/dc/terms/mediator> _:g70350851837440 .
 END
-        expect(ds.mediator.first.type.first.to_s).to eq("http://www.ebu.ch/metadata/ontologies/ebucore#Organisation")
+        expect(ds.mediator.first.type.first.to_s).to eq "http://www.ebu.ch/metadata/ontologies/ebucore#Organisation"
       end
     end
 
@@ -185,6 +180,10 @@ END
           property :title
         end
 
+        class Container < ActiveFedora::Base
+          contains :info, class_name: 'SpecDatastream'
+        end
+
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream
           property :series, predicate: EbuCore.isEpisodeOf, class_name: 'Series'
           property :program, predicate: EbuCore.isEpisodeOf, class_name: 'Program'
@@ -204,32 +203,31 @@ END
 
       after(:each) do
         Object.send(:remove_const, :SpecDatastream)
+        Object.send(:remove_const, :Container)
       end
 
-      let (:ds) do
-        mock_obj = double(:mock_obj, pid: 'test:124', :new_record? => true)
-        ds = SpecDatastream.new(mock_obj, 'descMd')
-      end
+      let(:parent) { Container.new id: '124' }
+      let (:file) { parent.info }
 
 
       it "should store the type of complex objects when type is specified" do
-        series = SpecDatastream::Series.new ds.graph
+        series = SpecDatastream::Series.new file.graph
         series.title = ["renovating bathrooms"]
-        ds.series = series
+        file.series = series
 
-        program = SpecDatastream::Program.new ds.graph
+        program = SpecDatastream::Program.new file.graph
         program.title = ["This old House"]
-        ds.program = program
+        file.program = program
 
-        expect(ds.program.first.type.size).to eq(1)
-        expect(ds.program.first.type.first.to_s).to eq('http://www.ebu.ch/metadata/ontologies/ebucore#Programme')
-        expect(ds.series.first.type.size).to eq(1)
-        expect(ds.series.first.type.first.to_s).to eq('http://www.ebu.ch/metadata/ontologies/ebucore#Series')
+        expect(file.program.first.type.size).to eq 1
+        expect(file.program.first.type.first.to_s).to eq 'http://www.ebu.ch/metadata/ontologies/ebucore#Programme'
+        expect(file.series.first.type.size).to eq 1
+        expect(file.series.first.type.first.to_s).to eq 'http://www.ebu.ch/metadata/ontologies/ebucore#Series'
       end
 
       it "should create an object of the correct type" do
-        expect(ds.program.build).to be_kind_of SpecDatastream::Program
-        expect(ds.series.build).to be_kind_of SpecDatastream::Series
+        expect(file.program.build).to be_kind_of SpecDatastream::Program
+        expect(file.series.build).to be_kind_of SpecDatastream::Series
       end
     end
   end