hydra-core 13.0.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18685bf2d660af57d5a126e79ed721a5bc317c3369d0ff1b6b53c2dda25e91e
-  data.tar.gz: 51b453b01d9681c124c096fc1b0c7445cd66f5cfc4b3c74e9d14928b6360fa9f
+  metadata.gz: b18b78f7931bd8e03a78a9635ab9f55c9851d6555e56a367ccaec3cff349ca9b
+  data.tar.gz: 26b2766d7d8ccaf52d2b127698cb5ec5e49e460b99311ee71c31ee411bd15da7
 SHA512:
-  metadata.gz: dcee913539a8117fb0deab0312b8a459e2eff936305e6af9a27c92e4fa1b4377664c4f10e6b7746b87c138f53fcf53265fec6242868e17060aee7e7fe6fc9fdf
-  data.tar.gz: ea75b84e2a3dbb6eccd3ec2fdcaf391e1d9f9957e92c4220d5cdb55dd828fea687ef92d9a2b3289f0c60bb2da556bcbad0eeddd2296f688e418a906f7de88839
+  metadata.gz: 384b95f53a1a1901ac1622fa6afc23e709bc5c8407f630868440b5adbf5438b79e03f6a99787b60b0885daafe25b14e2a5e89ba214206127a5a78958279deb76
+  data.tar.gz: 23afe29c5e9fd4c63d99c1d3fe1e377238cabc0081c23f4716dc118b184f637c7a13f0a11c01627222fddb4d1efe74cb4eeb17ad0eb61cf4e1232518a262508b

data/hydra-core.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 3.1'
 
   gem.add_dependency 'hydra-access-controls', version
-  gem.add_dependency "railties", '>= 6.1', '< 8.0'
+  gem.add_dependency "railties", '>= 6.1', '< 9'
 
-  gem.add_development_dependency 'rails-controller-testing', '~> 1'
-  gem.add_development_dependency 'rspec-rails', '~> 4.0'
-  gem.add_development_dependency 'sqlite3', '~> 1.3'
+  gem.add_development_dependency 'rails-controller-testing'
+  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'sqlite3'
 end

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "13.0.0"
+  VERSION = "13.2.0"
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -30,13 +30,13 @@ describe CatalogController do
       it "should only return public documents if role does not have permissions" do
         allow(controller).to receive(:current_user).and_return(nil)
         get :index
-        expect(assigns(:document_list).count).to eq @public_only_results.docs.count
+        expect(assigns(:response).documents.count).to eq @public_only_results.docs.count
       end
 
       it "should return documents if the group names need to be escaped" do
         allow(RoleMapper).to receive(:roles).and_return(["abc/123","cde/567"])
         get :index
-        expect(assigns(:document_list).count).to eq @public_only_results.docs.count
+        expect(assigns(:response).documents.count).to eq @public_only_results.docs.count
       end
     end
   end

data/spec/controllers/downloads_controller_spec.rb

@@ -39,144 +39,6 @@ describe DownloadsController do
       Object.send(:remove_const, :ContentHolder)
     end
 
-    context "when not logged in" do
-
-      context "when a specific datastream is requested" do
-        it "redirects to the root path and display an error" do
-          get :show, params: { id: obj, file: "descMetadata" }
-          expect(response).to redirect_to new_user_session_path
-          expect(flash[:alert]).to eq "You are not authorized to access this page."
-        end
-      end
-    end
-
-    context "when logged in, but without read access" do
-      let(:user) { User.create(email: 'email2@example.com', password: 'password') }
-      before do
-        sign_in user
-      end
-      context "when a specific datastream is requested" do
-        it "redirects to the root path and display an error" do
-          get :show, params: { id: obj, file: "descMetadata" }
-          expect(response).to redirect_to root_path
-          expect(flash[:alert]).to eq "You are not authorized to access this page."
-        end
-      end
-    end
-
-    context "when logged in as reader" do
-      before do
-        sign_in @user
-        allow_any_instance_of(User).to receive(:groups).and_return([])
-      end
-
-      describe "#show" do
-        it "defaults to returning default download configured by object" do
-          allow(ContentHolder).to receive(:default_file_path).and_return('buzz')
-          get :show, params: { id: obj }
-          expect(response).to be_successful
-          expect(response.headers['Content-Type']).to start_with "image/png"
-          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"buzz.png\""
-          expect(response.body).to eq 'fizz'
-        end
-
-        it "defaults to returning default download configured by controller" do
-          expect(DownloadsController.default_file_path).to eq "content"
-          get :show, params: { id: obj }
-          expect(response).to be_successful
-          expect(response.headers['Content-Type']).to start_with "image/png"
-          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"world.png\""
-          expect(response.body).to eq 'foobarfoobarfoobar'
-        end
-
-        context "when a specific datastream is requested" do
-          context "and it doesn't exist" do
-            it "returns :not_found when the datastream doesn't exist" do
-              get :show, params: { id: obj, file: "thumbnail" }
-              expect(response).to be_not_found
-            end
-          end
-          context "and it exists" do
-            it "returns it" do
-              get :show, params: { id: obj, file: "descMetadata" }
-              expect(response).to be_successful
-              expect(response.headers['Content-Type']).to start_with "text/plain"
-              expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"metadata.xml\""
-              expect(response.body).to eq "It's a stream"
-            end
-          end
-        end
-
-        it "supports setting disposition to inline" do
-          get :show, params: { id: obj, disposition: "inline" }
-          expect(response).to be_successful
-          expect(response.headers['Content-Type']).to start_with "image/png"
-          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"world.png\""
-          expect(response.body).to eq 'foobarfoobarfoobar'
-        end
-
-        it "allows you to specify filename for download" do
-          get :show, params: { id: obj, "filename" => "my%20dog.png" }
-          expect(response).to be_successful
-          expect(response.headers['Content-Type']).to start_with "image/png"
-          expect(response.headers["Content-Disposition"]).to start_with "inline; filename="
-          expect(response.headers["Content-Disposition"]).to include "my%20dog.png"
-          expect(response.body).to eq 'foobarfoobarfoobar'
-        end
-      end
-      describe "stream" do
-        let(:parent) { ActiveFedora::Base.new(id: '1234') }
-
-        before do
-          parent.add_file('one1two2threfour', path: 'webm', mime_type: 'video/webm', original_name: 'MyVideo.webm')
-          parent.save!
-          expect(controller).to receive(:authorize!).with(:download, instance_of(ActiveFedora::File)).and_return(true)
-        end
-
-        it "head request" do
-          request.env["HTTP_RANGE"] = 'bytes=0-15'
-          head :show, params: { id: parent, file: 'webm' }
-          expect(response.headers['Content-Length']).to eq 16
-          expect(response.headers['Accept-Ranges']).to eq 'bytes'
-          expect(response.headers['Content-Type']).to start_with 'video/webm'
-        end
-
-        it "sends the whole thing" do
-          request.env["HTTP_RANGE"] = 'bytes=0-15'
-          get :show, params: { id: '1234', file: 'webm' }
-          expect(response.body).to eq 'one1two2threfour'
-          expect(response.headers["Content-Range"]).to eq 'bytes 0-15/16'
-          expect(response.headers["Content-Length"]).to eq '16'
-          expect(response.headers['Accept-Ranges']).to eq 'bytes'
-          expect(response.headers['Content-Type']).to start_with "video/webm"
-          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"MyVideo.webm\""
-          expect(response.status).to eq 206
-        end
-
-        it "sends the whole thing when the range is open ended" do
-          request.env["HTTP_RANGE"] = 'bytes=0-'
-          get :show, params: { id: '1234', file: 'webm' }
-          expect(response.body).to eq 'one1two2threfour'
-        end
-
-        it "gets a range not starting at the beginning" do
-          request.env["HTTP_RANGE"] = 'bytes=3-15'
-          get :show, params: { id: '1234', file: 'webm' }
-          expect(response.body).to eq '1two2threfour'
-          expect(response.headers["Content-Range"]).to eq 'bytes 3-15/16'
-          expect(response.headers["Content-Length"]).to eq '13'
-        end
-
-        it "gets a range not ending at the end" do
-          request.env["HTTP_RANGE"] = 'bytes=4-11'
-          get :show, params: { id: '1234', file: 'webm' }
-          expect(response.body).to eq 'two2thre'
-          expect(response.headers["Content-Range"]).to eq 'bytes 4-11/16'
-          expect(response.headers["Content-Length"]).to eq '8'
-        end
-      end
-    end
-
     describe "overriding the default asset param key" do
       before do
         Rails.application.routes.draw do

data/spec/helpers/blacklight_helper_spec.rb

@@ -17,19 +17,19 @@ describe BlacklightHelper do
     end
 
     it "changes camel case to underscored lowercase" do
-      expect(helper.document_partial_name('has_model_s' => ["Presentation"])).to eq "presentation"
-      expect(helper.document_partial_name('has_model_s' => ["GenericContent"])).to eq("generic_content")
+      expect(helper.send(:document_partial_name, 'has_model_s' => ["Presentation"])).to eq "presentation"
+      expect(helper.send(:document_partial_name, 'has_model_s' => ["GenericContent"])).to eq("generic_content")
     end
 
     context "with a single valued field" do
       let(:field_name) { 'has_model_s' }
       it "should support single valued fields" do
-        expect(helper.document_partial_name('has_model_s' => "Chicken")).to eq "chicken"
+        expect(helper.send(:document_partial_name, 'has_model_s' => "Chicken")).to eq "chicken"
       end
     end
 
     it "handles periods" do
-      expect(helper.document_partial_name('has_model_s' => ["text.PDF"])).to eq "text_pdf"
+      expect(helper.send(:document_partial_name, 'has_model_s' => ["text.PDF"])).to eq "text_pdf"
     end
   end
 end

data/spec/requests/downloads_spec.rb

@@ -0,0 +1,170 @@
+require 'spec_helper'
+
+describe 'Downloads' do
+  before do
+    Rails.application.routes.draw do
+      resources :downloads
+      devise_for :users
+      root to: 'catalog#index'
+    end
+  end
+
+  describe "with a file" do
+    before do
+      class ContentHolder < ActiveFedora::Base
+        include Hydra::AccessControls::Permissions
+        has_subresource 'thumbnail'
+      end
+      @user = User.new.tap {|u| u.email = 'email@example.com'; u.password = 'password'; u.save}
+    end
+    let(:obj) do
+      ContentHolder.new.tap do |obj|
+        obj.add_file('fizz', path: 'buzz', original_name: 'buzz.png', mime_type: 'image/png')
+        obj.add_file('foobarfoobarfoobar', path: 'content', original_name: 'world.png', mime_type: 'image/png')
+        obj.add_file("It's a stream", path: 'descMetadata', original_name: 'metadata.xml', mime_type: 'text/plain')
+        obj.read_users = [@user.user_key]
+        obj.save!
+      end
+    end
+
+    after do
+      obj.destroy
+      Object.send(:remove_const, :ContentHolder)
+    end
+
+    context "when not logged in" do
+
+      context "when a specific datastream is requested" do
+        it "redirects to the root path and display an error" do
+          get "/downloads/#{obj.id.gsub('/', '%2F')}", params: { file: "descMetadata" }
+          expect(response).to redirect_to new_user_session_path
+          expect(flash[:alert]).to eq "You are not authorized to access this page."
+        end
+      end
+    end
+
+    context "when logged in, but without read access" do
+      let(:user) { User.create(email: 'email2@example.com', password: 'password') }
+      before do
+        sign_in user
+      end
+      context "when a specific datastream is requested" do
+        it "redirects to the root path and display an error" do
+          get "/downloads/#{obj.id.gsub('/', '%2F')}", params: { file: "descMetadata" }
+          expect(response).to redirect_to root_path
+          expect(flash[:alert]).to eq "You are not authorized to access this page."
+        end
+      end
+    end
+
+    context "when logged in as reader" do
+      before do
+        sign_in @user
+        allow_any_instance_of(User).to receive(:groups).and_return([])
+      end
+
+      describe "#show" do
+        it "defaults to returning default download configured by object" do
+          allow(ContentHolder).to receive(:default_file_path).and_return('buzz')
+          get "/downloads/#{obj.id.gsub('/', '%2F')}"
+          expect(response).to be_successful
+          expect(response.headers['Content-Type']).to start_with "image/png"
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"buzz.png\""
+          expect(response.body).to eq 'fizz'
+        end
+
+        it "defaults to returning default download configured by controller" do
+          expect(DownloadsController.default_file_path).to eq "content"
+          get "/downloads/#{obj.id.gsub('/', '%2F')}"
+          expect(response).to be_successful
+          expect(response.headers['Content-Type']).to start_with "image/png"
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"world.png\""
+          expect(response.body).to eq 'foobarfoobarfoobar'
+        end
+
+        context "when a specific datastream is requested" do
+          context "and it doesn't exist" do
+            it "returns :not_found when the datastream doesn't exist" do
+              get "/downloads/#{obj.id.gsub('/', '%2F')}", params: { file: "thumbnail" }
+              expect(response).to be_not_found
+            end
+          end
+          context "and it exists" do
+            it "returns it" do
+              get "/downloads/#{obj.id.gsub('/', '%2F')}", params: { file: "descMetadata" }
+              expect(response).to be_successful
+              expect(response.headers['Content-Type']).to start_with "text/plain"
+              expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"metadata.xml\""
+              expect(response.body).to eq "It's a stream"
+            end
+          end
+        end
+
+        it "supports setting disposition to inline" do
+          get "/downloads/#{obj.id.gsub('/', '%2F')}", params: { disposition: "inline" }
+          expect(response).to be_successful
+          expect(response.headers['Content-Type']).to start_with "image/png"
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"world.png\""
+          expect(response.body).to eq 'foobarfoobarfoobar'
+        end
+
+        it "allows you to specify filename for download" do
+          get "/downloads/#{obj.id.gsub('/', '%2F')}", params: { "filename" => "my%20dog.png" }
+          expect(response).to be_successful
+          expect(response.headers['Content-Type']).to start_with "image/png"
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename="
+          expect(response.headers["Content-Disposition"]).to include "my%20dog.png"
+          expect(response.body).to eq 'foobarfoobarfoobar'
+        end
+      end
+      describe "stream" do
+        let(:parent) { ContentHolder.new(id: '1234') }
+
+        before do
+          parent.add_file('one1two2threfour', path: 'webm', mime_type: 'video/webm', original_name: 'MyVideo.webm')
+          parent.read_users = [@user.user_key]
+          parent.save!
+          sign_in @user
+          allow_any_instance_of(User).to receive(:groups).and_return([])
+        end
+
+        it "head request" do
+          head "/downloads/1234", params: { file: 'webm' }, headers: { HTTP_RANGE: 'bytes=0-15' }
+          expect(response.headers['Content-Length']).to eq 16
+          expect(response.headers['Accept-Ranges']).to eq 'bytes'
+          expect(response.headers['Content-Type']).to start_with 'video/webm'
+        end
+
+        it "sends the whole thing" do
+          get "/downloads/1234", params: { file: 'webm' }, headers: { HTTP_RANGE: 'bytes=0-15' }
+          expect(response.body).to eq 'one1two2threfour'
+          expect(response.headers["Content-Range"]).to eq 'bytes 0-15/16'
+          expect(response.headers["Content-Length"]).to eq '16'
+          expect(response.headers['Accept-Ranges']).to eq 'bytes'
+          expect(response.headers['Content-Type']).to start_with "video/webm"
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"MyVideo.webm\""
+          expect(response.status).to eq 206
+        end
+
+        it "sends the whole thing when the range is open ended" do
+          get "/downloads/1234", params: { file: 'webm' }, headers: { HTTP_RANGE: 'bytes=0-' }
+          expect(response.body).to eq 'one1two2threfour'
+        end
+
+        it "gets a range not starting at the beginning" do
+          get "/downloads/1234", params: { file: 'webm' }, headers: { HTTP_RANGE: 'bytes=3-15' }
+          expect(response.body).to eq '1two2threfour'
+          expect(response.headers["Content-Range"]).to eq 'bytes 3-15/16'
+          expect(response.headers["Content-Length"]).to eq '13'
+        end
+
+        it "gets a range not ending at the end" do
+          get "/downloads/1234", params: { file: 'webm' }, headers: { HTTP_RANGE: 'bytes=4-11' }
+          expect(response.body).to eq 'two2thre'
+          expect(response.headers["Content-Range"]).to eq 'bytes 4-11/16'
+          expect(response.headers["Content-Length"]).to eq '8'
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ RSpec.configure do |config|
   config.include ::Rails::Controller::Testing::TemplateAssertions, type: :controller
   config.include ::Rails::Controller::Testing::TestProcess, type: :controller
   config.include ::Rails::Controller::Testing::Integration, type: :controller
+  config.include Devise::Test::IntegrationHelpers, type: :request
   config.use_transactional_fixtures = true
   config.infer_spec_type_from_file_location!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.2.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-access-controls
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 13.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 13.2.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,49 +44,49 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: 'Hydra-Head is a Rails Engine containing the core code for a Hydra application.
   The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer,
   and om'
@@ -138,6 +138,7 @@ files:
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
+- spec/requests/downloads_spec.rb
 - spec/search_builders/search_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/app/models/sample.rb
@@ -181,6 +182,7 @@ test_files:
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
+- spec/requests/downloads_spec.rb
 - spec/search_builders/search_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/app/models/sample.rb