active-fedora 10.3.0 → 11.0.0.rc1

data/spec/integration/associations_spec.rb

@@ -197,7 +197,7 @@ describe ActiveFedora::Base do
 
         it "lets you set an array of objects" do
           @library.books = [@book, @book2]
-          expect(@library.books).to eq [@book, @book2]
+          expect(@library.books).to contain_exactly @book, @book2
           @library.save
 
           @library.books = [@book]
@@ -205,7 +205,7 @@ describe ActiveFedora::Base do
         end
         it "lets you set an array of object ids" do
           @library.book_ids = [@book.id, @book2.id]
-          expect(@library.books).to eq [@book, @book2]
+          expect(@library.books).to contain_exactly @book, @book2
         end
 
         it "setter should wipe out previously saved relations" do
@@ -219,7 +219,7 @@ describe ActiveFedora::Base do
           @library.books = [@book, @book2]
           @library.save
           @library = Library.find(@library.id)
-          expect(@library.books).to eq [@book, @book2]
+          expect(@library.books).to contain_exactly @book, @book2
         end
 
         it "lets you lookup an array of objects with solr" do
@@ -230,7 +230,7 @@ describe ActiveFedora::Base do
           @book2.save
 
           @library = Library.find(@library.id)
-          expect(@library.books).to eq [@book, @book2]
+          expect(@library.books).to contain_exactly @book, @book2
 
           solr_resp = @library.books(response_format: :solr)
           expect(solr_resp.size).to eq 2
@@ -462,7 +462,7 @@ describe ActiveFedora::Base do
 
       it "loads the association stored in the parent" do
         @reloaded_course = Course.find(@course.id)
-        expect(@reloaded_course.textbooks).to eq [@t1, @t2]
+        expect(@reloaded_course.textbooks).to contain_exactly @t1, @t2
       end
 
       it "allows a parent to be deleted from the has_many association" do
@@ -480,7 +480,7 @@ describe ActiveFedora::Base do
         @course.textbooks = [@t3, @t4]
         @course.save
 
-        expect(@course.reload.textbooks).to eq [@t3, @t4]
+        expect(@course.reload.textbooks).to contain_exactly @t3, @t4
       end
 
       it "allows a child to be deleted from the has_and_belongs_to_many association" do

data/spec/integration/basic_contains_association_spec.rb

@@ -86,7 +86,7 @@ describe ActiveFedora::Base do
 
       it "has the two contained objects" do
         expect(model.contains.size).to eq 2
-        expect(model.contains.map(&:title)).to eq [['title 1'], ['title 2']]
+        expect(model.contains.map(&:title)).to contain_exactly ['title 1'], ['title 2']
       end
     end
 

data/spec/integration/clean_connection_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe ActiveFedora::CleanConnection do
       it "returns a clean graph" do
         graph = result.graph
         expect(graph.statements.to_a.length).to eq 1
-        expect(graph.statements.to_a.first).to eq [asset.rdf_subject, RDF::Vocab::DC.title, "test"]
+        expect(graph.statements.to_a.first).to contain_exactly asset.rdf_subject, RDF::Vocab::DC.title, RDF::Literal.new("test")
       end
     end
   end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -64,8 +64,7 @@ describe "Nested Rdf Objects" do
       comp2 = SpecDatastream::Component.new nil, 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.map(&:label)).to contain_exactly ["Alternator"], ["Crankshaft"]
     end
 
     it "is able to clear complex objects" do
@@ -85,7 +84,7 @@ _:g70350851837440 <http://purl.org/dc/terms/title> "Alternator" .
 <#{ActiveFedora.fedora.host}/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.map(&:label)).to contain_exactly ["Alternator"], ["Crankshaft"]
     end
 
     it "builds complex objects when a parent node doesn't exist" do
@@ -111,7 +110,6 @@ END
     describe "#first_or_create" do
       it "returns a result if the predicate exists" do
         part1 = ds.parts.build
-        ds.parts.build
         expect(ds.parts.first_or_create).to eq part1
       end
 
@@ -165,7 +163,7 @@ END
   _:g70350851837440 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.ebu.ch/metadata/ontologies/ebucore#Organisation> .
   <#{ActiveFedora.fedora.host}/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.map(&:to_s)).to include "http://www.ebu.ch/metadata/ontologies/ebucore#Organisation"
       end
     end
 
@@ -205,6 +203,7 @@ END
       let(:file) { parent.info }
 
       it "stores the type of complex objects when type is specified" do
+        pending "This is no longer supported by ActiveTriples - can we deprecate this altogether?"
         series = SpecDatastream::Series.new nil, file.graph
         series.title = ["renovating bathrooms"]
         file.series = series

data/spec/integration/datastream_rdf_nested_attributes_spec.rb

@@ -91,8 +91,7 @@ describe "Nesting attribute behavior of RDFDatastream" do
               }
               # , "Hemings, Sally"
             ]
-          }
-        }
+          } }
       end
 
       describe "on lists" do
@@ -104,8 +103,8 @@ describe "Nesting attribute behavior of RDFDatastream" do
         end
         it "accepts an array" do
           subject.elementList_attributes = [{ topicElement_attributes: [{ elementValue: "Quantum Behavior" }, { elementValue: "Wave Function" }] }]
-          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
-          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
+          element_values = subject.elementList.first.map(&:elementValue)
+          expect(element_values).to contain_exactly ["Quantum Behavior"], ["Wave Function"]
         end
       end
 
@@ -116,14 +115,15 @@ describe "Nesting attribute behavior of RDFDatastream" do
         end
 
         it 'has attributes' do
-          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"]
+          element_values = subject.topic.map { |x| x.elementList.first[0].elementValue }
+          expect(element_values).to contain_exactly ["Cosmology"], ["Quantum Behavior"]
+          expect(subject.personalName.first.elementList.first.fullNameElement).to contain_exactly "Jefferson, Thomas"
+          expect(subject.personalName.first.elementList.first.dateNameElement).to contain_exactly "1743-1826"
         end
 
         it 'builds nodes with ids' do
-          expect(subject.topic[0].elementList.first[0].rdf_subject).to eq 'http://library.ucsd.edu/ark:/20775/bb3333333x'
+          element_list_elements = subject.topic.flat_map { |y| y.elementList.first[0].rdf_subject }
+          expect(element_list_elements).to include 'http://library.ucsd.edu/ark:/20775/bb3333333x'
           expect(subject.personalName.first.rdf_subject).to eq 'http://library.ucsd.edu/ark:20775/jefferson'
         end
 
@@ -160,19 +160,20 @@ describe "Nesting attribute behavior of RDFDatastream" do
           { label: 'Alternator' },
           { label: 'Distributor' },
           { label: 'Transmission' },
-          { label: 'Fuel Filter' }] }
+          { label: 'Fuel Filter' }
+        ] }
       end
-      let(:replace_object_id) { subject.parts[1].rdf_subject.to_s }
-      let(:remove_object_id) { subject.parts[3].rdf_subject.to_s }
+      let(:replace_object_id) { subject.parts.find { |x| x.label == ['Distributor'] }.rdf_subject.to_s }
+      let(:remove_object_id) { subject.parts.find { |x| x.label == ['Fuel Filter'] }.rdf_subject.to_s }
 
       it "updates 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" }]
 
-        expect(subject.parts.map { |p| p.label.first }).to eq ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
+        expect(subject.parts.map { |p| p.label.first }).to contain_exactly 'Alternator', 'Universal Joint', 'Transmission', 'Oil Pump'
       end
       it "create a new object when the id is provided" do
         subject.parts_attributes = [{ id: 'http://example.com/part#1', label: "Universal Joint" }]
-        expect(subject.parts.last.rdf_subject).to eq RDF::URI('http://example.com/part#1')
+        expect(subject.parts.map(&:rdf_subject)).to include RDF::URI('http://example.com/part#1')
       end
     end
   end

data/spec/integration/date_time_properties_spec.rb

@@ -39,19 +39,4 @@ describe ActiveFedora::Base do
       expect(subject).to match(/\+01:00/)
     end
   end
-
-  describe "saving and loading in Solr" do
-    let(:object) { Foo.create!(date: [date], single_date: date2, empty_date: '', integer: 1) }
-    before { allow(Deprecation).to receive(:warn) }
-
-    let(:subject_solr) { object.class.load_instance_from_solr(object.id) }
-    it "uses DateTime objects" do
-      expect(subject_solr.date.first).to be_a DateTime
-      expect(subject_solr.single_date).to be_a DateTime
-    end
-    it "loads the correct time" do
-      expect(subject_solr.date.first).to eql date
-      expect(subject_solr.single_date).to eql date2
-    end
-  end
 end

data/spec/integration/direct_container_spec.rb

@@ -48,7 +48,7 @@ describe "Direct containers" do
         describe "#append" do
           let(:file2) { o.files.build }
           it "has two files" do
-            expect(o.files).to eq [file, file2]
+            expect(o.files).to contain_exactly file, file2
           end
 
           context "and then saved/reloaded" do
@@ -57,7 +57,7 @@ describe "Direct containers" do
               o.save!
             end
             it "has two files" do
-              expect(reloaded.files).to eq [file, file2]
+              expect(reloaded.files).to contain_exactly file, file2
             end
           end
         end
@@ -171,7 +171,7 @@ describe "Direct containers" do
         end
 
         it "deletes the contained resource directly" do
-          expect(history.files).to eq [file1, file2]
+          expect(history.files).to contain_exactly file1, file2
           file1.delete
           history.reload
           expect(history.files).to eq [file2]
@@ -191,7 +191,7 @@ describe "Direct containers" do
         end
 
         it "deletes the contained resource via the collection proxy" do
-          expect(history.reload.files).to eq [file1, file2]
+          expect(history.reload.files).to contain_exactly file1, file2
           history.files.delete(file1)
           expect(history.reload.files).to eq [file2]
         end

data/spec/integration/directly_contains_one_association_spec.rb

@@ -91,7 +91,7 @@ describe ActiveFedora::Base do
       replacement_file.content = "I'm a replacement"
       page_image.save
       expect(subject).to_not include(primary_file)
-      expect(subject).to eq([a_file, replacement_file])
+      expect(subject).to contain_exactly(a_file, replacement_file)
       expect(reloaded_page_image.primary_file).to eq(replacement_file)
     end
   end

data/spec/integration/eradicate_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::Base do
     end
     context "in a typical sitation" do
       specify "it cannot be reused" do
-        expect { described_class.create(id: ghost) }.to raise_error(Ldp::Gone)
+        expect { described_class.create(ghost) }.to raise_error(Ldp::Gone)
       end
     end
     specify "remove its tombstone" do

data/spec/integration/generators/solr_generator_spec.rb

@@ -9,14 +9,17 @@ describe ActiveFedora::Config::SolrGenerator do
       '.solr_wrapper'
     ]}
 
+    before do
+      generator.solr_wrapper_config
+    end
+
+    after do
+      files_to_test.each { |file| File.delete(file) if File.exist?(file) }
+    end
+
     it "creates config files" do
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          generator.solr_wrapper_config
-          files_to_test.each do |file|
-            expect(File).to exist(file), "Expected #{file} to exist"
-          end
-        end
+      files_to_test.each do |file|
+        expect(File).to exist(file), "Expected #{file} to exist"
       end
     end
   end

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -5,11 +5,11 @@ describe ActiveFedora::Base do
     context "that is also a HABTM" do
       before do
         class Book < ActiveFedora::Base
-          has_and_belongs_to_many :topics, predicate: ::RDF::FOAF.primaryTopic, inverse_of: :books
+          has_and_belongs_to_many :topics, predicate: ::RDF::Vocab::FOAF.primaryTopic, inverse_of: :books
         end
 
         class Topic < ActiveFedora::Base
-          has_and_belongs_to_many :books, predicate: ::RDF::FOAF.isPrimaryTopicOf
+          has_and_belongs_to_many :books, predicate: ::RDF::Vocab::FOAF.isPrimaryTopicOf
         end
       end
 
@@ -34,7 +34,7 @@ describe ActiveFedora::Base do
         end
 
         it "allows for more than 10 items" do
-          (1..12).each do
+          12.times do
             book.topics << Topic.create
           end
           book.save
@@ -208,7 +208,7 @@ describe ActiveFedora::Base do
       end
 
       it "delete should cause the entries to be removed from RELS-EXT, but not destroy the original record" do
-        expect(book.collections).to eq [collection1, collection2]
+        expect(book.collections).to contain_exactly collection1, collection2
         book.collections.delete(collection1)
         expect(book.collections).to eq [collection2]
         book.save!
@@ -218,7 +218,7 @@ describe ActiveFedora::Base do
       end
 
       it "destroy should cause the entries to be removed from RELS-EXT, but not destroy the original record" do
-        expect(book.collections).to eq [collection1, collection2]
+        expect(book.collections).to contain_exactly collection1, collection2
         book.collections.destroy(collection1)
         expect(book.collections).to eq [collection2]
         book.save!

data/spec/integration/has_many_associations_spec.rb

@@ -161,7 +161,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
 
     it "only returns relationships of the correct class" do
       @book.reload
-      expect(@book.people).to eq [@person1, @person2]
+      expect(@book.people).to contain_exactly @person1, @person2
       expect(@book.collections).to eq []
     end
   end
@@ -222,7 +222,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
       it "does not restrict relationships" do
         @book.reload
-        expect(@book.attachments).to eq [@image, @pdf]
+        expect(@book.attachments).to contain_exactly @image, @pdf
       end
     end
 
@@ -240,7 +240,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       it "does not restrict relationships" do
         email.attachment_ids = [image.id, pdf.id]
         email.reload
-        expect(email.attachments).to eq [image, pdf]
+        expect(email.attachments).to contain_exactly image, pdf
       end
     end
   end
@@ -409,7 +409,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       subject { library.books(true) }
 
       it "saves the new title" do
-        expect(subject.first.title).to eql ["Better book"]
+        expect(subject.first.title).to eq ["Better book"]
       end
     end
   end

data/spec/integration/indexing_spec.rb

@@ -62,7 +62,7 @@ describe ActiveFedora::Base do
       class GenericFile < ActiveFedora::Base
         has_many :permissions, predicate: ::RDF::Vocab::ACL.accessTo
         accepts_nested_attributes_for :permissions, allow_destroy: true
-        property :title, predicate: ::RDF::DC.title
+        property :title, predicate: ::RDF::Vocab::DC.title
 
         def to_solr
           super.tap do |doc|

data/spec/integration/indirect_container_spec.rb

@@ -160,7 +160,7 @@ describe "Indirect containers" do
         describe "#append" do
           let(:file2) { o.related_objects.build }
           it "has two related_objects" do
-            expect(o.related_objects).to eq [file, file2]
+            expect(o.related_objects).to contain_exactly file, file2
           end
 
           context "and then saved/reloaded" do
@@ -170,7 +170,7 @@ describe "Indirect containers" do
             end
 
             it "has two related_objects" do
-              expect(reloaded.related_objects).to eq [file, file2]
+              expect(reloaded.related_objects).to contain_exactly file, file2
             end
           end
         end
@@ -196,7 +196,7 @@ describe "Indirect containers" do
             end
 
             it "returns the ids" do
-              expect(reloaded.related_object_ids).to eq [file.id, file2.id]
+              expect(reloaded.related_object_ids).to contain_exactly file.id, file2.id
             end
           end
         end

data/spec/integration/ntriples_datastream_spec.rb

@@ -6,13 +6,23 @@ describe ActiveFedora::NtriplesRDFDatastream do
       property :size
     end
 
-    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-      property :title, predicate: ::RDF::Vocab::DC.title
-      property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted
-      property :filesize, predicate: FileVocabulary.size
-      property :part, predicate: ::RDF::Vocab::DC.hasPart
-      property :based_near, predicate: ::RDF::FOAF.based_near
-      property :related_url, predicate: ::RDF::RDFS.seeAlso
+    Deprecation.silence(ActiveFedora::RDFDatastream) do
+      class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        property :title, predicate: ::RDF::Vocab::DC.title do |index|
+          index.as :stored_searchable, :facetable
+        end
+        property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted do |index|
+          index.type :date
+          index.as :stored_searchable, :sortable
+        end
+        property :filesize, predicate: FileVocabulary.size do |index|
+          index.type :integer
+          index.as :stored_sortable
+        end
+        property :part, predicate: ::RDF::Vocab::DC.hasPart
+        property :based_near, predicate: ::RDF::Vocab::FOAF.based_near
+        property :related_url, predicate: ::RDF::RDFS.seeAlso
+      end
     end
 
     class RdfTest < ActiveFedora::Base
@@ -52,7 +62,7 @@ EOF
     end
     it "handles integers" do
       subject.filesize = 12_345
-      expect(subject.filesize).to be_kind_of Array
+      expect(subject.filesize).to eq [12_345]
       expect(subject.filesize.first).to be_kind_of Fixnum
     end
   end
@@ -89,7 +99,7 @@ EOF
     subject.save
 
     loaded = MyDatastream.new(subject.uri)
-    expect(loaded.part).to eq ['part 1', 'part 2']
+    expect(loaded.part).to contain_exactly 'part 1', 'part 2'
   end
 
   it "appends values" do
@@ -97,7 +107,12 @@ EOF
     subject.save
 
     subject.part << "thing 2"
-    expect(subject.part).to eq ["thing 1", "thing 2"]
+    expect(subject.part).to contain_exactly "thing 1", "thing 2"
+  end
+
+  it "is able to save a blank document" do
+    subject.title = ""
+    subject.save
   end
 
   it "loads n-triples into the graph" do
@@ -105,7 +120,7 @@ EOF
 <http://oregondigital.org/ns/62> <http://purl.org/dc/terms/spatial> "Benton County (Ore.)" .
 '
     subject.content = ntrip
-    expect(subject.graph.dump(:ntriples)).to eq ntrip
+    expect(subject.graph.statements.to_a).to contain_exactly(*RDF::NTriples::Reader.new(ntrip).statements.to_a)
   end
 
   describe "using rdf_subject" do
@@ -123,7 +138,7 @@ EOF
       subject.destroy
     end
 
-    subject { RdfTest.new(id: '/test:99') }
+    subject { RdfTest.new('/test:99') }
 
     it "writes rdf with proper subjects" do
       subject.reload
@@ -155,15 +170,15 @@ EOF
     subject.part = ["MacBeth"]
     subject.part << "Hamlet"
     subject.part << "Romeo & Juliet"
-    expect(subject.part.first).to eq "MacBeth"
-    subject.part.delete("MacBeth", "Romeo & Juliet")
+    expect(subject.part).to include "MacBeth"
+    subject.part.subtract(["MacBeth", "Romeo & Juliet"])
     expect(subject.part).to eq ["Hamlet"]
     expect(subject.part.first).to eq "Hamlet"
   end
   it "ignores values to be deleted that do not exist" do
     subject.part = ["title1", "title2", "title3"]
-    subject.part.delete("title2", "title4", "title6")
-    expect(subject.part).to eq ["title1", "title3"]
+    subject.part.subtract(["title2", "title4", "title6"])
+    expect(subject.part).to contain_exactly "title1", "title3"
   end
 
   describe "term proxy methods" do
@@ -185,19 +200,16 @@ EOF
     it "iterates over multiple values" do
       expect(subject.title).to respond_to(:each)
     end
-    it "gets the first value" do
-      expect(subject.title.first).to eq "title1"
-    end
     it "evaluates equality predictably" do
-      expect(subject.title).to eq ["title1", "title2", "title3"]
+      expect(subject.title).to contain_exactly "title1", "title2", "title3"
     end
     it "supports the empty? method" do
       expect(subject.title).to_not be_empty
-      subject.title.delete("title1", "title2", "title3")
+      subject.title.subtract(["title1", "title2", "title3"])
       expect(subject.title).to be_empty
     end
-    it "supports the is_a? method" do
-      expect(subject.title.is_a?(Array)).to eq true
+    it "supports the each method" do
+      expect(subject.title.respond_to?(:each)).to eq true
     end
   end
 end