plutonium 0.15.2 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7af9842b0dca317dc9cb8ca805d2a73373660f99e897f36862e93d6c3fa637b
-  data.tar.gz: 3daa392b9b27adc9e4d82fa760a38cf6a953c4be1394ad7cbaf2cad88012c1af
+  metadata.gz: 69be8d5055a10969befe7de4c78dea74e60f1da9ed5c3754d7a0b70ad74e6974
+  data.tar.gz: 98c4fb79a936ab08f6164c13bcd268f9ecaa4de42fc7ce1be5b47d68fe33a2d7
 SHA512:
-  metadata.gz: 020a6db84fe590b28095f4d2f2a60cc61b58a7d1cd4304bf944d464182439d0a4f3d4967c63846282ae8abbc05b5f016d1abae22516518c4ad73745308a359d8
-  data.tar.gz: 5987f4b5ee94790630c3bc1051b804223837e0fe28713fa5944c66fe719d7c727361d7d411a133c5435d7198db667e586a873314bf189891045c4e33c1aaa458
+  metadata.gz: faa4d002ac3d47973decd9531931131407b64de718acf1914ac3f8fa2ca1d584a562940897a4dff20591c94804b029ea001a88af66e0acde61e1dbe58e68a995
+  data.tar.gz: b91536d180e95b9d80e95fca3064e788bfca9410da7bd4e003c6fc7a618f7a3e9d7298ac38f7a8453f55e40776b5d6faae6560a9110eb04b8a1b265a74492ddb

data/app/views/components/sidebar_menu/sidebar_menu_component.rb

@@ -7,7 +7,7 @@ module PlutoniumUi
     def base_attributes
       # base attributes go here
       {
-        classname: "sidebar-menu space-y-2",
+        classname: "sidebar-menu space-y-2 pb-6 mb-6",
         controller: "sidebar-menu"
       }
     end

data/lib/plutonium/core/controllers/authorizable.rb

@@ -28,6 +28,11 @@ module Plutonium
         def entity_scope_for_authorize
           scoped_to_entity? ? current_scoped_entity : nil
         end
+
+        def verify_authorized
+          # we don't use action policy's inbuilt checks, so ensure they are neutered,
+          # also ensures pundit checks are disabled.
+        end
       end
     end
   end

data/lib/plutonium/core/controllers/bootable.rb

@@ -18,11 +18,12 @@ module Plutonium
         end
 
         class_methods do
-          include Plutonium::Lib::SmartCache
-
           def inherited(subclass)
             super
 
+            subclass.include Plutonium::Lib::SmartCache
+            subclass.memoize_unless_reloading :current_package
+            subclass.memoize_unless_reloading :current_engine
             subclass.boot
           end
 
@@ -42,13 +43,11 @@ module Plutonium
           def current_package
             (current_engine == Rails.application.class) ? nil : current_engine.module_parent
           end
-          memoize_unless_reloading :current_package
 
           def current_engine
             potential_package = module_parents[-2]
             potential_package.nil? ? Rails.application.class : ("#{potential_package}::Engine".safe_constantize || Rails.application.class)
           end
-          memoize_unless_reloading :current_engine
         end
       end
     end

data/lib/plutonium/core/controllers/entity_scoping.rb

@@ -81,16 +81,16 @@ module Plutonium
         # @return [ActiveRecord::Base, nil] the current scoped entity or nil if not found
         # @raise [NotImplementedError] if the scoping strategy is unknown
         def fetch_current_scoped_entity
-          scoped_entity = case scoped_entity_strategy
+          case scoped_entity_strategy
           when :path
-            fetch_entity_from_path
+            scoped_entity = fetch_entity_from_path
+            authorize! scoped_entity, to: :read?
+            scoped_entity
           when Symbol
             send(scoped_entity_strategy)
           else
             raise NotImplementedError, "Unknown scoped entity strategy: #{scoped_entity_strategy.inspect}"
           end
-          authorize! scoped_entity, to: :read?
-          scoped_entity
         end
 
         # Fetches the scoped entity from the path parameters.

data/lib/plutonium/resource/controller.rb

@@ -172,8 +172,13 @@ module Plutonium
       # @param [Hash] input_params The input parameters
       def override_entity_scoping_params(input_params)
         if scoped_to_entity?
-          input_params[scoped_entity_param_key] = current_scoped_entity
-          input_params[:"#{scoped_entity_param_key}_id"] = current_scoped_entity.id
+          if input_params.key?(scoped_entity_param_key) || resource_class.method_defined?(:"#{scoped_entity_param_key}=")
+            input_params[scoped_entity_param_key] = current_scoped_entity
+          end
+
+          if input_params.key?(:"#{scoped_entity_param_key}_id") || resource_class.method_defined?(:"#{scoped_entity_param_key}_id=")
+            input_params[:"#{scoped_entity_param_key}_id"] = current_scoped_entity.id
+          end
         end
       end
 
@@ -181,8 +186,13 @@ module Plutonium
       # @param [Hash] input_params The input parameters
       def override_parent_params(input_params)
         if current_parent.present?
-          input_params[parent_input_param] = current_parent
-          input_params[:"#{parent_input_param}_id"] = current_parent.id
+          if input_params.key?(parent_input_param) || resource_class.method_defined?(:"#{parent_input_param}=")
+            input_params[parent_input_param] = current_parent
+          end
+
+          if input_params.key?(:"#{parent_input_param}_id") || resource_class.method_defined?(:"#{parent_input_param}_id=")
+            input_params[:"#{parent_input_param}_id"] = current_parent.id
+          end
         end
       end
 

data/lib/plutonium/resource/controllers/authorizable.rb

@@ -77,7 +77,7 @@ module Plutonium
         #
         # @raise [ActionMissingCurrentAuthorizedScope] if current_authorized_scope hasn't been called
         def verify_current_authorized_scope
-          return if current_authorized_scope_count
+          return if verify_current_authorized_scope_skipped
           return if current_authorized_scope_count > 0
 
           raise ActionMissingCurrentAuthorizedScope.new(controller_path, action_name)

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.15.2"
+  VERSION = "0.15.4"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/lib/plutonium.rb

@@ -26,7 +26,7 @@ module Plutonium
     loader.ignore("#{__dir__}/generators")
     loader.ignore("#{__dir__}/plutonium/railtie.rb")
     loader.inflector.inflect("ui" => "UI")
-    loader.inflector.inflect("dsl" => "DSL")
+    loader.inflector.inflect("workflow_dsl" => "WorkflowDSL")
     loader.enable_reloading if defined?(Rails.env) && Rails.env.development?
     loader.setup
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.4
 platform: ruby
 authors:
 - Stefan Froelich