hydra-pcdm 0.2.0 → 0.3.0

data/spec/hydra/pcdm/models/object_spec.rb

@@ -5,134 +5,22 @@ describe Hydra::PCDM::Object do
     let(:child1) { described_class.new(id: '1') }
     let(:child2) { described_class.new(id: '2') }
     let(:object) { described_class.new }
-    before { object.objects = [child1, child2] }
+    before do
+      object.ordered_members << child1
+      object.ordered_members << child2
+    end
 
-    subject { object.object_ids }
+    subject { object.ordered_object_ids }
 
     it { is_expected.to eq %w(1 2) }
   end
 
-  describe '#objects=, +=, <<' do
-    context 'with acceptable child objects' do
-      let(:object1) { described_class.new }
-      let(:object2) { described_class.new }
-      let(:object3) { described_class.new }
-      let(:object4) { described_class.new }
-      let(:object5) { described_class.new }
-
-      it 'empty when no objects have been added' do
-        expect(subject.objects).to eq []
-      end
-
-      it 'add objects' do
-        subject.objects = [object1, object2]
-        subject.objects << object3
-        subject.objects += [object4, object5]
-        expect(subject.objects).to eq [object1, object2, object3, object4, object5]
-      end
-
-      it 'allow sub-objects' do
-        subject.objects = [object1, object2]
-        object1.objects = [object3]
-        expect(subject.objects).to eq [object1, object2]
-        expect(object1.objects).to eq [object3]
-      end
-
-      it 'allow repeating objects' do
-        subject.objects = [object1, object2]
-        subject.objects << object1
-        expect(subject.objects).to eq [object1, object2, object1]
-      end
-
-      describe 'adding objects that are ancestors' do
-        let(:error_type)    { ArgumentError }
-        let(:error_message) { 'Hydra::PCDM::Object with ID:  failed to pass AncestorChecker validation' }
-
-        context 'when the source object is the same' do
-          it 'raises an error' do
-            expect { object1.objects = [object1] }.to raise_error(error_type, error_message)
-            expect { object1.objects += [object1] }.to raise_error(error_type, error_message)
-            expect { object1.objects << [object1] }.to raise_error(error_type, error_message)
-          end
-        end
-
-        before do
-          object1.objects = [object2]
-        end
-
-        it 'raises an error' do
-          expect { object2.objects += [object1] }.to raise_error(error_type, error_message)
-          expect { object2.objects << [object1] }.to raise_error(error_type, error_message)
-          expect { object2.objects = [object1] }.to raise_error(error_type, error_message)
-        end
-
-        context 'with more ancestors' do
-          before do
-            object2.objects = [object3]
-          end
-
-          it 'raises an error' do
-            expect { object3.objects << [object1] }.to raise_error(error_type, error_message)
-            expect { object3.objects = [object1] }.to raise_error(error_type, error_message)
-            expect { object3.objects += [object1] }.to raise_error(error_type, error_message)
-          end
-
-          context 'with a more complicated example' do
-            before do
-              object3.objects = [object4, object5]
-            end
-
-            it 'raises errors' do
-              expect { object4.objects = [object1] }.to raise_error(error_type, error_message)
-              expect { object4.objects += [object1] }.to raise_error(error_type, error_message)
-              expect { object4.objects << [object1] }.to raise_error(error_type, error_message)
-
-              expect { object4.objects = [object2] }.to raise_error(error_type, error_message)
-              expect { object4.objects += [object2] }.to raise_error(error_type, error_message)
-              expect { object4.objects << [object2] }.to raise_error(error_type, error_message)
-            end
-          end
-        end
-      end
-    end
-
-    context 'with unacceptable child objects' do
-      before(:all) do
-        @collection101   = Hydra::PCDM::Collection.new
-        @object101       = described_class.new
-        @file101         = Hydra::PCDM::File.new
-        @non_pcdm_object = "I'm not a PCDM object"
-        @af_base_object  = ActiveFedora::Base.new
-      end
-
-      let(:error_type1)    { ArgumentError }
-      let(:error_message1) { 'Hydra::PCDM::Collection with ID:  was expected to pcdm_object?, but it was false' }
-      let(:error_type2)    { NoMethodError }
-      let(:error_message2) { /undefined method `pcdm_object\?' for .*/ }
-
-      it 'NOT aggregate Hydra::PCDM::Collection in objects aggregation' do
-        expect { @object101.objects = [@collection101] }.to raise_error(error_type1, error_message1)
-        expect { @object101.objects += [@collection101] }.to raise_error(error_type1, error_message1)
-        expect { @object101.objects << @collection101 }.to raise_error(error_type1, error_message1)
-      end
-
-      it 'NOT aggregate Hydra::PCDM::Files in objects aggregation' do
-        expect { @object101.objects += [@file1] }.to raise_error(error_type2, error_message2)
-        expect { @object101.objects << @file1 }.to raise_error(error_type2, error_message2)
-        expect { @object101.objects = [@file1] }.to raise_error(error_type2, error_message2)
-      end
+  describe '#ordered_member_ids' do
+    it 'returns IDs of all ordered members' do
+      o = described_class.new
+      subject.ordered_members << o
 
-      it 'NOT aggregate non-PCDM objects in objects aggregation' do
-        expect { @object101.objects << @non_pcdm_object }.to raise_error(error_type2, error_message2)
-        expect { @object101.objects = [@non_pcdm_object] }.to raise_error(error_type2, error_message2)
-        expect { @object101.objects += [@non_pcdm_object] }.to raise_error(error_type2, error_message2)
-      end
-
-      it 'NOT aggregate AF::Base objects in objects aggregation' do
-        expect { @object101.objects = [@af_base_object] }.to raise_error(error_type2, error_message2)
-        expect { @object101.objects += [@af_base_object] }.to raise_error(error_type2, error_message2)
-        expect { @object101.objects << @af_base_object }.to raise_error(error_type2, error_message2)
-      end
+      expect(subject.ordered_member_ids).to eq [o.id]
     end
   end
 
@@ -145,22 +33,22 @@ describe Hydra::PCDM::Object do
       let(:object5) { described_class.new }
 
       it 'add objects' do
-        subject.members = [object1, object2]
-        subject.members << object3
-        subject.members += [object4, object5]
-        expect(subject.members).to eq [object1, object2, object3, object4, object5]
+        subject.ordered_members = [object1, object2]
+        subject.ordered_members << object3
+        subject.ordered_members += [object4, object5]
+        expect(subject.ordered_members).to eq [object1, object2, object3, object4, object5]
       end
 
       it 'allow sub-objects' do
-        subject.members = [object1, object2]
-        object1.members = [object3]
-        expect(subject.members).to eq [object1, object2]
-        expect(object1.members).to eq [object3]
+        subject.ordered_members = [object1, object2]
+        object1.ordered_members = [object3]
+        expect(subject.ordered_members).to eq [object1, object2]
+        expect(object1.ordered_members).to eq [object3]
       end
 
       it 'allow repeating objects' do
-        subject.members = [object1, object2, object1]
-        expect(subject.members).to eq [object1, object2, object1]
+        subject.ordered_members = [object1, object2, object1]
+        expect(subject.ordered_members).to eq [object1, object2, object1]
       end
 
       describe 'adding objects that are ancestors' do
@@ -169,46 +57,46 @@ describe Hydra::PCDM::Object do
 
         context 'when the source object is the same' do
           it 'raises an error' do
-            expect { object1.members = [object1] }.to raise_error(error_type, error_message)
-            expect { object1.members += [object1] }.to raise_error(error_type, error_message)
-            expect { object1.members << [object1] }.to raise_error(error_type, error_message)
+            expect { object1.ordered_members = [object1] }.to raise_error(error_type, error_message)
+            expect { object1.ordered_members += [object1] }.to raise_error(error_type, error_message)
+            expect { object1.ordered_members << [object1] }.to raise_error(error_type, error_message)
           end
         end
 
         before do
-          object1.members = [object2]
+          object1.ordered_members = [object2]
         end
 
         it 'raises an error' do
-          expect { object2.members += [object1] }.to raise_error(error_type, error_message)
-          expect { object2.members << [object1] }.to raise_error(error_type, error_message)
-          expect { object2.members = [object1] }.to raise_error(error_type, error_message)
+          expect { object2.ordered_members += [object1] }.to raise_error(error_type, error_message)
+          expect { object2.ordered_members << [object1] }.to raise_error(error_type, error_message)
+          expect { object2.ordered_members = [object1] }.to raise_error(error_type, error_message)
         end
 
         context 'with more ancestors' do
           before do
-            object2.members = [object3]
+            object2.ordered_members = [object3]
           end
 
           it 'raises an error' do
-            expect { object3.members << [object1] }.to raise_error(error_type, error_message)
-            expect { object3.members = [object1] }.to raise_error(error_type, error_message)
-            expect { object3.members += [object1] }.to raise_error(error_type, error_message)
+            expect { object3.ordered_members << [object1] }.to raise_error(error_type, error_message)
+            expect { object3.ordered_members = [object1] }.to raise_error(error_type, error_message)
+            expect { object3.ordered_members += [object1] }.to raise_error(error_type, error_message)
           end
 
           context 'with a more complicated example' do
             before do
-              object3.members = [object4, object5]
+              object3.ordered_members = [object4, object5]
             end
 
             it 'raises errors' do
-              expect { object4.members = [object1] }.to raise_error(error_type, error_message)
-              expect { object4.members += [object1] }.to raise_error(error_type, error_message)
-              expect { object4.members << [object1] }.to raise_error(error_type, error_message)
+              expect { object4.ordered_members = [object1] }.to raise_error(error_type, error_message)
+              expect { object4.ordered_members += [object1] }.to raise_error(error_type, error_message)
+              expect { object4.ordered_members << [object1] }.to raise_error(error_type, error_message)
 
-              expect { object4.members = [object2] }.to raise_error(error_type, error_message)
-              expect { object4.members += [object2] }.to raise_error(error_type, error_message)
-              expect { object4.members << [object2] }.to raise_error(error_type, error_message)
+              expect { object4.ordered_members = [object2] }.to raise_error(error_type, error_message)
+              expect { object4.ordered_members += [object2] }.to raise_error(error_type, error_message)
+              expect { object4.ordered_members << [object2] }.to raise_error(error_type, error_message)
             end
           end
         end
@@ -234,26 +122,26 @@ describe Hydra::PCDM::Object do
       let(:error_message3) { /ActiveFedora::Base\(#\d+\) expected, got String\(#[\d]+\)/ }
 
       it 'NOT aggregate Hydra::PCDM::Collection in members aggregation' do
-        expect { @object101.members = [@collection101] }.to raise_error(error_type1, error_message1)
-        expect { @object101.members += [@collection101] }.to raise_error(error_type1, error_message1)
-        expect { @object101.members << @collection101 }.to raise_error(error_type1, error_message1)
+        expect { @object101.ordered_members = [@collection101] }.to raise_error(error_type1, error_message1)
+        expect { @object101.ordered_members += [@collection101] }.to raise_error(error_type1, error_message1)
+        expect { @object101.ordered_members << @collection101 }.to raise_error(error_type1, error_message1)
       end
       it 'NOT aggregate Hydra::PCDM::Files in members aggregation' do
-        expect { @object101.members += [@file1] }.to raise_error(error_type2, error_message2)
-        expect { @object101.members << @file1 }.to raise_error(error_type2, error_message2)
-        expect { @object101.members = [@file1] }.to raise_error(error_type2, error_message2)
+        expect { @object101.ordered_members += [@file1] }.to raise_error(error_type2, error_message2)
+        expect { @object101.ordered_members << @file1 }.to raise_error(error_type2, error_message2)
+        expect { @object101.ordered_members = [@file1] }.to raise_error(error_type2, error_message2)
       end
 
       it 'NOT aggregate non-PCDM objects in members aggregation' do
-        expect { @object101.members << @non_pcdm_object }.to raise_error(error_type3, error_message3)
-        expect { @object101.members = [@non_pcdm_object] }.to raise_error(error_type3, error_message3)
-        expect { @object101.members += [@non_pcdm_object] }.to raise_error(error_type3, error_message3)
+        expect { @object101.ordered_members << @non_pcdm_object }.to raise_error(error_type3, error_message3)
+        expect { @object101.ordered_members = [@non_pcdm_object] }.to raise_error(error_type3, error_message3)
+        expect { @object101.ordered_members += [@non_pcdm_object] }.to raise_error(error_type3, error_message3)
       end
 
       it 'NOT aggregate non-PCDM AF::Base objects in members aggregation' do
-        expect { @object101.members = [@af_base_object] }.to raise_error(error_type1, error_message1)
-        expect { @object101.members += [@af_base_object] }.to raise_error(error_type1, error_message1)
-        expect { @object101.members << @af_base_object }.to raise_error(error_type1, error_message1)
+        expect { @object101.ordered_members = [@af_base_object] }.to raise_error(error_type1, error_message1)
+        expect { @object101.ordered_members += [@af_base_object] }.to raise_error(error_type1, error_message1)
+        expect { @object101.ordered_members << @af_base_object }.to raise_error(error_type1, error_message1)
       end
     end
   end
@@ -265,17 +153,13 @@ describe Hydra::PCDM::Object do
       @collection1 = Hydra::PCDM::Collection.new
       @collection2 = Hydra::PCDM::Collection.new
       @parent_object = described_class.new
-      @object = described_class.new
-      @collection1.members = [@object]
-      @collection2.members = [@object]
-      @parent_object.members = [@object]
-      allow(@object).to receive(:id).and_return('banana')
-      proxies = [
-        build_proxy(container: @collection1),
-        build_proxy(container: @collection2),
-        build_proxy(container: @parent_object)
-      ]
-      allow(ActiveFedora::Aggregation::Proxy).to receive(:where).with(proxyFor_ssim: @object.id).and_return(proxies)
+      @object = described_class.create
+      @collection1.ordered_members = [@object]
+      @collection2.ordered_members = [@object]
+      @parent_object.ordered_members = [@object]
+      @parent_object.save
+      @collection1.save
+      @collection2.save
     end
 
     describe 'member_of' do
@@ -482,106 +366,6 @@ describe Hydra::PCDM::Object do
     end
   end
 
-  describe 'removing child objects' do
-    subject { described_class.new }
-    let(:object1) { described_class.new }
-    let(:object2) { described_class.new }
-    let(:object3) { described_class.new }
-
-    context 'when it is the only object' do
-      before do
-        subject.objects += [object1]
-        expect(subject.objects).to eq [object1]
-      end
-
-      it 'remove object while changes are in memory' do
-        expect(subject.objects.delete object1).to eq [object1]
-        expect(subject.objects).to eq []
-      end
-    end
-
-    context 'when multiple objects' do
-      before do
-        subject.objects += [object1, object2, object3]
-        expect(subject.objects).to eq [object1, object2, object3]
-      end
-
-      it 'remove first object when changes are in memory' do
-        expect(subject.objects.delete object1).to eq [object1]
-        expect(subject.objects).to eq [object2, object3]
-      end
-
-      it 'remove last object when changes are in memory' do
-        expect(subject.objects.delete object3).to eq [object3]
-        expect(subject.objects).to eq [object1, object2]
-      end
-
-      it 'remove middle object when changes are in memory' do
-        expect(subject.objects.delete object2).to eq [object2]
-        expect(subject.objects).to eq [object1, object3]
-      end
-
-      it 'remove middle object when changes are saved' do
-        subject.save
-        expect(subject.objects).to eq [object1, object2, object3]
-        expect(subject.objects.delete object2).to eq [object2]
-        expect(subject.objects).to eq [object1, object3]
-      end
-    end
-    context 'when object repeats' do
-      before do
-        subject.objects += [object1, object2, object3, object2, object3]
-        expect(subject.objects).to eq [object1, object2, object3, object2, object3]
-      end
-
-      it 'remove first occurrence when changes in memory' do
-        expect(subject.objects.delete object2).to eq [object2]
-        expect(subject.objects).to eq [object1, object3, object3]
-      end
-
-      it 'remove last occurrence when changes in memory' do
-        skip('pending resolution of AF-agg 46 and PCDM 102') do
-          expect(subject.objects.delete object2, -1).to eq object2
-          expect(subject.objects).to eq [object1, object2, object3, object3]
-        end
-      end
-
-      it 'remove nth occurrence when changes in memory' do
-        skip('pending resolution of AF-agg 46 and PCDM 102') do
-          expect(subject.objects.delete object2, 2).to eq object2
-          expect(subject.objects).to eq [object1, object2, object3, object3]
-        end
-      end
-
-      it 'remove nth occurrence when changes are saved' do
-        skip('pending resolution of AF-agg 46 and PCDM 102') do
-          expect(subject.objects).to eq [object1, object2, object3, object2, object3]
-          expect(subject.objects).to eq [object1, object2, object3, object2, object3]
-
-          expect(subject.objects.delete object2, 2).to eq object2
-          subject.save
-          expect(subject.objects).to eq [object1, object2, object3, object2, object3]
-        end
-      end
-    end
-
-    context 'when object is missing' do
-      it 'and 0 objects in object return empty array' do
-        expect(subject.objects.delete object1).to eq []
-      end
-
-      it 'and multiple objects in object return empty array when changes are in memory' do
-        subject.objects += [object1, object2]
-        expect(subject.objects.delete object3).to eq []
-      end
-
-      it 'return empty array when changes are saved' do
-        subject.objects += [object1, object2]
-        expect(subject.objects.delete object3).to eq []
-      end
-    end
-  end
-
   describe '#files' do
     subject { described_class.new }
     it 'have a files relation' do
@@ -693,9 +477,9 @@ describe Hydra::PCDM::Object do
     let(:object4) { described_class.new }
 
     it 'deprecated methods should pass' do
-      expect(object1.child_objects = [object2]).to eq [object2]
-      expect(object1.child_objects << object3).to eq [object2, object3]
-      expect(object1.child_objects += [object4]).to eq [object2, object3, object4]
+      expect(object1.ordered_members = [object2]).to eq [object2]
+      expect(object1.ordered_members << object3).to eq [object2, object3]
+      expect(object1.ordered_members += [object4]).to eq [object2, object3, object4]
       object1.save # required until issue AF-Agg-75 is fixed
       expect(object2.parent_objects).to eq [object1]
       expect(object2.parents).to eq [object1]

data/spec/hydra/pcdm/object_indexer_spec.rb

@@ -7,7 +7,7 @@ describe Hydra::PCDM::ObjectIndexer do
   let(:indexer)       { described_class.new(object) }
 
   before do
-    allow(object).to receive(:object_ids).and_return([child_object1.id, child_object2.id])
+    allow(object).to receive(:ordered_object_ids).and_return([child_object1.id, child_object2.id])
   end
 
   describe '#generate_solr_document' do

data/spec/spec_helper.rb

@@ -2,12 +2,11 @@ ENV['environment'] ||= 'test'
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter '/spec'
-end
-
-Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start 'rails'
 
 require 'bundler/setup'
 Bundler.setup