hydra-core 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7e8c28c9a948c53ca47121118a2c4948c52827
-  data.tar.gz: db44e15d1c9635905cb3b528ce3925f5e853b597
+  metadata.gz: 524755f49fc5894eebc57fe4478a9eda2837d677
+  data.tar.gz: cb181741d88d6800382ea2266325246e7fcfaff1
 SHA512:
-  metadata.gz: 7e52e69c0e0301648d27a6d21982575fac30ddcc45768bbd2a09bff23350bfdbf96f922af063020675ceaa67730afc072cec4ef91df95cfa70bda09d7f64f166
-  data.tar.gz: ff9c9d7cbd6a2a10c4dca45c351e32e38abe093a4b3553bafa587c01112e218e6019b4e28e04233794f616e547e19fab2d121a549e3816d8667b88cee220b8b7
+  metadata.gz: 1605b6bc8c2ed8fa7ee0db8d6e3b37d509625225b6b425b89f2ef1ecd048f6b8c4e730bc27202814525743de6d899eccc0ebd56cded63751a8cbed4524b9a702
+  data.tar.gz: dfaa1e040c60b9833df5c3313800f3731ca738466589bc8d6190880873ec17f50c974e81e0211a6cc2d8c3a7f9119ae6889bd7590348423daa17a19d11892d22

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

@@ -12,9 +12,6 @@ module Hydra::Controller::ControllerBehavior
   extend ActiveSupport::Concern
 
   included do
-    # Other modules to auto-include
-    include Hydra::AccessControlsEnforcement
-  
     # Catch permission errors
     rescue_from CanCan::AccessDenied do |exception|
       if (exception.action == :edit)
@@ -27,7 +24,11 @@ module Hydra::Controller::ControllerBehavior
       end
     end
   end
-  
+
+  # 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

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,9 @@
+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,4 +1,4 @@
 module HydraHead
-  VERSION = "8.0.0"
+  VERSION = "8.1.0"
 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: 8.0.0
+  version: 8.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-02-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ files:
 - 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
@@ -153,6 +154,7 @@ 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
@@ -166,12 +168,12 @@ 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/mods_asset_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
@@ -221,12 +223,12 @@ 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/mods_asset_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