hydra-access-controls 5.0.0.pre4 → 5.0.0.pre6

data/lib/hydra/ability.rb

@@ -4,8 +4,13 @@ require "blacklight"
 module Hydra::Ability
   include Hydra::AccessControlsEnforcement
 
+  def self.user_class
+    puts "Hydra.config[:user_model]: #{Hydra.config[:user_model].constantize.inspect}"
+    Hydra.config[:user_model] ?  Hydra.config[:user_model].constantize : ::User
+  end
+
   def initialize(user, session=nil)
-    user ||= ::User.new # guest user (not logged in)
+    user ||= Hydra::Ability.user_class.new # guest user (not logged in)
     hydra_default_permissions(user, session)
   end
 

data/lib/hydra/access_controls_enforcement.rb

@@ -225,16 +225,9 @@ module Hydra::AccessControlsEnforcement
   end
 
 
-  # Even though is_being_superuser? is deprecated, keep this method around (just return empty set) 
-  # so developers can easily override this behavior in their local app
+  # override to apply super user permissions
   def apply_superuser_permissions(permission_types)
-    user_access_filters = []
-    if current_user.respond_to?(:is_being_superuser?) && current_user.is_being_superuser?(session) ##Deprecated
-      permission_types.each do |type|
-        user_access_filters << "#{type}_access_person_t:[* TO *]"        
-      end
-    end
-    user_access_filters
+    []
   end
   
   # proxy for {enforce_index_permissions}

data/lib/hydra/role_mapper_behavior.rb

@@ -13,9 +13,9 @@ module Hydra::RoleMapperBehavior
     # If you pass in a nil User object (ie. user isn't logged in), or a uid that doesn't exist, it will return an empty array
     def roles(user_or_uid)
       if user_or_uid.kind_of?(String)
-        user = ::User.find_by_user_key(user_or_uid)
+        user = Hydra::Ability.user_class.find_by_user_key(user_or_uid)
         user_id = user_or_uid
-      elsif user_or_uid.kind_of?(::User) && user_or_uid.user_key   
+      elsif user_or_uid.kind_of?(Hydra::Ability.user_class) && user_or_uid.user_key   
         user = user_or_uid
         user_id = user.user_key
       end

data/spec/support/user.rb

@@ -13,10 +13,6 @@ class User
     new_record == true
   end
   
-  def is_being_superuser?(session)
-    # do nothing -- stubbing deprecated behavior
-  end
-  
   def self.find_by_uid(uid)
     nil
   end

data/spec/unit/ability_spec.rb

@@ -26,7 +26,6 @@ describe Ability do
     before do
       User.any_instance.stub(:email).and_return(nil)
       User.any_instance.stub(:new_record?).and_return(true)
-      User.any_instance.stub(:is_being_superuser?).and_return(false)
     end
     subject { Ability.new(nil) }
     it "should call custom_permissions" do

data/spec/unit/access_controls_enforcement_spec.rb

@@ -85,7 +85,6 @@ describe Hydra::AccessControlsEnforcement do
   describe "enforce_show_permissions" do
     it "should allow a user w/ edit permissions to view an embargoed object" do
       user = User.new :uid=>'testuser@example.com'
-      user.stub(:is_being_superuser?).and_return false
       RoleMapper.stub(:roles).with(user.user_key).and_return(["archivist"])
       subject.stub(:current_user).and_return(user)
       subject.should_receive(:can?).with(:edit, nil).and_return(true)
@@ -98,7 +97,6 @@ describe Hydra::AccessControlsEnforcement do
     end
     it "should prevent a user w/o edit permissions from viewing an embargoed object" do
       user = User.new :uid=>'testuser@example.com'
-      user.stub(:is_being_superuser?).and_return false
       RoleMapper.stub(:roles).with(user.user_key).and_return([])
       subject.stub(:current_user).and_return(user)
       subject.should_receive(:can?).with(:edit, nil).and_return(false)
@@ -112,7 +110,6 @@ describe Hydra::AccessControlsEnforcement do
   describe "apply_gated_discovery" do
     before(:each) do
       @stub_user = User.new :uid=>'archivist1@example.com'
-      @stub_user.stub(:is_being_superuser?).and_return false
       RoleMapper.stub(:roles).with(@stub_user.user_key).and_return(["archivist","researcher"])
       subject.stub(:current_user).and_return(@stub_user)
       @solr_parameters = {}
@@ -131,36 +128,11 @@ describe Hydra::AccessControlsEnforcement do
         @solr_parameters[:fq].first.should match(/#{type}_access_group_t\:researcher/)        
       end
     end
-    
-    describe "(DEPRECATED) for superusers" do
-      it "should return superuser access level" do
-        stub_user = User.new(:uid=>'suzie@example.com')
-        stub_user.stub(:is_being_superuser?).and_return true
-        RoleMapper.stub(:roles).with(stub_user.user_key).and_return(["archivist","researcher"])
-        subject.stub(:current_user).and_return(stub_user)
-        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
-        ["discover","edit","read"].each do |type|    
-          @solr_parameters[:fq].first.should match(/#{type}_access_person_t\:\[\* TO \*\]/)          
-        end
-      end
-      it "should not return superuser access to non-superusers" do
-        stub_user = User.new(:uid=>'suzie@example.com')
-        stub_user.stub(:is_being_superuser?).and_return false
-        RoleMapper.stub(:roles).with(stub_user.user_key).and_return(["archivist","researcher"])
-        subject.stub(:current_user).and_return(stub_user)
-        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
-        ["discover","edit","read"].each do |type|
-          @solr_parameters[:fq].should_not include("#{type}_access_person_t\:\[\* TO \*\]")              
-        end
-      end
-    end
-
   end
   
   describe "exclude_unwanted_models" do
     before(:each) do
       stub_user = User.new :uid=>'archivist1@example.com'
-      stub_user.stub(:is_being_superuser?).and_return false
       subject.stub(:current_user).and_return(stub_user)
       @solr_parameters = {}
       @user_parameters = {}

data/spec/unit/admin_policy_spec.rb

@@ -72,12 +72,17 @@ describe Hydra::AdminPolicy do
         subject.should_not have_key( Hydra.config[:permissions][:embargo_release_date] )
       end
       it "should provide prefixed/inherited solr permissions fields" do
-        subject[Hydra.config[:permissions][:inheritable][:catchall] ].should == ["posers", "slightlycoolkids", "africana-faculty", "cool-kids", "constantine", "nero", "julius_caesar"] 
+        catchall = Hydra.config[:permissions][:inheritable][:catchall] 
+        subject[catchall].should have(7).items
+        subject[catchall].should include("posers", "slightlycoolkids", "africana-faculty", "cool-kids", "constantine", "nero", "julius_caesar") 
         subject[Hydra.config[:permissions][:inheritable][:discover][:group] ].should == ["posers"]
         subject[Hydra.config[:permissions][:inheritable][:discover][:individual] ].should == ["constantine"]
         subject[Hydra.config[:permissions][:inheritable][:read][:group] ].should == ["slightlycoolkids"]
         subject[Hydra.config[:permissions][:inheritable][:read][:individual] ].should == ["nero"]
-        subject[Hydra.config[:permissions][:inheritable][:edit][:group] ].should == ["africana-faculty", "cool-kids"]
+        inheritable_group = Hydra.config[:permissions][:inheritable][:edit][:group]
+        subject[inheritable_group].length.should == 2
+        subject[inheritable_group].should include("africana-faculty", "cool-kids")
+
         subject[Hydra.config[:permissions][:inheritable][:edit][:individual] ].should == ["julius_caesar"]
         subject[Hydra.config[:permissions][:inheritable][:embargo_release_date] ].should == "2102-10-01"
       end

data/spec/unit/policy_aware_ability_spec.rb

@@ -67,7 +67,9 @@ describe Hydra::PolicyAwareAbility do
   end
   describe "edit_groups_from_policy" do
     it "should retrieve the list of groups with edit access from the policy" do
-      subject.edit_groups_from_policy(@policy.pid).should == ["cool_kids","in_crowd"]
+      result = subject.edit_groups_from_policy(@policy.pid)
+      result.length.should == 2
+      result.should include("cool_kids","in_crowd")
     end
   end
   describe "edit_persons_from_policy" do
@@ -77,7 +79,9 @@ describe Hydra::PolicyAwareAbility do
   end
   describe "read_groups_from_policy" do
     it "should retrieve the list of groups with read access from the policy" do
-      subject.read_groups_from_policy(@policy.pid).should == ["cool_kids", "in_crowd", "africana-faculty"]
+      result = subject.read_groups_from_policy(@policy.pid)
+      result.length.should == 3
+      result.should include("cool_kids", "in_crowd", "africana-faculty")
     end
   end
   describe "read_persons_from_policy" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre4
+  version: 5.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport