plutonium 0.22.0 → 0.23.1

data/app/views/resource/interactive_resource_action.html.erb

@@ -1,5 +1 @@
-<%= render_component :breadcrumbs, resource_class:, parent: current_parent, resource: resource_record! %>
-
-<%= render_component :dyna_frame_content do %>
-  <%= render "interactive_action_form", interactive_action: current_interactive_action %>
-<% end %>
+<%= render current_definition.interactive_action_page_class.new %>

data/app/views/rodauth/create_account.html.erb

@@ -140,10 +140,9 @@
         end %>
       </div>
     <% end %>
+    <%= render "password_visibility" %>
   <% end %>
 
-  <%= render "password_visibility" %>
-
   <%= form.submit rodauth.create_account_button,
               class:
                 "w-full text-white bg-primary-600 hover:bg-primary-700 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800" %>

data/config/initializers/sqlite_json_alias.rb

@@ -0,0 +1,8 @@
+# Alias json to jsonb in SQLite migrations
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::ConnectionAdapters::SQLite3::TableDefinition.class_eval do
+    def jsonb(*args, **options)
+      json(*args, **options)
+    end
+  end
+end 

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/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/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/theme.rb

@@ -21,7 +21,7 @@ module Plutonium
             valid_label: "text-green-700 dark:text-green-500",
             neutral_label: "text-gray-500 dark:text-gray-400",
             # input themes
-            input: "w-full p-2 border rounded-md shadow-sm font-medium text-sm dark:bg-gray-700",
+            input: "w-full p-2 border rounded-md shadow-sm font-medium text-sm dark:bg-gray-700 focus:ring-2",
             invalid_input: "bg-red-50 border-red-500 dark:border-red-500 text-red-900 dark:text-red-500 placeholder-red-700 dark:placeholder-red-500 focus:ring-red-500 focus:border-red-500",
             valid_input: "bg-green-50 border-green-500 dark:border-green-500 text-green-900 dark:text-green-400 placeholder-green-700 dark:placeholder-green-500 focus:ring-green-500 focus:border-green-500",
             neutral_input: "border-gray-300 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white focus:ring-primary-500 focus:border-primary-500",
@@ -36,6 +36,7 @@ module Plutonium
             neutral_color: nil,
             # file
             # file: "w-full border rounded-md shadow-sm font-medium text-sm dark:bg-gray-700 focus:outline-none",
+            file: "w-full border rounded-md shadow-sm font-medium text-sm dark:bg-gray-700 border-gray-300 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white focus:ring-primary-500 focus:border-primary-500 focus:outline-none focus:ring-2 [&::file-selector-button]:mr-3 [&::file-selector-button]:px-4 [&::file-selector-button]:py-2 [&::file-selector-button]:bg-gray-50 [&::file-selector-button]:border-0 [&::file-selector-button]:rounded-l-md [&::file-selector-button]:text-sm [&::file-selector-button]:font-medium [&::file-selector-button]:text-gray-700 [&::file-selector-button]:hover:bg-gray-100 [&::file-selector-button]:cursor-pointer dark:[&::file-selector-button]:bg-gray-600 dark:[&::file-selector-button]:text-gray-200 dark:[&::file-selector-button]:hover:bg-gray-500",
             # hint themes
             hint: "mt-2 text-sm text-gray-500 dark:text-gray-200 whitespace-pre",
             # error themes

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

@@ -17,12 +17,8 @@ module Plutonium
         @content = content
       end
 
-      def before_template
-        vanish do
-          @items.each do |item|
-            render item
-          end
-        end
+      def before_template(&)
+        vanish(&)
         super
       end
 

data/lib/plutonium/version.rb

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

data/src/css/core.css

@@ -1,13 +1,16 @@
-@layer components {
-  .pu-color-input::-webkit-color-swatch-wrapper {
-    @apply p-0;
-  }
+/**
+ * Color Input Styles for Tailwind v4
+ * Converted from @layer components to work with v4
+ */
 
-  .pu-color-input::-webkit-color-swatch {
-    @apply border-none rounded-lg;
-  }
+.pu-color-input::-webkit-color-swatch-wrapper {
+  @apply p-0;
+}
+
+.pu-color-input::-webkit-color-swatch {
+  @apply border-none rounded-lg;
+}
 
-  .pu-color-input::-moz-color-swatch {
-    @apply border-none rounded-lg;
-  }
+.pu-color-input::-moz-color-swatch {
+  @apply border-none rounded-lg;
 }