hydra-access-controls 12.1.0 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d746a886953c496a8dc25145ca468473f24988db6d2aeabe191b3001a7570b3e
-  data.tar.gz: 2b3d9f45bef0f184f735c16cfeb5ca8155ca5f6328d9e241c0065375d732b2f2
+  metadata.gz: 5ff7d89f80e476ffc0fb19c5149d560b680c1ab197a43a21dc240f4368c029a0
+  data.tar.gz: 41c6476c6f4f56ac92b4572d3c6c698e667c9802bcd11bed90b28d2f80b10a6d
 SHA512:
-  metadata.gz: 476fc32fd3f1b0accceb8e5c67f14a15d057dc3be62ca483af84b0174f068e68a282dcab5ecdfa9854130650b9ab2743ce30bb53a71c037cb907ad7aab5a38c5
-  data.tar.gz: 6340762ebeb31c19aeb67d185a0da530f0b57394bb7e982a9f19f2cd1c24fd1402df769b1ef1c1c2690b8c3458679ee9b6dafe9074a61efff471e3a90923be09
+  metadata.gz: d1c18d26af1a1cdbac16fb34bc0bd38b2a56d6599b3a4a5e5447a19b374a2aaac779b10d13f09aae9da17c14bc633e13b3f79e0161ac10fa43808c03f7aa0e16
+  data.tar.gz: 328e34ff6d1429bf05c116717794df6acd8bb1d5e43bdc41f190fc231ade9f162fd0fd87a2e469f9664d12f2be45bbb9a2d2de1b9602fc2af46135b197c1e464

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

@@ -8,69 +8,75 @@ module Hydra::AccessControls
       define_attribute_methods :visibility
       # instance variable needs to be initialized here based upon what is in read_groups
       after_initialize { @visibility = visibility }
+      # Starting in Rails 7.2, define_attribute_methods creates a module that overrides accessor methods
+      # defined in this module.  In order for the methods in this module to take precedence over those
+      # they need to be defined in a submodule and included after running define_attribute_methods.
+      include InstanceMethods
     end
 
-    def visibility=(value)
-      return if value.nil?
-      # only set explicit permissions
-      case value
-      when AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        public_visibility!
-      when AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        registered_visibility!
-      when AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        private_visibility!
-      else
-        raise ArgumentError, "Invalid visibility: #{value.inspect}"
+    module InstanceMethods
+      def visibility=(value)
+        return if value.nil?
+        # only set explicit permissions
+        case value
+        when AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+          public_visibility!
+        when AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          registered_visibility!
+        when AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+          private_visibility!
+        else
+          raise ArgumentError, "Invalid visibility: #{value.inspect}"
+        end
+        @visibility = value
       end
-      @visibility = value
-    end
 
-    def visibility
-      if read_groups.include? AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
-        AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-      elsif read_groups.include? AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
-        AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-      else
-        AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      def visibility
+        if read_groups.include? AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
+          AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        elsif read_groups.include? AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
+          AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        else
+          AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        end
       end
-    end
 
-    # Overridden for ActiveModel::Dirty tracking of visibility
-    # Required by ActiveModel::AttributeMethods
-    # @see https://api.rubyonrails.org/classes/ActiveModel/AttributeMethods.html
-    # An instance variable is used to avoid infinite recursion caused by calling #visibility
-    # Using this approach requires setting visibility read groups through #visibility=
-    # instead of manipulating them directly if #visibility_changed? is expected to work correctly.
-    def attributes
-      super.merge({ 'visibility' => @visibility })
-    end
+      # Overridden for ActiveModel::Dirty tracking of visibility
+      # Required by ActiveModel::AttributeMethods
+      # @see https://api.rubyonrails.org/classes/ActiveModel/AttributeMethods.html
+      # An instance variable is used to avoid infinite recursion caused by calling #visibility
+      # Using this approach requires setting visibility read groups through #visibility=
+      # instead of manipulating them directly if #visibility_changed? is expected to work correctly.
+      def attributes
+        super.merge({ 'visibility' => @visibility })
+      end
 
-    private
+      private
 
-      # Override represented_visibility if you want to add another visibility that is
-      # represented as a read group (e.g. on-campus)
-      # @return [Array] a list of visibility types that are represented as read groups
-      def represented_visibility
-        [AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED,
-         AccessRight::PERMISSION_TEXT_VALUE_PUBLIC]
-      end
+        # Override represented_visibility if you want to add another visibility that is
+        # represented as a read group (e.g. on-campus)
+        # @return [Array] a list of visibility types that are represented as read groups
+        def represented_visibility
+          [AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED,
+           AccessRight::PERMISSION_TEXT_VALUE_PUBLIC]
+        end
 
-      def public_visibility!
-        visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        remove_groups = represented_visibility - [AccessRight::PERMISSION_TEXT_VALUE_PUBLIC]
-        set_read_groups([AccessRight::PERMISSION_TEXT_VALUE_PUBLIC], remove_groups)
-      end
+        def public_visibility!
+          visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+          remove_groups = represented_visibility - [AccessRight::PERMISSION_TEXT_VALUE_PUBLIC]
+          set_read_groups([AccessRight::PERMISSION_TEXT_VALUE_PUBLIC], remove_groups)
+        end
 
-      def registered_visibility!
-        visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        remove_groups = represented_visibility - [AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED]
-        set_read_groups([AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED], remove_groups)
-      end
+        def registered_visibility!
+          visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          remove_groups = represented_visibility - [AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED]
+          set_read_groups([AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED], remove_groups)
+        end
 
-      def private_visibility!
-        visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        set_read_groups([], represented_visibility)
-      end
+        def private_visibility!
+          visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+          set_read_groups([], represented_visibility)
+        end
+    end
   end
 end

data/hydra-access-controls.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |gem|
   gem.license       = "APACHE-2.0"
   gem.metadata      = { "rubygems_mfa_required" => "true" }
 
-  gem.required_ruby_version = '>= 2.4'
+  gem.required_ruby_version = '>= 3.1'
 
-  gem.add_dependency 'activesupport', '>= 5.2', '< 7.1'
+  gem.add_dependency 'activesupport', '>= 6.1', '< 8.0'
   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-access-controls.rb

@@ -7,7 +7,6 @@ require 'blacklight-access_controls'
 
 module Hydra
   extend ActiveSupport::Autoload
-  autoload :AccessControls
   autoload :User
   autoload :AccessControlsEnforcement
   autoload :PolicyAwareAccessControlsEnforcement

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 13.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,6 @@ files:
 - app/indexers/hydra/access_controls/embargo_indexer.rb
 - app/indexers/hydra/access_controls/lease_indexer.rb
 - app/models/ability.rb
-- app/models/concerns/hydra/access_controls.rb
 - app/models/concerns/hydra/access_controls/access_right.rb
 - app/models/concerns/hydra/access_controls/embargoable.rb
 - app/models/concerns/hydra/access_controls/permissions.rb
@@ -217,14 +216,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Access controls for project hydra

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

@@ -1,10 +0,0 @@
-module Hydra
-  module AccessControls
-    extend ActiveSupport::Autoload
-    autoload :AccessRight
-    autoload :WithAccessRight
-    autoload :Embargoable
-    autoload :Visibility
-    autoload :Permissions
-  end
-end