hydra-pcdm 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e913d0d541120cd90ba7b1248d649d9db8d4ece
-  data.tar.gz: 836913f3d1251a91dd6cc4bbbb491c3a1b2bfc77
+  metadata.gz: c0be7a3fa222eb99a0aac81f40a4946f03231891
+  data.tar.gz: c13f936e7d5b45e39e80108e91c7dc1a96f37336
 SHA512:
-  metadata.gz: 5333b3cf2d17c4bf64597234759316bb3ef8a7af807bf1e1adf4a1312f22746d9d92deab8b55b6b6150f5247ff154ced8cdf702c707ff03dc2c2d3b2eb4d207f
-  data.tar.gz: 4d01b55002fd90b154e577dc9340732fe7e7796ba154a80536fbc91a04e6d487a102fe25f75472fd3a7196aca57e1787d2fba099d48a94802880f3b31a84a2f3
+  metadata.gz: 91fa47b049b2886f33a8ff57e33c002926ebecc21d2209d6d50691b4ff8d4bc6c35be05f2a83e7ab64d87c43998b71c216687bf2db6f4d26ba990dcfb8dffc83
+  data.tar.gz: 1a15fc8ebba626fa74a78931d88f4dab56ee2e0880293c587a4b19406859961d672bca76cd1b47f4da9c731f55159f52b6bf39b6d06e31f08430ff91ede3ea2d

data/lib/hydra/pcdm/models/concerns/object_behavior.rb

@@ -64,12 +64,8 @@ module Hydra::PCDM
     #   file_of_type(::RDF::URI("http://pcdm.org/ExtractedText"))
     def file_of_type(uri)
       matching_files = filter_files_by_type(uri)
-      if matching_files.empty?
-        file = files.build
-        Hydra::PCDM::AddTypeToFile.call(file, uri)
-      else
-        return matching_files.first
-      end
+      return matching_files.first unless matching_files.empty?
+      Hydra::PCDM::AddTypeToFile.call(files.build, uri)
     end
   end
 end

data/lib/hydra/pcdm/models/concerns/pcdm_behavior.rb

@@ -24,6 +24,7 @@ module Hydra::PCDM
     end
 
     def member_of
+      return [] if id.nil?
       ActiveFedora::Base.where(member_ids_ssim: id)
     end
 

data/lib/hydra/pcdm/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module PCDM
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'.freeze
   end
 end

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

@@ -238,20 +238,20 @@ describe Hydra::PCDM::Collection do
     end
     context 'when collection is missing' do
       it 'and 0 sub-collections should return empty array' do
-        expect(subject.members.delete collection1).to eq []
+        expect(subject.members.delete(collection1)).to eq []
       end
 
       it 'and multiple sub-collections should return empty array when changes are in memory' do
         subject.ordered_members << collection1
         subject.ordered_members << collection3
-        expect(subject.members.delete collection2).to eq []
+        expect(subject.members.delete(collection2)).to eq []
       end
 
       it 'returns empty array when changes are saved' do
         subject.ordered_members << collection1
         subject.ordered_members << collection3
         subject.save
-        expect(subject.members.delete collection2).to eq []
+        expect(subject.members.delete(collection2)).to eq []
       end
     end
   end
@@ -313,9 +313,7 @@ describe Hydra::PCDM::Collection do
         collection1.related_objects << object2      # second add to same collection
         collection1.save
         related_objects = collection1.reload.related_objects
-        expect(related_objects.include? object1).to be true
-        expect(related_objects.include? object2).to be true
-        expect(related_objects.size).to eq 2
+        expect(related_objects).to match_array [object1, object2]
       end
 
       it 'is empty when no related objects' do
@@ -328,9 +326,7 @@ describe Hydra::PCDM::Collection do
           collection1.related_objects << object2      # second add to same collection
           collection1.related_objects << object1      # repeat an object replaces the object
           related_objects = collection1.related_objects
-          expect(related_objects.include? object1).to be true
-          expect(related_objects.include? object2).to be true
-          expect(related_objects.size).to eq 2
+          expect(related_objects).to match_array [object1, object2]
         end
       end
     end
@@ -397,7 +393,7 @@ describe Hydra::PCDM::Collection do
       end
 
       it 'removes related object while changes are in memory' do
-        expect(subject.related_objects.delete object1).to eq [object1]
+        expect(subject.related_objects.delete(object1)).to eq [object1]
         expect(subject.related_objects).to eq []
       end
 
@@ -406,7 +402,7 @@ describe Hydra::PCDM::Collection do
         subject.ordered_members << collection2
         subject.ordered_members << object3
         subject.ordered_members << object2
-        expect(subject.related_objects.delete object1).to eq [object1]
+        expect(subject.related_objects.delete(object1)).to eq [object1]
         expect(subject.related_objects).to eq []
         expect(subject.ordered_collections).to eq [collection1, collection2]
         expect(subject.ordered_objects).to eq [object3, object2]
@@ -424,23 +420,23 @@ describe Hydra::PCDM::Collection do
       end
 
       it 'removes first related object when changes are in memory' do
-        expect(subject.related_objects.delete object1).to eq [object1]
+        expect(subject.related_objects.delete(object1)).to eq [object1]
         expect(subject.related_objects).to eq [object2, object3]
       end
 
       it 'removes last related object when changes are in memory' do
-        expect(subject.related_objects.delete object3).to eq [object3]
+        expect(subject.related_objects.delete(object3)).to eq [object3]
         expect(subject.related_objects).to eq [object1, object2]
       end
 
       it 'removes middle related object when changes are in memory' do
-        expect(subject.related_objects.delete object2).to eq [object2]
+        expect(subject.related_objects.delete(object2)).to eq [object2]
         expect(subject.related_objects).to eq [object1, object3]
       end
 
       it 'removes middle related object when changes are saved' do
         expect(subject.related_objects).to eq [object1, object2, object3]
-        expect(subject.related_objects.delete object2).to eq [object2]
+        expect(subject.related_objects.delete(object2)).to eq [object2]
         subject.save
         expect(subject.reload.related_objects).to eq [object1, object3]
       end
@@ -450,7 +446,7 @@ describe Hydra::PCDM::Collection do
       let(:object3) { Hydra::PCDM::Object.new }
 
       it 'returns empty array when 0 related objects and 0 collections and objects' do
-        expect(subject.related_objects.delete object1).to eq []
+        expect(subject.related_objects.delete(object1)).to eq []
       end
 
       it 'returns empty array when 0 related objects, but has collections and objects and changes in memory' do
@@ -458,20 +454,20 @@ describe Hydra::PCDM::Collection do
         subject.ordered_members << collection2
         subject.ordered_members << object1
         subject.ordered_members << object2
-        expect(subject.related_objects.delete object1).to eq []
+        expect(subject.related_objects.delete(object1)).to eq []
       end
 
       it 'returns empty array when other related objects and changes are in memory' do
         subject.related_objects << object1
         subject.related_objects << object3
-        expect(subject.related_objects.delete object2).to eq []
+        expect(subject.related_objects.delete(object2)).to eq []
       end
 
       it 'returns empty array when changes are saved' do
         subject.related_objects << object1
         subject.related_objects << object3
         subject.save
-        expect(subject.reload.related_objects.delete object2).to eq []
+        expect(subject.reload.related_objects.delete(object2)).to eq []
       end
     end
   end
@@ -616,7 +612,7 @@ describe Hydra::PCDM::Collection do
 
   describe 'make sure deprecated methods still work' do
     it 'deprecated methods should pass' do
-      expect(collection1.ordered_members = [collection2]).to eq [collection2]
+      collection1.ordered_members = [collection2]
       expect(collection1.ordered_members << collection3).to eq [collection2, collection3]
       expect(collection1.ordered_members += [collection4]).to eq [collection2, collection3, collection4]
       expect(collection1.ordered_members << object1).to eq [collection2, collection3, collection4, object1]

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

@@ -146,44 +146,73 @@ describe Hydra::PCDM::Object do
     end
   end
 
-  context 'when aggregated by other objects' do
+  describe 'in_objects' do
+    let(:object) { described_class.create }
+    subject { object.in_objects }
+    let(:collection) { Hydra::PCDM::Collection.new }
+    let(:parent_object) { described_class.new }
     before do
