rabarber 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae0f6a7f272a6d718ddf591e61b236a20b26da7c7eddc56f838637e6fd16b72
-  data.tar.gz: 07bb483c2ed0fc8e04b12fab9183d333cddae5ef4d3b3690d98119e1d9d97c5b
+  metadata.gz: '084b409c4886e7622ee37f20b8f00c0d6e083546394bf3617bdd5277548a2764'
+  data.tar.gz: 62c3f5fb0496fc5a0cf95f04f0f04d26ba4f847bdf1e838c248361dca72744ee
 SHA512:
-  metadata.gz: 8c87020ec8feb37dc344f332843eb49498197edbeab72d3c7b57edfb5e727029627aa5b8289fa506bdcb262d2df47fc378ca3d17f138879b3a64e51e998d22ab
-  data.tar.gz: d4e83ff02a8dfc17e8a2706756fa84f4e93035bd09c98455e8f5f2eb92f9c48636135200ed42fe6b6a6bda94671c187de97c1a85d6a21425d93191423c38711f
+  metadata.gz: 0a1b141efb53f2b863f0dbbd1fe4c03ce199b7278bc0c51f8868866b918ea3161b8aebd9920872b43d9aea8cf24c5161b0f87d6d535a7c76295aa7890ee4b337
+  data.tar.gz: b740291aba6e4d1c529453e990c30e009b5215ccbdc99a5eac6c1b8c21d354c813e5bdd3f700c37e9aa22d528b025814ce69629aedb95449108a704e233c53d2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.2
+
+- Refactor to improve readability and maintainability
+- Fix minor code errors
+
 ## 1.2.1
 
 - Cache roles to avoid unnecessary database queries

data/README.md

@@ -218,24 +218,26 @@ end
 
 This allows everyone to access `OrdersController` and its children and `index` action in `InvoicesController`. This also extends to scenarios where there is no user present, i.e. when the method responsible for returning the currently authenticated user in your application returns `nil`.
 
+Be aware that if the user is not authenticated (the method responsible for returning the currently authenticated user in your application returns `nil`), Rabarber will treat this situation as if the user with no roles assigned was authenticated.
+
 If you've set `must_have_roles` setting to `true`, then, only the users with at least one role can have access. This setting can be useful if your requirements are such that users without roles are not allowed to access anything.
 
 For more complex cases, Rabarber provides dynamic rules:
 
 ```rb
 class OrdersController < ApplicationController
-  grant_access if: :user_has_access?
-  grant_access unless: :user_has_no_access?
+  grant_access if: :current_company_accountant?
+  grant_access unless: :fired?
   ...
 
   private
 
-  def user_has_access?
-    ...
+  def current_company_accountant?
+    current_company.accountant == current_user
   end
 
-  def user_has_no_access?
-    ...
+  def fired?
+    current_user.fired?
   end
 end
 

data/lib/rabarber/configuration.rb

@@ -78,13 +78,13 @@ module Rabarber
       -> (missing_roles, context) {
         delimiter = context[:action] ? "#" : ""
         message = "Missing roles: #{missing_roles}, context: #{context[:controller]}#{delimiter}#{context[:action]}"
-        Rails.logger.tagged("Rabarber") { Rails.logger.warn message }
+        Rabarber::Logger.log(:warn, message)
       }
     end
 
     def default_when_unauthorized
       -> (controller) do
-        Rails.logger.tagged("Rabarber") { Rails.logger.warn "Unauthorized attempt" }
+        Rabarber::Logger.log(:warn, "Unauthorized attempt")
         if controller.request.format.html?
           controller.redirect_back fallback_location: controller.main_app.root_path
         else

data/lib/rabarber/logger.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Rabarber
+  module Logger
+    module_function
+
+    def log(log_level, message)
+      Rails.logger.tagged("Rabarber") { Rails.logger.public_send(log_level, message) }
+    end
+  end
+end

data/lib/rabarber/missing/base.rb

@@ -41,7 +41,7 @@ module Rabarber
 
       def controller_rules
         if controller
-          { controller => Rabarber::Permissions.controller_rules[controller] }
+          Rabarber::Permissions.controller_rules.slice(controller)
         else
           Rabarber::Permissions.controller_rules
         end
@@ -49,7 +49,7 @@ module Rabarber
 
       def action_rules
         if controller
-          { controller => Rabarber::Permissions.action_rules[controller] }
+          Rabarber::Permissions.action_rules.slice(controller)
         else
           Rabarber::Permissions.action_rules
         end

data/lib/rabarber/missing/roles.rb

@@ -7,8 +7,8 @@ module Rabarber
 
       def check_controller_rules
         controller_rules.each do |controller, controller_rule|
-          missing_roles = controller_rule.roles - all_roles if controller_rule.present?
-          missing_list << Rabarber::Missing::Item.new(missing_roles, controller, nil) if missing_roles.present?
+          missing_roles = controller_rule.roles - all_roles
+          missing_list << Rabarber::Missing::Item.new(missing_roles, controller, nil) unless missing_roles.empty?
         end
       end
 

data/lib/rabarber/version.rb

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

data/lib/rabarber.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "rabarber/version"
+require_relative "rabarber/logger"
 require_relative "rabarber/configuration"
 
 require "active_record"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - enjaku4
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,6 +50,7 @@ files:
 - lib/rabarber/input/types/booleans.rb
 - lib/rabarber/input/types/procs.rb
 - lib/rabarber/input/types/symbols.rb
+- lib/rabarber/logger.rb
 - lib/rabarber/missing/actions.rb
 - lib/rabarber/missing/base.rb
 - lib/rabarber/missing/roles.rb