hydra-core 11.0.1 → 12.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b05b587429cbb15a5cbf9b51ecfab69f4210ed361e3c3e45a254281f3c9476b
-  data.tar.gz: e405bbca53df7f535c111039b86320bdd13567d26eabc4438515161b024ff44d
+  metadata.gz: 96b390ac2fd463cbf23bf2a462607eb28ee78e09f80b04bad1fc986a63fb0e2c
+  data.tar.gz: 285cf500187d865a5f1199181216f6d9205950a4cbe8eff5b3a3f19fe920aa98
 SHA512:
-  metadata.gz: 863645e5703f7151967f3fa872a7bc9c4c764976f797588e3bc2b657e1fd092b42af09c5fbced33050b4ad8b90e0f9d16b80315af0323c1ef5e618909f15d116
-  data.tar.gz: a3b2c602ad537e952b14197eee5007450fbd7c267e80a0239aae4e4089dbf00ae0703cfe34a51bb3197f1e7d40b9bd72ccfc128f4bcbd02e024dd1afcecfda3a
+  metadata.gz: 4a4c94027dffce66f71815e667305689616305423fcf8760e94a73e3b251da1b5655844d80345f158114eb6efcb2de4d22d192a0269f6fe483f8bd7ccf1885f2
+  data.tar.gz: d2aecf65ff515fc399a2876266644f2e2dc4e205e6ed97ca04e8404dc556bda9d46a6d9c20afea2710f3c30cbb0cb7c33242ecd6e6a14eab326afa4b6ea50c6d

data/app/controllers/concerns/hydra/catalog.rb

@@ -3,6 +3,10 @@ module Hydra::Catalog
   include Blacklight::Catalog
   include Blacklight::AccessControls::Catalog
 
+  included do
+    self.search_service_class = Hydra::SearchService if respond_to?(:search_service_class)
+  end
+
   # Action-specific enforcement
   # Controller "before" filter for enforcing access controls on show actions
   # @param [Hash] opts (optional, not currently used)
@@ -20,4 +24,13 @@ module Hydra::Catalog
 
     permissions_doc
   end
+
+  # @return [Hash] a hash of context information to pass through to the search service
+  def search_service_context
+    ((super if defined?(super)) || {}).merge(hydra_search_service_context)
+  end
+
+  def hydra_search_service_context
+    { current_ability: current_ability }
+  end
 end

data/app/controllers/concerns/hydra/controller/download_behavior.rb

@@ -80,7 +80,9 @@ module Hydra
       # Override this if you'd like a different filename
       # @return [String] the filename
       def file_name
-        params[:filename] || file.original_name || (asset.respond_to?(:label) && asset.label) || file.id
+        fname = params[:filename] || file.original_name || (asset.respond_to?(:label) && asset.label) || file.id
+        fname = URI.unescape(fname) if Rails.version >= '6.0'
+        fname
       end
 
 

data/app/helpers/blacklight_helper.rb

@@ -1,4 +1,5 @@
 module BlacklightHelper
+  include Blacklight::CatalogHelperBehavior
   include Hydra::BlacklightHelperBehavior
 end
 

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -16,11 +16,7 @@ module Hydra
     #   => 'text_pdf'
     def type_field_to_partial_name(document, display_type)
       str = Array(display_type).join(' '.freeze).underscore
-      if Rails.version >= '5.0.0'
-        str.parameterize(separator: '_'.freeze)
-      else
-        str.parameterize('_'.freeze)
-      end
+      str.parameterize(separator: '_'.freeze)
     end
   end
 end

data/app/models/hydra/search_builder.rb

@@ -0,0 +1,6 @@
+module Hydra
+  class SearchBuilder < Blacklight::SearchBuilder
+    # Add a filter query to restrict the search to documents the current user has access to
+    include Hydra::AccessControlsEnforcement
+  end
+end

data/app/services/hydra/search_service.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Hydra
+  # Returns AdminSets that the current user has permission to use.
+  class SearchService < Blacklight::SearchService
+    def current_ability
+      context[:current_ability]
+    end
+  end
+end

data/hydra-core.gemspec

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

data/lib/generators/hydra/head_generator.rb

@@ -49,14 +49,6 @@ module Hydra
       end
     end
 
-    # Add Hydra to the SearchBuilder
-    def inject_hydra_search_builder_behavior
-      insert_into_file "app/models/search_builder.rb", after: "include Blacklight::Solr::SearchBuilderBehavior\n" do
-        "  # Add a filter query to restrict the search to documents the current user has access to\n" \
-        "  include Hydra::AccessControlsEnforcement\n"
-      end
-    end
-
     # Copy all files in templates/config directory to host config
     def create_configuration_files
 
@@ -79,7 +71,7 @@ module Hydra
     def create_conneg_configuration
       file_path = "config/initializers/mime_types.rb"
       append_to_file file_path do
-        "Mime::Type.register \"application/n-triples\", :nt\n" + 
+        "Mime::Type.register \"application/n-triples\", :nt\n" +
         "Mime::Type.register \"application/ld+json\", :jsonld\n" +
         "Mime::Type.register \"text/turtle\", :ttl"
       end
@@ -89,7 +81,7 @@ module Hydra
       file_path = "app/models/solr_document.rb"
       if File.exists?(file_path)
         inject_into_file file_path, :before => /end\Z/ do
-          "\n  # Do content negotiation for AF models. \n" + 
+          "\n  # Do content negotiation for AF models. \n" +
           "\n  use_extension( Hydra::ContentNegotiation )\n"
         end
       end

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "11.0.1"
+  VERSION = "12.0.1"
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -48,9 +48,19 @@ describe CatalogController do
       end
       context "with no asset" do
         it "returns a not found response code" do
-          get 'show', params: { id: "test", format: :nt }
+          handled = false
+
+          begin
+            get 'show', params: { id: "test", format: :nt }
+            # blacklight 6
+            expect(response).to be_not_found
+            handled = true
+          rescue Blacklight::Exceptions::RecordNotFound
+            # blacklight 7
+            handled = true
+          end
 
-          expect(response).to be_not_found
+          expect(handled).to eq true
         end
       end
       context "with an asset" do
@@ -69,7 +79,7 @@ describe CatalogController do
         it "is able to negotiate jsonld" do
           get 'show', params: { id: asset.id, format: :jsonld }
 
-          expect(response).to be_success
+          expect(response).to be_successful
           expect(response.headers['Content-Type']).to include("application/ld+json")
           graph = RDF::Reader.for(:jsonld).new(response.body)
           expect(graph.statements.to_a.length).to eq 3
@@ -77,8 +87,8 @@ describe CatalogController do
 
         it "is able to negotiate ttl" do
           get 'show', params: { id: asset.id, format: :ttl }
-          
-          expect(response).to be_success
+
+          expect(response).to be_successful
           graph = RDF::Reader.for(:ttl).new(response.body)
           expect(graph.statements.to_a.length).to eq 3
         end
@@ -115,7 +125,11 @@ describe CatalogController do
       it "triggers enforce_show_permissions" do
         allow(controller).to receive(:current_user).and_return(nil)
         expect(controller).to receive(:enforce_show_permissions)
-        get :show, params: { id: 'test:3' }
+        begin
+          get :show, params: { id: 'test:3' }
+        rescue Blacklight::Exceptions::RecordNotFound
+          # blacklight 7
+        end
       end
     end
   end

data/spec/controllers/downloads_controller_spec.rb

@@ -76,7 +76,7 @@ describe DownloadsController do
           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 eq "inline; filename=\"buzz.png\""
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"buzz.png\""
           expect(response.body).to eq 'fizz'
         end
 
@@ -85,7 +85,7 @@ describe DownloadsController do
           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 eq "inline; filename=\"world.png\""
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"world.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
 
@@ -101,7 +101,7 @@ describe DownloadsController 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 eq "inline; filename=\"metadata.xml\""
+              expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"metadata.xml\""
               expect(response.body).to eq "It's a stream"
             end
           end
@@ -111,7 +111,7 @@ describe DownloadsController 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 eq "inline; filename=\"world.png\""
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"world.png\""
           expect(response.body).to eq 'foobarfoobarfoobar'
         end
 
@@ -119,7 +119,8 @@ describe DownloadsController 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 eq "inline; filename=\"my%20dog.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
@@ -148,7 +149,7 @@ describe DownloadsController do
           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 eq "inline; filename=\"MyVideo.webm\""
+          expect(response.headers["Content-Disposition"]).to start_with "inline; filename=\"MyVideo.webm\""
           expect(response.status).to eq 206
         end
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -12,11 +12,13 @@ describe BlacklightHelper do
 
     before do
       allow(helper).to receive(:blacklight_config).and_return(config)
+      allow(helper).to receive(:blacklight_configuration_context).and_return(helper)
+      allow(helper).to receive(:evaluate_if_unless_configuration).and_return(true)
     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.document_partial_name('has_model_s' => ["GenericContent"])).to eq("generic_content")
     end
 
     context "with a single valued field" do

data/spec/search_builders/search_builder_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
-describe SearchBuilder do
-  let(:processor_chain) { [:add_access_controls_to_solr_params] }
-  let(:context) { double('context') }
+RSpec.describe Hydra::SearchBuilder do
+  let(:context) { CatalogController.new }
   let(:user) { double('user', user_key: 'joe') }
   let(:current_ability) { double('ability', user_groups: [], current_user: user) }
   let(:search_builder) { described_class }
 
   subject do
-    search_builder.new(processor_chain, context)
+    search_builder.new(context).with_ability(current_ability)
   end
 
   it "extends classes with the necessary Hydra modules" do

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'hydra-core'
 
 require 'simplecov'
 require 'coveralls'
+require 'rails-controller-testing'
 
 SimpleCov.root(File.expand_path('../..', __dir__))
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
@@ -29,6 +30,9 @@ ActiveFedora::Base.logger = Logger.new(STDOUT)
 require 'active_fedora/cleaner'
 RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :controller
+  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.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: 11.0.1
+  version: 12.0.1
 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: 2020-10-09 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-access-controls
@@ -17,34 +17,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 12.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 12.0.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,8 @@ files:
 - app/models/hydra/content_negotiation/fedora_uri_replacer.rb
 - app/models/hydra/content_negotiation/graph_finder.rb
 - app/models/hydra/content_negotiation/replacing_graph_finder.rb
+- app/models/hydra/search_builder.rb
+- app/services/hydra/search_service.rb
 - config/locales/hydra.en.yml
 - hydra-core.gemspec
 - lib/application_helper.rb
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)