hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/spec/wings/hydra/works/models/concerns/collection_valkyrie_behavior_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'wings_helper'
+require 'wings/model_transformer'
+
+RSpec.describe Wings::Works::CollectionValkyrieBehavior, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  let(:collection1) { build(:public_collection_lw, id: 'col1', title: ['Collection 1']) }
+
+  describe 'type check methods on valkyrie resource' do
+    let(:pcdm_object) { collection1 }
+    let(:resource) { subject.build }
+
+    it 'returns appropriate response from type check methods' do
+      expect(resource.pcdm_collection?).to be true
+      expect(resource.pcdm_object?).to be false
+      expect(resource.collection?).to be true
+      expect(resource.work?).to be false
+      expect(resource.file_set?).to be false
+    end
+  end
+end

data/spec/wings/hydra/works/models/concerns/file_set_valkyrie_behavior_spec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+require 'wings_helper'
+require 'wings/model_transformer'
+
+RSpec.describe Wings::Works::FileSetValkyrieBehavior, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  let(:resource) { subject.build }
+
+  let(:work1)    { build(:work, id: 'wk1', title: ['Work 1']) }
+  let(:work2)    { build(:work, id: 'wk2', title: ['Work 2']) }
+  let(:fileset1) { build(:file_set, id: 'fs1', title: ['Fileset 1']) }
+
+  describe 'type check methods on valkyrie resource' do
+    let(:pcdm_object) { fileset1 }
+
+    it 'returns appropriate response from type check methods' do
+      expect(resource.pcdm_collection?).to be false
+      expect(resource.pcdm_object?).to be true
+      expect(resource.collection?).to be false
+      expect(resource.work?).to be false
+      expect(resource.file_set?).to be true
+    end
+  end
+
+  describe '#parent_works' do
+    let(:pcdm_object) { fileset1 }
+    let(:child_file_set_resource) { resource }
+
+    before do
+      work1.ordered_members = [fileset1]
+      work2.ordered_members = [fileset1]
+      work1.save!
+      work2.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns parent works as valkyrie resources through file_set_valkyrie_behavior' do
+        resources = child_file_set_resource.parent_works(valkyrie: true)
+        expect(resources.map(&:work?)).to all(be true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work1.id, work2.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns parent works as fedora objects through file_set_valkyrie_behavior' do
+        af_objects = child_file_set_resource.parent_works(valkyrie: false)
+        expect(af_objects.map(&:work?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work1.id, work2.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns parent works as fedora objects through file_set_valkyrie_behavior' do
+        af_objects = child_file_set_resource.parent_works
+        expect(af_objects.map(&:work?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work1.id, work2.id]
+      end
+    end
+  end
+
+  describe '#parent_work_ids' do
+    let(:pcdm_object) { fileset1 }
+    let(:child_file_set_resource) { resource }
+
+    before do
+      work1.ordered_members = [fileset1]
+      work2.ordered_members = [fileset1]
+      work1.save!
+      work2.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns parent works as valkyrie resources through file_set_valkyrie_behavior' do
+        resource_ids = child_file_set_resource.parent_work_ids(valkyrie: true)
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([work1.id, work2.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns parent works as fedora objects through file_set_valkyrie_behavior' do
+        af_object_ids = child_file_set_resource.parent_work_ids(valkyrie: false)
+        expect(af_object_ids).to match_array [work1.id, work2.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns parent works as fedora objects through file_set_valkyrie_behavior' do
+        af_object_ids = child_file_set_resource.parent_work_ids
+        expect(af_object_ids).to match_array [work1.id, work2.id]
+      end
+    end
+  end
+end

data/spec/wings/hydra/works/models/concerns/work_valkyrie_behavior_spec.rb

@@ -0,0 +1,218 @@
+# frozen_string_literal: true
+require 'wings_helper'
+require 'wings/model_transformer'
+
+RSpec.describe Wings::Works::WorkValkyrieBehavior, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  let(:resource) { subject.build }
+
+  let(:collection1) { build(:collection, id: 'col1', title: ['Collection 1']) }
+  let(:collection2) { build(:collection, id: 'col2', title: ['Collection 2']) }
+  let(:work1)       { build(:work, id: 'wk1', title: ['Work 1']) }
+  let(:work2)       { build(:work, id: 'wk2', title: ['Child Work 1']) }
+  let(:work3)       { build(:work, id: 'wk3', title: ['Child Work 2']) }
+  let(:work4)       { build(:work, id: 'wk4', title: ['Parent Work 1']) }
+  let(:work5)       { build(:work, id: 'wk5', title: ['Parent Work 2']) }
+  let(:fileset1)    { build(:file_set, id: 'fs1', title: ['Child File Set 1']) }
+  let(:fileset2)    { build(:file_set, id: 'fs2', title: ['Child File Set 2']) }
+
+  before do
+    collection1.ordered_members << work1
+    collection1.save!
+    collection2.ordered_members << work1
+    collection2.save!
+    work4.ordered_members << work1
+    work4.save!
+    work5.ordered_members << work1
+    work5.save!
+    work1.ordered_members = [work2, work3, fileset1, fileset2]
+    work1.save!
+  end
+
+  describe 'type check methods on valkyrie resource' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    it 'returns appropriate response from type check methods' do
+      expect(work.pcdm_collection?).to be false
+      expect(work.pcdm_object?).to be true
+      expect(work.collection?).to be false
+      expect(work.work?).to be true
+      expect(work.file_set?).to be false
+    end
+  end
+
+  describe '#parent_works' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    context 'when return type is not specified' do
+      it 'returns only parent works, in AF format' do
+        af_objects = work.parent_works
+        expect(af_objects.map(&:work?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work4.id, work5.id]
+      end
+    end
+
+    context 'when active fedora objects are requested' do
+      it 'returns only parent works, in AF format' do
+        af_objects = work.parent_works(valkyrie: false)
+        expect(af_objects.map(&:work?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work4.id, work5.id]
+      end
+    end
+
+    context 'when valkyrie objects are requested' do
+      it 'returns only parent works, in Valkyrie format' do
+        resources = work.parent_works(valkyrie: true)
+        expect(resources.map(&:work?)).to all(be true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work4.id, work5.id])
+      end
+    end
+  end
+
+  describe '#parent_work_ids' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    context 'when return type is not specified' do
+      it 'returns AF ids for parent works only' do
+        af_object_ids = work.parent_work_ids
+        expect(af_object_ids).to match_array [work4.id, work5.id]
+      end
+    end
+
+    context 'when active fedora objects are requested' do
+      it 'returns AF ids for parent works only' do
+        af_object_ids = work.parent_work_ids(valkyrie: false)
+        expect(af_object_ids).to match_array [work4.id, work5.id]
+      end
+    end
+
+    context 'when valkyrie objects are requested' do
+      it 'returns Valkyrie ids for parent works only' do
+        resource_ids = work.parent_work_ids(valkyrie: true)
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([work4.id, work5.id])
+      end
+    end
+  end
+
+  describe '#child_works' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    context 'when return type is not specified' do
+      it 'returns only child works, in AF format' do
+        af_objects = work.child_works
+        expect(af_objects.map(&:work?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work2.id, work3.id]
+      end
+
+      context 'when operating on an unsaved work' do
+        let(:pcdm_object) { build(:work, title: ['Unsaved work without children']) }
+        it 'returns an empty array' do
+          af_objects = work.child_works
+          expect(af_objects).to match_array []
+        end
+      end
+    end
+
+    context 'when active fedora objects are requested' do
+      it 'returns only child works, in AF format' do
+        af_objects = work.child_works(valkyrie: false)
+        expect(af_objects.map(&:work?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work2.id, work3.id]
+      end
+    end
+
+    context 'when valkyrie objects are requested' do
+      it 'returns only child works, in Valkyrie format' do
+        resources = work.child_works(valkyrie: true)
+        expect(resources.map(&:work?)).to all(be true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
+      end
+    end
+  end
+
+  describe '#child_work_ids' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    context 'when return type is not specified' do
+      it 'returns AF ids for child works only' do
+        af_object_ids = work.child_work_ids
+        expect(af_object_ids).to match_array [work2.id, work3.id]
+      end
+    end
+
+    context 'when active fedora objects are requested' do
+      it 'returns AF ids for child works only' do
+        af_object_ids = work.child_work_ids(valkyrie: false)
+        expect(af_object_ids).to match_array [work2.id, work3.id]
+      end
+    end
+
+    context 'when valkyrie objects are requested' do
+      it 'returns Valkyrie ids for child works only' do
+        resource_ids = work.child_work_ids(valkyrie: true)
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
+      end
+    end
+  end
+
+  describe '#child_file_sets' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    context 'when return type is not specified' do
+      it 'returns only child file sets, in AF format' do
+        af_objects = work.child_file_sets
+        expect(af_objects.map(&:file_set?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [fileset1.id, fileset2.id]
+      end
+    end
+
+    context 'when active fedora objects are requested' do
+      it 'returns only child file sets, in AF format' do
+        af_objects = work.child_file_sets(valkyrie: false)
+        expect(af_objects.map(&:file_set?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [fileset1.id, fileset2.id]
+      end
+    end
+
+    context 'when valkyrie objects are requested' do
+      it 'returns only child file sets, in Valkyrie format' do
+        resources = work.child_file_sets(valkyrie: true)
+        expect(resources.map(&:file_set?)).to all(be true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([fileset1.id, fileset2.id])
+      end
+    end
+  end
+
+  describe '#child_file_set_ids' do
+    let(:pcdm_object) { work1 }
+    let(:work) { resource }
+
+    context 'when return type is not specified' do
+      it 'returns only child file sets, in AF format' do
+        af_object_ids = work.child_file_set_ids
+        expect(af_object_ids).to match_array [fileset1.id, fileset2.id]
+      end
+    end
+
+    context 'when active fedora objects are requested' do
+      it 'returns only child file sets, in AF format' do
+        af_object_ids = work.child_file_set_ids(valkyrie: false)
+        expect(af_object_ids).to match_array [fileset1.id, fileset2.id]
+      end
+    end
+
+    context 'when valkyrie objects are requested' do
+      it 'returns only child file sets, in Valkyrie format' do
+        resource_ids = work.child_file_set_ids(valkyrie: true)
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([fileset1.id, fileset2.id])
+      end
+    end
+  end
+end

data/spec/wings/model_transformer_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'spec_helper'
+require 'wings_helper'
 require 'wings/model_transformer'
 
 RSpec.describe Wings::ModelTransformer do
@@ -67,7 +67,7 @@ RSpec.describe Wings::ModelTransformer do
           expect(subject.to_s).to eq(GenericWork.to_s)
         end
         it 'has a internal_resource instance that is the given klass' do
-          expect(subject.internal_resource).to eq(GenericWork)
+          expect(subject.internal_resource).to eq(GenericWork.to_s)
         end
       end
     end
@@ -114,6 +114,170 @@ RSpec.describe Wings::ModelTransformer do
                             related_url: work.related_url,
                             source: work.source
     end
+
+    # rubocop:disable RSpec/AnyInstance
+    context 'without an existing id' do
+      let(:id)        { nil }
+      let(:minted_id) { 'bobross' }
+
+      before do
+        Hyrax.config.enable_noids = true
+        allow_any_instance_of(::Noid::Rails.config.minter_class)
+          .to receive(:mint)
+          .and_return(minted_id)
+      end
+
+      after { Hyrax.config.enable_noids = false }
+
+      it { expect(factory.build).to have_a_valkyrie_alternate_id_of minted_id }
+    end
+    # rubocop:enable RSpec/AnyInstance
+
+    context 'with an embargo' do
+      let(:work) { FactoryBot.create(:embargoed_work) }
+
+      it 'has the correct embargo id' do
+        expect(subject.build.embargo.id.id).to eq work.embargo.id
+      end
+    end
+
+    context 'with a lease' do
+      let(:work) { FactoryBot.create(:leased_work) }
+
+      it 'has the correct lease id' do
+        expect(subject.build.lease.id.id).to eq work.lease.id
+      end
+    end
+
+    context 'with an unsaved embargo' do
+      let(:work) { FactoryBot.build(:embargoed_work) }
+
+      it 'has the correct embargo details' do
+        expect(factory.build.embargo).to have_attributes work.embargo.attributes.symbolize_keys
+      end
+    end
+
+    context 'with newly saved embargo' do
+      let(:work) { FactoryBot.build(:embargoed_work) }
+
+      it 'has the correct embargo id' do
+        work.embargo.save
+
+        expect(subject.build.embargo.id.id).to eq work.embargo.id
+      end
+    end
+
+    context 'with an unsaved lease' do
+      let(:work) { FactoryBot.build(:leased_work) }
+
+      it 'has the correct lease details' do
+        expect(factory.build.lease).to have_attributes work.lease.attributes.symbolize_keys
+      end
+    end
+
+    context 'with newly saved lease' do
+      let(:work) { FactoryBot.build(:leased_work) }
+
+      it 'has the correct lease id' do
+        work.lease.save
+
+        expect(subject.build.lease.id.id).to eq work.lease.id
+      end
+    end
+
+    context 'with files and derivatives in fileset' do
+      let(:file_set)            { Hydra::Works::FileSet.new }
+      let(:original_file)       { File.open(File.join(fixture_path, 'world.png')) }
+      let(:thumbnail_file)      { File.open(File.join(fixture_path, 'image.jpg')) }
+      let(:extracted_text_file) { File.open(File.join(fixture_path, 'updated-file.txt')) }
+      let(:original_type)       { :original_file }
+      let(:thumbnail_type)      { :thumbnail }
+      let(:extracted_text_type) { :extracted_text }
+
+      before do
+        Hydra::Works::AddFileToFileSet.call(file_set, original_file, original_type)
+        Hydra::Works::AddFileToFileSet.call(file_set, thumbnail_file, thumbnail_type)
+        Hydra::Works::AddFileToFileSet.call(file_set, extracted_text_file, extracted_text_type)
+      end
+
+      it 'has the correct reflection ids' do
+        resource = described_class.new(pcdm_object: file_set).build
+        expect(resource.file_ids).to match_valkyrie_ids_with_active_fedora_ids(file_set.files.map(&:id))
+        expect(resource.original_file_ids).to match_valkyrie_ids_with_active_fedora_ids([file_set.original_file.id])
+        expect(resource.thumbnail_ids).to match_valkyrie_ids_with_active_fedora_ids([file_set.thumbnail.id])
+        expect(resource.extracted_text_ids).to match_valkyrie_ids_with_active_fedora_ids([file_set.extracted_text.id])
+      end
+    end
+
+    context 'with members' do
+      let(:work)        { FactoryBot.create(:work, id: 'pw', title: ['Parent Work']) }
+      let(:child_work1) { FactoryBot.create(:work, id: 'cw1', title: ['Child Work 1']) }
+      let(:child_work2) { FactoryBot.create(:work, id: 'cw2', title: ['Child Work 2']) }
+
+      context 'and members are ordered' do
+        before do
+          work.ordered_members << child_work1
+          work.ordered_members << child_work2
+        end
+
+        it 'sets member_ids to the ids of the ordered members' do
+          expect(subject.build.member_ids).to match_valkyrie_ids_with_active_fedora_ids(['cw1', 'cw2'])
+        end
+      end
+
+      context 'and members are unordered' do
+        before do
+          work.members << child_work1
+          work.members << child_work2
+        end
+
+        it 'sets member_ids to the ids of the unordered members' do
+          expect(subject.build.member_ids).to match_valkyrie_ids_with_active_fedora_ids(['cw1', 'cw2'])
+        end
+      end
+    end
+
+    context 'with parent collections' do
+      let(:work) { FactoryBot.create(:work_with_representative_file, with_admin_set: true) }
+      let(:parent_col1) { FactoryBot.create(:collection_lw, title: ['Parent Collection'], id: 'pcol1') }
+      let(:parent_col2) { FactoryBot.create(:collection_lw, title: ['Parent Collection'], id: 'pcol2') }
+
+      before do
+        work.member_of_collections = [parent_col1, parent_col2]
+      end
+
+      it 'sets member_of_collection_ids to the parent collection ids' do
+        expect(subject.build.member_of_collection_ids).to match_valkyrie_ids_with_active_fedora_ids(['pcol1', 'pcol2'])
+      end
+    end
+  end
+
+  context 'with _id attributes' do
+    let(:work) { FactoryBot.create(:work_with_representative_file, with_admin_set: true) }
+    before do
+      work.thumbnail_id = work.representative_id
+    end
+
+    it 'repopulates the _id attributes' do
+      resource = subject.build
+      expect(resource[:representative_id].to_s).to eq(work.representative_id)
+      expect(resource[:thumbnail_id].to_s).to eq(work.thumbnail_id)
+      expect(resource[:access_control_id].to_s).to eq(work.access_control_id)
+      expect(resource[:admin_set_id].to_s).to eq(work.admin_set_id)
+    end
+  end
+
+  context 'with a generic work that has open visibility' do
+    before { work.visibility = "open" }
+
+    it 'sets the visibility' do
+      resource = factory.build
+
+      expect(resource.read_groups).to contain_exactly(*work.read_groups)
+      expect(resource.read_users).to contain_exactly(*work.read_users)
+      expect(resource.edit_groups).to contain_exactly(*work.edit_groups)
+      expect(resource.edit_users).to contain_exactly(*work.edit_users)
+    end
   end
 
   context 'with relationship properties' do
@@ -172,117 +336,8 @@ RSpec.describe Wings::ModelTransformer do
           .to have_attributes title: book.title,
                               contributor: book.contributor,
                               description: book.description
-        expect_ids_to_match(subject.build.page_ids, ['pg1', 'pg2'])
-      end
-    end
-  end
-
-  context 'for PCDM & Hydra-Works models', :clean_repo do
-    let(:collection1) { build(:public_collection_lw, id: 'col1', title: ['Collection 1']) }
-    let(:collection2) { build(:public_collection_lw, id: 'col2', title: ['Collection 2']) }
-    let(:collection3) { build(:public_collection_lw, id: 'col3', title: ['Collection 3']) }
-    let(:work1)       { build(:work, id: 'wk1', title: ['Work 1']) }
-    let(:work2)       { build(:work, id: 'wk2', title: ['Work 2']) }
-    let(:work3)       { build(:work, id: 'wk3', title: ['Work 3']) }
-    let(:fileset1)    { build(:file_set, id: 'fs1', title: ['Fileset 1']) }
-    let(:fileset2)    { build(:file_set, id: 'fs2', title: ['Fileset 2']) }
-
-    describe '#build' do
-      context 'for parent collection' do
-        before do
-          collection1.members = [work1, work2, collection2, collection3]
-          collection1.save!
-        end
-
-        let(:pcdm_object) { collection1 }
-
-        it 'returns a Valkyrie::Resource' do
-          expect(subject.build).to be_a Valkyrie::Resource
-        end
-
-        it 'has the id of the active_fedora_object' do
-          expect(subject.build).to have_a_valkyrie_alternate_id_of collection1.id
-        end
-
-        it 'has attributes for the PCDM model' do
-          expect(subject.build)
-            .to have_attributes title: collection1.title
-          expect_ids_to_match(subject.build.member_ids, [work1.id, work2.id, collection2.id, collection3.id])
-        end
-      end
-
-      context 'for child collection' do
-        let(:pcdm_object) { collection3 }
-
-        before do
-          collection3.member_of_collections = [collection1, collection2]
-          collection3.save!
-        end
-
-        it 'returns a Valkyrie::Resource' do
-          expect(subject.build).to be_a Valkyrie::Resource
-        end
-
-        it 'has the id of the active_fedora_object' do ###
-          expect(subject.build).to have_a_valkyrie_alternate_id_of collection3.id
-        end
-
-        it 'has attributes matching the active_fedora_object' do
-          expect(subject.build)
-            .to have_attributes title: collection3.title
-          expect_ids_to_match(subject.build.member_of_collection_ids, ['col1', 'col2'])
-        end
-      end
-
-      context 'for work in collection' do
-        let(:pcdm_object) { work1 }
-
-        before do
-          work1.member_of_collections = [collection1, collection2]
-          work1.save!
-        end
-
-        it 'returns a Valkyrie::Resource' do
-          expect(subject.build).to be_a Valkyrie::Resource
-        end
-
-        it 'has the id of the active_fedora_object' do ###
-          expect(subject.build).to have_a_valkyrie_alternate_id_of work1.id
-        end
-
-        it 'has attributes matching the active_fedora_object' do
-          expect(subject.build)
-            .to have_attributes title: work1.title
-          expect_ids_to_match(subject.build.member_of_collection_ids, ['col1', 'col2'])
-        end
-      end
-
-      context 'work with works and filesets' do
-        let(:pcdm_object) { work1 }
-
-        before do
-          work1.members = [work2, work3, fileset1, fileset2]
-          work1.save!
-        end
-
-        it 'returns a Valkyrie::Resource' do
-          expect(subject.build).to be_a Valkyrie::Resource
-        end
-
-        it 'has the id of the active_fedora_object' do ###
-          expect(subject.build).to have_a_valkyrie_alternate_id_of work1.id
-        end
-
-        it 'has attributes matching the active_fedora_object' do
-          expect(subject.build)
-            .to have_attributes title: work1.title
-          expect_ids_to_match(subject.build.member_ids, [work2.id, work3.id, fileset1.id, fileset2.id])
-        end
+        expect(subject.build.page_ids).to match_valkyrie_ids_with_active_fedora_ids(['pg1', 'pg2'])
       end
     end
   end
-
-  def expect_ids_to_match(valkyrie_ids, expected_ids)
-    expect(valkyrie_ids.map(&:id)).to match_array expected_ids
-  end
 end