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

data/spec/models/job_io_wrapper_spec.rb

@@ -148,6 +148,38 @@ RSpec.describe JobIoWrapper, type: :model do
     end
   end
 
+  describe '#size' do
+    context 'when file responds to :size' do
+      before do
+        allow(subject.file).to receive(:respond_to?).with(:size).and_return(true)
+        allow(subject.file).to receive(:respond_to?).with(:stat).and_return(false)
+        allow(subject.file).to receive(:size).and_return(123)
+      end
+      it 'returns the size of the file' do
+        expect(subject.size).to eq '123'
+      end
+    end
+    context 'when file responds to :stat' do
+      before do
+        allow(subject.file).to receive(:respond_to?).with(:size).and_return(false)
+        allow(subject.file).to receive(:respond_to?).with(:stat).and_return(true)
+        allow(subject.file).to receive_message_chain(:stat, :size).and_return(456) # rubocop:disable RSpec/MessageChain
+      end
+      it 'returns the size of the file' do
+        expect(subject.size).to eq '456'
+      end
+    end
+    context 'when file responds to neither :size nor :stat' do
+      before do
+        allow(subject.file).to receive(:respond_to?).with(:size).and_return(false)
+        allow(subject.file).to receive(:respond_to?).with(:stat).and_return(false)
+      end
+      it 'returns nil' do
+        expect(subject.size).to eq nil
+      end
+    end
+  end
+
   describe '#file_actor' do
     let(:file_actor) { Hyrax::Actors::FileActor.new(file_set, subject.relation, user) }
 
@@ -169,4 +201,35 @@ RSpec.describe JobIoWrapper, type: :model do
       end
     end
   end
+
+  describe '#file_set' do
+    let(:fileset_id) { 'fileset_id' }
+    let!(:fileset) { create(:file_set, id: fileset_id) }
+    before { allow(subject).to receive(:file_set_id).and_return(fileset_id) }
+
+    context 'when finding through active fedora' do
+      it 'finds the file set using active fedora and returns an instance of an active fedora file set' do
+        results = subject.file_set
+        expect(results).to be_a_kind_of(FileSet)
+        expect(results.id).to eq fileset_id
+      end
+    end
+    context 'when finding through valkyrie' do
+      it 'finds the file set through valkyrie and returns an instance of a valkyrie file set resource' do
+        results = subject.file_set(use_valkyrie: true)
+        expect(results).to be_a_kind_of(Valkyrie::Resource)
+        expect(results.id.to_s).to eq fileset_id
+      end
+    end
+  end
+
+  describe '#to_file_metadata' do
+    it 'creates and returns file_metadata' do
+      expect(subject.to_file_metadata).to be_a_kind_of(Hyrax::FileMetadata)
+    end
+  end
+
+  describe '#file' do
+    xit 'switches between local filepath and CarrierWave file'
+  end
 end

data/spec/models/solr_hit_spec.rb

@@ -0,0 +1,9 @@
+RSpec.describe SolrHit do
+  subject(:solr_hit) { described_class.new "id" => "my:_ID1_" }
+
+  describe "#id" do
+    it "extracts the id from the solr hit" do
+      expect(solr_hit.id).to eq "my:_ID1_"
+    end
+  end
+end

data/spec/models/user_spec.rb

@@ -175,7 +175,7 @@ RSpec.describe User, type: :model do
     end
 
     it 'will fail if the User is not persisted' do
-      expect { subject }.to raise_error(ActiveRecord::StatementInvalid)
+      expect { subject }.to raise_error(ActiveRecord::RecordNotSaved)
     end
 
     context "when another process makes the agent" do

data/spec/presenters/hyrax/file_set_presenter_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe Hyrax::FileSetPresenter do
        "subject", "language", "license", "format_label", "file_size",
        "height", "width", "filename", "well_formed", "page_count",
        "file_title", "last_modified", "original_checksum", "mime_type",
-       "duration", "sample_rate"]
+       "duration", "sample_rate", "alpha_channels", "original_file_id"]
     end
 
     it "delegates to the solr_document" do
@@ -305,11 +305,15 @@ RSpec.describe Hyrax::FileSetPresenter do
   end
 
   describe 'IIIF integration' do
+    def uri_segment_escape(uri)
+      ActionDispatch::Journey::Router::Utils.escape_segment(uri)
+    end
+
     let(:file_set) { create(:file_set) }
     let(:solr_document) { SolrDocument.new(file_set.to_solr) }
     let(:request) { double(base_url: 'http://test.host') }
     let(:presenter) { described_class.new(solr_document, ability, request) }
-    let(:id) { CGI.escape(file_set.original_file.id) }
+    let(:id) { ActiveFedora::File.uri_to_id(file_set.original_file.versions.last.uri) }
     let(:read_permission) { true }
 
     before do
@@ -345,7 +349,7 @@ RSpec.describe Hyrax::FileSetPresenter do
           end
 
           it { is_expected.to be_instance_of IIIFManifest::DisplayImage }
-          its(:url) { is_expected.to eq "http://test.host/images/#{id}/full/600,/0/default.jpg" }
+          its(:url) { is_expected.to eq "http://test.host/images/#{uri_segment_escape(id)}/full/600,/0/default.jpg" }
 
           context 'with custom image size default' do
             let(:custom_image_size) { '666,' }
@@ -358,13 +362,13 @@ RSpec.describe Hyrax::FileSetPresenter do
             end
 
             it { is_expected.to be_instance_of IIIFManifest::DisplayImage }
-            its(:url) { is_expected.to eq "http://test.host/images/#{id}/full/#{custom_image_size}/0/default.jpg" }
+            its(:url) { is_expected.to eq "http://test.host/images/#{uri_segment_escape(id)}/full/#{custom_image_size}/0/default.jpg" }
           end
 
           context 'with custom image url builder' do
             let(:id) { file_set.original_file.id }
             let(:custom_builder) do
-              ->(file_id, base_url, _size) { "#{base_url}/downloads/#{file_id.split('/').first}" }
+              ->(file_id, base_url, _size, _format) { "#{base_url}/downloads/#{file_id.split('/').first}" }
             end
 
             around do |example|
@@ -388,7 +392,7 @@ RSpec.describe Hyrax::FileSetPresenter do
     end
 
     describe "#iiif_endpoint" do
-      subject { presenter.send(:iiif_endpoint, file_set.original_file.id) }
+      subject { presenter.send(:iiif_endpoint, id) }
 
       before do
         allow(Hyrax.config).to receive(:iiif_image_server?).and_return(riiif_enabled)
@@ -399,7 +403,7 @@ RSpec.describe Hyrax::FileSetPresenter do
       context 'with iiif_image_server enabled' do
         let(:riiif_enabled) { true }
 
-        its(:url) { is_expected.to eq "http://test.host/images/#{id}" }
+        its(:url) { is_expected.to eq "http://test.host/images/#{uri_segment_escape(id)}" }
         its(:profile) { is_expected.to eq 'http://iiif.io/api/image/2/level2.json' }
 
         context 'with a custom iiif image profile' do

data/spec/presenters/hyrax/presenter_factory_spec.rb

@@ -3,8 +3,8 @@ RSpec.describe Hyrax::PresenterFactory do
     let(:presenter_class) { Hyrax::FileSetPresenter }
 
     before do
-      allow(ActiveFedora::SolrService.instance.conn).to receive(:post)
-        .with('select', data: { q: "{!terms f=id}12,13", rows: 1000, qt: 'standard' })
+      allow(Hyrax::SolrService).to receive(:post)
+        .with("{!terms f=id}12,13", rows: 1000)
         .and_return('response' => { 'docs' => results })
     end
 

data/spec/presenters/hyrax/work_show_presenter_spec.rb

@@ -320,7 +320,7 @@ RSpec.describe Hyrax::WorkShowPresenter do
 
     context "solr query" do
       before do
-        expect(ActiveFedora::SolrService).to receive(:query).twice.with(anything, hash_including(rows: 10_000)).and_return([])
+        expect(Hyrax::SolrService).to receive(:query).twice.with(anything, hash_including(rows: 10_000)).and_return([])
       end
 
       it "requests >10 rows" do

data/spec/requests/riiif_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe 'IIIF image API', type: :request do
     context "when the user is authorized" do
       it "returns an image" do
         login_as user
-        get Riiif::Engine.routes.url_helpers.image_path(file.id, size: size)
+        get Riiif::Engine.routes.url_helpers.image_path(file.id, size: size, format: 'jpg', channels: nil)
         expect(response).to have_http_status(:ok)
         expect(response.content_type).to eq 'image/jpeg'
       end
@@ -23,7 +23,7 @@ RSpec.describe 'IIIF image API', type: :request do
 
     context "when the user is not authorized" do
       it "returns an image" do
-        get Riiif::Engine.routes.url_helpers.image_path(file.id, size: size)
+        get Riiif::Engine.routes.url_helpers.image_path(file.id, size: size, format: 'jpg', channels: nil)
         expect(response).to have_http_status(:unauthorized)
         expect(response.content_type).to eq 'image/jpeg'
       end

data/spec/search_builders/hyrax/my/find_works_search_builder_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Hyrax::My::FindWorksSearchBuilder do
 
     it "is successful" do
       subject
-      expect(solr_params[:fq]).to eq ["-" + ActiveFedora::SolrQueryBuilder.construct_query_for_ids([work.id])]
+      expect(solr_params[:fq]).to eq ["-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([work.id])]
     end
   end
 
@@ -38,8 +38,8 @@ RSpec.describe Hyrax::My::FindWorksSearchBuilder do
 
     it "is successful" do
       subject
-      ids = ActiveFedora::SolrService.query("{!field f=id}#{work.id}", fl: "member_ids_ssim").flat_map { |x| x.fetch("member_ids_ssim", []) }
-      expect(solr_params[:fq]).to eq ["-" + ActiveFedora::SolrQueryBuilder.construct_query_for_ids([ids])]
+      ids = Hyrax::SolrService.query("{!field f=id}#{work.id}", fl: "member_ids_ssim").flat_map { |x| x.fetch("member_ids_ssim", []) }
+      expect(solr_params[:fq]).to eq ["-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([ids])]
     end
   end
 

data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb

@@ -55,8 +55,8 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
       let(:document) { { id: id } }
 
       before do
-        ActiveFedora::SolrService.delete(id)
-        ActiveFedora::SolrService.add(document, commit: true)
+        Hyrax::SolrService.delete(id)
+        Hyrax::SolrService.add(document, commit: true)
       end
 
       it { is_expected.to be_a(Samvera::NestingIndexer::Documents::IndexDocument) }
@@ -72,7 +72,7 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
     it 'uses direct add to Solr on non-nested objects but yields the document and parent_ids to allow nesting logic to fire' do
       # The two collections and the work are handled via the nesting indexer.
       # we expect remaining repository objects to reindex via to_solr.
-      expect(ActiveFedora::SolrService).to receive(:add).exactly(count_of_items - 3).times
+      expect(Hyrax::SolrService).to receive(:add).exactly(count_of_items - 3).times
       yielded = []
       described_class.each_perservation_document_id_and_parent_ids do |document_id, parent_ids|
         yielded << [document_id, parent_ids]
@@ -110,7 +110,7 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
 
     before do
       ([parent] + children + not_my_children).each do |doc|
-        ActiveFedora::SolrService.add(doc, commit: true)
+        Hyrax::SolrService.add(doc, commit: true)
       end
     end
 
@@ -145,8 +145,7 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
 
   describe '.write_nesting_document_to_index_layer' do
     let(:work) { create(:work) }
-    let(:query_for_works_solr_document) { ->(id:) { ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids([id])).first } }
-
+    let(:query_for_works_solr_document) { ->(id:) { Hyrax::SolrService.query(Hyrax::SolrQueryBuilderService.construct_query_for_ids([id])).first } }
     # rubocop:disable RSpec/ExampleLength
     it 'will append parent_ids, ancestors, pathnames, and deepest_nested_depth to the SOLR document' do
       previous_solr_keys = work.to_solr.keys

data/spec/services/hyrax/admin_set_service_spec.rb

@@ -124,9 +124,9 @@ RSpec.describe Hyrax::AdminSetService do
       all_objects = []
       all_objects << works << admin_sets << file_sets
       all_objects.each do |obj|
-        ActiveFedora::SolrService.add(obj)
+        Hyrax::SolrService.add(obj)
       end
-      ActiveFedora::SolrService.commit
+      Hyrax::SolrService.commit
     end
 
     context "when there are works and files in the admin set" do

data/spec/services/hyrax/custom_queries/navigators/child_collections_navigator_spec.rb

@@ -0,0 +1,41 @@
+RSpec.describe Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+  let(:resource) { subject.build }
+  let(:custom_query_service) { Hyrax.query_service.custom_queries }
+
+  let(:collection1)    { build(:collection, id: 'col1', title: ['Collection 1']) }
+  let(:collection2)    { build(:collection, id: 'col2', title: ['Child Collection 1']) }
+  let(:collection3)    { build(:collection, id: 'col3', title: ['Child Collection 2']) }
+  let(:work1) { build(:work, id: 'wk1', title: ['Child Work 1']) }
+  let(:work2) { build(:work, id: 'wk2', title: ['Child Work 2']) }
+
+  describe '#find_child_collections' do
+    let(:pcdm_object) { collection1 }
+    let(:collection1_resource) { resource }
+
+    before do
+      collection1.members = [collection2, collection3, work1, work2]
+      collection1.save!
+    end
+
+    it 'returns only child collections as Valkyrie resources' do
+      child_collections = custom_query_service.find_child_collections(resource: collection1_resource)
+      expect(child_collections.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([collection2.id, collection3.id])
+    end
+  end
+
+  describe '#find_child_collection_ids' do
+    let(:pcdm_object) { collection1 }
+    let(:collection1_resource) { resource }
+
+    before do
+      collection1.members = [collection2, collection3, work1, work2]
+      collection1.save!
+    end
+
+    it 'returns Valkyrie ids for child collections only' do
+      child_collections = custom_query_service.find_child_collections(resource: collection1_resource)
+      expect(child_collections.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([collection2.id, collection3.id])
+    end
+  end
+end

data/spec/services/hyrax/custom_queries/navigators/child_filesets_navigator_spec.rb

@@ -0,0 +1,41 @@
+RSpec.describe Hyrax::CustomQueries::Navigators::ChildFilesetsNavigator, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+  let(:resource) { subject.build }
+  let(:custom_query_service) { Hyrax.query_service.custom_queries }
+
+  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(:fileset1) { build(:file_set, id: 'fs1', title: ['Child File Set 1']) }
+  let(:fileset2) { build(:file_set, id: 'fs2', title: ['Child File Set 2']) }
+
+  describe '#find_child_filesets' do
+    let(:pcdm_object) { work1 }
+    let(:work1_resource) { resource }
+
+    before do
+      work1.members = [work2, work3, fileset1, fileset2]
+      work1.save!
+    end
+
+    it 'returns only child filesets as Valkyrie resources' do
+      child_filesets = custom_query_service.find_child_filesets(resource: work1_resource)
+      expect(child_filesets.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([fileset1.id, fileset2.id])
+    end
+  end
+
+  describe '#find_child_fileset_ids' do
+    let(:pcdm_object) { work1 }
+    let(:work1_resource) { resource }
+
+    before do
+      work1.members = [work2, work3, fileset1, fileset2]
+      work1.save!
+    end
+
+    it 'returns Valkyrie ids for child filesets only' do
+      child_fileset_ids = custom_query_service.find_child_fileset_ids(resource: work1_resource)
+      expect(child_fileset_ids).to match_valkyrie_ids_with_active_fedora_ids([fileset1.id, fileset2.id])
+    end
+  end
+end

data/spec/services/hyrax/custom_queries/navigators/child_works_navigator_spec.rb

@@ -0,0 +1,79 @@
+RSpec.describe Hyrax::CustomQueries::Navigators::ChildWorksNavigator, :clean_repo do
+  subject(:factory) { Wings::ModelTransformer.new(pcdm_object: pcdm_object) }
+
+  let(:resource) { subject.build }
+  let(:custom_query_service) { Hyrax.query_service.custom_queries }
+
+  let(:collection1)    { build(:collection, id: 'col1', title: ['Collection 1']) }
+  let(:collection2)    { build(:collection, id: 'col2', title: ['Child Collection 1']) }
+  let(:collection3)    { build(:collection, id: 'col3', title: ['Child 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(:fileset1) { build(:file_set, id: 'fs1', title: ['Child File Set 1']) }
+  let(:fileset2) { build(:file_set, id: 'fs2', title: ['Child File Set 2']) }
+
+  describe '#find_child_works' do
+    context 'on a collection' do
+      let(:pcdm_object) { collection1 }
+      let(:collection1_resource) { resource }
+
+      before do
+        collection1.members = [collection2, collection3, work2, work1]
+        collection1.save!
+      end
+
+      it 'returns only child works as Valkyrie resources' do
+        child_works = custom_query_service.find_child_works(resource: collection1_resource)
+        expect(child_works.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work1.id])
+      end
+    end
+
+    context 'on a work' do
+      let(:pcdm_object) { work1 }
+      let(:work1_resource) { resource }
+
+      before do
+        work1.members = [work2, work3, fileset1, fileset2]
+        work1.save!
+      end
+
+      it 'returns only child works as Valkyrie resources' do
+        child_works = custom_query_service.find_child_works(resource: work1_resource)
+        expect(child_works.map(&:id)).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
+      end
+    end
+  end
+
+  describe '#find_child_work_ids' do
+    context 'on a collection' do
+      let(:pcdm_object) { collection1 }
+      let(:collection1_resource) { resource }
+
+      before do
+        collection1.members = [collection2, collection3, work2, work1]
+        collection1.save!
+      end
+
+      it 'returns Valkyrie ids for child works only' do
+        child_work_ids = custom_query_service.find_child_work_ids(resource: collection1_resource)
+        expect(child_work_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work1.id])
+      end
+    end
+
+    context 'on a work' do
+      let(:pcdm_object) { work1 }
+      let(:work1_resource) { resource }
+
+      before do
+        work1.members = [work2, work3, fileset1, fileset2]
+        work1.save!
+      end
+
+      it 'returns Valkyrie ids for child works only' do
+        child_work_ids = custom_query_service.find_child_work_ids(resource: work1_resource)
+        expect(child_work_ids).to match_valkyrie_ids_with_active_fedora_ids([work2.id, work3.id])
+      end
+    end
+  end
+end

data/spec/services/hyrax/custom_queries/wings.rb

@@ -0,0 +1,52 @@
+RSpec.describe Hyrax::CustomQueries::Wings do
+  let(:query_service) { Hyrax.query_service }
+
+  let(:work1) { create(:public_work) }
+  let(:work2) { create(:public_work) }
+  let(:hyrax_ids_array) { [work1.id, work2.id] }
+  let(:valk_ids_array) { [::Valkyrie::ID.new(work1.id), ::Valkyrie::ID.new(work2.id)] }
+  let(:valk_id_work1) { ::Valkyrie::ID.new(work1.id).id }
+  let(:valk_id_work2) { ::Valkyrie::ID.new(work2.id).id }
+  let(:subject) { query_service.custom_queries.find_many_by_alternate_ids(alternate_ids: id_list, use_valkyrie: use_valkyrie_value) }
+
+  describe '.find_many_by_alternate_ids' do
+    context 'with Valkyrie::ID input' do
+      let(:id_list) { valk_ids_array }
+      let(:use_valkyrie_value) { false }
+
+      it 'returns objects of requested type' do
+        expect(subject.first.is_a?(ActiveFedora::Base)).to be true
+        expect(subject.map(&:id)).to contain_exactly(work2.id, work1.id)
+      end
+    end
+
+    context 'when use_valkyrie: true' do
+      let(:use_valkyrie_value) { true }
+      let(:id_list) { hyrax_ids_array }
+
+      it 'returns Valkyrie::Resource objects' do
+        expect(subject.first).to be_a(Valkyrie::Resource)
+        expect(subject.map(&:alternate_ids).flatten.map(&:id)).to contain_exactly(valk_id_work2, valk_id_work1)
+      end
+    end
+
+    context 'when use_valkyrie: false' do
+      let(:use_valkyrie_value) { false }
+      let(:id_list) { hyrax_ids_array }
+
+      it 'returns ActiveFedora objects' do
+        expect(subject.first.is_a?(ActiveFedora::Base)).to be true
+        expect(subject.map(&:id)).to contain_exactly(work2.id, work1.id)
+        expect { subject } .not_to raise_error
+      end
+    end
+
+    context 'when list includes an invalid id' do
+      let(:id_list) { [work1.id, work2.id, '1212121212'] }
+
+      it 'returns error' do
+        expect { subject } .to raise_error
+      end
+    end
+  end
+end