hydra-access-controls 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ffdb463944fbf90c1e1b894dd1f25d4be83e18c1ae1ec3b2393a1c411a0528
-  data.tar.gz: 16207bb58ca3f13b1a3f7ceb2c1154a73c144f4494ed5c5286e39964417124af
+  metadata.gz: 07efef2c0eade2fd801ec1991064ba1c91a1c908c4246fc9616b3505db65a11d
+  data.tar.gz: 713ac1e13a8e0145e4a695d5d7d57b1e9c43ebfd6772f63ecdee5a90dbe9586e
 SHA512:
-  metadata.gz: 6e0161b3d4ca854caf3de3d69f91968c3343cc58d9a7096fb6cac0d2cbdb0e0a643d8a3577dc1b57f48ee00713740a2192b12226e435102b8fae28194c42dc38
-  data.tar.gz: 0ebcc1b9551e20431cc7520cdac61da660b04e3618df6c7856f359e51d52e66f10ab07588faa44a482d097b60687e78b8e3c374e2739936ce704f1da321097e8
+  metadata.gz: b3f13844c5831ffffcb8f547390c2d53f5911d8270ef1315f78a83f6d31e1b5d5074b88211790440f63c0a02e76eaa619ec97eb19350622876473249762e81cb
+  data.tar.gz: e84d27c37c4744c92c6ca0114ddb303143706f6a617d057e252b7c433855552d07a55b43a43cf68bf3f3fb9debcf4cd622ce9c4170b8da7ae308892a5af5a6d9

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

@@ -11,7 +11,7 @@ module Hydra::AccessControls
     end
 
     def active?
-      (embargo_release_date.present? && Date.today < embargo_release_date)
+      (embargo_release_date.present? && Date.yesterday.end_of_day < embargo_release_date)
     end
 
     # Deactivates the embargo and logs a message to the embargo_history property

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

@@ -11,7 +11,7 @@ module Hydra::AccessControls
     end
 
     def active?
-      lease_expiration_date.present? && Date.today < lease_expiration_date
+      (lease_expiration_date.present? && Date.today.end_of_day < lease_expiration_date)
     end
 
     def deactivate!

data/hydra-access-controls.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 3.1'
 
-  gem.add_dependency 'activesupport', '>= 6.1', '< 8.1'
+  gem.add_dependency 'activesupport', '>= 6.1', '< 9'
   gem.add_dependency 'active-fedora', '>= 10.0.0'
   gem.add_dependency 'blacklight-access_controls', '~> 6.0'
   gem.add_dependency 'cancancan', '>= 1.8', '< 4'

data/spec/unit/embargo_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+describe Hydra::AccessControls::Embargo do
+  let(:embargo) { described_class.new }
+
+  describe '#active?' do
+    context 'when embargo_release_date is not present' do
+      it 'returns false' do
+        embargo.embargo_release_date = nil
+        expect(embargo.active?).to be false
+      end
+    end
+
+    context 'when embargo_release_date is present' do
+      context 'with a future date' do
+        it 'returns true' do
+          embargo.embargo_release_date = 1.day.from_now
+          expect(embargo.active?).to be true
+        end
+      end
+
+      context 'with a past date' do
+        it 'returns false' do
+          embargo.embargo_release_date = 2.days.ago
+          expect(embargo.active?).to be false
+        end
+      end
+
+      context 'with today\'s date' do
+        it 'returns true when set to today at end of day' do
+          embargo.embargo_release_date = Date.today.end_of_day
+          expect(embargo.active?).to be true
+        end
+
+        it 'returns true when set to today at beginning of day' do
+          embargo.embargo_release_date = Date.today.beginning_of_day
+          expect(embargo.active?).to be true
+        end
+
+        it 'returns true when set to today at noon' do
+          embargo.embargo_release_date = Date.today.noon
+          expect(embargo.active?).to be true
+        end
+      end
+
+      context 'with yesterday\'s date' do
+        it 'returns false when set to yesterday at end of day' do
+          embargo.embargo_release_date = Date.yesterday.end_of_day
+          expect(embargo.active?).to be false
+        end
+
+        it 'returns false when set to yesterday at beginning of day' do
+          embargo.embargo_release_date = Date.yesterday.beginning_of_day
+          expect(embargo.active?).to be false
+        end
+      end
+
+      context 'edge case: exactly at the boundary' do
+        it 'returns false when release date equals yesterday end_of_day' do
+          boundary_time = Date.yesterday.end_of_day
+          embargo.embargo_release_date = boundary_time
+          expect(embargo.active?).to be false
+        end
+
+        it 'returns true when release date is one second after yesterday end_of_day' do
+          boundary_time = Date.yesterday.end_of_day + 1.second
+          embargo.embargo_release_date = boundary_time
+          expect(embargo.active?).to be true
+        end
+      end
+    end
+  end
+
+  describe '#deactivate!' do
+    context 'when embargo is active' do
+      before do
+        embargo.embargo_release_date = 1.day.from_now
+        embargo.visibility_during_embargo = 'private'
+        embargo.visibility_after_embargo = 'public'
+      end
+
+      it 'clears embargo fields and logs history' do
+        expect(embargo.active?).to be true
+        embargo.deactivate!
+
+        expect(embargo.embargo_release_date).to be_nil
+        expect(embargo.visibility_during_embargo).to be_nil
+        expect(embargo.visibility_after_embargo).to be_nil
+        expect(embargo.embargo_history).to include(a_string_matching(/active embargo was deactivated/))
+      end
+    end
+
+    context 'when embargo is expired' do
+      before do
+        embargo.embargo_release_date = 1.day.ago
+        embargo.visibility_during_embargo = 'private'
+        embargo.visibility_after_embargo = 'public'
+      end
+
+      it 'clears embargo fields and logs history' do
+        expect(embargo.active?).to be false
+        embargo.deactivate!
+
+        expect(embargo.embargo_release_date).to be_nil
+        expect(embargo.visibility_during_embargo).to be_nil
+        expect(embargo.visibility_after_embargo).to be_nil
+        expect(embargo.embargo_history).to include(a_string_matching(/expired embargo was deactivated/))
+      end
+    end
+
+    context 'when no embargo is set' do
+      it 'does nothing' do
+        embargo.embargo_release_date = nil
+        embargo.deactivate!
+        expect(embargo.embargo_history).to be_empty
+      end
+    end
+  end
+end

data/spec/unit/lease_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+describe Hydra::AccessControls::Lease do
+  let(:lease) { described_class.new }
+
+  describe '#active?' do
+    context 'when lease_expiration_date is not present' do
+      it 'returns false' do
+        lease.lease_expiration_date = nil
+        expect(lease.active?).to be false
+      end
+    end
+
+    context 'when lease_expiration_date is present' do
+      context 'with a future date' do
+        it 'returns true' do
+          lease.lease_expiration_date = 1.day.from_now
+          expect(lease.active?).to be true
+        end
+      end
+
+      context 'with a past date' do
+        it 'returns false' do
+          lease.lease_expiration_date = 2.days.ago
+          expect(lease.active?).to be false
+        end
+      end
+
+      context 'with today\'s date' do
+        it 'returns false when set to today at end of day' do
+          lease.lease_expiration_date = Date.today.end_of_day
+          expect(lease.active?).to be false
+        end
+
+        it 'returns false when set to today at beginning of day' do
+          lease.lease_expiration_date = Date.today.beginning_of_day
+          expect(lease.active?).to be false
+        end
+
+        it 'returns false when set to today at noon' do
+          lease.lease_expiration_date = Date.today.noon
+          expect(lease.active?).to be false
+        end
+      end
+
+      context 'with yesterday\'s date' do
+        it 'returns false when set to yesterday at end of day' do
+          lease.lease_expiration_date = Date.yesterday.end_of_day
+          expect(lease.active?).to be false
+        end
+
+        it 'returns false when set to yesterday at beginning of day' do
+          lease.lease_expiration_date = Date.yesterday.beginning_of_day
+          expect(lease.active?).to be false
+        end
+      end
+
+      context 'edge case: exactly at the boundary' do
+        it 'returns false when expiration date equals today end_of_day' do
+          boundary_time = Date.today.end_of_day
+          lease.lease_expiration_date = boundary_time
+          expect(lease.active?).to be false
+        end
+
+        it 'returns true when expiration date is one second after today end_of_day' do
+          boundary_time = Date.today.end_of_day + 1.second
+          lease.lease_expiration_date = boundary_time
+          expect(lease.active?).to be true
+        end
+      end
+    end
+  end
+
+  describe '#deactivate!' do
+    context 'when lease is active' do
+      before do
+        lease.lease_expiration_date = 1.day.from_now
+        lease.visibility_during_lease = 'public'
+        lease.visibility_after_lease = 'private'
+      end
+
+      it 'clears lease fields and logs history' do
+        expect(lease.active?).to be true
+        lease.deactivate!
+
+        expect(lease.lease_expiration_date).to be_nil
+        expect(lease.visibility_during_lease).to be_nil
+        expect(lease.visibility_after_lease).to be_nil
+        expect(lease.lease_history).to include(a_string_matching(/active lease was deactivated/))
+      end
+    end
+
+    context 'when lease is expired' do
+      before do
+        lease.lease_expiration_date = 1.day.ago
+        lease.visibility_during_lease = 'public'
+        lease.visibility_after_lease = 'private'
+      end
+
+      it 'clears lease fields and logs history' do
+        expect(lease.active?).to be false
+        lease.deactivate!
+
+        expect(lease.lease_expiration_date).to be_nil
+        expect(lease.visibility_during_lease).to be_nil
+        expect(lease.visibility_after_lease).to be_nil
+        expect(lease.lease_history).to include(a_string_matching(/expired lease was deactivated/))
+      end
+    end
+
+    context 'when no lease is set' do
+      it 'does nothing' do
+        lease.lease_expiration_date = nil
+        lease.deactivate!
+        expect(lease.lease_history).to be_empty
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -21,7 +21,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -191,8 +191,10 @@ files:
 - spec/unit/admin_policy_spec.rb
 - spec/unit/collection_relationship_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/embargo_spec.rb
 - spec/unit/embargoable_spec.rb
 - spec/unit/ip_base_ability_spec.rb
+- spec/unit/lease_spec.rb
 - spec/unit/permission_spec.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
@@ -246,8 +248,10 @@ test_files:
 - spec/unit/admin_policy_spec.rb
 - spec/unit/collection_relationship_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/embargo_spec.rb
 - spec/unit/embargoable_spec.rb
 - spec/unit/ip_base_ability_spec.rb
+- spec/unit/lease_spec.rb
 - spec/unit/permission_spec.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb