hydra-access-controls 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e759b7615b78617bcefe2142ae56d9e20fcdd3
-  data.tar.gz: 32093d9d2cd45ae6913644976cff53344be2532f
+  metadata.gz: 8a9a107ab5eb383394ebfc47c69dce414947a066
+  data.tar.gz: 700a1c079faad7648d7255c296f219355aae9463
 SHA512:
-  metadata.gz: 268da443deb9bbc03cff733704a6517d17a3b0ec35ded2f03003b15b4bf97772fedd8bfe02f17bfa490e361400c886da3dd21a3213d36412e9daadd0c8611afc
-  data.tar.gz: bbb965bacc370f3b20e0d5c43e231ca321835228877c53f485e77e6b5a8eea249ec8356bb6d17672dd42e7f60db5388315f582929ee7365b7ba2d57ec03ea2bb
+  metadata.gz: 9a456db93036e5e7e24559357a468e1609f5ce6d89faf40c5db9bfe2af7c09c0bc359d733cf518079d05b24f76432a7feda172bd64a315d21ee0f831ac81d701
+  data.tar.gz: 3ad0be9f95328df88caa11274857b3842fa130c0a70c13e65c50ad948eefe0d79904c2be440b741ccc8c3b2c69b5ecce9767b12a9ccbbd93438fbe252c3f54a7

data/hydra-access-controls.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '~> 4.0'
   gem.add_dependency "active-fedora", '~> 8.0.0'
   gem.add_dependency "om", '~> 3.0', '>= 3.0.7'
-  gem.add_dependency 'cancancan'
-  gem.add_dependency 'deprecation'
-  gem.add_dependency "blacklight", '~> 5.3'
+  gem.add_dependency 'cancancan', '~> 1.8'
+  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
@@ -13,6 +14,10 @@ module Hydra::AccessControlsEnforcement
     self.solr_access_filters_logic = [:apply_group_permissions, :apply_user_permissions, :apply_superuser_permissions ]
 
   end
+
+  def current_ability
+    @current_ability || raise("current_ability has not been set on #{self}")
+  end
   
   protected
 
@@ -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,12 +21,11 @@ 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'
@@ -35,10 +34,10 @@ describe Hydra::AccessControlsEnforcement do
         expect(@solr_parameters[:fq].first).to_not match(/registered/) 
       end
       it "Then I should not have individual or group permissions"
-      it "Should changed based on the discovery_perissions" do
+      it "Should change 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 +51,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|
@@ -72,10 +71,10 @@ describe Hydra::AccessControlsEnforcement do
           end
         end
       end
-      it "Should changed based on the discovery_perissions" do
+      it "Should change 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 +116,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 +133,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 +141,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 +149,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: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,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: activesupport
@@ -64,44 +64,44 @@ dependencies:
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '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