rabarber 3.0.2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 577541d4928a55318bf4358aab22e46b094b873172c78ab3a5cdcd5c48e2fd1f
-  data.tar.gz: 8705e8907a36e9cc811784c951011b448fe37ec5cd5a63b70d263589af035164
+  metadata.gz: 44b43bb0c28c871575c4e723415cd3df577a2fa715b07178c4a8a21102183791
+  data.tar.gz: 7cf707c61a560d271345162834a0557f51519a0fbfe9d1e81eb3d74cfb401cff
 SHA512:
-  metadata.gz: b35a496964096d6ce0538f2d84d43786c86fb367b03afa1a8604cd9e9225f015266fb2d94c4df01513c07cbb1e639851f858fb12bcded98646718a586218fd8a
-  data.tar.gz: 8bab47c3abf70362eecd13237eca64db16c3b7a0bae06334efe8c7ba3e0f1cb48b39a1c443ce5456957ef643c7256693a8ac0e0d2ecbabb3b701463a00120dc9
+  metadata.gz: '09d9897bdd2df705e37bf9800a10f30904b102d8d33773e35cec4ed0c7ceebeca78fc47ce038cc6b617f698ee89cebc7d34da7d0cd3ef67685cc2d61ed022ebb'
+  data.tar.gz: 610d8700782cc500bfa83d62de0816c2b6253f6fcb42d5c233213675da9e4c7d9b0b7e9b07287514d48cae68b0cc56440cb0e225147487f2f15d02ea5a8e7aab

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## v4.0.1
+
+### Bugs:
+
+- Resolved an issue preventing the gem from being used with rbs_rails
+
+## v4.0.0
+
+### Breaking:
+
+- Dropped support for Ruby 3.0
+- Dropped support for Rails 6.1
+
+### Misc:
+
+- Added support for Rails 8.0
+
 ## v3.0.2
 
 ### Misc:

data/lib/rabarber/audit/events/base.rb

@@ -38,8 +38,8 @@ module Rabarber
         def human_context
           case context
           in { context_type: nil, context_id: nil } then "Global"
-          in { context_type: context_type, context_id: nil } then context_type
-          in { context_type: context_type, context_id: context_id } then "#{context_type}##{context_id}"
+          in { context_type:, context_id: nil } then context_type
+          in { context_type:, context_id: } then "#{context_type}##{context_id}"
           else raise "Unexpected context: #{context}"
           end
         end

data/lib/rabarber/core/roleable.rb

@@ -10,7 +10,7 @@ module Rabarber
       end
 
       def roleable_roles(context: nil)
-        roleable.roles(context: context)
+        roleable.roles(context:)
       end
     end
   end

data/lib/rabarber/helpers/helpers.rb

@@ -5,11 +5,11 @@ module Rabarber
     include Rabarber::Core::Roleable
 
     def visible_to(*roles, context: nil, &block)
-      capture(&block) if roleable.has_role?(*roles, context: context)
+      capture(&block) if roleable.has_role?(*roles, context:)
     end
 
     def hidden_from(*roles, context: nil, &block)
-      capture(&block) unless roleable.has_role?(*roles, context: context)
+      capture(&block) unless roleable.has_role?(*roles, context:)
     end
   end
 end

data/lib/rabarber/models/concerns/has_roles.rb

@@ -85,7 +85,7 @@ module Rabarber
     private
 
     def create_new_roles(role_names, context:)
-      new_roles = role_names - Rabarber::Role.names(context: context)
+      new_roles = role_names - Rabarber::Role.names(context:)
       new_roles.each { |role_name| Rabarber::Role.create!(name: role_name, **context) }
     end
 
@@ -98,7 +98,7 @@ module Rabarber
     end
 
     def delete_roleable_cache(context:)
-      Rabarber::Core::Cache.delete(roleable_id, context: context)
+      Rabarber::Core::Cache.delete(roleable_id, context:)
     end
 
     def roleable_id

data/lib/rabarber/models/role.rb

@@ -9,7 +9,7 @@ module Rabarber
                      format: { with: Rabarber::Input::Role::REGEX },
                      strict: true
 
-    has_and_belongs_to_many :roleables, join_table: "rabarber_roles_roleables"
+    before_destroy :delete_assignments
 
     class << self
       def names(context: nil)
@@ -20,9 +20,9 @@ module Rabarber
         name = process_role_name(name)
         processed_context = process_context(context)
 
-        return false if exists?(name: name, **processed_context)
+        return false if exists?(name:, **processed_context)
 
-        !!create!(name: name, **processed_context)
+        !!create!(name:, **processed_context)
       end
 
       def rename(old_name, new_name, context: nil, force: false)
@@ -30,11 +30,11 @@ module Rabarber
         role = find_by(name: process_role_name(old_name), **processed_context)
         name = process_role_name(new_name)
 
-        return false if !role || exists?(name: name, **processed_context) || assigned_to_roleables(role).any? && !force
+        return false if !role || exists?(name:, **processed_context) || assigned_to_roleables(role).any? && !force
 
         delete_roleables_cache(role, context: processed_context)
 
-        role.update!(name: name)
+        role.update!(name:)
       end
 
       def remove(name, context: nil, force: false)
@@ -57,7 +57,7 @@ module Rabarber
       private
 
       def delete_roleables_cache(role, context:)
-        Rabarber::Core::Cache.delete(*assigned_to_roleables(role), context: context)
+        Rabarber::Core::Cache.delete(*assigned_to_roleables(role), context:)
       end
 
       def assigned_to_roleables(role)
@@ -76,5 +76,15 @@ module Rabarber
         Rabarber::Input::Context.new(context).process
       end
     end
+
+    private
+
+    def delete_assignments
+      ActiveRecord::Base.connection.execute(
+        ActiveRecord::Base.sanitize_sql(
+          ["DELETE FROM rabarber_roles_roleables WHERE role_id = ?", id]
+        )
+      )
+    end
   end
 end

data/lib/rabarber/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabarber
-  VERSION = "3.0.2"
+  VERSION = "4.0.1"
 end

data/rabarber.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.metadata["rubygems_mfa_required"] = "true"
   spec.summary = "Simple role-based authorization library for Ruby on Rails"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0", "< 3.4"
+  spec.required_ruby_version = ">= 3.1", "< 3.4"
 
   spec.files = [
     "rabarber.gemspec", "README.md", "CHANGELOG.md", "LICENSE.txt"
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 6.1", "< 7.3"
+  spec.add_dependency "rails", ">= 7.0", "< 8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.1
 platform: ruby
 authors:
 - enjaku4
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
 description:
 email:
 - rabarber_gem@icloud.com
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: '3.4'
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Simple role-based authorization library for Ruby on Rails