hydra-core 9.8.1 → 9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6bce4c322a2015039716338e6ce76ee2dd280e
-  data.tar.gz: da5239427f902aaa159fd3405c7bc864cf425cc4
+  metadata.gz: 67a86254605c32e33aa739f20bc785e25b8204e0
+  data.tar.gz: 53c8772a249c394a8f89796d3ceb89ad6551fe3c
 SHA512:
-  metadata.gz: 2232d4cee1da5b52e3c99b332743820212c7ddcbe74a78cb051982243c87e6e69dd6fb41134e1d53ca2f68a8d38cf94e55b156d379b7adc95412aedf9925cb8c
-  data.tar.gz: b155e70aaba5ec97d09a221fbacbdc1c3dbd13f0117117966681e10301e02494492ce888238b75ded5e3df10de35467ddea660e56d6120ccc0e8dcfa9d83fbea
+  metadata.gz: e00a07e0a403e8a2828a06426b5ce1b7e91e0d5b13034af4c10708044b9647ad0dbc0c71fcbe48833f89f84e4a5749f401128d483c494a6382ec4493dde0640e
+  data.tar.gz: c3ddab7fff80ce0fcf4698d9479a98802d59635b97f19c640aeda798a498d2b55b1b7c10f235b24847f0b3200789585981da550cb46426012962ea3d53c185f2

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

@@ -34,7 +34,7 @@ module Hydra::Controller::ControllerBehavior
   module ClassMethods
     # get the solr name for a field with this name and using the given solrizer descriptor
     def solr_name(name, *opts)
-      ActiveFedora::SolrQueryBuilder.solr_name(name, *opts)
+      ActiveFedora.index_field_mapper.solr_name(name, *opts)
     end
   end
 end

data/app/search_builders/hydra/search_builder.rb

@@ -2,5 +2,11 @@ module Hydra
   class SearchBuilder < Blacklight::SearchBuilder
     include Blacklight::Solr::SearchBuilderBehavior
     include Hydra::AccessControlsEnforcement
+    extend Deprecation
+
+    def initialize(*)
+      Deprecation.warn SearchBuilder, "Hydra::SearchBuilder is deprecated and will be removed in hydra-head 10.0. Instead add include Hydra::AccessControlsEnforcement to app/models/search_builder.rb"
+      super
+    end
   end
 end

data/hydra-core.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rails", '~> 4.0'
   gem.add_dependency 'hydra-access-controls', version
-  gem.add_dependency 'active-fedora', '~> 9.8'
 
   gem.add_development_dependency 'sqlite3', '~> 1.3'
   gem.add_development_dependency 'yard', '~> 0.8.7'

data/lib/generators/hydra/head_generator.rb

@@ -54,6 +54,13 @@ 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
+        "  include Hydra::AccessControlsEnforcement\n"
+      end
+    end
+
     # Copy all files in templates/config directory to host config
     def create_configuration_files
 

data/lib/generators/hydra/templates/catalog_controller.rb

@@ -7,12 +7,17 @@ class CatalogController < ApplicationController
   # These before_filters apply the hydra access controls
   before_filter :enforce_show_permissions, only: :show
 
-  # This applies appropriate access controls to all solr queries
-  Hydra::SearchBuilder.default_processor_chain += [:add_access_controls_to_solr_params]
-
-
   configure_blacklight do |config|
-    config.search_builder_class = Hydra::SearchBuilder
+    ## Class for sending and receiving requests from a search index
+    # config.repository_class = Blacklight::Solr::Repository
+    #
+    ## Class for converting Blacklight's url parameters to into request parameters for the search index
+    # config.search_builder_class = ::SearchBuilder
+    #
+    ## Model that maps search index responses to the blacklight response model
+    # config.response_model = Blacklight::Solr::Response
+
+    ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
       qt: 'search',
       rows: 10

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.8.1"
+  VERSION = "9.9.0"
 end

data/lib/tasks/hydra.rake

@@ -17,4 +17,17 @@ namespace :hydra do
       end
     end
   end
+
+  desc "Start solr and fedora instances for tests"
+  task :test_server do
+    with_server('test',
+                fcrepo_port: ENV.fetch('FCREPO_PORT', '8986'),
+                solr_port: ENV.fetch('SOLR_PORT', '8985')) do
+      begin
+        sleep
+      rescue Interrupt
+        puts "Stopping server"
+      end
+    end
+  end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -14,7 +14,7 @@ describe CatalogController do
     let(:config) { CatalogController.blacklight_config }
     describe "search_builder_class" do
       subject {config.search_builder_class }
-      it { is_expected.to eq Hydra::SearchBuilder }
+      it { is_expected.to eq ::SearchBuilder }
     end
   end
 

data/spec/search_builders/search_builder_spec.rb

@@ -1,22 +1,42 @@
 require 'spec_helper'
 
-describe Hydra::SearchBuilder do
+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) { double('ability', user_groups: [], current_user: user) }
+  let(:search_builder) { described_class }
 
-  subject { described_class.new(processor_chain, context) }
+  subject do
+    Deprecation.silence(Hydra::SearchBuilder) do
+      search_builder.new(processor_chain, context)
+    end
+  end
   before { subject.current_ability = current_ability }
 
-  it "should extend classes with the necessary Hydra modules" do
+  it "extends classes with the necessary Hydra modules" do
     expect(Hydra::SearchBuilder.included_modules).to include(Hydra::AccessControlsEnforcement)
   end
 
   context "when a query is generated" do
-    it "should triggers add_access_controls_to_solr_params" do
+    it "triggers add_access_controls_to_solr_params" do
       expect(subject).to receive(:add_access_controls_to_solr_params)
       subject.query
     end
   end
+
+  context "the deprecated Hydra::SearchBuilder" do
+    let(:search_builder) { Hydra::SearchBuilder }
+
+    it "extends classes with the necessary Hydra modules" do
+      expect(Hydra::SearchBuilder.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(:add_access_controls_to_solr_params)
+        subject.query
+      end
+    end
+  end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -2,5 +2,5 @@ gem 'rspec-rails', '~> 3.1', group: :test
 gem 'rspec-its'
 gem 'byebug' unless ENV['CI']
 
-gem 'rails', ENV.fetch('RAILS_VERSION', '4.2.5.1')
+gem 'rails', ENV.fetch('RAILS_VERSION', '4.2.6')
 gem 'blacklight', ENV.fetch('BLACKLIGHT_VERSION', '6.0.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.8.1
+  version: 9.9.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: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,28 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.8.1
+        version: 9.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.8.1
-- !ruby/object:Gem::Dependency
-  name: active-fedora
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.8'
+        version: 9.9.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement