rabarber 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83c97e518621ea7749eab381d5e1e4f84785c8197036e923220fa0d29fcc43e
-  data.tar.gz: 9fe75afecf6c3066c0cbf779ffdf79a2e67716a8acdc0f15c72e85008528f5ab
+  metadata.gz: 2df45030b2e771a3825eb72a544575fce977253f77ce26673f65372c9d03c06e
+  data.tar.gz: 3538bc9bc309f5715cdf25426d21b9353be873b2e7c25bc135403b4382342678
 SHA512:
-  metadata.gz: 407ed9c374cbe8dafd964aa939f342d47a307bd101e2932bf8ae12c526f48a75524df6eb6f6f35a6a3fb4a023f7db5e50a7c04b580f56fde06ccfcc09f431df8
-  data.tar.gz: 4cfcde7d7b6ed23faff8d0e6f8f036c641ecf6dfb18e1b075dbdfd6aaa5f8391dfdf13ea7e25b70b7881489fc3b292791f663c6c70b1a32a634e7caf681a2355
+  metadata.gz: 50a7e4d76a49010af472916c1dfea7fd59bfc882ca67f1fd1a3742f2357e112d8fab112a75af6baf404fc02155128f928c3637ca1d7e9c71ecc238bdbe648b62
+  data.tar.gz: f020edd72b93678b25761df692bd3b1d361ec9caad9872952d8df79f4e21948ca46e20de2e1dbe41270a8a26d989d7394b79000429d086923dc94b1173b3a166

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+- Allow to use strings as role names
+
 ## 1.0.3
 
 - Enhance clarity by improving error types and messages

data/lib/rabarber/configuration.rb

@@ -21,19 +21,21 @@ module Rabarber
     end
 
     def current_user_method=(method_name)
-      raise ConfigurationError, "current_user_method must be a symbol" unless method_name.is_a?(Symbol)
+      unless (method_name.is_a?(Symbol) || method_name.is_a?(String)) && method_name.present?
+        raise ConfigurationError, "Configuration 'current_user_method' must be a Symbol or a String"
+      end
 
       @current_user_method = method_name.to_sym
     end
 
     def must_have_roles=(value)
-      raise ConfigurationError, "must_have_roles must be a boolean" unless [true, false].include?(value)
+      raise ConfigurationError, "Configuration 'must_have_roles' must be a Boolean" unless [true, false].include?(value)
 
       @must_have_roles = value
     end
 
     def when_unauthorized=(callable)
-      raise ConfigurationError, "when_unauthorized must be a proc" unless callable.is_a?(Proc)
+      raise ConfigurationError, "Configuration 'when_unauthorized' must be a Proc" unless callable.is_a?(Proc)
 
       @when_unauthorized = callable
     end

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

@@ -19,36 +19,23 @@ module Rabarber
     end
 
     def has_role?(*role_names)
-      validate_role_names(role_names)
-
-      (roles & role_names).any?
+      (roles & RoleNames.pre_process(role_names)).any?
     end
 
     def assign_roles(*role_names, create_new: true)
-      validate_role_names(role_names)
+      roles_to_assign = RoleNames.pre_process(role_names)
 
-      create_new_roles(role_names) if create_new
+      create_new_roles(roles_to_assign) if create_new
 
-      rabarber_roles << Role.where(name: role_names) - rabarber_roles
+      rabarber_roles << Role.where(name: roles_to_assign) - rabarber_roles
     end
 
     def revoke_roles(*role_names)
-      validate_role_names(role_names)
-
-      self.rabarber_roles = rabarber_roles - Role.where(name: role_names)
+      self.rabarber_roles = rabarber_roles - Role.where(name: RoleNames.pre_process(role_names))
     end
 
     private
 
-    def validate_role_names(role_names)
-      return if role_names.all? { |role_name| role_name.is_a?(Symbol) && role_name.to_s.match?(Role::NAME_REGEX) }
-
-      raise(
-        InvalidArgumentError,
-        "Role names must be symbols and may only contain lowercase letters, numbers and underscores"
-      )
-    end
-
     def create_new_roles(role_names)
       new_roles = role_names - Role.names
       new_roles.each { |role_name| Role.create!(name: role_name) }

data/lib/rabarber/models/role.rb

@@ -4,9 +4,7 @@ module Rabarber
   class Role < ActiveRecord::Base
     self.table_name = "rabarber_roles"
 
-    NAME_REGEX = /\A[a-z0-9_]+\z/
-
-    validates :name, presence: true, uniqueness: true, format: { with: NAME_REGEX }
+    validates :name, presence: true, uniqueness: true, format: { with: RoleNames::REGEX }
 
     def self.names
       pluck(:name).map(&:to_sym)

data/lib/rabarber/role_names.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Rabarber
+  module RoleNames
+    module_function
+
+    REGEX = /\A[a-z0-9_]+\z/
+
+    def pre_process(role_names)
+      return role_names.map(&:to_sym) if role_names.all? do |role_name|
+        (role_name.is_a?(Symbol) || role_name.is_a?(String)) && role_name.to_s.match?(REGEX)
+      end
+
+      raise(
+        InvalidArgumentError,
+        "Role names must be Symbols or Strings and may only contain lowercase letters, numbers and underscores"
+      )
+    end
+  end
+end

data/lib/rabarber/rule.rb

@@ -5,9 +5,9 @@ module Rabarber
     attr_reader :action, :roles, :custom
 
     def initialize(action, roles, custom)
-      @action = validate_action(action)
-      @roles = validate_roles(roles)
-      @custom = validate_custom_rule(custom)
+      @action = pre_process_action(action)
+      @roles = RoleNames.pre_process(Array(roles))
+      @custom = pre_process_custom_rule(custom)
     end
 
     def verify_access(user_roles, custom_rule_receiver, action_name = nil)
@@ -38,29 +38,18 @@ module Rabarber
       end
     end
 
-    def validate_action(action)
-      return action if action.nil? || action.is_a?(Symbol)
+    def pre_process_action(action)
+      return action.to_sym if (action.is_a?(String) || action.is_a?(Symbol)) && action.present?
+      return action if action.nil?
 
-      raise InvalidArgumentError, "Action name must be a symbol"
+      raise InvalidArgumentError, "Action name must be a Symbol or a String"
     end
 
-    def validate_roles(roles)
-      roles_array = Array(roles)
+    def pre_process_custom_rule(custom)
+      return custom.to_sym if (custom.is_a?(String) || custom.is_a?(Symbol)) && action.present?
+      return custom if custom.nil? || custom.is_a?(Proc)
 
-      return roles_array if roles_array.empty? || roles_array.all? do |role|
-        role.is_a?(Symbol) && role.match?(Role::NAME_REGEX)
-      end
-
-      raise(
-        InvalidArgumentError,
-        "Role names must be symbols and may only contain lowercase letters, numbers and underscores"
-      )
-    end
-
-    def validate_custom_rule(custom)
-      return custom if custom.nil? || custom.is_a?(Symbol) || custom.is_a?(Proc)
-
-      raise InvalidArgumentError, "Custom rule must be a symbol or a proc"
+      raise InvalidArgumentError, "Custom rule must be a Symbol, a String, or a Proc"
     end
   end
 end

data/lib/rabarber/version.rb

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

data/lib/rabarber.rb

@@ -6,13 +6,12 @@ require_relative "rabarber/configuration"
 require "active_record"
 require "active_support"
 
-require_relative "rabarber/controllers/concerns/authorization"
+require_relative "rabarber/role_names"
 
+require_relative "rabarber/controllers/concerns/authorization"
 require_relative "rabarber/helpers/helpers"
-
-require_relative "rabarber/models/role"
 require_relative "rabarber/models/concerns/has_roles"
-
+require_relative "rabarber/models/role"
 require_relative "rabarber/permissions"
 
 module Rabarber

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - enjaku4
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-01 00:00:00.000000000 Z
+date: 2024-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,7 @@ files:
 - lib/rabarber/models/concerns/has_roles.rb
 - lib/rabarber/models/role.rb
 - lib/rabarber/permissions.rb
+- lib/rabarber/role_names.rb
 - lib/rabarber/rule.rb
 - lib/rabarber/version.rb
 - rabarber.gemspec