plutonium 0.20.1 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4bef64109c5d7a4f0806307b70f4506a4e39df4b9599b3dca7e93735d6d9695
-  data.tar.gz: e08c935a33e869842f9299b401a451ac5f008f5c3bad349f64d12ec15740fcfd
+  metadata.gz: 545bfd12db25550638b5a2e1bd63f238490416df72cb799385561c28792684a4
+  data.tar.gz: 8658bb44139a602f1b8adcd66a888ee4c98a708bcec45e6aafc4afea328438e8
 SHA512:
-  metadata.gz: 330f168dd3d9ea13d1666a47d8b54ff4aac2154d8a5ac90d48e66a553f2b1a19cc467c94af482528ee9ed31d4828a6e376306c53443411ac31b64665c70e5945
-  data.tar.gz: c00da81b08def50023b1d09c4e9aa347f26db6bc766153c9d507ea363f9c9bf371787002a644fe6467305f5523152ceaa7cd2efa176ae06838b9412025e9a58b
+  metadata.gz: d0e4767510da8df48a19ad7450c377afa7b138b32dc04bdbc5de076d0600555b5a811df2b9161b5cede2b2ffad03c8ffd5faf3512cbaabfafc537e5abf9691dd
+  data.tar.gz: 48205cfc48b3ecac7b073ccd05629f839489ae9a923a1f79961a9cf1cf863b8c6e3b74344e6418ec9bd67b2dfed6a8673bf5768d755d3af28b1d287282e58440

data/lib/generators/pu/core/assets/templates/tailwind.config.js

@@ -18,13 +18,13 @@ module.exports = {
     }
   })),
   theme: plutoniumTailwindConfig.merge(
+    plutoniumTailwindConfig.theme,
     {
+      // define your custom theme here
     },
-    plutoniumTailwindConfig.theme
   ),
   content: [
     `${__dirname}/app/**/*.{erb,haml,html,slim,rb}`,
-    `${__dirname}/app/assets/stylesheets/**/*.css`,
     `${__dirname}/app/javascript/**/*.js`,
     `${__dirname}/packages/**/app/**/*.{erb,haml,html,slim,rb}`,
   ].concat(plutoniumTailwindConfig.content),

data/lib/plutonium/action/base.rb

@@ -93,6 +93,9 @@ module Plutonium
         case options
         when RouteOptions
           options
+        when Array
+          kwargs = options.extract_options!
+          RouteOptions.new(*options, **kwargs)
         when Hash
           RouteOptions.new(**options)
         when nil

data/lib/plutonium/core/controller.rb

@@ -17,7 +17,7 @@ module Plutonium
 
         helper Plutonium::Helpers
         helper_method :make_page_title, :resource_url_for,
-          :resource_url_args_for, :root_path, :app_name
+          :resource_url_args_for, :root_path, :app_name, :route_options_to_url
 
         append_view_path File.expand_path("app/views", Plutonium.root)
         layout -> { turbo_frame_request? ? false : "resource" }
@@ -111,6 +111,33 @@ module Plutonium
       def registered_resources
         current_engine.resource_register.resources
       end
+
+      # Converts RouteOptions into a URL using the appropriate URL resolver.
+      #
+      # This method takes a RouteOptions object and generates a URL based on the url_resolver
+      # specified within the RouteOptions. It supports different resolution strategies:
+      # - If the route_options responds to :to_proc, executes it as a Proc in the current instance context
+      # - For :resource_url_for resolver, generates a URL using the provided subject
+      # - For :url_for resolver, generates a URL using only the url_options from route_options
+      #
+      # @param [RouteOptions, #to_proc] route_options The RouteOptions object or callable to convert to a URL
+      # @param [Object] subject The subject to use when generating URLs with :resource_url_for
+      # @return [String] The generated URL
+      # @raise [NotImplementedError] If an unsupported url_resolver is specified
+      def route_options_to_url(route_options, subject = nil)
+        url_resolver = route_options.url_resolver
+
+        if url_resolver == :resource_url_for
+          raise ArgumentError, "subject is required when url_resolver is: :resource_url_for" unless subject
+          resource_url_for(subject, *route_options.url_args, **route_options.url_options)
+        elsif url_resolver == :url_for
+          url_for(**route_options.url_options)
+        elsif url_resolver.respond_to?(:to_proc)
+          instance_exec(subject, &url_resolver)
+        else
+          raise NotImplementedError, "url_resolver: #{url_resolver}"
+        end
+      end
     end
   end
 end

data/lib/plutonium/lib/bit_flags.rb

@@ -44,6 +44,19 @@ module Plutonium
         value & check == check
       end
 
+      # Sets the specified flags in the given value.
+      #
+      # @param value [Integer] The original value to modify.
+      # @param flags [Array<Symbol, String>] The flags to set.
+      # @return [Integer] A new value with the specified flags set.
+      # @example
+      #   flags.set!(2, :read, :execute)  # => 6
+      def set!(value, *flags)
+        normalized_flags = normalize_flags(flags)
+        bits_to_set = bits(*normalized_flags)
+        value | bits_to_set
+      end
+
       # Extracts the flags that are set in the given value.
       #
       # @param value [Integer] The value to extract flags from.

data/lib/plutonium/ui/component/methods.rb

@@ -30,6 +30,7 @@ module Plutonium
           :resource_name_plural,
           :display_name_of,
           :resource_url_for,
+          :route_options_to_url,
           :current_user,
           :current_parent,
           :current_definition,

data/lib/plutonium/ui/page_header.rb

@@ -40,7 +40,8 @@ module Plutonium
 
       def render_actions
         @actions.each do |action|
-          url = resource_url_for(resource_record? || resource_class, *action.route_options.url_args, **action.route_options.url_options)
+          subject = resource_record? || resource_class
+          url = route_options_to_url(action.route_options, subject)
           ActionButton(action, url:)
         end
       end

data/lib/plutonium/ui/table/resource.rb

@@ -35,7 +35,7 @@ module Plutonium
           EmptyCard("No #{resource_name_plural(resource_class)} match your query") {
             action = resource_definition.defined_actions[:new]
             if action&.permitted_by?(current_policy)
-              url = resource_url_for(resource_class, *action.route_options.url_args, **action.route_options.url_options)
+              url = route_options_to_url(action.route_options, resource_class)
               ActionButton(action, url:)
             end
           }
@@ -85,14 +85,7 @@ module Plutonium
                   .select { |k, a| a.collection_record_action? && policy.allowed_to?(:"#{k}?") }
                   .values
                   .each do |action|
-                    # TODO: extract this
-                    url = case action.route_options.url_resolver
-                    when :resource_url_for
-                      resource_url_for(record, *action.route_options.url_args, **action.route_options.url_options)
-                    else
-                      raise NotImplementedError, "url_resolver: #{action.route_options.url_resolver}"
-                    end
-
+                    url = route_options_to_url(action.route_options, record)
                     ActionButton(action, url:, variant: :table)
                   end
               end

data/lib/plutonium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.3
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk