bullet_train-super_load_and_authorize_resource 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81cc394c759fc1978b2ebc991ceaca6aa58166547ca66fe7effa749edb9991e
-  data.tar.gz: 97e897180acc2c38a05bc769ea797af4e7bd995625a046f15bb14959c4f4a7e9
+  metadata.gz: 55b8c178e08ec31fa070c7050997504e62ad3fe5a3144ab48aaabc22a024bbb6
+  data.tar.gz: b26bec97cc2bdfd035ad54556ad86fb5dc11e09fd9703065cdc849376b29980d
 SHA512:
-  metadata.gz: d4bff613bfce15a96b195c3fdb41e08ad60c9d507de2a1dba4802fe2136a155924689fde682f338b3130645387037de0b90a133563c345f13dfa0fed694a5554
-  data.tar.gz: 6b1841e2d258ec37f0613cf4deb32a7ae5ce665ce330c2e7601ff76ea6617ca6d307af6e7460ec7aaa00ce7ceb4603aa906a03df8dbfdaf496897ce43c951623
+  metadata.gz: 20eaceb1d47a3f75a9c38902ba57977c7ea346eecfb6299f3a8394da440f353ed7eea32cee600c8c97d8c3d896a5ed0e09c9de188a16e220088b7fba1eded562
+  data.tar.gz: 76361205a48f962b66066a531452509b562979c8f1043c37d2c9e7a42d0a5fce085a31c95f4fc66b5f9116fda9b1c8d2b53d70b3767ec9746c258c4e54c9ae8a

data/app/controllers/concerns/bullet_train/loads_and_authorizes_resource.rb

@@ -2,17 +2,18 @@ module BulletTrain::LoadsAndAuthorizesResource
   extend ActiveSupport::Concern
 
   class_methods do
+    # Returns an array of module names based on the classes namespace minus regex_to_remove_controller_namespace
     def model_namespace_from_controller_namespace
-      controller_class_name =
-        if regex_to_remove_controller_namespace
-          name.gsub(regex_to_remove_controller_namespace, "")
-        else
-          name
-        end
-      namespace = controller_class_name.split("::")
-      # Remove "::ThingsController"
-      namespace.pop
-      namespace
+      name
+        .gsub(regex_to_remove_controller_namespace || //, "")
+        .split("::")
+        .tap(&:pop) # drops actual class name
+    end
+
+    def regex_to_remove_controller_namespace
+      return super if defined?(super)
+
+      raise "This is a template method that needs to be implemented by controllers including LoadsAndAuthorizesResource."
     end
 
     # this is one of the few pieces of 'magical' functionality that bullet train implements
@@ -202,22 +203,14 @@ module BulletTrain::LoadsAndAuthorizesResource
     end
   end
 
-  def regex_to_remove_controller_namespace
-    raise "This is a template method that needs to be implemented by controllers including LoadsAndAuthorizesResource."
-  end
-
   def load_team
-    # Not all objects that need to be authorized belong to a team,
-    # so we give @team a nil value if no association is found.
-    begin
-      # Sometimes `@team` has already been populated by earlier `before_action` steps.
-      @team ||= @child_object&.team || @parent_object&.team
-    rescue NoMethodError
-      @team = nil
-    end
+    @team ||= @child_object&.try(:team) || @parent_object&.try(:team)
 
-    # Update current attributes.
-    Current.team = @team
+    return unless @team
+
+    if defined?(Current) && Current.respond_to?(:team=)
+      Current.team = @team
+    end
 
     # If the currently loaded team is saved to the database, make that the user's new current team.
     if @team.try(:persisted?)

data/lib/bullet_train/super_load_and_authorize_resource/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperLoadAndAuthorizeResource
-    VERSION = "1.5.1"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_load_and_authorize_resource
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan