rabarber 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3ce45aa7325a095c750691a8633e323a57a987b2c4e4f45902726ce0d30458
-  data.tar.gz: 66be6c782c564ef658a405ec94c2ada4b46915820a0b9ac5afcfbf0a5bbcedd8
+  metadata.gz: 2df45030b2e771a3825eb72a544575fce977253f77ce26673f65372c9d03c06e
+  data.tar.gz: 3538bc9bc309f5715cdf25426d21b9353be873b2e7c25bc135403b4382342678
 SHA512:
-  metadata.gz: bb12a4ed60e610cb9875243bb87d78ba0e0ab0713507d1967485e16b57fbe7856cbfcf855878b37c75827d02f81fa7baa8cd2f299020bb24dc621fa44aeaf902
-  data.tar.gz: 3e65bde49df87b1656eab0b92b8da9cd5fd5975e725911026d8ada08b95eedf912aea4dffb0aa39ba1319979ed4cbb90ff234c66a32b91bbd3c3cda224867e64
+  metadata.gz: 50a7e4d76a49010af472916c1dfea7fd59bfc882ca67f1fd1a3742f2357e112d8fab112a75af6baf404fc02155128f928c3637ca1d7e9c71ecc238bdbe648b62
+  data.tar.gz: f020edd72b93678b25761df692bd3b1d361ec9caad9872952d8df79f4e21948ca46e20de2e1dbe41270a8a26d989d7394b79000429d086923dc94b1173b3a166

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.0.4
+
+- Allow to use strings as role names
+
+## 1.0.3
+
+- Enhance clarity by improving error types and messages
+- Resolve inconsistency in types of role names
+
 ## 1.0.2
 
 - Various enhancements for gem development and release

data/README.md

@@ -7,7 +7,7 @@ Rabarber is an authorization library for Ruby on Rails, primarily designed for u
 
 ---
 
-#### Example of Usage:
+**Example of Usage**:
 
 Consider a CRM where users with different roles have distinct access levels. For instance, the role 'accountant' can interact with invoices but cannot access marketing information, while the role 'marketer' has access to marketing-related data. Such authorization rules can be easily defined with Rabarber.
 
@@ -78,7 +78,7 @@ end
 - `must_have_roles` must be a boolean determining whether a user with no roles can access endpoints permitted to everyone. The default value is `false` (allowing users without roles to access endpoints permitted to everyone).
 - `when_unauthorized` must be a lambda where you can define your actions when access is not authorized (`controller` is an instance of the controller where the code is executed). By default, the user is redirected back if the request format is HTML; otherwise, a 401 Unauthorized response is sent.
 
-## Usage
+## Roles
 
 Include `Rabarber::HasRoles` module in your model representing users in your application:
 
@@ -89,9 +89,9 @@ class User < ApplicationRecord
 end
 ```
 
-### This adds the following methods:
+This adds the following methods:
 
-#### `#assign_roles`
+**`#assign_roles`**
 
 To assign roles to the user, use:
 
@@ -110,7 +110,7 @@ Rabarber::Role.create(name: "manager")
 ```
 The role names are unique.
 
-#### `#revoke_roles`
+**`#revoke_roles`**
 
 To revoke roles, use:
 
@@ -119,7 +119,7 @@ user.revoke_roles(:accountant, :marketer)
 ```
 If any of the specified roles doesn't exist or the user doesn't have the role you want to revoke, it will be ignored.
 
-#### `#has_role?`
+**`#has_role?`**
 
 To check whether the user has a role, use:
 
@@ -129,7 +129,7 @@ user.has_role?(:accountant, :marketer)
 
 It returns `true` if the user has at least one role and `false` otherwise.
 
-#### `#roles`
+**`#roles`**
 
 To view all the roles assigned to the user, use:
 
@@ -147,9 +147,7 @@ Rabarber::Role.names
 
 Utilize the aforementioned methods to manipulate user roles. For example, create a custom UI for managing roles or assign necessary roles during migration or runtime (e.g., when the user is created). You can also write custom authorization policies based on `#has_role?` method (e.g., to scope the data that the user can access). Adapt these methods to fit the requirements of your application.
 
----
-
-### Authorization Rules
+## Authorization Rules
 
 Include `Rabarber::Authorization` module into the controller that needs authorization rules to be applied (authorization rules will be applied to the controller and its children). Typically, it is `ApplicationController`, but it can be any controller.
 
@@ -159,7 +157,7 @@ class ApplicationController < ActionController::Base
   ...
 end
 ```
-This adds `.grant_access` method to the controller and its children. This method allows you to define the authorization rules.
+This adds `.grant_access` method which allows you to define the authorization rules.
 
 The most basic usage of the method is as follows:
 
@@ -260,9 +258,7 @@ end
 ```
 This means that `Crm::InvoicesController` is still accessible to `admin` but is also accessible to `accountant`.
 
----
-
-### View Helpers
+## View Helpers
 
 Rabarber also provides a couple of helpers that can be used in views: `visible_to` and `hidden_from`. The usage is straightforward:
 

data/lib/rabarber/configuration.rb

@@ -21,21 +21,21 @@ module Rabarber
     end
 
     def current_user_method=(method_name)
-      unless [Symbol, String].include?(method_name.class)
-        raise ArgumentError, "Method name must be a symbol or a string"
+      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 ArgumentError, "Value 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 ArgumentError, "Proc is expected" 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,38 +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? do |role_name|
-        [Symbol, String].include?(role_name.class) && role_name.match?(/\A[a-z0-9_]+\z/)
-      end
-
-      raise(
-        ArgumentError,
-        "Role names must be symbols or strings and may only contain lowercase letters 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,7 +4,7 @@ module Rabarber
   class Role < ActiveRecord::Base
     self.table_name = "rabarber_roles"
 
-    validates :name, presence: true, uniqueness: true
+    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 = action
-      @roles = Array(roles)
-      @custom = 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)
@@ -37,5 +37,19 @@ module Rabarber
         custom_rule_receiver.send(custom)
       end
     end
+
+    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 or a String"
+    end
+
+    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)
+
+      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.2"
+  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
@@ -23,4 +22,6 @@ module Rabarber
   end
 
   class Error < StandardError; end
+  class ConfigurationError < Error; end
+  class InvalidArgumentError < Error; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  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