hydra-access-controls 12.0.2 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d315c3651446489e496d13f9f0060aefa00a82b38e166550514b8b151f4aeded
-  data.tar.gz: 9aaa2681fa23b2b942c11e37bb22bf512822008ca164b6c0d04db4ae0b0772a0
+  metadata.gz: d746a886953c496a8dc25145ca468473f24988db6d2aeabe191b3001a7570b3e
+  data.tar.gz: 2b3d9f45bef0f184f735c16cfeb5ca8155ca5f6328d9e241c0065375d732b2f2
 SHA512:
-  metadata.gz: 675a001e6ea4774af0160c465556f868f0c5c3dd5f9c7626e2060e8da4632d8ba7e03c67b7181ddca54cab2bb018ca165a14481f72b5fea63aeaf46a5cb99b0a
-  data.tar.gz: 76fd86a0768bdb9418433b857874178bc67da4fd05b60587083f21fca67ab883653be3319759a8358aec34cd76ce98a650b88153a8cbf40e37be560fc5eb67ad
+  metadata.gz: 476fc32fd3f1b0accceb8e5c67f14a15d057dc3be62ca483af84b0174f068e68a282dcab5ecdfa9854130650b9ab2743ce30bb53a71c037cb907ad7aab5a38c5
+  data.tar.gz: 6340762ebeb31c19aeb67d185a0da530f0b57394bb7e982a9f19f2cd1c24fd1402df769b1ef1c1c2690b8c3458679ee9b6dafe9074a61efff471e3a90923be09

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

@@ -93,7 +93,7 @@ module Hydra
         end
         if visibility != expected_visibility
           failure_message << "visibility should be #{expected_visibility} but it is currently #{visibility}.  Call embargo_visibility! on this object to repair."
-          self.errors[:embargo] << failure_message
+          self.errors.add(:embargo, failure_message)
           return false
         end
         true
@@ -122,7 +122,7 @@ module Hydra
         end
         if visibility != expected_visibility
           failure_message << "visibility should be #{expected_visibility} but it is currently #{visibility}.  Call lease_visibility! on this object to repair."
-          self.errors[:lease] << failure_message
+          self.errors.add(:lease, failure_message)
           return false
         end
         true

data/app/validators/hydra/future_date_validator.rb

@@ -6,13 +6,13 @@ module Hydra
         begin
           if date = value.to_date
             if date <= Date.today
-              record.errors[attribute] << "Must be a future date"
+              record.errors.add(attribute, "Must be a future date")
             end
           else
-            record.errors[attribute] << "Invalid Date Format"
+            record.errors.add(attribute, "Invalid Date Format")
           end
         rescue ArgumentError, NoMethodError
-          record.errors[attribute] << "Invalid Date Format"
+          record.errors.add(attribute, "Invalid Date Format")
         end
       end
     end

data/hydra-access-controls.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = version
   gem.license       = "APACHE-2.0"
+  gem.metadata      = { "rubygems_mfa_required" => "true" }
 
   gem.required_ruby_version = '>= 2.4'
 
-  gem.add_dependency 'activesupport', '>= 5.2', '< 7'
+  gem.add_dependency 'activesupport', '>= 5.2', '< 7.1'
   gem.add_dependency 'active-fedora', '>= 10.0.0'
   gem.add_dependency 'blacklight-access_controls', '~> 6.0'
   gem.add_dependency 'cancancan', '>= 1.8', '< 4'

data/lib/hydra/ip_based_groups.rb

@@ -38,12 +38,16 @@ module Hydra
 
         file = File.join(Rails.root, filename)
 
-        unless File.exists?(file)
+        unless File.exist?(file)
           raise "ip-range configuration file not found. Expected: #{file}."
         end
 
         begin
-          yml = YAML::load_file(file)
+          yml = if Psych::VERSION > '4.0'
+            YAML.safe_load(File.read(file), aliases: true)
+          else
+            YAML.safe_load(File.read(file), [], [], true)
+          end
         rescue
           raise("#{filename} was found, but could not be parsed.\n")
         end

data/lib/hydra/role_mapper_behavior.rb

@@ -56,7 +56,7 @@ module Hydra::RoleMapperBehavior
         filename = 'config/role_map.yml'
         file = File.join(Rails.root, filename)
 
-        unless File.exists?(file)
+        unless File.exist?(file)
           raise "You are missing a role map configuration file: #{filename}. Have you run \"rails generate hydra:head\"?"
         end
 
@@ -67,7 +67,11 @@ module Hydra::RoleMapperBehavior
         end
 
         begin
-          yml = YAML::load(erb)
+	  yml = if Psych::VERSION > '4.0'
+	    YAML.safe_load(erb, aliases: true)
+	  else
+	    YAML.safe_load(erb, [], [], true)
+	  end
         rescue
           raise("#{filename} was found, but could not be parsed.\n")
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 12.0.2
+  version: 12.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -21,7 +21,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,8 @@ files:
 homepage: https://github.com/samvera/hydra-head/tree/master/hydra-access-controls
 licenses:
 - APACHE-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Access controls for project hydra