hydra-access-controls 9.0.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e1af2c1d5219ce072890685cd37cb4ba06977d3
-  data.tar.gz: 533fa9cf3ab5fe3980fb8d99963088bd5264106d
+  metadata.gz: 53a9ac37f60be38af2c511a423f849ecd9991c0f
+  data.tar.gz: 8ac4de9c1ac17eabc873ed5e0775d252d4e0b77b
 SHA512:
-  metadata.gz: 3479ee135682c056dbfb1867a20ccf4606347968888ef0154fc2725a7e791dd7f7d68d65bec01b3ecfab515e230295f98883da8c231fa28602d8ab8e4c0d5b66
-  data.tar.gz: 8072b01fc5d75d915edc7ef905bd052c0f6931e3d9adfc8974b22d680b4c1ec116cf6c010c5415e4daa8b99f8eab6602263236169c9038885c96787a6a0ad993
+  metadata.gz: 61551d7bed4090045e64c9c07b1f38c28edd724e5df26c0e38987a031f72f6bcc12d717f9a538af4c29fded68091da6ec345f5c5503ea234a8e9c1b182d6046a
+  data.tar.gz: adb99e576d8f641be0ef66b7efedde72840f1fe3a859c59f457fe18eb9ce3933bb9ca14a5c9fd00dbca50bc744420c485e6a6cb28d0ce5eb6a5b74014e3c923f

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.0'
   gem.add_dependency 'cancancan', '~> 1.8'
-  gem.add_dependency 'deprecation', '~> 0.1.0'
-  gem.add_dependency "blacklight", '~> 5.3'
+  gem.add_dependency 'deprecation', '~> 0.1'
+  gem.add_dependency "blacklight", '~> 5.10'
 
   # 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/ability.rb

@@ -11,7 +11,7 @@ module Hydra
     included do
       include CanCan::Ability
       include Hydra::PermissionsQuery
-      include Blacklight::SolrHelper
+      include Blacklight::SearchHelper
       class_attribute :ability_logic
       self.ability_logic = [:create_permissions, :edit_permissions, :read_permissions, :download_permissions, :custom_permissions]
     end

data/lib/hydra/access_controls_enforcement.rb

@@ -1,7 +1,8 @@
 module Hydra::AccessControlsEnforcement
   extend ActiveSupport::Concern
 
-  included do
+  included do |klass|
+    attr_writer :current_ability
     class_attribute :solr_access_filters_logic
 
     # Set defaults. Each symbol identifies a _method_ that must be in
@@ -14,6 +15,10 @@ module Hydra::AccessControlsEnforcement
 
   end
 
+  def current_ability
+    @current_ability || raise("current_ability has not been set on #{self}")
+  end
+
   protected
 
   def gated_discovery_filters(permission_types = discovery_permissions, ability = current_ability)
@@ -59,15 +64,13 @@ module Hydra::AccessControlsEnforcement
   # * Applies a lucene query to the solr :q parameter for gated discovery
   # * Uses public_qt search handler if user does not have "read" permissions
   # @param solr_parameters the current solr parameters
-  # @param user_parameters the current user-subitted parameters
   #
-  # @example This method should be added to your Catalog Controller's solr_search_params_logic
+  # @example This method should be added to your CatalogController's search_params_logic
   #   class CatalogController < ApplicationController
-  #     include Hydra::Controller::ControllerBehavior
-  #     CatalogController.solr_search_params_logic << :add_access_controls_to_solr_params
+  #     CatalogController.search_params_logic += [:add_access_controls_to_solr_params]
   #   end
-  def add_access_controls_to_solr_params(solr_parameters, user_parameters)
-    apply_gated_discovery(solr_parameters, user_parameters)
+  def add_access_controls_to_solr_params(solr_parameters)
+    apply_gated_discovery(solr_parameters)
   end
 
 
@@ -83,11 +86,10 @@ module Hydra::AccessControlsEnforcement
 
   # Contrller before filter that sets up access-controlled lucene query in order to provide gated discovery behavior
   # @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("Solr parameters: #{ solr_parameters.inspect }")
+    Rails.logger.debug("Solr parameters: #{ solr_parameters.inspect }")
   end
 
 

data/spec/unit/access_controls_enforcement_spec.rb

@@ -21,13 +21,13 @@ describe Hydra::AccessControlsEnforcement do
   describe "When I am searching for content" do
     before do
       @solr_parameters = {}
-      @user_parameters = {}
     end
     context "Given I am not logged in" do
       before do
         allow(subject).to receive(:current_user).and_return(User.new(:new_record=>true))
-        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        subject.send(:apply_gated_discovery, @solr_parameters)
       end
+
       it "Then I should be treated as a member of the 'public' group" do
         expect(@solr_parameters[:fq].first).to eq 'edit_access_group_ssim:public OR discover_access_group_ssim:public OR read_access_group_ssim:public'
       end
@@ -37,7 +37,7 @@ describe Hydra::AccessControlsEnforcement do
       it "Should changed based on the discovery_perissions" do
         @solr_parameters = {}
         discovery_permissions = ["read","edit"]
-        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        subject.send(:apply_gated_discovery, @solr_parameters)
         ["edit","read"].each do |type|
           expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:public/)
         end
@@ -52,7 +52,7 @@ describe Hydra::AccessControlsEnforcement do
         # This is a pretty fragile way to stub it...
         allow(RoleMapper).to receive(:byname).and_return(@user.user_key=>["faculty", "africana-faculty"])
         allow(subject).to receive(:current_user).and_return(@user)
-        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        subject.send(:apply_gated_discovery, @solr_parameters)
       end
       it "Then I should be treated as a member of the 'public' and 'registered' groups" do
         ["discover","edit","read"].each do |type|
@@ -75,7 +75,7 @@ describe Hydra::AccessControlsEnforcement do
       it "Should changed based on the discovery_perissions" do
         @solr_parameters = {}
         discovery_permissions = ["read","edit"]
-        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        subject.send(:apply_gated_discovery, @solr_parameters)
         ["faculty", "africana-faculty"].each do |group_id|
           ["edit","read"].each do |type|
             expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:#{group_id}/)
@@ -117,16 +117,15 @@ describe Hydra::AccessControlsEnforcement do
       allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["archivist","researcher"])
       allow(subject).to receive(:current_user).and_return(@stub_user)
       @solr_parameters = {}
-      @user_parameters = {}
     end
     it "should set query fields for the user id checking against the discover, access, read fields" do
-      subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","edit","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_person_ssim\:#{@stub_user.user_key}/)
       end
     end
     it "should set query fields for all roles the user is a member of checking against the discover, access, read fields" do
-      subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","edit","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:archivist/)
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:researcher/)
@@ -135,7 +134,7 @@ describe Hydra::AccessControlsEnforcement do
 
     it "should escape slashes in the group names" do
       allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["abc/123","cde/567"])
-      subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","edit","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:abc\\\/123/)
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:cde\\\/567/)
@@ -143,7 +142,7 @@ describe Hydra::AccessControlsEnforcement do
     end
     it "should escape spaces in the group names" do
       allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["abc 123","cd/e 567"])
-      subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","edit","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:abc\\ 123/)
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:cd\\\/e\\ 567/)
@@ -151,7 +150,7 @@ describe Hydra::AccessControlsEnforcement do
     end
     it "should escape colons in the group names" do
       allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["abc:123","cde:567"])
-      subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      subject.send(:apply_gated_discovery, @solr_parameters)
       ["discover","edit","read"].each do |type|
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:abc\\:123/)
         expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:cde\\:567/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,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: activesupport
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement