RubyGems - hydra-access-controls - Versions diffs - 12.1.0 → 13.1.0 - Mend

hydra-access-controls 12.1.0 → 13.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/app/models/concerns/hydra/access_controls/visibility.rb +59 -53
data/hydra-access-controls.gemspec +3 -3
data/lib/hydra-access-controls.rb +0 -1
metadata +12 -13
data/app/models/concerns/hydra/access_controls.rb +0 -10

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d746a886953c496a8dc25145ca468473f24988db6d2aeabe191b3001a7570b3e
-  data.tar.gz: 2b3d9f45bef0f184f735c16cfeb5ca8155ca5f6328d9e241c0065375d732b2f2
+  metadata.gz: b9ffdb463944fbf90c1e1b894dd1f25d4be83e18c1ae1ec3b2393a1c411a0528
+  data.tar.gz: 16207bb58ca3f13b1a3f7ceb2c1154a73c144f4494ed5c5286e39964417124af
 SHA512:
-  metadata.gz: 476fc32fd3f1b0accceb8e5c67f14a15d057dc3be62ca483af84b0174f068e68a282dcab5ecdfa9854130650b9ab2743ce30bb53a71c037cb907ad7aab5a38c5
-  data.tar.gz: 6340762ebeb31c19aeb67d185a0da530f0b57394bb7e982a9f19f2cd1c24fd1402df769b1ef1c1c2690b8c3458679ee9b6dafe9074a61efff471e3a90923be09
+  metadata.gz: 6e0161b3d4ca854caf3de3d69f91968c3343cc58d9a7096fb6cac0d2cbdb0e0a643d8a3577dc1b57f48ee00713740a2192b12226e435102b8fae28194c42dc38
+  data.tar.gz: 0ebcc1b9551e20431cc7520cdac61da660b04e3618df6c7856f359e51d52e66f10ab07588faa44a482d097b60687e78b8e3c374e2739936ce704f1da321097e8

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

@@ -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 CHANGED Viewed

@@ -17,14 +17,14 @@ 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.1'
   gem.add_dependency 'active-fedora', '>= 10.0.0'
   gem.add_dependency 'blacklight-access_controls', '~> 6.0'
   gem.add_dependency 'cancancan', '>= 1.8', '< 4'
   gem.add_dependency 'deprecation', '~> 1.0'
   gem.add_development_dependency 'rake', '>= 12.3.3'
-  gem.add_development_dependency 'rspec', '~> 4.0'
+  gem.add_development_dependency 'rspec'
 end

data/lib/hydra-access-controls.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 13.1.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: 2025-05-23 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.1'
   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.1'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 description: Access controls for project hydra
 email:
 - hydra-tech@googlegroups.com
@@ -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 DELETED Viewed

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