hydra-access-controls 11.0.6 → 11.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a286d397032ccf1ba4e2df1ea63470a75184cc7f7f98ed053663d33f593683c
-  data.tar.gz: a4c7de8fa18771222b5710bb954ad59c3011420ed7f3b02bc241105559712962
+  metadata.gz: c5b5acef420272359ea5685e15459ecbc780955e7ebf3b42d5b65bc1356fcf39
+  data.tar.gz: 32f0de6835fad597e00eb8f2bccfb4ef671a56c62775e06f718a979793bc6792
 SHA512:
-  metadata.gz: 9647db12b9efdac6049bc6fd770e200b4e9f28e1a8d5e5f8e357f8a8020d5390bd68eb0cc03bda037dc0a4d1db89048dcba5c9db387086d98e0474d770302a81
-  data.tar.gz: cffcd8456b9e636e4e4957fc02a1709c3fad8764658205ea851bebdc7109bb2f68a7ea8e56f8343bcce33301446dbe29daa02fe47582067291b3894a2108f0c4
+  metadata.gz: 85dc230ed0b72e12f330222f4a1082d4edb37764cba991dcf21a6f1e3db31d8db1b5bc1c1d2036ae09cb967055934528d9396a2d85a9ecb8b6f5fd88ded3c6bc
+  data.tar.gz: 605d7270804ff8f4251b1f5901f4b47a0a00dd4e5fe85edfe2045ab9f4fecc002c51839ac8986bb4d0e27e4d296fd4fdffc0ec5a9bbf381c62f1cc5e41e0e24f

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

@@ -5,8 +5,8 @@ module Hydra
       include Hydra::AccessControls::WithAccessRight
 
       included do
-        validates :lease_expiration_date, :'hydra/future_date' => true, if: :enforce_future_date_for_lease?
-        validates :embargo_release_date, :'hydra/future_date' => true, if: :enforce_future_date_for_embargo?
+        validates :lease_expiration_date, :'hydra/future_date' => true, if: :enforce_future_date_for_lease?, on: :create
+        validates :embargo_release_date, :'hydra/future_date' => true, if: :enforce_future_date_for_embargo?, on: :create
 
         belongs_to :embargo, predicate: Hydra::ACL.hasEmbargo, class_name: 'Hydra::AccessControls::Embargo', autosave: true
         belongs_to :lease, predicate: Hydra::ACL.hasLease, class_name: 'Hydra::AccessControls::Lease', autosave: true

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

@@ -41,7 +41,7 @@ module Hydra::AccessControls
     end
 
     def agent_name
-      URI.decode(parsed_agent.last)
+      decode(parsed_agent.last)
     end
 
     def update(*)
@@ -80,7 +80,7 @@ module Hydra::AccessControls
     end
 
     def build_agent_resource(prefix, name)
-      [Agent.new(::RDF::URI.new("#{prefix}##{URI.encode(name)}"))]
+      [Agent.new(::RDF::URI.new("#{prefix}##{encode(name)}"))]
     end
 
     def build_access(access)
@@ -96,5 +96,15 @@ module Hydra::AccessControls
                     raise ArgumentError, "Unknown access #{access.inspect}"
                   end
     end
+
+    private
+
+    def encode(str)
+      URI::RFC2396_Parser.new.escape(str)
+    end
+
+    def decode(str)
+      URI::RFC2396_Parser.new.unescape(str)
+    end
   end
 end

data/spec/unit/embargoable_spec.rb

@@ -83,9 +83,9 @@ describe Hydra::AccessControls::Embargoable do
   end
 
   describe 'validations' do
-    context "with dates" do
+    context "with past dates" do
       subject { ModsAsset.new(lease_expiration_date: past_date, embargo_release_date: past_date) }
-      it "validates embargo_release_date and lease_expiration_date" do
+      it "validates embargo_release_date and lease_expiration_date on create" do
         expect(subject).to_not be_valid
         expect(subject.errors[:lease_expiration_date]).to eq ['Must be a future date']
         expect(subject.errors[:embargo_release_date]).to eq ['Must be a future date']

data/spec/unit/permission_spec.rb

@@ -47,17 +47,29 @@ describe Hydra::AccessControls::Permission do
   end
 
   describe "URI escaping" do
-    let(:permission) { described_class.new(type: 'person', name: 'john doe', access: 'read') }
-    let(:permission2) { described_class.new(type: 'group', name: 'hydra devs', access: 'read') }
+    let(:user_permission) { described_class.new(type: 'person', name: 'john doe', access: 'read') }
+    let(:user_permission2) { described_class.new(type: 'person', name: 'john%20doe', access: 'read') }
+    let(:user_permission3) { described_class.new(type: 'person', name: 'john+doe', access: 'read') }
+    let(:group_permission) { described_class.new(type: 'group', name: 'hydra devs', access: 'read') }
+    let(:group_permission2) { described_class.new(type: 'group', name: 'hydra%20devs', access: 'read') }
+    let(:group_permission3) { described_class.new(type: 'group', name: 'hydra+devs', access: 'read') }
 
     it "should escape agent when building" do
-      expect(permission.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/person#john%20doe'
-      expect(permission2.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/group#hydra%20devs'
+      expect(user_permission.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/person#john%20doe'
+      expect(user_permission2.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/person#john%2520doe'
+      expect(user_permission3.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/person#john+doe'
+      expect(group_permission.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/group#hydra%20devs'
+      expect(group_permission2.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/group#hydra%2520devs'
+      expect(group_permission3.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/group#hydra+devs'
     end
 
     it "should unescape agent when parsing" do
-      expect(permission.agent_name).to eq 'john doe'
-      expect(permission2.agent_name).to eq 'hydra devs'
+      expect(user_permission.agent_name).to eq 'john doe'
+      expect(user_permission2.agent_name).to eq 'john%20doe'
+      expect(user_permission3.agent_name).to eq 'john+doe'
+      expect(group_permission.agent_name).to eq 'hydra devs'
+      expect(group_permission2.agent_name).to eq 'hydra%20devs'
+      expect(group_permission3.agent_name).to eq 'hydra+devs'
     end
 
     context 'with a User instance passed as :name argument' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 11.0.6
+  version: 11.0.7
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport