hydra-access-controls 6.0.0.rc2 → 6.0.0.rc3

data/lib/hydra/ability.rb

@@ -20,12 +20,13 @@ module Hydra
       Hydra.config[:user_model] ?  Hydra.config[:user_model].constantize : ::User
     end
 
-    attr_reader :current_user, :session
+    attr_reader :current_user, :session, :cache
 
     def initialize(user, session=nil)
       @current_user = user || Hydra::Ability.user_class.new # guest user (not logged in)
       @user = @current_user # just in case someone was using this in an override. Just don't.
       @session = session
+      @cache = Hydra::PermissionsCache.new
       hydra_default_permissions()
     end
 
@@ -66,7 +67,7 @@ module Hydra
       end
    
       can :edit, SolrDocument do |obj|
-        PermissionsCache.put(obj.id, obj)
+        cache.put(obj.id, obj)
         test_edit(obj.id)
       end       
     end
@@ -81,7 +82,7 @@ module Hydra
       end 
       
       can :read, SolrDocument do |obj|
-        PermissionsCache.put(obj.id, obj)
+        cache.put(obj.id, obj)
         test_read(obj.id)
       end 
     end

data/lib/hydra/access_controls_enforcement.rb

@@ -3,7 +3,6 @@ module Hydra::AccessControlsEnforcement
 
   included do
     include Hydra::AccessControlsEvaluation
-    include Hydra::PermissionsQuery
     class_attribute :solr_access_filters_logic
 
     # Set defaults. Each symbol identifies a _method_ that must be in
@@ -58,7 +57,7 @@ module Hydra::AccessControlsEnforcement
   # Controller "before" filter for enforcing access controls on show actions
   # @param [Hash] opts (optional, not currently used)
   def enforce_show_permissions(opts={})
-    permissions = permissions_doc(params[:id])
+    permissions = current_ability.permissions_doc(params[:id])
     unless permissions.is_public?
       #its not 'public'
       if permissions.under_embargo? && !can?(:edit, permissions)

data/lib/hydra/permissions_cache.rb

@@ -1,16 +1,18 @@
-module Hydra::PermissionsCache
-  @@cache = {}
+class Hydra::PermissionsCache
+  def initialize
+    clear 
+  end
 
-  def self.get(pid)
-    @@cache[pid]
+  def get(pid)
+    @cache[pid]
   end
 
-  def self.put(pid, doc)
-    @@cache[pid] = doc 
+  def put(pid, doc)
+    @cache[pid] = doc 
   end
 
-  def self.clear
-    @@cache = {}
+  def clear
+    @cache = {}
   end
 
 end

data/lib/hydra/permissions_query.rb

@@ -6,10 +6,10 @@ module Hydra
     end
 
     def permissions_doc(pid)
-      doc = Hydra::PermissionsCache.get(pid)
+      doc = cache.get(pid)
       unless doc
         doc = get_permissions_solr_response_for_doc_id(pid)
-        Hydra::PermissionsCache.put(pid, doc)
+        cache.put(pid, doc)
       end
       doc
     end

data/spec/unit/access_controls_enforcement_spec.rb

@@ -77,19 +77,18 @@ describe Hydra::AccessControlsEnforcement do
 
       subject.params = {}
       subject.should_receive(:can?).with(:edit, stub_doc).and_return(true)
-      subject.should_receive(:get_permissions_solr_response_for_doc_id).and_return(stub_doc)
+      subject.current_ability.should_receive(:get_permissions_solr_response_for_doc_id).and_return(stub_doc)
       lambda {subject.send(:enforce_show_permissions, {}) }.should_not raise_error Hydra::AccessDenied
     end
     it "should prevent a user w/o edit permissions from viewing an embargoed object" do
-      Hydra::PermissionsCache.clear()
       user = User.new :uid=>'testuser@example.com'
       RoleMapper.stub(:roles).with(user.user_key).and_return([])
       subject.stub(:current_user).and_return(user)
       subject.stub(:can?).with(:read, nil).and_return(true)
       subject.params = {}
       stub_doc = Hydra::PermissionsSolrDocument.new({"edit_access_person_ssim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
+      subject.current_ability.should_receive(:get_permissions_solr_response_for_doc_id).and_return(stub_doc)
       subject.should_receive(:can?).with(:edit, stub_doc).and_return(false)
-      subject.should_receive(:get_permissions_solr_response_for_doc_id).and_return(stub_doc)
       lambda {subject.send(:enforce_show_permissions, {})}.should raise_error Hydra::AccessDenied, "This item is under embargo.  You do not have sufficient access privileges to read this document."
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport