plutonium 0.21.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7d59a1efadc76fab68fd64a2a08bed616fd14c35439c6c486141f73b8856d8
-  data.tar.gz: 69b5be0a1f342a7388f715da0fa240410ed437fece5603f8f4d1b6c892d3ca03
+  metadata.gz: 5b6106e6479856651cc2e5b632cb05004392cd1643a3eb157e1f88a84de06103
+  data.tar.gz: 57389cece65e0f035f5001c279bdbc910d03812ec055a6ed118b087e27ed0c0f
 SHA512:
-  metadata.gz: f593bae03cbbb4c14ab1932615fef6d99744c575aaa418836cbb53af0bbee188e8064b64d8191af39ef959a4258220d97a8751cba3d6815f5801cf4ec15f377c
-  data.tar.gz: 1822266c88940a5fded00df5c8a7482614b511580c3d6859d46f3e0e82f225567172eacf321034676b181fbc66f3c4d41b22197ab53a936db2453880425950dc
+  metadata.gz: 013ca5e147764f6dd8181b63aac505d09559561b012fd53f104dcb4259a48a11859eb0c8d1aff05e1c90caf7374b598c186bf1eb55533d0440aab94a1ca45a86
+  data.tar.gz: 7e9fd22ffb966a36045b97eb413d54b58e4523fb2faa9fae90aec803a6e62fc45cc125dae8bfd1b488831a1fd4d767dd2e70c938d82406820f374983a3459442

data/lib/active_model/validations/attached_validator.rb

@@ -10,7 +10,7 @@ module ActiveModel
     #
     class AttachedValidator < EachValidator
       def validate_each(record, attribute, value)
-        record.errors.add(attribute, (options[:message] || "must be attached")) unless value.attached?
+        record.errors.add(attribute, options[:message] || "must be attached") unless value.attached?
       end
     end
   end

data/lib/active_model/validations/url_validator.rb

@@ -43,7 +43,7 @@ module ActiveModel
         return true unless options[:image].present?
         return true unless FastImage.type(value).nil?
 
-        record.errors.add(attribute, (options[:message] || "is not a valid image URL"))
+        record.errors.add(attribute, options[:message] || "is not a valid image URL")
         false
       end
     end

data/lib/plutonium/resource/controllers/crud_actions/index_action.rb

@@ -14,7 +14,7 @@ module Plutonium
           def filtered_resource_collection
             query_params = current_definition
               .query_form.new(nil, query_object: current_query_object, page_size: nil)
-              .extract_input(params)[:q]
+              .extract_input(params, view_context:)[:q]
 
             base_query = current_authorized_scope
             current_query_object.apply(base_query, query_params)

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

@@ -5,8 +5,10 @@ module Plutonium
     module Component
       module Behaviour
         extend ActiveSupport::Concern
+        include Phlexi::Field::Common::Tokens
         include Methods
         include Kit
+        include Tokens
 
         if Rails.env.development?
           def around_template(&)

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

@@ -12,7 +12,7 @@ module Plutonium
       #   class MyView
       #     include Plutonium::UI::Component::Kit
       #
-      #     def template
+      #     def view_template
       #       PageHeader(title: "Dashboard")
       #       TabList(items: tabs)
       #       Panel(class: "mt-4") do

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Component
+      module Tokens
+        def classes(*tokens, **conditional_tokens)
+          tokens = self.tokens(*tokens, **conditional_tokens)
+
+          if tokens.empty?
+            {}
+          else
+            {class: tokens}
+          end
+        end
+
+        def tokens(*tokens, **conditional_tokens)
+          conditional_tokens.each do |condition, token|
+            truthy = case condition
+            when Symbol then send(condition)
+            when Proc then condition.call
+            else raise ArgumentError, "The class condition must be a Symbol or a Proc."
+            end
+
+            if truthy
+              case token
+              when Hash then __append_token__(tokens, token[:then])
+              else __append_token__(tokens, token)
+              end
+            else
+              case token
+              when Hash then __append_token__(tokens, token[:else])
+              end
+            end
+          end
+
+          tokens = tokens.select(&:itself).join(" ")
+          tokens.strip!
+          tokens.gsub!(/\s+/, " ")
+          tokens
+        end
+
+        private
+
+        def __append_token__(tokens, token)
+          case token
+          when nil then nil
+          when String then tokens << token
+          when Symbol then tokens << token.name
+          when Array then tokens.concat(token)
+          else raise ArgumentError,
+            "Conditional classes must be Symbols, Strings, or Arrays of Symbols or Strings."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/display/components/markdown.rb

@@ -23,7 +23,7 @@ module Plutonium
 
           def render_value(value)
             article(**attributes) {
-              unsafe_raw(render_markdown(value))
+              raw(safe(render_markdown(value)))
             }
           end
 

data/lib/plutonium/ui/dyna_frame/content.rb

@@ -7,7 +7,7 @@ module Plutonium
         def view_template
           if current_turbo_frame.present?
             turbo_frame_tag(current_turbo_frame) do
-              render "flash"
+              render partial("flash")
               yield
             end
           else

data/lib/plutonium/ui/form/base.rb

@@ -7,6 +7,7 @@ module Plutonium
         include Plutonium::UI::Component::Behaviour
 
         class Builder < Builder
+          include Phlexi::Field::Common::Tokens
           include Plutonium::UI::Form::Options::InferredTypes
 
           def easymde_tag(**, &)

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

@@ -61,36 +61,39 @@ module Plutonium
           input_definition = definition.defined_inputs[name] || {}
           input_options = input_definition[:options] || {}
 
-          condition = input_options[:condition] || field_options[:condition]
-          return if condition && !instance_exec(&condition)
-
           tag = input_options[:as] || field_options[:as]
-          tag_attributes =
-            input_options.except(:wrapper, :as, :pre_submit, :condition)
+          tag_attributes = input_options.except(:wrapper, :as, :pre_submit, :condition)
           if input_options[:pre_submit]
-            tag_attributes[
-              "data-action"
-            ] = "change->form#preSubmit"
+            tag_attributes["data-action"] = "change->form#preSubmit"
           end
-          tag_block =
-            input_definition[:block] ||
-            ->(f) do
-              tag ||= f.inferred_field_component
-              f.send(:"#{tag}_tag", **tag_attributes)
-            end
-
-          wrapper_options = input_options[:wrapper] || {}
-          if !wrapper_options[:class] || !wrapper_options[:class].include?("col-span")
-            # temp hack to allow col span overrides
-            # TODO: remove once we complete theming, which will support merges
-            wrapper_options[:class] = tokens("col-span-full", wrapper_options[:class])
+          tag_block = input_definition[:block] || ->(f) do
+            tag ||= f.inferred_field_component
+            f.send(:"#{tag}_tag", **tag_attributes)
           end
 
           field_options = field_options.except(:as, :condition)
-          render form.field(name, **field_options).wrapped(
-            **wrapper_options
-          ) do |f|
-            render instance_exec(f, &tag_block)
+
+          condition = input_options[:condition] || field_options[:condition]
+          conditionally_hidden = condition && !instance_exec(&condition)
+          if conditionally_hidden
+            # Do not render the field, but still create field
+            # Phlexi form will record it without rendering it, allowing us to extract its value
+            form.field(name, **field_options) do |f|
+              instance_exec(f, &tag_block)
+            end
+          else
+            wrapper_options = input_options[:wrapper] || {}
+            if !wrapper_options[:class] || !wrapper_options[:class].include?("col-span")
+              # temp hack to allow col span overrides
+              # TODO: remove once we complete theming, which will support merges
+              wrapper_options[:class] = tokens("col-span-full", wrapper_options[:class])
+            end
+
+            render form.field(name, **field_options).wrapped(
+              **wrapper_options
+            ) do |f|
+              render instance_exec(f, &tag_block)
+            end
           end
         end
 

data/lib/plutonium/ui/layout/base.rb

@@ -59,7 +59,7 @@ module Plutonium
         end
 
         def render_flash
-          render "flash"
+          render partial("flash")
         end
 
         def render_before_content

data/lib/plutonium/ui/layout/resource_layout.rb

@@ -17,8 +17,8 @@ module Plutonium
         def render_before_main
           super
 
-          render("resource_header")
-          render("resource_sidebar")
+          render partial("resource_header")
+          render partial("resource_sidebar")
         end
       end
     end

data/lib/plutonium/ui/page/edit.rb

@@ -15,7 +15,7 @@ module Plutonium
         end
 
         def render_default_content
-          render "resource_form"
+          render partial("resource_form")
         end
 
         def page_type = :edit_page

data/lib/plutonium/ui/page/index.rb

@@ -19,7 +19,7 @@ module Plutonium
         end
 
         def render_default_content
-          render "resource_table"
+          render partial("resource_table")
         end
 
         def page_type = :index_page

data/lib/plutonium/ui/page/interactive_action.rb

@@ -15,7 +15,7 @@ module Plutonium
         end
 
         def render_default_content
-          render "interactive_action_form"
+          render partial("interactive_action_form")
         end
 
         def page_type = :interactive_action_page

data/lib/plutonium/ui/page/new.rb

@@ -15,7 +15,7 @@ module Plutonium
         end
 
         def render_default_content
-          render "resource_form"
+          render partial("resource_form")
         end
 
         def page_type = :new_page

data/lib/plutonium/ui/page/show.rb

@@ -19,7 +19,7 @@ module Plutonium
         end
 
         def render_default_content
-          render "resource_details"
+          render partial("resource_details")
         end
 
         def page_type = :show_page

data/lib/plutonium/ui/panel.rb

@@ -1,8 +1,6 @@
 module Plutonium
   module UI
     class Panel < Plutonium::UI::Component::Base
-      include Phlex::DeferredRender
-
       def initialize
         @items = []
       end
@@ -19,6 +17,15 @@ module Plutonium
         @content = content
       end
 
+      def before_template
+        vanish do
+          @items.each do |item|
+            render item
+          end
+        end
+        super
+      end
+
       def view_template
         wrapped do
           render_toolbar if render_toolbar?

data/lib/plutonium/ui/table/components/pagy_info.rb

@@ -34,11 +34,6 @@ module Plutonium
           end
 
           def per_page_selector
-            original_attributes = Phlex::HTML::EVENT_ATTRIBUTES
-            temp_attributes = Phlex::HTML::EVENT_ATTRIBUTES.dup
-            temp_attributes.delete("onchange")
-            Phlex::HTML.const_set(:EVENT_ATTRIBUTES, temp_attributes)
-
             div(
               class: "flex items-center space-x-2 mt-2 md:mt-0",
               data_controller: "select-navigator"
@@ -55,9 +50,6 @@ module Plutonium
                 end
               end
             end
-          ensure
-            # TODO: remove this once Phlex adds support for SafeValues
-            Phlex::HTML.const_set(:EVENT_ATTRIBUTES, original_attributes)
           end
 
           def select_classes

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.21.1"
+  VERSION = "0.23.0"
   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.21.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-27 00:00:00.000000000 Z
+date: 2025-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,62 +192,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: phlexi-field
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: phlexi-form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: phlexi-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: phlexi-display
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: phlexi-menu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: tailwind_merge
   requirement: !ruby/object:Gem::Requirement
@@ -811,6 +825,7 @@ files:
 - lib/plutonium/ui/component/behaviour.rb
 - lib/plutonium/ui/component/kit.rb
 - lib/plutonium/ui/component/methods.rb
+- lib/plutonium/ui/component/tokens.rb
 - lib/plutonium/ui/display/base.rb
 - lib/plutonium/ui/display/components/association.rb
 - lib/plutonium/ui/display/components/attachment.rb