hydra-core 9.1.1 → 9.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeaf0ad10fe003791b1a113272ea588e56670fc1
-  data.tar.gz: a05450f3306ecef24f812e9daa9c62b785ce14c0
+  metadata.gz: ac588315cdf1172497fb2ad3791de1a5337ed896
+  data.tar.gz: 144af558698a89db79f7a1be3a0f0852e7f608dd
 SHA512:
-  metadata.gz: 062b3bfc9c2f5658da3a1b87763478c37c1930a0fca2938cc8fb38ccfe6d1d0f16fc4033b3f19d9812939dc0811ddd6b827859ebafdb0d7b2a6dc61cbe39f1cb
-  data.tar.gz: f0daddca17fb68cf7e917287a97ea58d8c7b8275a664a0654743a8cae4c2e9f8e0fa9922c9c66cf6026850bd8705744128d2b10bd2f6e4c39e46c6aa60c0631b
+  metadata.gz: 014b179384dd2fa6ba2fef3a3288a5fa61fe55adcf106708b98aeb3009b6f5b1da1c217a39a9113e59c7fb9c87e7623c2588f5da5c1b682f00238c1838ee9e48
+  data.tar.gz: 5f7433fed253c1d65253b8c0609c76e021b540548023047e692c40a46a01ab8ff8cc00afc2c72e083296ea636df0a7d0ca9628e11d5a12d644925b59f4421f7d

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

@@ -0,0 +1,5 @@
+module Hydra::Catalog
+  extend ActiveSupport::Concern
+  include Blacklight::Catalog
+  include Hydra::Controller::SearchBuilder
+end

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

@@ -16,12 +16,7 @@ module Hydra::Controller::ControllerBehavior
     rescue_from CanCan::AccessDenied, with: :deny_access
   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)
+  # 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/controllers/concerns/hydra/controller/search_builder.rb

@@ -0,0 +1,9 @@
+module Hydra::Controller::SearchBuilder
+  extend ActiveSupport::Concern
+
+  # 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
+
+end

data/lib/generators/hydra/head_generator.rb

@@ -41,9 +41,19 @@ module Hydra
       end
     end
 
+    def overwrite_catalog_controller
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+    end
+
+    # Add Hydra to the application controller
+    def inject_hydra_controller_behavior
+      insert_into_file "app/controllers/application_controller.rb", after: "include Blacklight::Controller\n" do
+        "  include Hydra::Controller::ControllerBehavior\n"
+      end
+    end
+
     # Copy all files in templates/config directory to host config
     def create_configuration_files
-      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
 
       # Initializers
       file_path = "config/initializers/hydra_config.rb"

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

@@ -3,8 +3,7 @@ require 'blacklight/catalog'
 
 class CatalogController < ApplicationController
 
-  include Blacklight::Catalog
-  include Hydra::Controller::ControllerBehavior
+  include Hydra::Catalog
   # These before_filters apply the hydra access controls
   before_filter :enforce_show_permissions, :only=>:show
   # This applies appropriate access controls to all solr queries

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.1.1"
+  VERSION = "9.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.1.2
 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-03-10 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: 9.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: 9.1.2
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -120,9 +120,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Rakefile
+- app/controllers/concerns/hydra/catalog.rb
 - app/controllers/concerns/hydra/controller.rb
 - app/controllers/concerns/hydra/controller/controller_behavior.rb
 - app/controllers/concerns/hydra/controller/download_behavior.rb
+- app/controllers/concerns/hydra/controller/search_builder.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
 - app/models/concerns/hydra/model_methods.rb
@@ -192,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)