Improve readability of role access list

rubygems · Sep 22, 2024 · c513739 · c513739
1 parent 3374305
commit c513739
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/app/models/ownership.rb b/app/models/ownership.rb
@@ -22,7 +22,7 @@ class Ownership < ApplicationRecord
 
   enum :role, { owner: Access::OWNER, maintainer: Access::MAINTAINER }, validate: true, _default: :owner
 
-  scope :user_with_minimum_role, ->(user, role) { where(user: user, role: Access.flag_for_role(role)..) }
+  scope :user_with_minimum_role, ->(user, role) { where(user: user, role: Access.with_minimum_role(role)) }
 
   def self.by_indexed_gem_name
     select("ownerships.*, rubygems.name")

diff --git a/lib/access.rb b/lib/access.rb
@@ -15,6 +15,10 @@ def self.flag_for_role(role)
     ROLES.fetch(role)
   end
 
+  def self.with_minimum_role(role)
+    Range.new(flag_for_role(role), nil)
+  end
+
   def self.role_for_flag(flag)
     ROLES.key(flag)&.inquiry.tap do |role|
       raise ArgumentError, "Unknown role flag: #{flag}" if role.blank?

diff --git a/test/lib/access_test.rb b/test/lib/access_test.rb
@@ -28,4 +28,13 @@ class AccessTest < ActiveSupport::TestCase
       end
     end
   end
+
+  context ".with_minimum_role" do
+    should "return the range of roles for a given permission flag" do
+      assert_equal Range.new(Access::OWNER, nil), Access.with_minimum_role("owner")
+      refute_includes Access.with_minimum_role("owner"), Access::MAINTAINER
+      assert_includes Access.with_minimum_role("owner"), Access::OWNER
+      assert_includes Access.with_minimum_role("owner"), Access::ADMIN
+    end
+  end
 end