hydra-access-controls 10.1.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 227c7fcd9a6a9990741af16b0c74790bc3ea2be8
-  data.tar.gz: cd2b439253d0f68120b99b4c15da1a9e3b79b2cf
+  metadata.gz: dd77cc006dc72fb8cf39eb7208e44174c3e30977
+  data.tar.gz: c09d582cf8381231e7ca1205cb45b3474995feb2
 SHA512:
-  metadata.gz: 425b092455b7191fd781dd267dab81495ef33cae744403d0e13b1efc1a65e9ee200fed164757831c433b8f8d5502500ee63a8002a932cfedf2a6a9cca681bd3e
-  data.tar.gz: de0ede421bf5fcdc13ad69010a2e0423c7e74fe4d7b0ec7405bce2d9a769a4f86dfc9f2bd6bdd8c8ec50c77a581747424a809aaa97bf456a189f5ea58364a4cd
+  metadata.gz: 5255b0efdca03ff5e128505584067206d6989f0d9a1f80478dd7b2336aeecb4445963d6d44cea6dd01fe4d4f2f89f21aff5c1535a865b1a9a9af86f6024414ba
+  data.tar.gz: 47bda39ffbddbd9a532d58561cb1ef8ebd44771cb872631dc758d332b021acc41a4bb2e752696762b8d383df0e03d6a981f0236f2b01dd0afd720dd2bca5b849

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

@@ -7,7 +7,7 @@ module Hydra
       included do
         belongs_to :access_control, predicate: ::ACL.accessControl, class_name: 'Hydra::AccessControl'
         before_destroy do |obj|
-          access_control.destroy
+          access_control.destroy unless access_control.nil?
         end
         after_save do
           # Only force save if autosave woudn't be called normally

data/hydra-access-controls.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport', '>= 4', '< 6'
-  gem.add_dependency "active-fedora", '>= 10.0.0.beta1', '< 11'
+  gem.add_dependency "active-fedora", '>= 10.0.0', '< 12'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 1.0'
   gem.add_dependency "blacklight", '>= 5.16'

data/spec/unit/permissions_spec.rb

@@ -229,5 +229,9 @@ describe Hydra::AccessControls::Permissions do
     it "destroys the associated permissions" do
       expect { subject.destroy }.to change { Hydra::AccessControls::Permission.count }.by(-1)
     end
+
+    it "does not raise an exception if permissions do not exist" do
+      expect { Foo.new.destroy }.not_to raise_error(NoMethodError)
+    end
   end
 end

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -25,65 +25,65 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
     end
     @sample_policies = []
     # user discover
-    policy1 = Hydra::AdminPolicy.create("test-policy1")
+    policy1 = Hydra::AdminPolicy.create(id: "test-policy1")
     policy1.default_permissions.create(:type=>"person", :access=>"discover", :name=>"sara_student")
     policy1.save!
 
     @sample_policies << policy1
 
     # user read
-    policy2 = Hydra::AdminPolicy.create("test-policy2")
+    policy2 = Hydra::AdminPolicy.create(id: "test-policy2")
     policy2.default_permissions.create(:type=>"person", :access=>"read", :name=>"sara_student")
     policy2.save!
     @sample_policies << policy2
 
     # user edit
-    policy3 = Hydra::AdminPolicy.create("test-policy3")
+    policy3 = Hydra::AdminPolicy.create(id: "test-policy3")
     policy3.default_permissions.create(:type=>"person", :access=>"edit", :name=>"sara_student")
     policy3.save!
     @sample_policies << policy3
 
 
     # group discover
-    policy4 = Hydra::AdminPolicy.create("test-policy4")
+    policy4 = Hydra::AdminPolicy.create(id: "test-policy4")
     policy4.default_permissions.create(:type=>"group", :access=>"discover", :name=>"africana-104-students")
     policy4.save!
     @sample_policies << policy4
 
     # group read
-    policy5 = Hydra::AdminPolicy.create("test-policy5")
+    policy5 = Hydra::AdminPolicy.create(id: "test-policy5")
     policy5.default_permissions.create(:type=>"group", :access=>"read", :name=>"africana-104-students")
     policy5.save!
     @sample_policies << policy5
 
     # group edit
-    policy6 = Hydra::AdminPolicy.create("test-policy6")
+    policy6 = Hydra::AdminPolicy.create(id: "test-policy6")
     policy6.default_permissions.create(:type=>"group", :access=>"edit", :name=>"africana-104-students")
     policy6.save!
     @sample_policies << policy6
 
     # public discover
-    policy7 = Hydra::AdminPolicy.create("test-policy7")
+    policy7 = Hydra::AdminPolicy.create(id: "test-policy7")
     policy7.default_permissions.create(:type=>"group", :access=>"discover", :name=>"public")
     policy7.save!
     @sample_policies << policy7
 
     # public read
-    policy8 = Hydra::AdminPolicy.create("test-policy8")
+    policy8 = Hydra::AdminPolicy.create(id: "test-policy8")
     policy8.default_permissions.create(:type=>"group", :access=>"read", :name=>"public")
     policy8.save!
     @sample_policies << policy8
 
     # user discover policies for testing that all are applied when over 10 are applicable
     (9..11).each do |i|
-      policy = Hydra::AdminPolicy.create("test-policy#{i}")
+      policy = Hydra::AdminPolicy.create(id: "test-policy#{i}")
       policy.default_permissions.create(:type=>"person", :access=>"discover", :name=>"sara_student")
       policy.save!
       @sample_policies << policy
     end
 
     # no access
-    policy_no_access = Hydra::AdminPolicy.new("test-policy_no_access")
+    policy_no_access = Hydra::AdminPolicy.new(id: "test-policy_no_access")
     policy_no_access.save!
 
     @sample_policies << policy_no_access

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0.beta1
+        version: 10.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0.beta1
+        version: 10.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement