hydra-access-controls 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9a107ab5eb383394ebfc47c69dce414947a066
-  data.tar.gz: 700a1c079faad7648d7255c296f219355aae9463
+  metadata.gz: 7d0c332d417111f77876c46bd3331349ce28da60
+  data.tar.gz: 1282b9c10fe0ac75ba5e2793da8a08a1e0deb462
 SHA512:
-  metadata.gz: 9a456db93036e5e7e24559357a468e1609f5ce6d89faf40c5db9bfe2af7c09c0bc359d733cf518079d05b24f76432a7feda172bd64a315d21ee0f831ac81d701
-  data.tar.gz: 3ad0be9f95328df88caa11274857b3842fa130c0a70c13e65c50ad948eefe0d79904c2be440b741ccc8c3b2c69b5ecce9767b12a9ccbbd93438fbe252c3f54a7
+  metadata.gz: 36f0b7eeab09aeee018e6610fd510a392110e7c6d6251d7b78b70c9c9b33b36014675b373f36487e53139ed79f397fa0e4404aee052c2f1c9630b4120c1cd2da
+  data.tar.gz: c61a05b0b34fdf009ab676eda0a67f209f42c53d792952e39e454ac09be6cc4c9c2c66f665d47717a0b89a50e4155462ac6b8cb07c2bde46a577b351a374d33f

data/hydra-access-controls.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
   gem.version       = version
   gem.license       = "APACHE2"
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0.0'
 
   gem.add_dependency 'activesupport', '~> 4.0'
-  gem.add_dependency "active-fedora", '~> 8.0.0'
+  gem.add_dependency "active-fedora", '~> 8.0'
   gem.add_dependency "om", '~> 3.0', '>= 3.0.7'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 0.1'

data/lib/hydra/policy_aware_access_controls_enforcement.rb

@@ -4,8 +4,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
   # Extends Hydra::AccessControlsEnforcement.apply_gated_discovery to reflect policy-provided access
   # appends the result of policy_clauses into the :fq
   # @param solr_parameters the current solr parameters
-  # @param user_parameters the current user-subitted parameters
-  def apply_gated_discovery(solr_parameters, user_parameters)
+  def apply_gated_discovery(solr_parameters)
     solr_parameters[:fq] ||= []
     solr_parameters[:fq] << gated_discovery_filters.join(" OR ")
     logger.debug("POLICY-aware Solr parameters: #{ solr_parameters.inspect }")
@@ -43,13 +42,11 @@ module Hydra::PolicyAwareAccessControlsEnforcement
 
   def apply_policy_user_permissions(permission_types = discovery_permissions)
     # for individual user access
-    user_access_filters = []
-    if current_user
-      permission_types.each do |type|
-        user_access_filters << escape_filter(ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_person", Hydra::Datastream::RightsMetadata.indexer ), current_user.user_key)
-      end
+    user = current_ability.current_user
+    return [] unless user && user.user_key.present?
+    permission_types.map do |type|
+      escape_filter(ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_person", Hydra::Datastream::RightsMetadata.indexer ), user.user_key)
     end
-    user_access_filters
   end
 
   # Returns the Model used for AdminPolicy objects.

data/spec/spec_helper.rb

@@ -20,11 +20,18 @@ end
 require 'support/rails'
 
 # Since we're not doing a Rails Engine test, we have to load these classes manually:
-require_relative '../app/models/role_mapper'
-require_relative '../app/models/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"

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -90,7 +90,6 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
   
   before do
     @solr_parameters = {}
-    @user_parameters = {}
     @user = FactoryGirl.build(:sara_student)
   end
   
@@ -129,13 +128,13 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       # stubbing out policies_with_access because solr doesn't always return them in the same order.
       policy_pids = (1..8).map {|n| "test:policy#{n}"}
       subject.should_receive(:policies_with_access).and_return(policy_pids)
-      subject.apply_gated_discovery(@solr_parameters, @user_parameters)
+      subject.apply_gated_discovery(@solr_parameters)
       governed_field = ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)
       @solr_parameters[:fq].first.should include(" OR (_query_:\"{!raw f=#{governed_field}}info:fedora/test:policy1\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy2\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy3\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy4\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy5\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy6\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy7\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy8\")")
     end
     it "should not change anything if there are no clauses to add" do
       subject.stub(:policy_clauses).and_return(nil)
-      subject.apply_gated_discovery(@solr_parameters, @user_parameters)
+      subject.apply_gated_discovery(@solr_parameters)
       @solr_parameters[:fq].first.should_not include(" OR (#{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy1 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy2 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy3 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy4 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy5 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy6 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy7 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy8)")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra
@@ -269,4 +269,3 @@ test_files:
 - spec/unit/visibility_spec.rb
 - spec/unit/with_access_right_spec.rb
 - spec/validators/future_date_validator_spec.rb
-has_rdoc: