hydra-access-controls 10.4.0 → 10.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f40c134a095ee25028a636e05a76ff5b6b48536
-  data.tar.gz: 1355f04637b5036f5fe70d2e85fae2d27be014b4
+  metadata.gz: ed94a3c77e4473df017f3e8d932af844b5bc4eda
+  data.tar.gz: 14bf723d584d15d01d35882b3be61fa4d2c14fa5
 SHA512:
-  metadata.gz: 5b08e56a15a842c3319c1096898db5af1c8a7f7dbf852d33c4b2e7d1740f0be84c9b258d19692b4328684ad4ef447a21e7e736171f4c5b101bfa9f595d494d57
-  data.tar.gz: 9d14bb58b1c249ad2ad6dc5b75a62fa14b0d54f957efa43f0c1ae8aa7fe651b8433587042ee054424cfd211607502efb6ba014fcbaee32c9d2df80250b4fe135
+  metadata.gz: ac4802b6ab1511152cef8d8f9c4c27194eb6e5f90e4439f35130497d17bb72ccd7676be420a1c80ea487b7bda2f60595dee9acec091e80fcf9a911d8dd8fece8
+  data.tar.gz: 0f3830cef55ada92f0d9cb4250e433ac56b331eba178e4cbaea785aa68748cfff57355dc2ded2a60d511255b65abc173332ff4179f971642a0d5c955845d2b59

data/lib/hydra/ability.rb

@@ -38,6 +38,7 @@ module Hydra
     end
 
     def edit_permissions
+      # Loading an object from Fedora can be slow, so assume that if a string is passed, it's an object id
       can [:edit, :update, :destroy], String do |id|
         test_edit(id)
       end

data/lib/hydra/config.rb

@@ -32,9 +32,18 @@ module Hydra
     end
 
     attr_reader :permissions
-    attr_writer :id_to_resource_uri
+    attr_writer :id_to_resource_uri, :user_key_field
     attr_accessor :user_model
 
+    def user_key_field
+      @user_key_field || default_user_key_field
+    end
+
+    def default_user_key_field
+      Deprecation.warn(self, "You must set 'config.user_key_field = Devise.authentication_keys.first' in your config/initializer/hydra_config.rb file. The default value will be removed in hydra-access-controls 12")
+      Devise.authentication_keys.first
+    end
+
     # This is purely used for translating an ID to user-facing URIs not used for
     # persistence. Useful for storing RDF in Fedora but displaying their
     # subjects in content negotiation as local to the application.

data/lib/hydra/role_mapper_behavior.rb

@@ -75,8 +75,9 @@ module Hydra::RoleMapperBehavior
           raise("#{filename} was found, but was blank or malformed.\n")
         end
 
-        yml.fetch(Rails.env)
-
+        roles = yml.fetch(Rails.env)
+        raise "No roles were found for the #{Rails.env} environment in #{file}" unless roles
+        roles
       end
   end
 end

data/lib/hydra/shared_spec/group_service_interface.rb

@@ -0,0 +1,16 @@
+RSpec.shared_examples 'a Hydra group_service interface' do
+  before do
+    raise 'adapter must be set with `let(:group_service)`' unless
+      defined? group_service
+  end
+
+  subject { group_service }
+
+  it { is_expected.to respond_to(:role_names).with(0).arguments }
+
+  describe '#fetch_groups' do
+    it 'requires a user: keyword arg' do
+      expect(group_service.method(:fetch_groups).parameters).to eq([[:keyreq, :user]])
+    end
+  end
+end

data/lib/hydra/user.rb

@@ -19,7 +19,7 @@ module Hydra::User
     # Devise authentication_keys configuration variable. This method encapsulates
     # whether we use email or username (or something else) as the identifing user attribute.
     def find_by_user_key(key)
-      find_by(Devise.authentication_keys.first.to_sym => key)
+      find_by(Hydra.config.user_key_field => key)
     end
   end
 end

data/spec/unit/config_spec.rb

@@ -42,10 +42,22 @@ describe Hydra::Config do
       expect(config[:permissions][:policy_class]).to be_nil
   end
 
-  it "should have defaults" do
+  it "has defaults" do
     expect(config.permissions.read.individual).to eq 'read_access_person_ssim'
     expect(config.permissions.embargo.release_date).to eq 'embargo_release_date_dtsi'
     expect(config.user_model).to eq 'User'
+    expect(config.user_key_field).to eq :email
   end
 
+  describe "user_key_field" do
+    after do
+      # restore default
+      config.user_key_field = :email
+    end
+    
+    it "is settable" do
+      config.user_key_field = :uid
+      expect(config.user_key_field).to eq :uid
+    end
+  end
 end

data/spec/unit/role_mapper_spec.rb

@@ -1,10 +1,29 @@
 require 'spec_helper'
+require 'hydra/shared_spec/group_service_interface'
 
-describe RoleMapper do
+RSpec.describe RoleMapper do
   it "defines the 4 roles" do
     expect(RoleMapper.role_names.sort).to eq %w(admin_policy_object_editor archivist donor patron researcher)
   end
 
+  describe "map" do
+    subject { described_class.map }
+
+    context "when there are no roles defined for the current environment" do
+      before do
+        described_class.instance_variable_set :@map, nil
+        allow(Rails).to receive(:env).and_return('production')
+      end
+
+      it "raises an error" do
+        expect { subject }.to raise_error RuntimeError, %r{^No roles were found for the production environment in .*config/role_map\.yml$}
+      end
+    end
+  end
+
+  let(:group_service) { described_class }
+  it_behaves_like 'a Hydra group_service interface'
+
   describe "#whois" do
     it "knows who is what" do
       expect(RoleMapper.whois('archivist').sort).to eq %w(archivist1@example.com archivist2@example.com leland_himself@example.com)
@@ -14,7 +33,7 @@ describe RoleMapper do
   end
 
   describe "fetch_groups" do
-    let(:user) { instance_double(User, user_key: email, new_record?: false) } 
+    let(:user) { instance_double(User, user_key: email, new_record?: false) }
     subject { RoleMapper.fetch_groups(user: user) }
 
     context "for a user with multiple roles" do
@@ -26,7 +45,7 @@ describe RoleMapper do
         expect(RoleMapper.fetch_groups(user: user)).to match_array ['archivist', 'donor', 'patron']
       end
     end
-      
+
     context "for a user with a single role" do
       let(:email) { 'archivist2@example.com' }
       it { is_expected.to match_array ['archivist'] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.4.0
+  version: 10.5.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -186,6 +186,7 @@ files:
 - lib/hydra/policy_aware_ability.rb
 - lib/hydra/policy_aware_access_controls_enforcement.rb
 - lib/hydra/role_mapper_behavior.rb
+- lib/hydra/shared_spec/group_service_interface.rb
 - lib/hydra/user.rb
 - spec/factories.rb
 - spec/indexers/embargo_indexer_spec.rb
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra