hydra-access-controls 9.4.1 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2936e5b807433daa6ecd2c103eb663255afa6815
-  data.tar.gz: 0bcbd88134dea8542bf81852bb9ff15d39c35317
+  metadata.gz: 124bb44e71c185a51d708ad4c7a368ff767315fd
+  data.tar.gz: 41fd3af3306eb3f9cf8943a048cba3eddde884a9
 SHA512:
-  metadata.gz: 9e3a0171c9cb88cbc161b86295a628f2c4d5b0a1f45a22a4322d2c562ed167d49455c6c064ef4d8a9909fdc44df951584c8332d8bf4c09e0276a551a766f32bd
-  data.tar.gz: a15532976668837b47d10e1f93511abe7f109486a21a1b832bc1e7117ffd7063c3e2750e4130e02a62df0975e464a15cc371d7d057f97ad4643d47d592a74672
+  metadata.gz: 4fc4407250c8593de0233f270cf3d1bbe638916713dab4b1e8e9462dcb3ebfbd52162fce9037e03af7ccfcaba8ce227f9c662f0c6c487d41e5ee836c2e0a8d3a
+  data.tar.gz: 5ea74853a2c5782822c74640bfb7197b2e45950e25677eab3072720c0dad2b7ac77c55a2879d5f7c771fd36f2fa452aa6f8f36a760ccea1550c4c21545d6d190

data/hydra-access-controls.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '~> 4.0'
   gem.add_dependency "active-fedora", '~> 9.0'
   gem.add_dependency 'cancancan', '~> 1.8'
-  gem.add_dependency 'deprecation', '~> 0.1'
-  gem.add_dependency "blacklight", '~> 5.10'
+  gem.add_dependency 'deprecation', '~> 0.2'
+  gem.add_dependency "blacklight", '~> 5.16'
 
   # sass-rails is typically generated into the app's gemfile by `rails new`
   # In rails 3 it's put into the "assets" group and thus not available to the

data/lib/hydra/permissions_query.rb

@@ -11,7 +11,6 @@ module Hydra
       doc
     end
 
-
     protected
 
     # a solr query method
@@ -22,8 +21,8 @@ module Hydra
     def get_permissions_solr_response_for_doc_id(id=nil, extra_controller_params={})
       raise Blacklight::Exceptions::InvalidSolrID.new("The application is trying to retrieve permissions without specifying an asset id") if id.nil?
       solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
-      response = ActiveFedora::SolrService.instance.conn.get('select', :params=> solr_opts)
-      solr_response = Blacklight::SolrResponse.new(response, solr_opts)
+      response = ActiveFedora::SolrService.instance.conn.get('select', params: solr_opts)
+      solr_response = Blacklight::Solr::Response.new(response, solr_opts)
 
       raise Blacklight::Exceptions::InvalidSolrID.new("The solr permissions search handler didn't return anything for id \"#{id}\"") if solr_response.docs.empty?
       Hydra::PermissionsSolrDocument.new(solr_response.docs.first, solr_response)
@@ -42,9 +41,9 @@ module Hydra
       id ||= params[:id]
       # just to be consistent with the other solr param methods:
       {
-        :qt => :permissions,
-        :id => id # this assumes the document request handler will map the 'id' param to the unique key field
+        qt: :permissions,
+        id: id # this assumes the document request handler will map the 'id' param to the unique key field
       }
     end
-  end    
+  end
 end

data/spec/spec_helper.rb

@@ -22,21 +22,18 @@ end
 require 'support/rails'
 
 # Since we're not doing a Rails Engine test, we have to load these classes manually:
-require_relative '../app/vocabularies/acl'
-require_relative '../app/vocabularies/hydra/acl'
-require_relative '../app/models/role_mapper'
-require_relative '../app/models/ability'
-require_relative '../app/indexers/hydra/access_controls/embargo_indexer'
-require_relative '../app/indexers/hydra/access_controls/lease_indexer'
-require_relative '../app/models/hydra/access_controls/access_control_list'
-require_relative '../app/models/hydra/access_controls/permission'
-require_relative '../app/models/hydra/access_controls/embargo'
-require_relative '../app/models/hydra/access_controls/lease'
-require_relative '../app/models/concerns/hydra/with_depositor'
-require_relative '../app/models/concerns/hydra/ip_based_ability'
-require_relative '../app/services/hydra/lease_service'
-require_relative '../app/services/hydra/embargo_service'
-require_relative '../app/validators/hydra/future_date_validator'
+require 'active_support'
+require 'active_support/dependencies'
+relative_load_paths = ["#{Blacklight.root}/app/controllers/concerns",
+                       "#{Blacklight.root}/app/models",
+                       "app/models",
+                       "app/models/concerns",
+                       "app/indexers",
+                       "app/services",
+                       "app/validators",
+                       "app/vocabularies"]
+ActiveSupport::Dependencies.autoload_paths += relative_load_paths
+
 require 'support/mods_asset'
 require 'support/solr_document'
 require "support/user"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.4.1
+  version: 9.5.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement