hydra-access-controls 9.1.3 → 9.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2426039b8e73a0ff13649f3e0f76aba68ae372
-  data.tar.gz: f9621b0df71766c3495fbd7557ebd15a3fbe26a1
+  metadata.gz: f9d76736a4784893bf7830fef1115a305586043f
+  data.tar.gz: ae74e9ffe75fd0f4207d91ac069f3c0fd4902cb9
 SHA512:
-  metadata.gz: 310c1363e3f37d91fd017325a5d7582720299a6ab1ee429d414e1a190c5d51dab8f1fd55dae39c58dd85d999401e4fe19054c66d6e76bba6149b3822c5b0e6db
-  data.tar.gz: f26b39e2faeb72af6f74adf0d27e8e82bb05a80fb7dc133d8f30d7a76542d12d751a0bf8432acb839b0fbeba06ab9a472fdb949979274115204b734be33bd311
+  metadata.gz: 9ed8dd701b055ad960fa2e58786e146fec30b6037a20985a676e0fca9994c7292188bc2d82ca1cba8e454f7b9a43c6e94e351a8144e5d3da192291a988eea417
+  data.tar.gz: 233d870496e4dec3770026e30c3be0f3843cc9b8b9195ca16ce47e9c83d76fbe78404e54e698b51571b9cf42c126022f53a9de4c2e366e3ad4ce7f06cde981fa

data/app/models/concerns/hydra/admin_policy_behavior.rb

@@ -3,7 +3,7 @@ module Hydra
     extend ActiveSupport::Concern
 
     included do
-      has_and_belongs_to_many :default_permissions, predicate: Hydra::ACL.defaultPermissions, class_name: 'Hydra::AccessControls::Permission'
+      has_and_belongs_to_many :default_permissions, predicate: Hydra::ACL.defaultPermissions, class_name: 'Hydra::AccessControls::Permission', inverse_of: :admin_policies
       belongs_to :default_embargo, predicate: Hydra::ACL.hasEmbargo, class_name: 'Hydra::AccessControls::Embargo'
     end
 
@@ -22,8 +22,9 @@ module Hydra
     end
 
     def merged_policies
-      default_permissions.each_with_object({}) do |policy, h|
-        args = policy.to_hash
+      # Workaround for https://github.com/projecthydra/active_fedora/issues/775
+      default_permissions.to_a.uniq.each_with_object({}) do |permission, h|
+        args = permission.to_hash
         h[args[:access]] ||= {}
         h[args[:access]][args[:type]] ||= []
         h[args[:access]][args[:type]] << args[:name]
@@ -48,18 +49,5 @@ module Hydra
       end
       defaultRights.update_permissions(perm_hash)
     end
-
-    ## Returns a list with all the permissions on the object.
-    # @example
-    #  [{:name=>"group1", :access=>"discover", :type=>'group'},
-    #  {:name=>"group2", :access=>"discover", :type=>'group'},
-    #  {:name=>"user2", :access=>"read", :type=>'user'},
-    #  {:name=>"user1", :access=>"edit", :type=>'user'},
-    #  {:name=>"user3", :access=>"read", :type=>'user'}]
-    def default_permissions
-      (defaultRights.groups.map {|x| {:type=>'group', :access=>x[1], :name=>x[0] }} + 
-       defaultRights.users.map {|x| {:type=>'user', :access=>x[1], :name=>x[0]}})
-    end
-
   end
 end

data/app/models/hydra/access_controls/access_control_list.rb

@@ -1,7 +1,6 @@
 module Hydra::AccessControls
   class AccessControlList < ActiveFedora::Base
     belongs_to :access_to, predicate: ::ACL.accessTo, class_name: 'ActiveFedora::Base'
-    # has_many :admin_policies, class_name: 'Hydra::AdminPolicy'
     property :mode, predicate: ::ACL.mode, class_name: 'Hydra::AccessControls::Mode'
     property :agent, predicate: ::ACL.agent, class_name: 'Hydra::AccessControls::Agent'
     # property :agentClass, predicate: ACL.agentClass

data/app/models/hydra/access_controls/permission.rb

@@ -3,6 +3,8 @@ module Hydra::AccessControls
   GROUP_AGENT_URL_PREFIX = "http://projecthydra.org/ns/auth/group".freeze
   PERSON_AGENT_URL_PREFIX = 'http://projecthydra.org/ns/auth/person'.freeze
   class Permission < AccessControlList
+    has_many :admin_policies, inverse_of: :default_permissions, class_name: 'Hydra::AdminPolicy'
+
     def initialize(args)
       super()
       build_agent(args[:name], args[:type].to_s)

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 Hydra::Engine.config.autoload_paths.each { |path| $LOAD_PATH.unshift path }
 
+require 'byebug' unless ENV['CI']
+
 if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
   require 'simplecov'
   require 'simplecov-rcov'

data/spec/unit/admin_policy_spec.rb

@@ -60,9 +60,9 @@ describe Hydra::AdminPolicy do
   end
 
   describe "Inheritable rights" do
+    let(:policy) { described_class.new }
     before do
-      @policy = Hydra::AdminPolicy.new
-      @policy.default_permissions.build([
+      policy.default_permissions.build([
         {:name=>"africana-faculty", :access=>"edit", :type=>"group"},
         {:name=>"cool-kids", :access=>"edit", :type=>"group"},
         {:name=>"julius_caesar", :access=>"edit", :type=>"person"},
@@ -71,11 +71,23 @@ describe Hydra::AdminPolicy do
         {:name=>"posers", :access=>"discover", :type=>"group"},
         {:name=>"constantine", :access=>"discover", :type=>"person"}
       ])
-      @policy.build_default_embargo.embargo_release_date = "2102-10-01"
+      policy.build_default_embargo.embargo_release_date = "2102-10-01"
     end
 
-    describe "to_solr" do
-      subject { @policy.to_solr }
+    describe "persisting" do
+      before do
+        policy.save!
+        policy.reload
+      end
+
+      it "has the permissions that were set" do
+        expect(policy.default_permissions.size).to eq 7
+      end
+
+    end
+
+    describe "indexing" do
+      subject { policy.to_solr }
 
       it "should not affect normal solr permissions fields" do
         expect(subject).to_not have_key Hydra.config.permissions.discover.group

data/spec/unit/policy_aware_ability_spec.rb

@@ -10,162 +10,174 @@ describe Hydra::PolicyAwareAbility do
         :embargo_release_date => "inheritable_embargo_release_date_dtsi"
     })
   end
+
   before do
     class PolicyAwareClass
       include Hydra::PolicyAwareAbility
     end
-    @policy = Hydra::AdminPolicy.create
-    # Set the inheritable permissions
-    @policy.default_permissions.create [
-        {:type=>"group", :access=>"read", :name=>"africana-faculty"},
-        {:type=>"group", :access=>"edit", :name=>"cool_kids"},
-        {:type=>"group", :access=>"edit", :name=>"in_crowd"},
-        {:type=>"person", :access=>"read", :name=>"nero"},
-        {:type=>"person", :access=>"edit", :name=>"julius_caesar"}
-      ]
+  end
 
-    @policy.save!
-    @asset = ModsAsset.new
-    @asset.admin_policy = @policy
-    @asset.save!
+  let(:policy) do
+    Hydra::AdminPolicy.create do |p|
+      # Set the inheritable permissions
+      p.default_permissions.build [
+        { type: "group", access: "read", name: "africana-faculty" },
+        { type: "group", access: "edit", name: "cool_kids" },
+        { type: "group", access: "edit", name: "in_crowd" },
+        { type: "person", access: "read", name: "nero" },
+        { type: "person", access: "edit", name: "julius_caesar" }
+      ]
+    end
   end
+  let(:asset) { ModsAsset.create { |a| a.admin_policy = policy } }
 
   after do
     Object.send(:remove_const, :PolicyAwareClass)
   end
 
-  subject { PolicyAwareClass.new( User.new ) }
+  let(:instance) { PolicyAwareClass.new( User.new ) }
 
   describe "policy_id_for" do
-    before do
-      @policy2 = Hydra::AdminPolicy.create
-      @policy2.default_permissions.create [
-         {:type=>"group", :access=>"read", :name=>"untenured-faculty"},
-         {:type=>"group", :access=>"edit", :name=>"awesome_kids"},
-         {:type=>"group", :access=>"edit", :name=>"bad_crowd"},
-         {:type=>"person", :access=>"read", :name=>"constantine"},
-         {:type=>"person", :access=>"edit", :name=>"brutus"}
+    let(:policy2) do
+      Hydra::AdminPolicy.create do |p|
+        # Set the inheritable permissions
+        p.default_permissions.build [
+          { type: "group", access: "read", name: "untenured-faculty" },
+          { type: "group", access: "edit", name: "awesome_kids" },
+          { type: "group", access: "edit", name: "bad_crowd" },
+          { type: "person", access: "read", name: "constantine" },
+          { type: "person", access: "edit", name: "brutus" }
         ]
-      @policy2.save
-      @asset2 = ModsAsset.new
-      @asset2.admin_policy = @policy2
-      @asset2.save
-      @asset3 = ModsAsset.create
+      end
     end
+    let(:asset2) { ModsAsset.create { |a| a.admin_policy = policy2 } }
+    let(:asset3) { ModsAsset.create }
 
     it "should retrieve the pid doc for the current object's governing policy" do
-      expect(subject.policy_id_for(@asset.id)).to eq @policy.id
-      expect(subject.policy_id_for(@asset2.id)).to eq @policy2.id
-      expect(subject.policy_id_for(@asset3.id)).to be_nil
+      expect(instance.policy_id_for(asset.id)).to eq policy.id
+      expect(instance.policy_id_for(asset2.id)).to eq policy2.id
+      expect(instance.policy_id_for(asset3.id)).to be_nil
     end
   end
 
   describe "policy_permissions_doc" do
     it "should retrieve the permissions doc for the current object's policy and store for re-use" do
-      expect(subject).to receive(:get_permissions_solr_response_for_doc_id).with(@policy.id).once.and_return("mock solr doc")
-      expect(subject.policy_permissions_doc(@policy.id)).to eq "mock solr doc"
-      expect(subject.policy_permissions_doc(@policy.id)).to eq "mock solr doc"
-      expect(subject.policy_permissions_doc(@policy.id)).to eq "mock solr doc"
+      expect(instance).to receive(:get_permissions_solr_response_for_doc_id).with(policy.id).once.and_return("mock solr doc")
+      expect(instance.policy_permissions_doc(policy.id)).to eq "mock solr doc"
+      expect(instance.policy_permissions_doc(policy.id)).to eq "mock solr doc"
+      expect(instance.policy_permissions_doc(policy.id)).to eq "mock solr doc"
     end
   end
+
   describe "test_edit_from_policy" do
     context "public user" do
       it "should return false" do
-        allow(subject).to receive(:user_groups).and_return(["public"])
-        expect(subject.test_edit_from_policy(@asset.id)).to be false
+        allow(instance).to receive(:user_groups).and_return(["public"])
+        expect(instance.test_edit_from_policy(asset.id)).to be false
       end
     end
     context "registered user" do
       it "should return false" do
-        expect(subject.user_groups).to include("registered")
-        expect(subject.test_edit_from_policy(@asset.id)).to be false
+        expect(instance.user_groups).to include("registered")
+        expect(instance.test_edit_from_policy(asset.id)).to be false
       end
     end
     context "user with policy read access only" do
       it "should return false" do
-        allow(subject.current_user).to receive(:user_key).and_return("nero")
-        expect(subject.test_edit_from_policy(@asset.id)).to be false
+        allow(instance.current_user).to receive(:user_key).and_return("nero")
+        expect(instance.test_edit_from_policy(asset.id)).to be false
       end
     end
     context "user with policy edit access" do
       it "should return true" do
-        allow(subject.current_user).to receive(:user_key).and_return("julius_caesar")
-        expect(subject.test_edit_from_policy(@asset.id)).to be true
+        allow(instance.current_user).to receive(:user_key).and_return("julius_caesar")
+        expect(instance.test_edit_from_policy(asset.id)).to be true
       end
     end
     context "user in group with policy read access" do
       it "should return false" do
-        allow(subject).to receive(:user_groups).and_return(["africana-faculty"])
-        expect(subject.test_edit_from_policy(@asset.id)).to be false
+        allow(instance).to receive(:user_groups).and_return(["africana-faculty"])
+        expect(instance.test_edit_from_policy(asset.id)).to be false
       end
     end
     context "user in group with policy edit access" do
       it "should return true" do
-        allow(subject).to receive(:user_groups).and_return(["cool_kids"])
-        expect(subject.test_edit_from_policy(@asset.id)).to be true
+        allow(instance).to receive(:user_groups).and_return(["cool_kids"])
+        expect(instance.test_edit_from_policy(asset.id)).to be true
       end
     end
   end
+
   describe "test_read_from_policy" do
     context "public user" do
       it "should return false" do
-        allow(subject).to receive(:user_groups).and_return(["public"])
-        expect(subject.test_read_from_policy(@asset.id)).to be false
+        allow(instance).to receive(:user_groups).and_return(["public"])
+        expect(instance.test_read_from_policy(asset.id)).to be false
       end
     end
     context "registered user" do
       it "should return false" do
-        expect(subject.user_groups).to include("registered")
-        expect(subject.test_read_from_policy(@asset.id)).to be false
+        expect(instance.user_groups).to include("registered")
+        expect(instance.test_read_from_policy(asset.id)).to be false
       end
     end
     context "user with policy read access only" do
       it "should return false" do
-        allow(subject.current_user).to receive(:user_key).and_return("nero")
-        expect(subject.test_read_from_policy(@asset.id)).to be true
+        allow(instance.current_user).to receive(:user_key).and_return("nero")
+        expect(instance.test_read_from_policy(asset.id)).to be true
       end
     end
     context "user with policy edit access" do
       it "should return true" do
-        allow(subject.current_user).to receive(:user_key).and_return("julius_caesar")
-        expect(subject.test_read_from_policy(@asset.id)).to be true
+        allow(instance.current_user).to receive(:user_key).and_return("julius_caesar")
+        expect(instance.test_read_from_policy(asset.id)).to be true
       end
     end
     context "user in group with policy read access" do
       it "should return false" do
-        allow(subject).to receive(:user_groups).and_return(["africana-faculty"])
-        expect(subject.test_read_from_policy(@asset.id)).to be true
+        allow(instance).to receive(:user_groups).and_return(["africana-faculty"])
+        expect(instance.test_read_from_policy(asset.id)).to be true
       end
     end
     context "user in group with policy edit access" do
       it "should return true" do
-        allow(subject).to receive(:user_groups).and_return(["cool_kids"])
-        expect(subject.test_read_from_policy(@asset.id)).to be true
+        allow(instance).to receive(:user_groups).and_return(["cool_kids"])
+        expect(instance.test_read_from_policy(asset.id)).to be true
       end
     end
   end
+
   describe "edit_groups_from_policy" do
+    subject { instance.edit_groups_from_policy(policy.id) }
+
     it "should retrieve the list of groups with edit access from the policy" do
-      result = subject.edit_groups_from_policy(@policy.id)
-      expect(result.length).to eq 2
-      expect(result).to include("cool_kids","in_crowd")
+      expect(subject).to match_array ["cool_kids", "in_crowd"]
     end
   end
+
   describe "edit_persons_from_policy" do
+    subject do
+      instance.edit_users_from_policy(policy.id)
+    end
+
     it "should retrieve the list of individuals with edit access from the policy" do
-      expect(subject.edit_users_from_policy(@policy.id)).to eq ["julius_caesar"]
+      expect(subject).to eq ["julius_caesar"]
     end
   end
+
   describe "read_groups_from_policy" do
+    subject { instance.read_groups_from_policy(policy.id) }
+
     it "should retrieve the list of groups with read access from the policy" do
-      result = subject.read_groups_from_policy(@policy.id)
-      expect(result.length).to eq 3
-      expect(result).to include("cool_kids", "in_crowd", "africana-faculty")
+      expect(subject).to match_array ["cool_kids", "in_crowd", "africana-faculty"]
     end
   end
-  describe "read_persons_from_policy" do
+
+  describe "read_users_from_policy" do
+    subject { instance.read_users_from_policy(policy.id) }
+
     it "should retrieve the list of individuals with read access from the policy" do
-      expect(subject.read_users_from_policy(@policy.id)).to eq ["julius_caesar","nero"]
+      expect(subject).to eq ["julius_caesar", "nero"]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.1.3
+  version: 9.1.4
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport