hydra-core 11.0.0.rc1 → 11.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d850d13eafcff9bae87313b3cebc8105112e7a88ba647d5990e9cd8e11ade4
-  data.tar.gz: fff6f63fd06dfb2ecf1e2b1d156c125bba73f5a4ecc705c0f4446d6262e69f0e
+  metadata.gz: b236ff206441cb6307af47cd301f992b280c94b4cfed89a9fafc2c93bbfb5abb
+  data.tar.gz: e18f193c12ac996b90e02d48d587db90ad4423e5e57bae4c8eaad793c9c71e65
 SHA512:
-  metadata.gz: ec47478235d34b1f5f80b225b2b3fd1e63d5a45b37341043d21e05dbff9c2efbebf20d029058ed8a3d4677f04aeeea2d1bab0d5241c611aea58ccb169d57cdfe
-  data.tar.gz: 024e396c84e36581c5468e9ee7817fa014dff09913e885ba9d3bf27e42edef22c10e299590eae227e50d5083f87bba44d1843ec77c21c7a3d73c2abd78891ca5
+  metadata.gz: 29f4c357ad8c2c7fe8ce9ff4d64fe76a3c977cff8ed75e4dde3d3a9ee5d71bbf39fe88cc63818c2bdf3b4f2a42a580edd37511d0c3f6dff381ad8387f0ed4b6d
+  data.tar.gz: f495df249c440f139281199eb08dc1c0adfadc380159afe3ac11127fc2319302c2035e8ff8f6c1e1d5b0a9642f9b4a04df42db80f92a6fdff9b971a139a41c38

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

@@ -3,11 +3,6 @@ module Hydra::Catalog
   include Blacklight::Catalog
   include Blacklight::AccessControls::Catalog
 
-  # This will work for BL 6, but will need to move to SearchService in BL 7
-  def search_builder
-    Hydra::AccessControls::SearchBuilder.new(self, ability: current_ability)
-  end
-
   # Action-specific enforcement
   # Controller "before" filter for enforcing access controls on show actions
   # @param [Hash] opts (optional, not currently used)

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

@@ -125,11 +125,7 @@ module Hydra
         unless response.headers["Last-Modified"] || response.headers["ETag"]
           Rails.logger.warn("Response may be buffered instead of streaming, best to set a Last-Modified or ETag header")
         end
-        iostream.each do |in_buff|
-          response.stream.write in_buff
-        end
-      ensure
-        response.stream.close
+        self.response_body = iostream
       end
 
       def default_file

data/hydra-core.gemspec

@@ -4,7 +4,7 @@ version = File.read(File.expand_path("../../HYDRA_VERSION", __FILE__)).strip
 Gem::Specification.new do |gem|
   gem.authors     = ["Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors"]
   gem.email       = ["hydra-tech@googlegroups.com"]
-  gem.homepage    = "http://projecthydra.org"
+  gem.homepage    = "https://github.com/samvera/hydra-head/tree/master/hydra-core"
   gem.summary     = %q{Hydra-Head Rails Engine (requires Rails3) }
   gem.description = %q{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}
 
@@ -16,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.version       = version
   gem.license       = "APACHE2"
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.4'
 
-  gem.add_dependency "railties", '>= 4.0.0', '< 6'
   gem.add_dependency 'hydra-access-controls', version
+  gem.add_dependency "railties", '>= 4.0.0', '< 6'
 
-  gem.add_development_dependency 'sqlite3', '~> 1.3'
+  gem.add_development_dependency 'rails-controller-testing', '~> 1'
   gem.add_development_dependency 'rspec-rails', '~> 3.1'
-  gem.add_development_dependency 'factory_bot_rails', '~> 4.8.2'
+  gem.add_development_dependency 'sqlite3', '~> 1.3'
 end

data/lib/generators/hydra/head_generator.rb

@@ -49,6 +49,14 @@ 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
 
@@ -71,7 +79,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
@@ -81,7 +89,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.0.rc1"
+  VERSION = "11.0.0.rc2"
 end

data/spec/models/user_spec.rb

@@ -32,7 +32,7 @@ describe User do
   end
 
   describe "#groups" do
-    let(:user) { FactoryBot.create(:user) }
+    let(:user) { described_class.new }
     let(:mock_service) { double }
     before do
       user.group_service = mock_service

data/spec/search_builders/search_builder_spec.rb

@@ -1,22 +1,23 @@
 require 'spec_helper'
 
-describe Hydra::AccessControls::SearchBuilder do
-  let(:config) { CatalogController.blacklight_config }
-  let(:context) { double('context', blacklight_config: config) }
+describe SearchBuilder do
+  let(:processor_chain) { [:add_access_controls_to_solr_params] }
+  let(:context) { double('context') }
   let(:user) { double('user', user_key: 'joe') }
-  let(:current_ability) do
-    double('ability', user_groups: [], current_user: user)
-  end
-
+  let(:current_ability) { double('ability', user_groups: [], current_user: user) }
   let(:search_builder) { described_class }
 
   subject do
-    search_builder.new(context, ability: current_ability)
+    search_builder.new(processor_chain, context)
+  end
+
+  it "extends classes with the necessary Hydra modules" do
+    expect(described_class.included_modules).to include(Hydra::AccessControlsEnforcement)
   end
 
   context "when a query is generated" do
     it "triggers add_access_controls_to_solr_params" do
-      expect(subject).to receive(:apply_gated_discovery)
+      expect(subject).to receive(:add_access_controls_to_solr_params)
       subject.query
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
-ENV["RAILS_ENV"] ||= "test"
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] ||= 'test'
 
 require 'engine_cart'
 path = File.expand_path(File.join('..', '..', '..', '.internal_test_app'), __FILE__)
@@ -7,15 +9,19 @@ EngineCart.load_application! path
 require 'bundler/setup'
 require 'rspec/rails'
 require 'hydra-core'
-require "factory_bot"
-require "factories"
 
-if ENV['COVERAGE']
-  require 'simplecov'
-  require 'simplecov-rcov'
+require 'simplecov'
+require 'coveralls'
 
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start
+SimpleCov.root(File.expand_path('../..', __dir__))
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+)
+SimpleCov.start('rails') do
+  add_filter %r{lib/generators/.*\.rb}
 end
 
 ActiveFedora::Base.logger = Logger.new(STDOUT)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 11.0.0.rc1
+  version: 11.0.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hydra-access-controls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 11.0.0.rc2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 11.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -32,33 +46,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
-  name: hydra-access-controls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 11.0.0.rc1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 11.0.0.rc1
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -74,19 +74,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.2
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.2
+        version: '1.3'
 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'
@@ -131,7 +131,6 @@ files:
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/ip_based_ability_spec.rb
-- spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/models/content_negotiation/replacing_graph_finder_spec.rb
 - spec/models/solr_document_spec.rb
@@ -146,7 +145,7 @@ files:
 - spec/support/matchers/solr_matchers.rb
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
-homepage: http://projecthydra.org
+homepage: https://github.com/samvera/hydra-head/tree/master/hydra-core
 licenses:
 - APACHE2
 metadata: {}
@@ -158,15 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)
@@ -175,7 +173,6 @@ test_files:
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/ip_based_ability_spec.rb
-- spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/models/content_negotiation/replacing_graph_finder_spec.rb
 - spec/models/solr_document_spec.rb

data/spec/factories.rb

@@ -1,11 +0,0 @@
-FactoryBot.define do
-  sequence :email do |n|
-    "person#{n}@example.com"
-  end
-
-  factory :user do
-    email
-    password 'password'
-  end
-
-end