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

data/spec/wings/converter_value_mapper_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'wings/converter_value_mapper'
+
+RSpec.describe Wings::ConverterValueMapper do
+  subject(:mapper) { described_class.for(value) }
+  let(:value)      { 'a value' }
+
+  describe '.for' do
+    it 'returns a value mapper' do
+      expect(described_class.for(value)).to be_a described_class
+    end
+  end
+
+  describe '.result' do
+    it 'returns the value by default' do
+      expect(mapper.result).to eq value
+    end
+
+    context 'with a NestedResourceArray value'
+    context 'with a NestedResource value'
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require 'wings_helper'
+require 'wings/model_transformer'
+
+RSpec.describe Wings::Pcdm::CollectionValkyrieBehavior, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  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(:pcdm_object) { collection1 }
+  let(:resource) { subject.build }
+
+  before do
+    collection2.member_of_collections = [collection1]
+    collection2.save!
+    collection3.member_of_collections = [collection1]
+    collection3.save!
+  end
+
+  describe 'type check methods on valkyrie resource' do
+    it { expect(resource.pcdm_collection?).to be true }
+    it { expect(resource.pcdm_object?).to be false }
+  end
+
+  describe '#collection_ids' do
+    it { expect(resource.collection_ids).to eq([collection2.id, collection3.id]) }
+  end
+
+  describe '#collections' do
+    it { expect(resource.collections).to eq([collection2, collection3]) }
+  end
+
+  describe '#ordered_collection_ids' do
+    it { expect(resource.ordered_collection_ids).to eq([collection2.id, collection3.id]) }
+  end
+
+  describe '#ordered_collections' do
+    it { expect(resource.ordered_collections).to eq([collection2, collection3]) }
+  end
+end

data/spec/wings/hydra/pcdm/models/concerns/object_valkyrie_behavior_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+require 'wings_helper'
+require 'wings/model_transformer'
+
+RSpec.describe Wings::Pcdm::ObjectValkyrieBehavior, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  let(:work1)       { build(:work, id: 'wk1', title: ['Work 1']) }
+
+  describe 'type check methods on valkyrie resource' do
+    let(:pcdm_object) { work1 }
+    let(:resource) { subject.build }
+
+    it 'returns appropriate response from type check methods' do
+      expect(resource.pcdm_collection?).to be false
+      expect(resource.pcdm_object?).to be true
+    end
+  end
+end

data/spec/wings/hydra/pcdm/models/concerns/pcdm_valkyrie_behavior_spec.rb

@@ -0,0 +1,442 @@
+# frozen_string_literal: true
+require 'wings_helper'
+require 'wings/model_transformer'
+
+RSpec.describe Wings::Pcdm::PcdmValkyrieBehavior, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  let(:resource) { subject.build }
+
+  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 '#parent_collections' do
+    let(:pcdm_object) { collection1 }
+    let(:child_collection_resource) { resource }
+
+    before do
+      collection1.member_of_collections = [collection2, collection3]
+      collection1.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns parent collections as valkyrie resources through pcdm_valkyrie_behavior' do
+        resources = child_collection_resource.parent_collections(valkyrie: true)
+        expect(resources.map(&:pcdm_collection?)).to all(be true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([collection2.id, collection3.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = child_collection_resource.parent_collections(valkyrie: false)
+        expect(af_objects.map(&:pcdm_collection?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [collection2.id, collection3.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = child_collection_resource.parent_collections
+        expect(af_objects.map(&:pcdm_collection?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [collection2.id, collection3.id]
+      end
+    end
+  end
+
+  describe '#parent_collection_ids' do
+    let(:pcdm_object) { collection1 }
+    let(:child_collection_resource) { resource }
+
+    before do
+      collection1.member_of_collections = [collection2, collection3]
+      collection1.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns ids of parent collections as valkyrie resources through pcdm_valkyrie_behavior' do
+        resource_ids = child_collection_resource.parent_collection_ids(valkyrie: true)
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([collection2.id, collection3.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns ids of parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+        af_object_ids = child_collection_resource.parent_collection_ids(valkyrie: false)
+        expect(af_object_ids.to_a).to match_array [collection2.id, collection3.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns ids of parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+        af_object_ids = child_collection_resource.parent_collection_ids
+        expect(af_object_ids.to_a).to match_array [collection2.id, collection3.id]
+      end
+    end
+  end
+
+  describe '#members' do
+    let(:pcdm_object) { work1 }
+    let(:parent_work_resource) { resource }
+
+    before do
+      work1.ordered_members = [work2, work3, fileset1, fileset2]
+      work1.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns parent collections as valkyrie resources through pcdm_valkyrie_behavior' do
+        resources = parent_work_resource.members(valkyrie: true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id, fileset1.id, fileset2.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = parent_work_resource.members(valkyrie: false)
+        expect(af_objects.map(&:id)).to match_array [work2.id, work3.id, fileset1.id, fileset2.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = parent_work_resource.members
+        expect(af_objects.map(&:id)).to match_array [work2.id, work3.id, fileset1.id, fileset2.id]
+      end
+    end
+  end
+
+  describe '#member_ids' do
+    let(:pcdm_object) { work1 }
+    let(:parent_work_resource) { resource }
+
+    before do
+      work1.ordered_members = [work2, work3, fileset1, fileset2]
+      work1.save!
+    end
+
+    # TODO: For now, the tests confirm that the correct members are returned and that they all have valkyrie ids.
+    #       This is because #member_ids comes from the attribute definition and can't receive a `valkyrie:` parameter.
+    context 'when valkyrie resources requested' do
+      it 'returns ids of parent collections as valkyrie resources through pcdm_valkyrie_behavior' do
+        resource_ids = parent_work_resource.member_ids
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id, fileset1.id, fileset2.id])
+      end
+    end
+    # context 'when valkyrie resources requested' do
+    #   it 'returns ids of parent collections as valkyrie resources through pcdm_valkyrie_behavior' do
+    #     resource_ids = parent_work_resource.member_ids(valkyrie: true)
+    #     expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id, fileset1.id, fileset2.id])
+    #   end
+    # end
+    # context 'when active fedora objects requested' do
+    #   it 'returns ids of parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+    #     af_object_ids = parent_work_resource.member_ids(valkyrie: false)
+    #     expect(af_object_ids.to_a).to match_array [work2.id, work3.id, fileset1.id, fileset2.id]
+    #   end
+    # end
+    # context 'when return type is not specified' do
+    #   it 'returns ids of parent collections as active fedora objects through pcdm_valkyrie_behavior' do
+    #     af_object_ids = parent_work_resource.member_ids
+    #     expect(af_object_ids.to_a).to match_array [work2.id, work3.id, fileset1.id, fileset2.id]
+    #   end
+    # end
+  end
+
+  describe '#child_objects' do
+    let(:pcdm_object) { collection1 }
+
+    before do
+      collection1.ordered_members = [work1, work2, collection2, collection3]
+      collection1.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns works only as valkyrie resources through pcdm_valkyrie_behavior' do
+        resources = resource.child_objects(valkyrie: true)
+        expect(resources.size).to eq 2
+        expect(resources.map(&:pcdm_object?)).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 works only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = resource.child_objects(valkyrie: false)
+        expect(af_objects.size).to eq 2
+        expect(af_objects.map(&:pcdm_object?)).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 works only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = resource.child_objects
+        expect(af_objects.size).to eq 2
+        expect(af_objects.map(&:pcdm_object?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work1.id, work2.id]
+      end
+    end
+  end
+
+  describe '#object_ids' do
+    let(:pcdm_object) { collection1 }
+
+    before do
+      collection1.ordered_members = [work1, work2, collection2, collection3]
+      collection1.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns ids of works only as valkyrie resources through pcdm_valkyrie_behavior' do
+        resource_ids = resource.child_object_ids(valkyrie: true)
+        expect(resource_ids.size).to eq 2
+        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 ids of works only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_object_ids = resource.child_object_ids(valkyrie: false)
+        expect(af_object_ids.size).to eq 2
+        expect(af_object_ids.to_a).to match_array [work1.id, work2.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns ids of works only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_object_ids = resource.child_object_ids
+        expect(af_object_ids.size).to eq 2
+        expect(af_object_ids.to_a).to match_array [work1.id, work2.id]
+      end
+    end
+  end
+
+  describe '#member_of' do
+    let(:pcdm_object) { work3 }
+    let(:child_resource) { resource }
+
+    before do
+      work1.ordered_members = [work3, fileset1]
+      work2.ordered_members = [work3, fileset2]
+      work1.save!
+      work2.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns works only as valkyrie resources through pcdm_valkyrie_behavior' do
+        resources = child_resource.member_of(valkyrie: true)
+        expect(resources.size).to eq 2
+        expect(resources.map(&:pcdm_object?)).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 works only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = child_resource.member_of(valkyrie: false)
+        expect(af_objects.size).to eq 2
+        expect(af_objects.map(&:pcdm_object?)).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 works only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = child_resource.member_of
+        expect(af_objects.size).to eq 2
+        expect(af_objects.map(&:pcdm_object?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [work1.id, work2.id]
+      end
+    end
+  end
+
+  describe '#in_collections' do
+    # TODO: This test is misleading.  Hyrax does not use the members relationship for tracking members of a collection.
+    #       It uses the member_of_collections relationship.  Use of members here is only to test the in_collections
+    #       method from PCDM which is used in 2 places in Hyrax.  It is likely that the 2 places this is used never gets
+    #       any collections and use of this method is a no-op.  But that needs to be confirmed before this can be deprecated.
+    let(:pcdm_object) { work1 }
+    let(:child_resource) { resource }
+
+    before do
+      collection1.ordered_members = [work1, collection3]
+      collection2.ordered_members = [work1, work2]
+      work3.ordered_members = [work1]
+      collection1.save!
+      collection2.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns collections only as valkyrie resources through pcdm_valkyrie_behavior' do
+        resources = child_resource.in_collections(valkyrie: true)
+        expect(resources.size).to eq 2
+        expect(resources.map(&:pcdm_collection?)).to all(be true)
+        expect(resources.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([collection1.id, collection2.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns collections only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = child_resource.in_collections(valkyrie: false)
+        expect(af_objects.size).to eq 2
+        expect(af_objects.map(&:pcdm_collection?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [collection1.id, collection2.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns collections only as active fedora objects through pcdm_valkyrie_behavior' do
+        af_objects = child_resource.in_collections
+        expect(af_objects.size).to eq 2
+        expect(af_objects.map(&:pcdm_collection?)).to all(be true)
+        expect(af_objects.map(&:id)).to match_array [collection1.id, collection2.id]
+      end
+    end
+  end
+
+  describe '#in_collection_ids' do
+    # TODO: This test is misleading.  Hyrax does not use the members relationship for tracking members of a collection.
+    #       It uses the member_of_collections relationship.  Use of members here is only to test the in_collection_ids
+    #       method from PCDM which is used in 1 place in Hyrax.  It is likely that the place this is used never gets
+    #       any collections and use of this method is a no-op.  But that needs to be confirmed before this can be deprecated.
+    let(:pcdm_object) { work1 }
+    let(:child_resource) { resource }
+
+    before do
+      collection1.ordered_members = [work1, collection3]
+      collection2.ordered_members = [work1, work2]
+      work3.ordered_members = [work1]
+      collection1.save!
+      collection2.save!
+      work3.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns collection ids only as valkyrie resource ids through pcdm_valkyrie_behavior' do
+        resource_ids = child_resource.in_collection_ids(valkyrie: true)
+        expect(resource_ids).to match_valkyrie_ids_with_active_fedora_ids([collection1.id, collection2.id])
+      end
+    end
+    context 'when active fedora objects requested' do
+      it 'returns collection ids only as active fedora object ids through pcdm_valkyrie_behavior' do
+        af_object_ids = child_resource.in_collection_ids(valkyrie: false)
+        expect(af_object_ids).to match_array [collection1.id, collection2.id]
+      end
+    end
+    context 'when return type is not specified' do
+      it 'returns collection ids only as active fedora object ids through pcdm_valkyrie_behavior' do
+        af_object_ids = child_resource.in_collection_ids
+        expect(af_object_ids).to match_array [collection1.id, collection2.id]
+      end
+    end
+  end
+
+  describe '#missing_method' do
+    let!(:pcdm_object) { collection1 }
+    it 'raises NoMethodError when neither the resource nor the active fedora object respond to the method' do
+      expect { resource.a_missing_method }.to raise_error NoMethodError
+    end
+  end
+
+  describe '#parent_works' do
+    let(:pcdm_object) { work3 }
+    let(:child_work_resource) { resource }
+
+    before do
+      work1.ordered_members = [work3]
+      work2.ordered_members = [work3]
+      work1.save!
+      work2.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns parent works as valkyrie resources through pcdm_valkyrie_behavior' do
+        resources = child_work_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 pcdm_valkyrie_behavior' do
+        af_objects = child_work_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 pcdm_valkyrie_behavior' do
+        af_objects = child_work_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) { work3 }
+    let(:child_work_resource) { resource }
+
+    before do
+      work1.ordered_members = [work3]
+      work2.ordered_members = [work3]
+      work1.save!
+      work2.save!
+    end
+
+    context 'when valkyrie resources requested' do
+      it 'returns parent works as valkyrie resources through pcdm_valkyrie_behavior' do
+        resource_ids = child_work_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 pcdm_valkyrie_behavior' do
+        af_object_ids = child_work_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 pcdm_valkyrie_behavior' do
+        af_object_ids = child_work_resource.parent_work_ids
+        expect(af_object_ids).to match_array [work1.id, work2.id]
+      end
+    end
+  end
+
+  describe '#member_collections' do
+    let(:pcdm_object) { collection1 }
+
+    before do
+      collection1.ordered_members = [work1, work2, collection2, collection3]
+      collection1.save!
+    end
+
+    it { expect(resource.member_collections).to eq([collection2, collection3]) }
+  end
+
+  describe '#member_collection_ids' do
+    let(:pcdm_object) { collection1 }
+
+    before do
+      collection1.ordered_members = [work1, work2, collection2, collection3]
+      collection1.save!
+    end
+
+    it { expect(resource.member_collection_ids).to eq([collection2.id, collection3.id]) }
+  end
+
+  describe '#member_works' do
+    let(:pcdm_object) { collection1 }
+
+    before do
+      collection1.ordered_members = [work1, work2, collection2, collection3]
+      collection1.save!
+    end
+
+    it { expect(resource.member_works).to eq([work1, work2]) }
+  end
+
+  describe '#member_work_ids' do
+    let(:pcdm_object) { collection1 }
+
+    before do
+      collection1.ordered_members = [work1, work2, collection2, collection3]
+      collection1.save!
+    end
+
+    it { expect(resource.member_work_ids).to eq([work1.id, work2.id]) }
+  end
+end