-      # Using before(:all) and instance variable because regular :let syntax had a significant impact on performance
-      # All of the tests in this context are describing idempotent behavior, so isolation between examples isn't necessary.
-      @collection1 = Hydra::PCDM::Collection.new
-      @collection2 = Hydra::PCDM::Collection.new
-      @parent_object = described_class.new
-      @object = described_class.create
-      @collection1.ordered_members = [@object]
-      @collection2.ordered_members = [@object]
-      @parent_object.ordered_members = [@object]
-      @parent_object.save
-      @collection1.save
-      @collection2.save
+      collection.ordered_members = [object]
+      parent_object.ordered_members = [object]
+      parent_object.save
+      collection.save
     end
 
-    describe 'member_of' do
-      subject { @object.member_of }
-      it 'finds all nodes that aggregate the object with hasMember' do
-        expect(subject).to include(@collection1, @collection2, @parent_object)
-      end
+    it 'finds objects that aggregate the object' do
+      expect(subject).to eq [parent_object]
     end
+  end
 
-    describe 'in_objects' do
-      subject { @object.in_objects }
-      it 'finds objects that aggregate the object with hasMember' do
-        expect(subject).to eq [@parent_object]
-      end
+  describe 'in_collections' do
+    let(:object) { described_class.create }
+    subject { object.in_collections }
+    let(:object) { described_class.create }
+    let(:collection1) { Hydra::PCDM::Collection.new }
+    let(:collection2) { Hydra::PCDM::Collection.new }
+    let(:parent_object) { described_class.new }
+    before do
+      collection1.ordered_members = [object]
+      collection2.ordered_members = [object]
+      parent_object.ordered_members = [object]
+      parent_object.save
+      collection1.save
+      collection2.save
     end
-    describe 'in_collections' do
-      subject { @object.in_collections }
-      it 'finds collections that aggregate the object with hasMember' do
-        expect(subject).to include(@collection1, @collection2)
-        expect(subject.count).to eq 2
+
+    it 'finds collections that aggregate the object' do
+      expect(subject).to match_array [collection1, collection2]
+      expect(subject.count).to eq 2
+    end
+  end
+
+  describe 'member_of' do
+    subject { object.member_of }
+
+    context 'when it is aggregated by other objects' do
+      let(:object) { described_class.create }
+      let(:collection) { Hydra::PCDM::Collection.new }
+      let(:parent_object) { described_class.new }
+      before do
+        collection.ordered_members = [object]
+        parent_object.ordered_members = [object]
+        parent_object.save
+        collection.save
+      end
+
+      it 'finds all nodes that aggregate the object' do
+        expect(subject).to include(collection, parent_object)
       end
     end
-    def build_proxy(container:)
-      instance_double(ActiveFedora::Aggregation::Proxy, container: container)
+
+    context 'when the object is not saved' do
+      let(:object) { described_class.new }
+
+      context 'and other objects exist in the repo' do
+        before { Hydra::PCDM::Collection.create }
+        it 'is empty' do
+          expect(subject).to be_empty
+        end
+      end
     end
   end
 
@@ -203,9 +232,7 @@ describe Hydra::PCDM::Object do
         subject.related_objects << object2      # second add to same object
         subject.save
         related_objects = subject.reload.related_objects
-        expect(related_objects.include? object1).to be true
-        expect(related_objects.include? object2).to be true
-        expect(related_objects.size).to eq 2
+        expect(related_objects).to match_array [object1, object2]
       end
 
       it 'not repeat objects in the related object set' do
@@ -214,15 +241,13 @@ describe Hydra::PCDM::Object do
           subject.related_objects << object2      # second add to same object
           subject.related_objects << object1      # repeat an object replaces the object
           related_objects = subject.related_objects
-          expect(related_objects.include? object1).to be true
-          expect(related_objects.include? object2).to be true
-          expect(related_objects.size).to eq 2
+          expect(related_objects).to match_array [object1, object2]
         end
       end
     end
 
     context 'with unacceptable inputs' do
-      before(:all) do
+      before do
         @collection101   = Hydra::PCDM::Collection.new
         @object101       = described_class.new
         @file101         = Hydra::PCDM::File.new
@@ -296,7 +321,7 @@ describe Hydra::PCDM::Object do
       end
 
       it 'remove related object while changes are in memory' do
-        expect(subject.related_objects.delete object1).to eq [object1]
+        expect(subject.related_objects.delete(object1)).to eq [object1]
         expect(subject.related_objects).to eq []
       end
     end
@@ -312,23 +337,23 @@ describe Hydra::PCDM::Object do
       end
 
       it 'remove first related object when changes are in memory' do
-        expect(subject.related_objects.delete object1).to eq [object1]
+        expect(subject.related_objects.delete(object1)).to eq [object1]
         expect(subject.related_objects).to eq [object2, object3, object4, object5]
       end
 
       it 'remove last related object when changes are in memory' do
-        expect(subject.related_objects.delete object5).to eq [object5]
+        expect(subject.related_objects.delete(object5)).to eq [object5]
         expect(subject.related_objects).to eq [object1, object2, object3, object4]
       end
 
       it 'remove middle related object when changes are in memory' do
-        expect(subject.related_objects.delete object3).to eq [object3]
+        expect(subject.related_objects.delete(object3)).to eq [object3]
         expect(subject.related_objects).to eq [object1, object2, object4, object5]
       end
 
       it 'remove middle related object when changes are saved' do
         expect(subject.related_objects).to eq [object1, object2, object3, object4, object5]
-        expect(subject.related_objects.delete object3).to eq [object3]
+        expect(subject.related_objects.delete(object3)).to eq [object3]
         subject.save
         expect(subject.reload.related_objects).to eq [object1, object2, object4, object5]
       end
@@ -336,15 +361,7 @@ describe Hydra::PCDM::Object do
 
     context 'when related object is missing' do
       it 'return empty array when 0 related objects and 0 objects' do
-        expect(subject.related_objects.delete object1).to eq []
-      end
-
-      it 'return empty array when other related objects and changes in memory' do
-        subject.related_objects << object1
-        subject.related_objects << object2
-        subject.related_objects << object4
-        subject.related_objects << object5
-        expect(subject.related_objects.delete object3).to eq []
+        expect(subject.related_objects.delete(object1)).to eq []
       end
 
       it 'return empty array when other related objects and changes are in memory' do
@@ -352,7 +369,7 @@ describe Hydra::PCDM::Object do
         subject.related_objects << object2
         subject.related_objects << object4
         subject.related_objects << object5
-        expect(subject.related_objects.delete object3).to eq []
+        expect(subject.related_objects.delete(object3)).to eq []
       end
 
       it 'return empty array when changes are saved' do
@@ -361,7 +378,7 @@ describe Hydra::PCDM::Object do
         subject.related_objects << object4
         subject.related_objects << object5
         subject.save
-        expect(subject.reload.related_objects.delete object3).to eq []
+        expect(subject.reload.related_objects.delete(object3)).to eq []
       end
     end
   end
@@ -477,7 +494,7 @@ describe Hydra::PCDM::Object do
     let(:object4) { described_class.new }
 
     it 'deprecated methods should pass' do
-      expect(object1.ordered_members = [object2]).to eq [object2]
+      object1.ordered_members = [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

data/spec/hydra/pcdm_spec.rb

@@ -8,43 +8,43 @@ describe Hydra::PCDM do
   describe 'Validations' do
     describe '#collection?' do
       it 'return true for a pcdm collection' do
-        expect(described_class.collection? coll1).to be true
+        expect(described_class).to be_collection coll1
       end
 
       it 'return false for a pcdm object' do
-        expect(described_class.collection? obj1).to be false
+        expect(described_class).not_to be_collection obj1
       end
 
       it 'return false for a pcdm file' do
-        expect(described_class.collection? file1).to be false
+        expect(described_class).not_to be_collection file1
       end
     end
 
     describe '#object?' do
       it 'return false for a pcdm collection' do
-        expect(described_class.object? coll1).to be false
+        expect(described_class).not_to be_object coll1
       end
 
       it 'return true for a pcdm object' do
-        expect(described_class.object? obj1).to be true
+        expect(described_class).to be_object obj1
       end
 
       it 'return false for a pcdm file' do
-        expect(described_class.object? file1).to be false
+        expect(described_class).not_to be_object file1
       end
     end
 
     describe '#file?' do
       it 'return false for a pcdm collection' do
-        expect(described_class.file? coll1).to be false
+        expect(described_class).not_to be_file coll1
       end
 
       it 'return false for a pcdm object' do
-        expect(described_class.file? obj1).to be false
+        expect(described_class).not_to be_file obj1
       end
 
       it 'return true for a pcdm file' do
-        expect(described_class.file? file1).to be true
+        expect(described_class).to be_file file1
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pcdm
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora