hydra-access-controls 10.6.2 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59c85b9ad05b984f2c51a16b14fea58931a6d63f9b34e2b632869b7d96f8eea5
-  data.tar.gz: f2b1c0daa69c0afee47b4065eaff8507326cadfbce996ad338554760a827015c
+  metadata.gz: e4b22da24ea67d1fdb58bfce4044fa0d7c7167640bd7fb7c89bce988e0571595
+  data.tar.gz: 6adce22a2c6036385cd97550dfb51e11e23eea2b72b11076fcd0e54bb96f0ee6
 SHA512:
-  metadata.gz: '018366d44ecf5c886e36da31dd5a61ebb7c38b2156ecf2f60c59b0c767fb206b56b4b7fae547538d75fdb16748df4718b8f657ddd01389c489cd05d821216c6f'
-  data.tar.gz: d61093876bcebebb316f74aa0bebe9eee6d9349c017c45ea9c61a4a4b02ffde9578a12404973a4299d5e4b6d618e210fa2356574bd2306e71e1917f0c21205cc
+  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/app/models/hydra/access_control.rb

@@ -31,11 +31,11 @@ module Hydra
             obj.update(attributes.except(:id, '_destroy'))
           end
         else
-          relationship.create(attributes)
+          relationship.build(attributes)
         end
       end
       # Poison the cache
-      relationship.reset if any_destroyed
+      save! && relationship.reset if any_destroyed
     end
 
     def relationship

data/hydra-access-controls.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["hydra-tech@googlegroups.com"]
   gem.description   = %q{Access controls for project hydra}
   gem.summary       = %q{Access controls for project hydra}
-  gem.homepage      = "http://projecthydra.org"
+  gem.homepage      = "https://github.com/samvera/hydra-head/tree/master/hydra-access-controls"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -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', '< 13'
+  gem.add_dependency "active-fedora", '>= 10.0.0'
   gem.add_dependency "blacklight", '>= 5.16'
   gem.add_dependency "blacklight-access_controls", '~> 0.6.0'
   gem.add_dependency 'cancancan', '~> 1.8'

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ Hydra::Engine.config.autoload_paths.each { |path| $LOAD_PATH.unshift path }
 require 'byebug' unless ENV['CI']
 
 def coverage_needed?
-  ENV['COVERAGE'] || ENV['TRAVIS']
+  ENV['COVERAGE'] || ENV['CI']
 end
 
 if RUBY_VERSION =~ /^1.9/ && coverage_needed?

data/spec/unit/accessible_by_spec.rb

@@ -23,7 +23,7 @@ describe "active_fedora/accessible_by" do
 
   describe "#accsesible_by" do
     it "should return objects readable by the ability" do
-      expect(ModsAsset.accessible_by(ability)).to eq [public_obj, editable_obj]
+      expect(ModsAsset.accessible_by(ability)).to contain_exactly(public_obj, editable_obj)
     end
     it "should return object editable by the ability" do
       expect(ModsAsset.accessible_by(ability, :edit)).to eq [editable_obj]

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 }

data/tasks/hydra-access-controls.rake

@@ -6,7 +6,7 @@ namespace "hydra-access" do
     fcrepo_params = { port: 8986, verbose: true, managed: true,
                       no_jms: true, fcrepo_home_dir: 'fcrepo4-test-data' }
     SolrWrapper.wrap(solr_params) do |solr|
-      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")) do
+      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "conf")) do
         FcrepoWrapper.wrap(fcrepo_params) do
           Rake::Task['spec'].invoke
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.6.2
+  version: 11.0.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,9 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +211,7 @@ files:
 - spec/unit/with_depositor_spec.rb
 - spec/validators/future_date_validator_spec.rb
 - tasks/hydra-access-controls.rake
-homepage: http://projecthydra.org
+homepage: https://github.com/samvera/hydra-head/tree/master/hydra-access-controls
 licenses:
 - APACHE-2.0
 metadata: {}
@@ -236,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra