hydra-access-controls 9.2.0.rc1 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 361ce3b1b9ae7f917b0f671b2536f5965950ff28
-  data.tar.gz: 43a7d26a5d9ad1f913b7827ce56abcd4455d7e73
+  metadata.gz: 253a587f6be8c789190ce4652d72a76c96192c1b
+  data.tar.gz: b8b48f8969ffac5925ad5a1f80c0a82de1e92c9c
 SHA512:
-  metadata.gz: 6d003ee8f236a5fdc56bbe001e722439023e89d3a9d58b6bb4d6420dca05aa529ba164220b289c8a5e783cdbd3803e2c2d3ad6a626799e5ac58b27f72ef0847b
-  data.tar.gz: abeb83a756abe8e91fe5f88f56e8e35a0918c5e5d27a2ba297868a436778272128474183976c2d61123a64bf86c1c46614fff3ea9bb87a4157fd5f34a4a34e95
+  metadata.gz: 48166e2c463853f451ca6526a160c50c458f9bcb7b0d18703c8f85db33a48160ebdd7e0a474b228c3d3304927892a82613474ddaa37d0eaa2c52288f74dbedd8
+  data.tar.gz: 1948d7ec0915657d4458ba332c751e554df761f72dbcd04320a1cb26c067e66ffd572b42b16c4e9e032a3b44eaed2da0cef38fcd40ce7a152c16dda813af1cff

data/app/models/concerns/hydra/access_controls/permissions.rb

@@ -392,9 +392,18 @@ module Hydra
       def search_by_type_and_mode(type, mode)
         case type
         when :group
-          permissions.to_a.select { |p| group_agent?(p.agent) && p.mode.first.rdf_subject == mode }
+          search_by_mode(mode) { |agent| group_agent?(agent) }
         when :person
-          permissions.to_a.select { |p| person_agent?(p.agent) && p.mode.first.rdf_subject == mode }
+          search_by_mode(mode) { |agent| person_agent?(agent) }
+        end
+      end
+
+      # @param [RDF::URI] mode One of the permissions modes, e.g. ACL.Write, ACL.Read, etc.
+      # @yieldparam [Array<ActiveFedora::Base>] agent the agent type assertions
+      # @return [Array<Permission>] list of permissions where the mode is as selected, the block evaluates to true and the target is not marked for delete
+      def search_by_mode(mode, &block)
+        permissions.to_a.select do |p|
+          yield(p.agent) && !p.marked_for_destruction? && p.mode.first.rdf_subject == mode
         end
       end
 

data/spec/unit/permissions_spec.rb

@@ -19,11 +19,11 @@ describe Hydra::AccessControls::Permissions do
     subject.read_groups=['group1', 'group2']
     subject.edit_users=['user1']
     subject.read_users=['user2', 'user3']
-    expect(subject.permissions).to match_array [Hydra::AccessControls::Permission.new(:type=>"group", :access=>"read", :name=>"group1"),
-        Hydra::AccessControls::Permission.new({:type=>"group", :access=>"read", :name=>"group2"}),
-        Hydra::AccessControls::Permission.new({:type=>"person", :access=>"read", :name=>"user2"}),
-        Hydra::AccessControls::Permission.new({:type=>"person", :access=>"read", :name=>"user3"}),
-        Hydra::AccessControls::Permission.new({:type=>"person", :access=>"edit", :name=>"user1"})]
+    expect(subject.permissions).to match_array [Hydra::AccessControls::Permission.new(type: "group", access: "read", name: "group1"),
+        Hydra::AccessControls::Permission.new({ type: "group", access: "read", name: "group2" }),
+        Hydra::AccessControls::Permission.new({ type: "person", access: "read", name: "user2" }),
+        Hydra::AccessControls::Permission.new({ type: "person", access: "read", name: "user3" }),
+        Hydra::AccessControls::Permission.new({ type: "person", access: "edit", name: "user1" })]
   end
 
   describe "building a new permission" do
@@ -40,33 +40,33 @@ describe Hydra::AccessControls::Permissions do
     describe "with nested attributes" do
       before do
         subject.save!
-        subject.permissions_attributes = [{:type=>"person", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions_attributes = [{ type: "person", access: "edit", name: "jcoyne" }]
       end
       context "when a hash is passed" do
         before do
-          subject.permissions_attributes = {'0' => {type: "group", access:"read", name:"group1"},
-                                            '1' => {type: 'person', access: 'edit', name: 'user2'}}
+          subject.permissions_attributes = {'0' => { type: "group", access:"read", name:"group1" },
+                                            '1' => { type: 'person', access: 'edit', name: 'user2' }}
         end
         it "should handle a hash" do
           expect(subject.permissions.size).to eq 3
           expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
           expect(subject.permissions.map(&:to_hash)).to match_array [
-              {type: "person", access: "edit", name: "jcoyne"},
-              {type: "group", access: "read", name: "group1"},
-              {type: "person", access: "edit", name: "user2"}]
+              { type: "person", access: "edit", name: "jcoyne" },
+              { type: "group", access: "read", name: "group1" },
+              { type: "person", access: "edit", name: "user2" }]
         end
       end
 
-      it "should create new group permissions" do
-        subject.permissions_attributes = [{type: "group", access: "read", name: "group1"}]
+      it "creates new group permissions" do
+        subject.permissions_attributes = [{ type: "group", access: "read", name: "group1" }]
         expect(subject.permissions.size).to eq 2
         expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
         expect(subject.permissions[0].to_hash).to eq(type: "person", access: "edit", name: "jcoyne")
         expect(subject.permissions[1].to_hash).to eq(type: "group", access: "read", name: "group1")
       end
 
-      it "should create new user permissions" do
-        subject.permissions_attributes = [{:type=>"person", :access=>"read", :name=>"user1"}]
+      it "creates new user permissions" do
+        subject.permissions_attributes = [{ type: "person", access: "read", name: "user1" }]
         expect(subject.permissions.size).to eq 2
         expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
         expect(subject.permissions[0].to_hash).to eq(type: "person", access: "edit", name: "jcoyne")
@@ -74,9 +74,9 @@ describe Hydra::AccessControls::Permissions do
       end
 
       context "when called multiple times" do
-        it "should not replace existing groups" do
-          subject.permissions_attributes = [{:type=>"group", :access=>"read", :name=>"group1"}]
-          subject.permissions_attributes = [{:type=>"group", :access=>"read", :name=>"group2"}]
+        it "doesn't replace existing groups" do
+          subject.permissions_attributes = [{ type: "group", access: "read", name: "group1" }]
+          subject.permissions_attributes = [{ type: "group", access: "read", name: "group2" }]
           expect(subject.permissions.size).to eq 3
           expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
           expect(subject.permissions[0].to_hash).to eq(type: "person", access: "edit", name: "jcoyne")
@@ -84,9 +84,9 @@ describe Hydra::AccessControls::Permissions do
           expect(subject.permissions[2].to_hash).to eq(type: "group", access: "read", name: "group2")
         end
 
-        it "should not replace existing users" do
-          subject.permissions_attributes = [{:type=>"person", :access=>"read", :name=>"user1"}]
-          subject.permissions_attributes = [{:type=>"person", :access=>"read", :name=>"user2"}]
+        it "doesn't replace existing users" do
+          subject.permissions_attributes = [{ type: "person", access: "read", name: "user1" }]
+          subject.permissions_attributes = [{ type: "person", access: "read", name: "user2" }]
           expect(subject.permissions.size).to eq 3
           expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
           expect(subject.permissions[0].to_hash).to eq(type: "person", access: "edit", name: "jcoyne")
@@ -94,49 +94,74 @@ describe Hydra::AccessControls::Permissions do
           expect(subject.permissions[2].to_hash).to eq(type: "person", access: "read", name: "user2")
         end
 
-        it "should update permissions on existing users" do
-          subject.update permissions_attributes: [{:type=>"person", :access=>"read", :name=>"user1"}]
-          subject.update permissions_attributes: [{:type=>"person", :access=>"edit", :name=>"user1"}]
+        it "updates permissions on existing users" do
+          subject.update permissions_attributes: [{ type: "person", access: "read", name: "user1" }]
+          subject.update permissions_attributes: [{ type: "person", access: "edit", name: "user1" }]
           expect(subject.permissions.size).to eq 2
           expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
           expect(subject.permissions[0].to_hash).to eq(type: "person", access: "edit", name: "jcoyne")
           expect(subject.permissions[1].to_hash).to eq(type: "person", access: "edit", name: "user1")
         end
 
-        it "should update permissions on existing groups" do
-          subject.update permissions_attributes: [{:type=>"group", :access=>"read", :name=>"group1"}]
-          subject.update permissions_attributes: [{:type=>"group", :access=>"edit", :name=>"group1"}]
+        it "updates permissions on existing groups" do
+          subject.update permissions_attributes: [{ type: "group", access: "read", name: "group1" }]
+          subject.update permissions_attributes: [{ type: "group", access: "edit", name: "group1" }]
           expect(subject.permissions.map(&:to_hash)).to match_array [
-                                            {:type=>"group", :access=>"edit", :name=>"group1"},
-                                            {:type=>"person", :access=>"edit", :name=>"jcoyne"}]
+                                            { type: "group", access: "edit", name: "group1" },
+                                            { type: "person", access: "edit", name: "jcoyne" }]
         end
       end
 
-      it "should remove permissions on existing users" do
-        subject.update permissions_attributes: [{:type=>"person", :access=>"read", :name=>"user1"}]
-        subject.update permissions_attributes: [{:id=>ActiveFedora::Base.uri_to_id(subject.permissions.last.rdf_subject.to_s), :type=>"person", :access=>"edit", :name=>"user1", _destroy: true}]
-        expect(subject.permissions.reload.map(&:to_hash)).to eq [{ :name=>"jcoyne", :type=>"person", :access=>"edit" }]
-      end
+      context "when the destroy flag is set" do
+        let(:reloaded) { subject.permissions.reload.map(&:to_hash) }
+        let(:permissions_id) { ActiveFedora::Base.uri_to_id(subject.permissions.last.rdf_subject.to_s) }
+
+        context "to a truthy value" do
+          context "when updating users" do
+            before do
+              subject.update permissions_attributes: [{ type: "person", access: "read", name: "user1" }]
+              subject.update permissions_attributes: [{ id: permissions_id, type: "person", access: "edit", name: "user1", _destroy: true}]
+            end
+
+            it "removes permissions on existing users" do
+              indexed_result = ActiveFedora::SolrService.query("id:#{subject.id}").first['edit_access_person_ssim']
+              expect(indexed_result).to eq ['jcoyne']
+              expect(reloaded).to eq [{ name: "jcoyne", type: "person", access: "edit" }]
+            end
+          end
+
+          context "when updating groups" do
+            before do
+              subject.update permissions_attributes: [{ type: "group", access: "read", name: "group1" }]
+              subject.update permissions_attributes: [{ id: permissions_id, type: "group", access: "edit", name: "group1", _destroy: '1' }]
+            end
+
+            it "removes permissions on existing groups" do
+              #See what actually gets stored in solr
+              indexed_result = ActiveFedora::SolrService.query("id:#{subject.id}").first['edit_access_group_ssim']
+              expect(indexed_result).to be_nil
+              expect(reloaded).to eq [{ type: "person", access: "edit", name: "jcoyne" }]
+            end
+          end
+        end
 
-      it "should remove permissions on existing groups" do
-        subject.update permissions_attributes: [{:type=>"group", :access=>"read", :name=>"group1"}]
-        subject.update permissions_attributes: [{:id=>ActiveFedora::Base.uri_to_id(subject.permissions.last.rdf_subject.to_s), :type=>"group", :access=>"edit", :name=>"group1", _destroy: '1'}]
-        expect(subject.permissions.reload.map(&:to_hash)).to eq [{:type=>"person", :access=>"edit", :name=>"jcoyne"}]
-      end
+        context "to a falsy value" do
 
-      it "should not remove when destroy flag is falsy" do
-        subject.update permissions_attributes: [{:type=>"group", :access=>"read", :name=>"group1"}]
-        subject.update permissions_attributes: [{:id=>ActiveFedora::Base.uri_to_id(subject.permissions.last.rdf_subject.to_s), :type=>"group", :access=>"edit", :name=>"group1", _destroy: '0'}]
-        expect(subject.permissions.reload.map(&:to_hash)).to match_array [{:type=>"group", :access=>"edit", :name=>"group1"},
-                                                          {:type=>"person", :access=>"edit", :name=>"jcoyne"}]
+          it "doesn't remove the record" do
+            subject.update permissions_attributes: [{ type: "group", access: "read", name: "group1" }]
+            subject.update permissions_attributes: [{ id: permissions_id, type: "group", access: "edit", name: "group1", _destroy: '0' }]
+            expect(reloaded).to match_array [{ type: "group", access: "edit", name: "group1" },
+                                             { type: "person", access: "edit", name: "jcoyne" }]
+          end
+        end
       end
     end
 
     describe "with the setter" do
       before do
         subject.permissions = [
-          Hydra::AccessControls::Permission.new(:type=>"group", :access=>"edit", :name=>"group1"),
-          Hydra::AccessControls::Permission.new(:type=>"person", :access=>"edit", :name=>"jcoyne")]
+          Hydra::AccessControls::Permission.new(type: "group", access: "edit", name: "group1"),
+          Hydra::AccessControls::Permission.new(type: "person", access: "edit", name: "jcoyne")]
         subject.save!
       end
       it "should set the permissions" do
@@ -177,12 +202,12 @@ describe Hydra::AccessControls::Permissions do
       subject.set_read_groups(['group-2', 'group-3'], ['group-6'])
       # 'group-7' is not eligible to be revoked
       expect(subject.permissions.map(&:to_hash)).to match_array([
-        {name: 'group-2', type: 'group', access: 'read'},
-        {name: 'group-3', type: 'group', access: 'read'},
-        {name: 'group-7', type: 'group', access: 'read'},
-        {name: 'group-8', type: 'group', access: 'edit'},
-        {name: 'person1', type: 'person', access: 'read'},
-        {name: 'person2', type: 'person', access: 'discover'}])
+        { name: 'group-2', type: 'group', access: 'read' },
+        { name: 'group-3', type: 'group', access: 'read' },
+        { name: 'group-7', type: 'group', access: 'read' },
+        { name: 'group-8', type: 'group', access: 'edit' },
+        { name: 'person1', type: 'person', access: 'read' },
+        { name: 'person2', type: 'person', access: 'discover' }])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.2.0.rc1
+  version: 9.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8