hydra-access-controls 11.0.0 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f31fcebaf724bb3c6c85d7b57a09f64de643f5dc665885efa2c9b934a3bd0466
-  data.tar.gz: 1e7c95962c8ae4d971d75ed0a123ab1635dc0a1c1dabe2e26dc9a3780b4d0147
+  metadata.gz: e4b22da24ea67d1fdb58bfce4044fa0d7c7167640bd7fb7c89bce988e0571595
+  data.tar.gz: 6adce22a2c6036385cd97550dfb51e11e23eea2b72b11076fcd0e54bb96f0ee6
 SHA512:
-  metadata.gz: 53b789e51356d804eee597220cde26ac8ea01ea4c2d0f20cd95a351e4924ed65d29cd33bea517d7280a719d86074e8b196302accb7066ec20336343675dc4b65
-  data.tar.gz: bc3e90b4894cc39e1e8783ab3d594f0b26b217890627140ef5aacd7ee017f36be66740dd6e381cabbf0cf2f00dc71c48d68aabe6f0e36f002d3fb3f970c0d514
+  metadata.gz: 17ae9693da60445afd084147a730c0cb86d585d5402ca8e88f4483d6cfd8b75cae3a41f4b241121dafba1d2ef6e868a33cf887cc8ba4d9cbf2e02deae415bd35
+  data.tar.gz: 0e4891b4c48b83db40d5e9e95da32630807a964dfbdd9ea84c5687adbf1092d319682c3fa5e006c1c4b76dc423ce5b50a77c2baae25916830a5b3ae0b5a44396

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

@@ -8,8 +8,8 @@ module Hydra
         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?
 
-        belongs_to :embargo, predicate: Hydra::ACL.hasEmbargo, class_name: 'Hydra::AccessControls::Embargo'
-        belongs_to :lease, predicate: Hydra::ACL.hasLease, class_name: 'Hydra::AccessControls::Lease'
+        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
 
         delegate :visibility_during_embargo, :visibility_during_embargo=, :visibility_after_embargo, :visibility_after_embargo=, :embargo_release_date, :embargo_release_date=, :embargo_history, :embargo_history=, to: :existing_or_new_embargo
         delegate :visibility_during_lease, :visibility_during_lease=, :visibility_after_lease, :visibility_after_lease=, :lease_expiration_date, :lease_expiration_date=, :lease_history, :lease_history=, to: :existing_or_new_lease

data/spec/unit/embargoable_spec.rb

@@ -19,6 +19,59 @@ describe Hydra::AccessControls::Embargoable do
   let(:model) { TestModel.new }
   subject { model }
 
+  describe 'an object under embargo/lease' do
+    before do
+      class ModelWithPersistence < ActiveFedora::Base
+        include Hydra::AccessControls::Embargoable
+      end
+    end
+    after { Object.send(:remove_const, :ModelWithPersistence) }
+    let(:original_date) { 7.days.from_now }
+    let(:updated_date) { 14.days.from_now }
+    subject { ModelWithPersistence.new }
+    context 'saved with a new embargo release date' do
+      it 'will persist the new date' do
+        subject.visibility_during_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        subject.visibility_after_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        subject.embargo_release_date = original_date
+        subject.save
+
+        # These next three lines are to verify the round-trip for saves.
+        persisted_object = subject.class.find(subject.id)
+        expect(persisted_object).to be_under_embargo
+        expect(persisted_object.embargo_release_date).to eq(original_date)
+
+        expect do
+          persisted_object.embargo_release_date = updated_date
+          persisted_object.save
+        end.to change { persisted_object.class.find(persisted_object.id).embargo_release_date }
+                 .from(original_date)
+                 .to(updated_date)
+      end
+    end
+
+    context 'saved with a new lease expiration date' do
+      it 'will persist the new date' do
+        subject.visibility_during_lease =  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        subject.visibility_after_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        subject.lease_expiration_date = original_date
+        subject.save
+
+        # These next three lines are to verify the round-trip for saves.
+        persisted_object = subject.class.find(subject.id)
+        expect(persisted_object).to be_active_lease
+        expect(persisted_object.lease_expiration_date).to eq(original_date)
+
+        expect do
+          persisted_object.lease_expiration_date = updated_date
+          persisted_object.save
+        end.to change { persisted_object.class.find(persisted_object.id).lease_expiration_date }
+                 .from(original_date)
+                 .to(updated_date)
+      end
+    end
+  end
+
   describe '#embargo_indexer_class' do
     subject { model.embargo_indexer_class }
     it { is_expected.to eq Hydra::AccessControls::EmbargoIndexer }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra