plutonium 0.15.6 → 0.15.8

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

@@ -12,8 +12,8 @@
         <%= yield %>
       </div>
   </div>
-  <div class="mt-4 flex items-center font-medium text-blue-600 dark:text-blue-500 hover:underline">
+  <div class="mt-4 flex items-center font-medium text-secondary-600 dark:text-secondary-400 hover:underline">
     <%= render_icon "outline/home" %>
-    <%= link_to "Home", root_path, class: "font-medium text-blue-600 dark:text-blue-500" %>
+    <%= link_to "Home", root_path, class: "font-medium text-secondary-600 dark:text-secondary-400" %>
   </div>
 <% end %>

data/docs/guide/getting-started/installation.md

@@ -3,6 +3,7 @@
 ::: tip VERSION REQUIREMENTS
 - Ruby 3.2.2 or higher
 - Rails 7.1 or higher
+- Node.js and Yarn
 :::
 
 ## Quick Start
@@ -151,7 +152,7 @@ bin/importmap pin @radioactive-labs/plutonium
 ```
 
 ```bash [esbuild]
-npm install @radioactive-labs/plutonium
+yarn add @radioactive-labs/plutonium
 ```
 :::
 

data/docs/guide/getting-started/resources.md

@@ -17,7 +17,8 @@ Resources are the core building blocks of a Plutonium application. A resource re
 The fastest way to create a resource is using the scaffold generator:
 
 ```bash
-rails generate pu:res:scaffold Blog user:belongs_to title:string content:text state:string published_at:datetime?
+rails generate pu:res:scaffold Blog user:belongs_to \
+  title:string content:text 'published_at:datetime?'
 ```
 
 This generates several files, including:
@@ -40,11 +41,11 @@ class BlogPolicy < Plutonium::Resource::Policy
   end
 
   def permitted_attributes_for_create
-    %i[user title content state published_at]
+    %i[user title content published_at]
   end
 
   def permitted_attributes_for_read
-    %i[user title content state published_at]
+    %i[user title content published_at]
   end
 end
 ```
@@ -83,12 +84,12 @@ end
 class BlogDefinition < Plutonium::Resource::Definition
   # Customize how fields are displayed
   display :title, class: "col-span-full"
-  display :content do |f|
+  display :content, class: "col-span-full" do |f|
     f.text_tag class: "prose dark:prose-invert"
   end
 
   # Custom column display in tables
-  column :state, align: :right
+  column :published_at, align: :end
 end
 ```
 :::
@@ -140,7 +141,6 @@ module Blogs
 
     def execute
       if resource.update(
-        state: "published",
         published_at: publish_date
       )
         succeed(resource)
@@ -175,20 +175,16 @@ class BlogDefinition < Plutonium::Resource::Definition
   end
 
   # Add filters
-  filter :state,
-    with: SelectFilter,
-    choices: %w[draft published]
-
   filter :published_at,
     with: DateFilter,
     predicate: :gteq
 
   # Add scopes
   scope :published do |scope|
-    where(state: "published")
+    scope.where.not(published_at: nil)
   end
   scope :draft do |scope|
-    where(state: "draft")
+    scope.where(published_at: nil)
   end
 
   # Configure sorting

data/docs/public/templates/plutonium.rb

@@ -15,6 +15,14 @@ after_bundle do
   git add: "."
   git commit: %( -m 'add annotate' )
 
+  generate "pu:gem:standard"
+  git add: "."
+  git commit: %( -m 'add standardrb' )
+
+  generate "pu:gem:letter_opener"
+  git add: "."
+  git commit: %( -m 'add letter_opener' )
+
   generate "pu:core:assets"
   git add: "."
   git commit: %( -m 'integrate assets' )

data/lib/generators/pu/core/assets/assets_generator.rb

@@ -26,7 +26,7 @@ module Pu
       end
 
       def install_dependencies
-        run "npm install @radioactive-labs/plutonium flowbite @tailwindcss/forms"
+        run "yarn add @radioactive-labs/plutonium flowbite @tailwindcss/forms"
       end
 
       def configure_application

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

@@ -1,12 +1,22 @@
 const { execSync } = require('child_process');
 const plutoniumGemPath = execSync("bundle show plutonium").toString().trim();
 const plutoniumTailwindConfig = require(`${plutoniumGemPath}/tailwind.options.js`)
+const tailwindPlugin = require('tailwindcss/plugin')
 
 module.exports = {
   darkMode: plutoniumTailwindConfig.darkMode,
   plugins: [
     // add plugins here
-  ].concat(plutoniumTailwindConfig.plugins.map((plugin) => require(plugin))),
+  ].concat(plutoniumTailwindConfig.plugins.map(function (plugin) {
+    switch (typeof plugin) {
+      case "function":
+        return tailwindPlugin(plugin)
+      case "string":
+        return require(plugin)
+      default:
+        throw Error(`unsupported plugin: ${plugin}: ${(typeof plugin)}`)
+    }
+  })),
   theme: plutoniumTailwindConfig.theme,
   content: [
     `${__dirname}/app/**/*.rb`,

data/lib/generators/pu/eject/layout/layout_generator.rb

@@ -15,7 +15,7 @@ module Pu
       class_option :rodauth, type: :boolean
 
       def start
-        destination_dir = (destination_app == "main_app") ? "app/views/" : "packages/#{destination_app}/app/views/"
+        destination_dir = (destination_portal == "main_app") ? "app/views/" : "packages/#{destination_portal}/app/views/"
         [
           "layouts/resource.html.erb"
         ].each do |file|
@@ -27,8 +27,8 @@ module Pu
 
       private
 
-      def destination_app
-        @destination_app || select_app(options[:dest], msg: "Select destination app")
+      def destination_portal
+        @destination_portal || select_portal(options[:dest], msg: "Select destination portal")
       end
 
       def copy_file(source_path, destination_path)

data/lib/generators/pu/eject/shell/shell_generator.rb

@@ -14,7 +14,7 @@ module Pu
       class_option :dest, type: :string
 
       def start
-        destination_dir = (destination_app == "main_app") ? "app/views/" : "packages/#{destination_app}/app/views"
+        destination_dir = (destination_portal == "main_app") ? "app/views/" : "packages/#{destination_portal}/app/views"
         [
           "plutonium/_resource_header.html.erb",
           "plutonium/_resource_sidebar.html.erb"
@@ -27,8 +27,8 @@ module Pu
 
       private
 
-      def destination_app
-        @destination_app || select_app(options[:dest], msg: "Select destination app")
+      def destination_portal
+        @destination_portal || select_portal(options[:dest], msg: "Select destination portal")
       end
 
       def copy_file(source_path, destination_path)

data/lib/generators/pu/extra/colorized_logger/colorized_logger_generator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "../../lib/plutonium_generators"
+
+module Pu
+  module Extra
+    class ColorizedLoggerGenerator < Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Set up a colorized logger"
+
+      def start
+        copy_file "config/initializers/colorized_logger.rb"
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+    end
+  end
+end

data/lib/generators/pu/extra/colorized_logger/templates/config/initializers/colorized_logger.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+return unless Rails.env.development?
+
+# Taken from https://gist.github.com/kyrylo/3d90f7a656d1a0accf244b8f1d25999b?permalink_comment_id=5264120#gistcomment-5264120
+
+module ColorizedLogger
+  %i[debug info warn error fatal unknown].each do |level|
+    color = case level
+    when :debug then "\e[0;36m"  # Cyan text
+    when :info then "\e[0;32m"  # Green text
+    when :warn then "\e[1;33m"  # Yellow text
+    when :error, :fatal then "\e[1;31m"  # Red text
+    else "\e[0m"  # Terminal default
+    end
+
+    define_method(level) do |progname = nil, &block|
+      super(color + (progname || (block && block.call)).to_s + "\e[0m")
+    end
+  end
+end
+Rails.logger.extend(ColorizedLogger)

data/lib/generators/pu/gem/dotenv/dotenv_generator.rb

@@ -21,7 +21,7 @@ module Pu
 
           gitignore "!/.env.template", "!/.env.local.template", "!/.env"
 
-          insert_into_file "Gemfile", "\ngem \"dotenv\", :groups => [:development, :test]\n", after: /^gem ["']rails["'].*\n/
+          insert_into_file "Gemfile", "\ngem \"dotenv\", groups: %i[development test]\n", after: /^gem ["']rails["'].*\n/
           bundle!
         end
       rescue => e

data/lib/generators/pu/gem/letter_opener/letter_opener_generator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "../../lib/plutonium_generators"
+
+module Pu
+  module Gem
+    class LetterOpenerGenerator < Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      desc "Set up letter_opener"
+
+      def start
+        bundle "letter_opener", group: :development
+        environment "config.action_mailer.delivery_method = :letter_opener", env: :development
+        environment "config.action_mailer.perform_deliveries = true", env: :development
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+    end
+  end
+end

data/lib/generators/pu/gem/redis/redis_generator.rb

@@ -7,8 +7,6 @@ module Pu
     class RedisGenerator < Rails::Generators::Base
       include PlutoniumGenerators::Generator
 
-      source_root File.expand_path("templates", __dir__)
-
       desc "Set up redis"
 
       def start

data/lib/generators/pu/gem/standard/standard_generator.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "../../lib/plutonium_generators"
+
+module Pu
+  module Gem
+    class StandardGenerator < Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      desc "Set up standardrb"
+
+      def start
+        bundle "standardrb"
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+    end
+  end
+end

data/lib/generators/pu/lib/plutonium_generators/generator.rb

@@ -52,7 +52,7 @@ module PlutoniumGenerators
       end
     end
 
-    def select_app(selected_package = nil, msg: "Select app")
+    def select_portal(selected_package = nil, msg: "Select portal")
       select_package(selected_package, msg: msg, pkgs: available_apps)
     end
 

data/lib/generators/pu/res/conn/conn_generator.rb

@@ -22,7 +22,7 @@ module Pu
         error "No resources found" if available_resources.blank?
         selected_resources = prompt.multi_select("Select resources", available_resources)
 
-        @app_namespace = select_app.camelize
+        @app_namespace = select_portal.camelize
 
         selected_resources.each do |resource|
           @resource_class = resource

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

@@ -26,7 +26,7 @@ module Plutonium
         end
 
         def entity_scope_for_authorize
-          scoped_to_entity? ? current_scoped_entity : nil
+          current_scoped_entity if scoped_to_entity?
         end
 
         def verify_authorized

data/lib/plutonium/definition/actions.rb

@@ -14,8 +14,12 @@ module Plutonium
           end
         end
 
-        def action(name, **)
-          instance_defined_actions[name] = Plutonium::Action::Simple.new(name, **)
+        def action(name, interaction: nil, **)
+          instance_defined_actions[name] = if interaction
+            Plutonium::Action::Interactive::Factory.create(name, interaction:, **)
+          else
+            Plutonium::Action::Simple.new(name, **)
+          end
         end
 
         def defined_actions

data/lib/plutonium/definition/base.rb

@@ -29,6 +29,7 @@ module Plutonium
       include Actions
       include Sorting
       include Search
+      include NestedInputs
 
       class IndexPage < Plutonium::UI::Page::Index; end
 

data/lib/plutonium/definition/nested_inputs.rb

@@ -0,0 +1,19 @@
+module Plutonium
+  module Definition
+    module NestedInputs
+      extend ActiveSupport::Concern
+
+      included do
+        defineable_prop :nested_input
+
+        # def self.nested_input(name, with: nil, **)
+        #   defined_nested_inputs[name] = {}
+        # end
+
+        # def nested_input(name, with: nil, **)
+        #   instance_defined_nested_inputs[name] = {}
+        # end
+      end
+    end
+  end
+end

data/lib/plutonium/resource/controller.rb

@@ -34,7 +34,7 @@ module Plutonium
         # Gets the resource class for the controller
         # @return [ActiveRecord::Base] The resource class
         def resource_class
-          return @resource_class if @resource_class.present?
+          return @resource_class if @resource_class
 
           name.to_s.gsub(/^#{current_package}::/, "").gsub(/Controller$/, "").classify.constantize
         rescue NameError
@@ -52,14 +52,14 @@ module Plutonium
       # Returns the resource record based on path parameters
       # @return [ActiveRecord::Base, nil] The resource record
       def resource_record
-        @resource_record ||= current_authorized_scope.from_path_param(params[:id]).first! if params[:id].present?
+        @resource_record ||= current_authorized_scope.from_path_param(params[:id]).first! if params[:id]
         @resource_record
       end
 
       # Returns the submitted resource parameters
       # @return [Hash] The submitted resource parameters
       def submitted_resource_params
-        @submitted_resource_params ||= build_form(resource_class.new).extract_input(params)[resource_param_key.to_sym]
+        @submitted_resource_params ||= build_form(resource_class.new).extract_input(params, view_context:)[resource_param_key.to_sym]
       end
 
       # Returns the resource parameters, including scoped and parent parameters
@@ -125,19 +125,23 @@ module Plutonium
       # Applies submitted resource params if they have been passed
       def maybe_apply_submitted_resource_params!
         ensure_get_request
-        resource_record.attributes = submitted_resource_params if params[resource_param_key].present?
+        resource_record.attributes = submitted_resource_params if params[resource_param_key]
       end
 
       # Returns the current parent based on path parameters
       # @return [ActiveRecord::Base, nil] The current parent
       def current_parent
-        return unless parent_route_param.present?
+        return unless parent_route_param
 
         @current_parent ||= begin
           parent_route_key = parent_route_param.to_s.gsub(/_id$/, "").to_sym
           parent_class = current_engine.resource_register.route_key_lookup[parent_route_key]
-          parent_scope = parent_class.from_path_param(params[parent_route_param])
-          parent_scope = parent_scope.associated_with(current_scoped_entity) if scoped_to_entity?
+          parent_scope = if scoped_to_entity?
+            parent_class.associated_with(current_scoped_entity)
+          else
+            parent_class.all
+          end
+          parent_scope = parent_scope.from_path_param(params[parent_route_param])
           current_parent = parent_scope.first!
           authorize! current_parent, to: :read?
           current_parent
@@ -153,7 +157,7 @@ module Plutonium
       # Returns the parent input parameter
       # @return [Symbol, nil] The parent input parameter
       def parent_input_param
-        return unless current_parent.present?
+        return unless current_parent
 
         resource_class.reflect_on_all_associations(:belongs_to).find { |assoc| assoc.klass.name == current_parent.class.name }&.name&.to_sym
       end
@@ -182,7 +186,7 @@ module Plutonium
       # Overrides parent parameters
       # @param [Hash] input_params The input parameters
       def override_parent_params(input_params)
-        if current_parent.present?
+        if current_parent
           if input_params.key?(parent_input_param) || resource_class.method_defined?(:"#{parent_input_param}=")
             input_params[parent_input_param] = current_parent
           end

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

@@ -112,7 +112,7 @@ module Plutonium
         #
         # @return [Hash] default context for the current resource's policy
         def current_policy_context
-          {scope: current_parent || entity_scope_for_authorize}
+          {entity_scope: current_parent || entity_scope_for_authorize}
         end
 
         # Authorizes the current action for the given record of the current resource
@@ -130,7 +130,7 @@ module Plutonium
         #
         # @return [Array<Symbol>] the list of permitted attributes for the current action
         def permitted_attributes
-          @permitted_attributes ||= current_policy.send_with_report(:"permitted_attributes_for_#{action_name}")
+          @permitted_attributes ||= current_policy.send_with_report(:"permitted_attributes_for_#{action_name}").freeze
         end
 
         # Returns the list of permitted associations for the current resource

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

@@ -232,7 +232,7 @@ module Plutonium
           @submitted_interaction_params ||= current_interactive_action
             .interaction
             .build_form(nil)
-            .extract_input(params)[:interaction]
+            .extract_input(params, view_context:)[:interaction]
         end
 
         def redirect_url_after_action_on(resource_record_or_resource_class)

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

@@ -5,7 +5,6 @@ module Plutonium
         extend ActiveSupport::Concern
 
         included do
-          helper_method :presentable_attributes, :present_associations?
           helper_method :build_form, :build_detail, :build_collection
         end
 
@@ -14,12 +13,24 @@ module Plutonium
         def presentable_attributes
           @presentable_attributes ||= begin
             presentable_attributes = permitted_attributes
-            presentable_attributes -= [scoped_entity_param_key, :"#{scoped_entity_param_key}_id"] if scoped_to_entity?
-            presentable_attributes -= [parent_input_param, :"#{parent_input_param}_id"] if current_parent.present?
+            if current_parent
+              presentable_attributes -= [parent_input_param, :"#{parent_input_param}_id"]
+            elsif scoped_to_entity?
+              presentable_attributes -= [scoped_entity_param_key, :"#{scoped_entity_param_key}_id"]
+            end
             presentable_attributes
           end
         end
 
+        def submittable_attributes
+          @submittable_attributes ||= begin
+            submittable_attributes = permitted_attributes
+            submittable_attributes -= [parent_input_param, :"#{parent_input_param}_id"] if current_parent
+            submittable_attributes -= [scoped_entity_param_key, :"#{scoped_entity_param_key}_id"] if scoped_to_entity?
+            submittable_attributes
+          end
+        end
+
         def build_collection
           current_definition.collection_class.new(@resource_records, resource_fields: presentable_attributes, resource_definition: current_definition)
         end
@@ -29,11 +40,7 @@ module Plutonium
         end
 
         def build_form(record = resource_record)
-          current_definition.form_class.new(record, resource_fields: presentable_attributes, resource_definition: current_definition)
-        end
-
-        def present_associations?
-          current_parent.nil?
+          current_definition.form_class.new(record, resource_fields: submittable_attributes, resource_definition: current_definition)
         end
       end
     end

data/lib/plutonium/ui/block.rb

@@ -0,0 +1,13 @@
+module Plutonium
+  module UI
+    class Block < Plutonium::UI::Component::Base
+      def view_template(&)
+        raise ArgumentError, "Block requires a content block" unless block_given?
+
+        div class: "relative bg-white dark:bg-gray-800 shadow-md sm:rounded-lg my-3" do
+          yield
+        end
+      end
+    end
+  end
+end

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

@@ -10,6 +10,16 @@ module Plutonium
 
         def Breadcrumbs(...) = render Plutonium::UI::Breadcrumbs.new(...)
 
+        def SkeletonTable(...) = render Plutonium::UI::SkeletonTable.new(...)
+
+        def Block(...) = render Plutonium::UI::Block.new(...)
+
+        def Panel(...) = render Plutonium::UI::Panel.new(...)
+
+        def FrameNavigatorPanel(...) = render Plutonium::UI::FrameNavigatorPanel.new(...)
+
+        def DynaFrameHost(...) = render Plutonium::UI::DynaFrame::Host.new(...)
+
         def DynaFrameContent(...) = render Plutonium::UI::DynaFrame::Content.new(...)
 
         def PageHeader(...) = render Plutonium::UI::PageHeader.new(...)

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

@@ -21,19 +21,37 @@ module Plutonium
         private
 
         def render_fields
-          fields_wrapper {
-            resource_fields.each { |name|
-              render_resource_field name
-            }
-          }
+          Block do
+            fields_wrapper do
+              resource_fields.each do |name|
+                render_resource_field name
+              end
+            end
+          end
         end
 
         def render_associations
-          nil
-          # TODO
-          # resource_associations.each do |name, renderer|
-          #   #     <%= render renderer.with(record: details.record) %>
-          # end
+          resource_associations.each do |name|
+            reflection = object.class.reflect_on_association name
+
+            if !reflection
+              raise ArgumentError,
+                "unknown association #{object.class}##{name} defined in #permitted_associations"
+            elsif !registered_resources.include?(reflection.klass)
+              raise ArgumentError,
+                "#{object.class}##{name} defined in #permitted_associations, but #{reflection.klass} is not a registered resource"
+            end
+
+            title = object.class.human_attribute_name(name)
+            src = case reflection.macro
+            when :belongs_to
+              associated = object.public_send name
+              resource_url_for(associated, parent: nil) if associated
+            when :has_many
+              resource_url_for(reflection.klass, parent: object)
+            end
+            FrameNavigatorPanel(title:, src:) if src
+          end
         end
 
         def render_resource_field(name)
@@ -73,7 +91,7 @@ module Plutonium
         end
 
         def present_associations?
-          current_parent.nil?
+          current_turbo_frame.nil?
         end
       end
     end

data/lib/plutonium/ui/display/theme.rb

@@ -6,7 +6,7 @@ module Plutonium
       class Theme < Phlexi::Display::Theme
         def self.theme
           super.merge({
-            base: "relative bg-white dark:bg-gray-800 shadow-md sm:rounded-lg my-3",
+            base: "",
             value_wrapper: "max-h-[300px] overflow-y-auto",
             fields_wrapper: "p-6 grid grid-cols-1 md:grid-cols-2 2xl:grid-cols-4 gap-6 gap-y-10 grid-flow-row-dense",
             label: "text-base font-bold text-gray-500 dark:text-gray-400 mb-1",

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

@@ -6,10 +6,10 @@ module Plutonium
 
         def view_template
           if current_turbo_frame.present?
-            render turbo_frame_tag(current_turbo_frame) {
+            turbo_frame_tag(current_turbo_frame) do
               render "flash"
               yield
-            }
+            end
           else
             yield
           end

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

@@ -0,0 +1,20 @@
+module Plutonium
+  module UI
+    module DynaFrame
+      class Host < Plutonium::UI::Component::Base
+        include Phlex::Rails::Helpers::TurboFrameTag
+
+        def initialize(src:, loading:, id: SecureRandom.hex, **attributes)
+          @id = id
+          @src = src
+          @loading = loading
+          @attributes = attributes
+        end
+
+        def view_template(&)
+          turbo_frame_tag(@id, src: @src, loading: @loading, **@attributes, class: 'dyna', &)
+        end
+      end
+    end
+  end
+end