hydra-core 9.0.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e650d3c0f70cb2d90248936821667a93f48119f1
-  data.tar.gz: e1a5c28dde2dc3921dc0246adae37f51ce0f8ba1
+  metadata.gz: 35097c74f8d0a475d310fbf00ad56ca0ea227df3
+  data.tar.gz: 6d0c147bd22aabd48138d458b311af2e77d0053f
 SHA512:
-  metadata.gz: b6a6294fa68a61b50d5f1745ca0252015056b95486c3e02d8d3c2522df1da39aba14328cbd2ab2e524601d8c4be9d29f589a3439b7717f0063e11afb0ac5239d
-  data.tar.gz: 8874b3851b280c03c07773dedd99abde81c7945eddaf58ab02b755a647c1fbff8ae26bb2cfa64f02494e966a3dca85b6d443672c7ce258d453665231f0f68ebe
+  metadata.gz: b9bbda263576781c0898c3f7ad95e0118322ea652da45f234765c761281b013474accfe223e8381948b0b00f979a1ef49f1cd5a7d96ca6a5669c032470c13306
+  data.tar.gz: c81a296754a2c0d646073b1f22f5cbc90d85a64481286bb306667b05073a683dde1ff5dc751a338d6204b1611855b31c7b75864574bd41ef48b6570c16c5d9a3

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

@@ -12,14 +12,16 @@ module Hydra::Controller::ControllerBehavior
   extend ActiveSupport::Concern
 
   included do
-    # Other modules to auto-include
-    include Hydra::AccessControlsEnforcement
-
     # Catch permission errors
     rescue_from CanCan::AccessDenied, with: :deny_access
   end
 
-  # get the currently configured user identifier.  Can be overridden to return whatever (ie. login, email, etc)
+  # Override blacklight to produce a search_builder that has the current collection in context
+  def search_builder processor_chain = search_params_logic
+    super.tap { |builder| builder.current_ability = current_ability }
+  end
+
+   # get the currently configured user identifier.  Can be overridden to return whatever (ie. login, email, etc)
   # defaults to using whatever you have set as the Devise authentication_key
   def user_key
     current_user.user_key if current_user

data/app/search_builders/hydra/search_builder.rb

@@ -0,0 +1,5 @@
+module Hydra
+  class SearchBuilder < Blacklight::Solr::SearchBuilder
+    include Hydra::AccessControlsEnforcement
+  end
+end

data/lib/generators/hydra/head_generator.rb

@@ -62,6 +62,8 @@ module Hydra
 
       # Fedora & Solr YAML files
       invoke('active_fedora:config')
+
+      copy_file 'config/blacklight.yml', force: true
     end
 
     # Add Hydra behaviors to the user model

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

@@ -8,10 +8,11 @@ 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
-  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
+  CatalogController.search_params_logic += [:add_access_controls_to_solr_params]
 
 
   configure_blacklight do |config|
+    config.search_builder_class = Hydra::SearchBuilder
     config.default_solr_params = {
       :qt => 'search',
       :rows => 10

data/lib/generators/hydra/templates/config/blacklight.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/development" %>
+test: &test
+  adapter: solr
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+production:
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
+

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.0.1"
+  VERSION = "9.1.0"
 end

data/{app/models → lib}/mods_asset.rb

@@ -1,10 +1,15 @@
 # An EXAMPLE   Basic Model for Assets that conform to Hydra commonMetadata cModel and have basic MODS metadata (currently "Article" is the MODS exemplar)
 class ModsAsset < ActiveFedora::Base
-  
+  extend Deprecation
+
+  def initialize(*)
+    Deprecation.warn(ModsAsset, "ModsAsset is deprecated and will be removed in hydra-head 10")
+    super
+  end
+
   ## Convenience methods for manipulating the rights metadata datastream
   include Hydra::AccessControls::Permissions
-  
+
   # adds helpful methods for basic hydra objects
   include Hydra::ModelMethods
-  
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -10,6 +10,14 @@ describe CatalogController do
     expect(controller).to be_an_instance_of CatalogController
   end
 
+  describe "configuration" do
+    let(:config) { CatalogController.blacklight_config }
+    describe "search_builder_class" do
+      subject {config.search_builder_class }
+      it { is_expected.to eq Hydra::SearchBuilder }
+    end
+  end
+
   describe "Paths Generated by Custom Routes:" do
     # paths generated by custom routes
     it "should map {:controller=>'catalog', :action=>'index'} to GET /catalog" do
@@ -48,12 +56,6 @@ describe CatalogController do
   end
 
   describe "filters" do
-    describe "index" do
-      it "should trigger enforce_index_permissions" do
-        expect(controller).to receive(:add_access_controls_to_solr_params)
-        get :index
-      end
-    end
     describe "show" do
       it "should trigger enforce_show_permissions" do
         allow(controller).to receive(:current_user).and_return(nil)

data/spec/search_builders/search_builder_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Hydra::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) }
+
+  subject { described_class.new(processor_chain, context) }
+  before { subject.current_ability = current_ability }
+
+  it "should extend 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
+      expect(subject).to receive(:add_access_controls_to_solr_params)
+      subject.query
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.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: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.1
+        version: 9.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.1
+        version: 9.1.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ files:
 - app/models/concerns/hydra/models.rb
 - app/models/concerns/hydra/solr.rb
 - app/models/hydra/datastream/properties.rb
-- app/models/mods_asset.rb
+- app/search_builders/hydra/search_builder.rb
 - config/jetty.yml
 - config/locales/hydra.en.yml
 - hydra-core.gemspec
@@ -138,11 +138,13 @@ files:
 - lib/generators/hydra/jetty_generator.rb
 - lib/generators/hydra/templates/ability.rb
 - lib/generators/hydra/templates/catalog_controller.rb
+- lib/generators/hydra/templates/config/blacklight.yml
 - lib/generators/hydra/templates/config/initializers/hydra_config.rb
 - lib/generators/hydra/templates/config/role_map.yml
 - lib/hydra-core.rb
 - lib/hydra-head/engine.rb
 - lib/hydra-head/version.rb
+- lib/mods_asset.rb
 - lib/railties/active-fedora.rake
 - lib/railties/hydra_jetty.rake
 - spec/.gitignore
@@ -150,11 +152,11 @@ files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/lib/catalog_spec.rb
 - spec/lib/model_methods_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
+- spec/search_builders/search_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb
@@ -200,11 +202,11 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/lib/catalog_spec.rb
 - spec/lib/model_methods_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
 - spec/rcov.opts
+- spec/search_builders/search_builder_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/downloads_controller.rb

data/spec/lib/catalog_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Hydra::Controller::ControllerBehavior do
-
-  before do
-    class CatalogTest < ApplicationController
-      include Hydra::Controller::ControllerBehavior
-    end
-  end
-
-  it "should extend classes with the necessary Hydra modules" do
-    expect(CatalogTest.included_modules).to include(Hydra::AccessControlsEnforcement)
-  end
-
-end