hydra-access-controls 6.4.0.rc4 → 6.4.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88206682c3c647370e3ad2a69f8f6c6966e8be1
-  data.tar.gz: 9e41bdafc97dc0fdf4a537a885562de12dc3ec07
+  metadata.gz: 76381cfbb357cec68b454fdbd3063282f75eb4d4
+  data.tar.gz: 55598936df275fb7a52d2ff5d9395cd004914062
 SHA512:
-  metadata.gz: 1b5464365e2272eecad05fa91e5c2038413cb36c770552e609f6a4a556d192922c944bfb97ea7abba1b795b97928cc295d9a22d98c27fa2a7c1ccd7ed388f7d2
-  data.tar.gz: 8053315e645d78d4dc8de1868273cad335b7a2767a9911f0cefce3f9faa60898de4846578411822a4c5839af8388b53568f146560dd94c80eca4503e0c1c1bcd
+  metadata.gz: 3607135f5aa9afae8abb1d026a0379993461144a9aba78e881c5c39283161bff14b2b916923c0218ccad67a92f7da25452a209ef727d6d63c42fe4c119e0ce5f
+  data.tar.gz: cc97938c99770ca31edf253d21f660b8bb0e54954f4a5469f90e26e85c4c7472a5995c5a00fc3ae6ffc3b97d7e7c50ce87daef34d264aae1c2e8b5912860a807

data/lib/hydra/user.rb

@@ -15,7 +15,7 @@ module Hydra::User
   end
 
   def groups
-    RoleMapper.roles(user_key)
+    RoleMapper.roles(self)
   end
   
   module ClassMethods

data/spec/unit/ability_spec.rb

@@ -197,7 +197,7 @@ describe Ability do
     context "Then a collaborator with edit access (group permision)" do
       before do
         @user = FactoryGirl.build(:martia_morocco)
-        RoleMapper.stub(:roles).with(@user.user_key).and_return(@user.roles)
+        RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
       end
       subject { Ability.new(@user) }
 
@@ -233,7 +233,7 @@ describe Ability do
     context "Then someone whose role/group has read access" do
       before do
         @user = FactoryGirl.build(:martia_morocco)
-        RoleMapper.stub(:roles).with(@user.user_key).and_return(@user.roles)
+        RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
       end
       subject { Ability.new(@user) }
 

data/spec/unit/access_controls_enforcement_spec.rb

@@ -88,7 +88,7 @@ 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'
-      RoleMapper.stub(:roles).with(user.user_key).and_return(["archivist"])
+      RoleMapper.stub(:roles).with(user).and_return(["archivist"])
       subject.stub(:current_user).and_return(user)
       subject.stub(:can?).with(:read, nil).and_return(true)
       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})
@@ -100,7 +100,7 @@ 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'
-      RoleMapper.stub(:roles).with(user.user_key).and_return([])
+      RoleMapper.stub(:roles).with(user).and_return([])
       subject.stub(:current_user).and_return(user)
       subject.stub(:can?).with(:read, nil).and_return(true)
       subject.params = {}
@@ -113,7 +113,7 @@ describe Hydra::AccessControlsEnforcement do
   describe "apply_gated_discovery" do
     before(:each) do
       @stub_user = User.new :uid=>'archivist1@example.com'
-      RoleMapper.stub(:roles).with(@stub_user.user_key).and_return(["archivist","researcher"])
+      RoleMapper.stub(:roles).with(@stub_user).and_return(["archivist","researcher"])
       subject.stub(:current_user).and_return(@stub_user)
       @solr_parameters = {}
       @user_parameters = {}
@@ -133,7 +133,7 @@ describe Hydra::AccessControlsEnforcement do
     end
 
     it "should escape slashes in the group names" do
-      RoleMapper.stub(:roles).with(@stub_user.user_key).and_return(["abc/123","cde/567"])
+      RoleMapper.stub(:roles).with(@stub_user).and_return(["abc/123","cde/567"])
       subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       ["discover","edit","read"].each do |type|
         @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:abc\\\/123/)        
@@ -141,7 +141,7 @@ describe Hydra::AccessControlsEnforcement do
       end
     end
     it "should escape spaces in the group names" do
-      RoleMapper.stub(:roles).with(@stub_user.user_key).and_return(["abc 123","cd/e 567"])
+      RoleMapper.stub(:roles).with(@stub_user).and_return(["abc 123","cd/e 567"])
       subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       ["discover","edit","read"].each do |type|
         @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:abc\\ 123/)

data/spec/unit/admin_policy_spec.rb

@@ -127,7 +127,7 @@ describe Hydra::AdminPolicy do
   describe "When accessing assets with Policies associated" do
     before do
       @user = FactoryGirl.build(:martia_morocco)
-      RoleMapper.stub(:roles).with(@user.user_key).and_return(@user.roles)
+      RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
     end
     before(:all) do
       class TestAbility

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -95,7 +95,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
   describe "policies_with_access" do
     context "Authenticated user" do
       before do
-        RoleMapper.stub(:roles).with(@user.user_key).and_return(@user.roles)
+        RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
         subject.stub(:current_user).and_return(@user)
       end
       it "should return the policies that provide discover permissions" do
@@ -120,7 +120,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
   
   describe "apply_gated_discovery" do
     before do
-      RoleMapper.stub(:roles).with(@user.user_key).and_return(@user.roles)
+      RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
       subject.stub(:current_user).and_return(@user)
     end
     it "should include policy-aware query" do
@@ -140,7 +140,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
 
   describe "apply_policy_role_permissions" do
     it "should escape slashes in the group names" do
-      RoleMapper.stub(:roles).with(@user.user_key).and_return(["abc/123","cde/567"])
+      RoleMapper.stub(:roles).with(@user).and_return(["abc/123","cde/567"])
       subject.stub(:current_user).and_return(@user)
       user_access_filters = subject.apply_policy_role_permissions
       ["edit","discover","read"].each do |type|
@@ -149,7 +149,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       end
     end
     it "should escape spaces in the group names" do
-      RoleMapper.stub(:roles).with(@user.user_key).and_return(["abc 123","cd/e 567"])
+      RoleMapper.stub(:roles).with(@user).and_return(["abc 123","cd/e 567"])
       subject.stub(:current_user).and_return(@user)
       user_access_filters = subject.apply_policy_role_permissions
       ["edit","discover","read"].each do |type|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc4
+  version: 6.4.0.rc5
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra