hydra-works 0.16.0 → 2.0.0

data/spec/hydra/works/models/concerns/file_set/contained_files_spec.rb

@@ -1,21 +1,8 @@
 require 'spec_helper'
 
 describe Hydra::Works::ContainedFiles do
-  let(:file_set) do
-    Hydra::Works::FileSet.create
-  end
-
-  let(:thumbnail) do
-    file = file_set.files.build
-    Hydra::PCDM::AddTypeToFile.call(file, pcdm_thumbnail_uri)
-  end
-
-  let(:file)                { file_set.files.build }
-  let(:pcdm_thumbnail_uri)  { ::RDF::URI('http://pcdm.org/use#ThumbnailImage') }
-
-  before do
-    file_set.files = [file]
-  end
+  let(:file_set) { Hydra::Works::FileSet.create }
+  let(:pcdm_thumbnail_uri) { ::RDF::URI('http://pcdm.org/use#ThumbnailImage') }
 
   describe '#thumbnail' do
     context 'when a thumbnail is present' do
@@ -63,7 +50,7 @@ describe Hydra::Works::ContainedFiles do
       end
       it 'retains origin pcdm.File RDF type' do
         expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#OriginalFile'))
-        expect(file_set.original_file.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
+        expect(subject.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
 

data/spec/hydra/works/models/file_set_spec.rb

@@ -48,6 +48,17 @@ describe Hydra::Works::FileSet do
     it { is_expected.to eq [work] }
   end
 
+  describe '#in_work_ids' do
+    subject { file_set.in_work_ids }
+    let(:work) { Hydra::Works::Work.create }
+    before do
+      work.ordered_members << file_set
+      work.save
+    end
+
+    it { is_expected.to eq [work.id] }
+  end
+
   describe '#destroy' do
     let(:work) { Hydra::Works::Work.create }
     before do
@@ -86,4 +97,40 @@ describe Hydra::Works::FileSet do
       expect(file_set.collection?).to be false
     end
   end
+
+  context 'relationships' do
+    context '#parent_works and #parent_work_ids' do
+      let(:parent_work) { Hydra::Works::Work.new(id: 'parent_work') }
+      let(:child_file_set1)   { described_class.new(id: 'child_file_set1') }
+      let(:child_file_set2)   { described_class.new(id: 'child_file_set2') }
+
+      context 'when parent work knows about child file sets' do
+        before do
+          parent_work.members = [child_file_set1, child_file_set2]
+          child_file_set1.save
+          child_file_set2.save
+          parent_work.save
+        end
+
+        it 'gets parent work' do
+          expect(child_file_set1.parent_works).to match_array [parent_work]
+          expect(child_file_set1.parent_work_ids).to match_array [parent_work.id]
+        end
+      end
+
+      context 'when child works know about parent works' do
+        # before do
+        #   # NOOP: The :member_of relationship is not defined for works.  It only uses the :members relationship.
+        #   child_file_set1.member_of = [parent_work]
+        #   child_file_set2.member_of = [parent_work]
+        # end
+
+        it 'gets parent work' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(child_file_set1.parent_works).to match_array [parent_work]
+          expect(child_file_set1.parent_work_ids).to match_array [parent_work.id]
+        end
+      end
+    end
+  end
 end

data/spec/hydra/works/models/work_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe Hydra::Works::Work do
   subject { described_class.new }
 
-  let(:work1) { described_class.new }
-  let(:work2) { described_class.new }
-  let(:work3) { described_class.new }
-  let(:work4) { described_class.new }
-  let(:work5) { described_class.new }
+  let(:work1) { described_class.new(id: 'wk1') }
+  let(:work2) { described_class.new(id: 'wk2') }
+  let(:work3) { described_class.new(id: 'wk3') }
+  let(:work4) { described_class.new(id: 'wk4') }
+  let(:work5) { described_class.new(id: 'wk5') }
 
-  let(:file_set1) { Hydra::Works::FileSet.new }
-  let(:file_set2) { Hydra::Works::FileSet.new }
+  let(:file_set1) { Hydra::Works::FileSet.new(id: 'fs1') }
+  let(:file_set2) { Hydra::Works::FileSet.new(id: 'fs2') }
 
   let(:object1) { Hydra::PCDM::Object.new }
   let(:object2) { Hydra::PCDM::Object.new }
@@ -262,9 +262,11 @@ describe Hydra::Works::Work do
     end
     it 'has a parent collection' do
       expect(work2.in_collections).to eq [collection1]
+      expect(work2.in_collection_ids).to eq [collection1.id]
     end
     it 'has a parent work' do
       expect(work2.in_works).to eq [work1]
+      expect(work2.in_work_ids).to eq [work1.id]
     end
   end
 
@@ -279,4 +281,208 @@ describe Hydra::Works::Work do
       expect(work1.member_of_collection_ids).to eq [collection1.id]
     end
   end
+
+  context 'relationships' do
+    context '#parent_collections and #parent_collection_ids' do
+      let(:col1) { Hydra::Works::Collection.new(id: 'col1') }
+      let(:col2) { Hydra::Works::Collection.new(id: 'col2') }
+
+      context 'when parents collection knows about child works' do
+        before do
+          col1.members = [work1]
+          col2.members = [work1]
+          work1.save
+          col1.save
+          col2.save
+        end
+
+        it 'get both parent collections' do
+          expect(work1.parent_collections).to match_array [col1, col2]
+          expect(work1.parent_collection_ids).to match_array [col1.id, col2.id]
+        end
+      end
+
+      context 'when child works knows about parent collections' do
+        before do
+          work1.member_of_collections = [col1, col2]
+        end
+
+        it 'gets both parent collections' do
+          expect(work1.parent_collections).to match_array [col1, col2]
+          expect(work1.parent_collection_ids).to match_array [col1.id, col2.id]
+        end
+      end
+
+      context 'when some children know about parent and some parents know about child' do
+        before do
+          col1.members = [work1]
+          work1.member_of_collections = [col2]
+          work1.save
+          col1.save
+        end
+
+        it 'gets both parent collections' do
+          expect(work1.parent_collections).to match_array [col1, col2]
+          expect(work1.parent_collection_ids).to match_array [col1.id, col2.id]
+        end
+      end
+    end
+
+    context '#parent_works and #parent_work_ids' do
+      let(:parent_col1)  { Hydra::Works::Collection.new(id: 'col1') }
+      let(:parent_work1) { work1 }
+      let(:parent_work2) { work2 }
+      let(:child_work)   { work3 }
+
+      context 'when parent work knows about child works' do
+        before do
+          parent_col1.members = [child_work] # collection is included to make sure parent_works only returns works
+          parent_work1.members = [child_work]
+          parent_work2.members = [child_work]
+          child_work.save
+          parent_col1.save
+          parent_work1.save
+          parent_work2.save
+        end
+
+        it 'gets both parent works' do
+          expect(child_work.parent_works).to match_array [parent_work1, parent_work2]
+          expect(child_work.parent_work_ids).to match_array [parent_work1.id, parent_work2.id]
+        end
+      end
+
+      context 'when child works know about parent works' do
+        # before do
+        #   # NOOP: The :member_of relationship is not defined for works.  It only uses the :members relationship.
+        #   child_work.member_of = [parent_work1, parent_work2]
+        # end
+
+        it 'gets both parent works' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(child_work.parent_works).to match_array [parent_work1, parent_work2]
+          expect(child_work.parent_work_ids).to match_array [parent_work1.id, parent_work2.id]
+        end
+      end
+
+      context 'when some children know about parent and some parents know about child' do
+        # before do
+        #   parent_work1.members = [child_work]
+        #   child_work.save
+        #   parent_work1.save
+        #   # NOOP: The :member_of relationship is not defined for works.  It only uses the :members relationship.
+        #   child_work.member_of = [parent_work2]
+        # end
+
+        it 'gets both parent works' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(child_work.parent_works).to match_array [parent_work1, parent_work2]
+          expect(child_work.parent_work_ids).to match_array [parent_work1.id, parent_work2.id]
+        end
+      end
+    end
+
+    context '#child_works and #child_work_ids' do
+      context 'when parent works know about child works' do
+        let(:child_work1)   { work1 }
+        let(:child_work2)   { work2 }
+        let(:parent_work)   { work3 }
+        let(:child_fileset) { file_set1 } # fileset is included to make sure child_works only returns works
+
+        before do
+          parent_work.members = [child_work1, child_work2, child_fileset]
+          parent_work.save
+        end
+
+        it 'gets both child works' do
+          expect(parent_work.child_works).to match_array [child_work1, child_work2]
+          expect(parent_work.child_work_ids).to match_array [child_work1.id, child_work2.id]
+        end
+      end
+
+      context 'when child knows about parent' do
+        before do
+          # before do
+          #   # NOOP: The :member_of relationship is not defined for works.  It only uses the :members relationship.
+          #   child_work1.member_of = [parent_work]
+          #   child_work2.member_of = [parent_work]
+          # end
+        end
+
+        it 'gets both child works' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(parent_work.child_works).to match_array [child_work1, child_work2]
+          expect(parent_work.child_work_ids).to match_array [child_work1.id, child_work2.id]
+        end
+      end
+
+      context 'when some children know about parent and some parents know about child' do
+        before do
+          # before do
+          #   # NOOP: The :member_of relationship is not defined for works.  It only uses the :members relationship.
+          #   child_work1.member_of = [parent_work]
+          #   parent_work.members = [child_work2, child_fileset]
+          #   parent_work.save
+          # end
+        end
+
+        it 'gets both child works' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(parent_work.child_works).to match_array [child_work1, child_work2]
+          expect(parent_work.child_work_ids).to match_array [child_work1.id, child_work2.id]
+        end
+      end
+    end
+
+    context '#child_file_sets and #child_file_set_ids' do
+      context 'when parents knows about child' do
+        let(:child_fileset1) { file_set1 }
+        let(:child_fileset2) { file_set2 }
+        let(:parent_work)    { work1 }
+        let(:child_work)     { work2 } # work is included to make sure child_file_sets only returns file_sets
+
+        before do
+          parent_work.members = [child_fileset1, child_fileset2, child_work]
+          parent_work.save
+        end
+
+        it 'gets both child filesets' do
+          expect(parent_work.child_file_sets).to match_array [child_fileset1, child_fileset2]
+          expect(parent_work.child_file_set_ids).to match_array [child_fileset1.id, child_fileset2.id]
+        end
+      end
+
+      context 'when child knows about parent' do
+        before do
+          # before do
+          #   # NOOP: The :member_of relationship is not defined for file sets.  It only uses the :members relationship.
+          #   child_fileset1.member_of = [parent_work]
+          #   child_fileset2.member_of = [parent_work]
+          # end
+        end
+
+        it 'gets both child filesets' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(parent_work.child_file_sets).to match_array [child_fileset1, child_fileset2]
+          expect(parent_work.child_file_set_ids).to match_array [child_fileset1.id, child_fileset2.id]
+        end
+      end
+
+      context 'when some children know about parent and some parents know about child' do
+        before do
+          # before do
+          #   # NOOP: The :member_of relationship is not defined for file sets.  It only uses the :members relationship.
+          #   child_fileset1.member_of = [parent_work]
+          #   parent_work.members = [child_fileset2, child_work]
+          #   parent_work.save
+          # end
+        end
+
+        it 'gets both child filesets' do
+          skip 'Pending implementation of the :member_of relationship for works'
+          expect(parent_work.child_file_sets).to match_array [child_fileset1, child_fileset2]
+          expect(parent_work.child_file_set_ids).to match_array [child_fileset1.id, child_fileset2.id]
+        end
+      end
+    end
+  end
 end

data/spec/hydra/works/services/characterization_service_spec.rb

@@ -19,7 +19,7 @@ describe Hydra::Works::CharacterizationService do
       # Persist our file with some content and reload
       file.content = "junk"
       expect(file.save).to be true
-      expect(file.reload).to eq({})
+      expect(file.reload).to be_empty
       # Re-check property values
       expect(file.file_size).to eq(["7618"])
       expect(file.file_title).to eq(["sample-file"])
@@ -81,20 +81,24 @@ describe Hydra::Works::CharacterizationService do
   end
 
   context "passing an object that does not have matching properties" do
-    let!(:current_schemas) { ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas }
-
     let(:characterization) { class_double("Hydra::FileCharacterization").as_stubbed_const }
     let(:fits_filename)    { 'fits_0.8.5_pdf.xml' }
     let(:fits_response)    { IO.read(File.join(fixture_path, fits_filename)) }
     let(:file_content)     { 'dummy content' }
     let(:file)             { Hydra::PCDM::File.new { |f| f.content = file_content } }
 
-    before do
+    around do |example|
+      @current_schemas = ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas
+      @metadata_schema = Hydra::PCDM::File::GeneratedMetadataSchema
       ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas = [ActiveFedora::WithMetadata::DefaultSchema]
-      allow(characterization).to receive(:characterize).and_return(fits_response)
+      example.run
+      ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas = @current_schemas
+      # This next line required to force resetting the metadata schema class used by Hydra::PCDM::File
+      Hydra::PCDM::File.instance_variable_set(:@metadata_schema, @metadata_schema)
     end
-    after do
-      ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas = [current_schemas]
+
+    before do
+      allow(characterization).to receive(:characterize).and_return(fits_response)
     end
 
     it 'does not explode with an error' do
@@ -123,39 +127,98 @@ describe Hydra::Works::CharacterizationService do
       end
     end
 
+    context 'using netCDF metadata' do
+      let(:fits_filename) { 'fits_netcdf_two_mimetypes.xml' }
+      let(:fits_response) { IO.read(File.join(fixture_path, fits_filename)) }
+
+      it 'reports the correct, single MIME type' do
+        expect(file.mime_type).to eq("application/netcdf")
+      end
+    end
+
     context 'using image metadata' do
-      let(:fits_filename) { 'fits_0.8.5_jp2.xml' }
       let(:fits_response) { IO.read(File.join(fixture_path, fits_filename)) }
 
-      it 'assigns expected values to image properties.' do
-        expect(file.file_size).to eq(["11043"])
-        expect(file.byte_order).to eq(["big endian"])
-        expect(file.compression).to contain_exactly("JPEG 2000 Lossless", "JPEG 2000")
-        expect(file.width).to eq(["512"])
-        expect(file.height).to eq(["465"])
-        expect(file.color_space).to eq(["sRGB"])
+      context 'with fits_0.8.5' do
+        let(:fits_filename) { 'fits_0.8.5_jp2.xml' }
+        it 'assigns expected values to image properties.' do
+          expect(file.file_size).to eq(["11043"])
+          expect(file.byte_order).to eq(["big endian"])
+          expect(file.compression).to contain_exactly("JPEG 2000 Lossless", "JPEG 2000")
+          expect(file.width).to eq(["512"])
+          expect(file.height).to eq(["465"])
+          expect(file.color_space).to eq(["sRGB"])
+        end
+      end
+
+      context 'with fits_1.2.0' do
+        let(:fits_filename) { 'fits_1.2.0_jpg.xml' }
+        it 'ensures duplicate values are not returned for exifVersion, dateCreated, dateModified.' do
+          expect(file.exif_version).to eq(["0221"])
+          expect(file.date_created).to eq(["2009:02:04 11:05:25.36-06:00"])
+          expect(file.date_modified).to eq(["2009:02:04 16:10:47"])
+        end
       end
     end
+
     context 'using video metadata' do
-      let(:fits_filename) { 'fits_0.8.5_avi.xml' }
       let(:fits_response) { IO.read(File.join(fixture_path, fits_filename)) }
 
-      it 'assigns expected values to video properties.' do
-        expect(file.height).to eq(["264"])
-        expect(file.width).to eq(["356"])
-        expect(file.duration).to eq(["14.10 s"])
-        expect(file.frame_rate).to eq(["10"])
-        expect(file.sample_rate).to eq(["11025"])
+      context 'with fits_0.8.5' do
+        let(:fits_filename) { 'fits_0.8.5_avi.xml' }
+        it 'assigns expected values to video properties.' do
+          expect(file.height).to eq(["264"])
+          expect(file.width).to eq(["356"])
+          expect(file.duration).to eq(["14.10 s"])
+          expect(file.frame_rate).to eq(["10"])
+          expect(file.sample_rate).to eq(["11025"])
+        end
+      end
+
+      context 'with fits_1.2.0' do
+        let(:fits_filename) { 'fits_1.2.0_avi.xml' }
+        it 'assigns expected values to video properties.' do
+          expect(file.height).to eq(["264"])
+          expect(file.width).to eq(["356"])
+          expect(file.duration).to eq(["14148"])
+          expect(file.frame_rate).to eq(["10.000"])
+          expect(file.bit_rate).to eq(["409204"])
+          expect(file.aspect_ratio).to eq(["4:3"])
+        end
       end
     end
+
     context 'using audio metadata' do
-      let(:fits_filename) { 'fits_0.8.5_mp3.xml' }
       let(:fits_response) { IO.read(File.join(fixture_path, fits_filename)) }
 
-      it 'assigns expected values to audio properties.' do
-        expect(file.mime_type).to eq("audio/mpeg")
-        expect(file.duration).to eq(["0:0:15:261"])
-        expect(file.sample_rate).to eq(["44100"])
+      context 'with fits_0.8.5' do
+        let(:fits_filename) { 'fits_0.8.5_mp3.xml' }
+        it 'assigns expected values to audio properties.' do
+          expect(file.mime_type).to eq("audio/mpeg")
+          expect(file.duration).to eq(["0:0:15:261"])
+          expect(file.bit_rate).to include("192000")
+          expect(file.sample_rate).to eq(["44100"])
+        end
+      end
+
+      context 'with fits_1.2.0' do
+        let(:fits_filename) { 'fits_1.2.0_mp3.xml' }
+        it 'assigns expected values to audio properties.' do
+          expect(file.mime_type).to eq("audio/mpeg")
+          expect(file.duration).to eq(["0:0:15:261"])
+          expect(file.bit_rate).to include("192000")
+          expect(file.sample_rate).to eq(["44100"])
+        end
+      end
+    end
+
+    context 'using multi-layer tiff metadata' do
+      let(:fits_filename) { 'fits_0.8.5_tiff.xml' }
+      let(:fits_response) { IO.read(File.join(fixture_path, fits_filename)) }
+
+      it 'assigns single largest value to width, height' do
+        expect(file.width).to eq(["2226"])
+        expect(file.height).to eq(["1650"])
       end
     end
   end