plutonium 0.15.7 → 0.15.9

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

@@ -5,7 +5,6 @@ module Plutonium
         extend ActiveSupport::Concern
 
         included do
-          helper_method :presentable_attributes
           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,7 +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)
+          current_definition.form_class.new(record, resource_fields: submittable_attributes, resource_definition: current_definition)
         end
       end
     end

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

@@ -12,7 +12,7 @@ module Plutonium
         end
 
         def view_template(&)
-          turbo_frame_tag(@id, src: @src, loading: @loading, **@attributes, &)
+          turbo_frame_tag(@id, src: @src, loading: @loading, **@attributes, class: 'dyna', &)
         end
       end
     end

data/lib/plutonium/ui/form/concerns/renders_nested_resource_fields.rb

@@ -5,6 +5,7 @@ module Plutonium
     module Form
       module Concerns
         # Handles rendering of nested resource fields in forms
+        # TODO: further decompose this into components
         # @api private
         module RendersNestedResourceFields
           extend ActiveSupport::Concern
@@ -19,75 +20,51 @@ module Plutonium
             defineable_props :field, :input
           end
 
-          # Template object for new nested records
-          class NotPersisted
-            def persisted?
-              false
-            end
-          end
-
-          private
-
-          # Renders a nested resource field with associated inputs
-          # @param [Symbol] name The name of the nested resource field
-          # @raise [ArgumentError] if the nested input definition is missing required configuration
-          def render_nested_resource_field(name)
-            context = NestedFieldContext.new(
-              name: name,
-              definition: build_nested_definition(name),
-              resource_class: resource_class,
-              resource_definition: resource_definition
-            )
-
-            render_nested_field_container(context) do
-              render_nested_field_header(context)
-              render_nested_field_content(context)
-              render_nested_add_button(context)
-            end
-          end
-
-          private
-
           class NestedFieldContext
             attr_reader :name, :definition, :options, :permitted_fields
 
-            def initialize(name:, definition:, resource_class:, resource_definition:)
+            def initialize(name:, definition:, resource_class:, resource_definition:, object_class:)
               @name = name
               @definition = definition
               @resource_definition = resource_definition
               @resource_class = resource_class
               @options = build_options
               @permitted_fields = build_permitted_fields
+              @object_class = object_class
             end
 
             def nested_attribute_options
               @nested_attribute_options ||= @resource_class.all_nested_attributes_options[@name] || {}
             end
 
-            def nested_input_param
+            def nested_fields_input_param
               @options[:as] || :"#{@name}_attributes"
             end
 
-            def multiple?
+            def nested_fields_multiple?
               @options[:multiple]
             end
 
+            def blank_object
+              (@object_class || nested_attribute_options[:class])&.new
+            end
+
             private
 
             def build_options
               options = @resource_definition.defined_nested_inputs[@name][:options].dup || {}
-              merge_nested_options(options)
-              set_nested_limits(options)
+              merge_nested_fields_options(options)
+              set_nested_fields_limits(options)
               options
             end
 
-            def merge_nested_options(options)
+            def merge_nested_fields_options(options)
               NESTED_OPTION_KEYS.each do |key|
                 options.fetch(key) { options[key] = nested_attribute_options[key] }
               end
             end
 
-            def set_nested_limits(options)
+            def set_nested_fields_limits(options)
               options.fetch(:limit) do
                 options[:limit] = if SINGULAR_MACROS.include?(nested_attribute_options[:macro])
                   1
@@ -106,19 +83,43 @@ module Plutonium
             end
           end
 
-          def build_nested_definition(name)
+          # Template object for new nested records
+
+          private
+
+          # Renders a nested resource field with associated inputs
+          # @param [Symbol] name The name of the nested resource field
+          # @raise [ArgumentError] if the nested input definition is missing required configuration
+          def render_nested_resource_field(name)
+            # debugger if $extracting_input
+            context = NestedFieldContext.new(
+              name: name,
+              definition: build_nested_fields_definition(name),
+              resource_class: resource_class,
+              resource_definition: resource_definition,
+              object_class: resource_definition.defined_nested_inputs[name][:options]&.fetch(:object_class, nil)
+            )
+
+            render_nested_field_container(context) do
+              render_nested_field_header(context)
+              render_nested_field_content(context)
+              render_nested_fields_add_button(context)
+            end
+          end
+
+          def build_nested_fields_definition(name)
             nested_input_definition = resource_definition.defined_nested_inputs[name]
 
             if nested_input_definition[:options]&.fetch(:using, nil)
               nested_input_definition[:options][:using]
             elsif nested_input_definition[:block]
-              build_definition_from_block(nested_input_definition[:block])
+              build_nested_fields_definition_from_block(nested_input_definition[:block])
             else
               raise_missing_nested_definition_error(name)
             end
           end
 
-          def build_definition_from_block(block)
+          def build_nested_fields_definition_from_block(block)
             definition = NestedInputsDefinition.new
             block.call(definition)
             definition
@@ -138,16 +139,16 @@ module Plutonium
           def render_nested_field_header(context)
             div do
               h2(class: "text-lg font-semibold text-gray-900 dark:text-white") { context.name.to_s.humanize }
-              render_description(context.options[:description]) if context.options[:description]
+              render_nested_fields_header_description(context.options[:description]) if context.options[:description]
             end
           end
 
-          def render_description(description)
+          def render_nested_fields_header_description(description)
             p(class: "text-md font-normal text-gray-500 dark:text-gray-400") { description }
           end
 
           def render_nested_field_content(context)
-            if context.multiple?
+            if context.nested_fields_multiple?
               render_multiple_nested_fields(context)
             else
               render_single_nested_field(context)
@@ -157,77 +158,79 @@ module Plutonium
           end
 
           def render_multiple_nested_fields(context)
-            render_template_for_nested_fields(context, collection: {NEW_RECORD: NotPersisted.new})
-            render_existing_nested_fields(context)
+            nesting_method = :nest_many
+            options = {default: {NEW_RECORD: context.blank_object}}
+            render_template_for_nested_fields(context, options, nesting_method:)
+            render_existing_nested_fields(context, options, nesting_method:)
           end
 
           def render_single_nested_field(context)
-            render_template_for_nested_fields(context, object: NotPersisted.new)
-            render_existing_nested_fields(context, single: true)
+            nesting_method = :nest_one
+            options = {default: context.blank_object}
+            render_template_for_nested_fields(context, options, nesting_method:)
+            render_existing_nested_fields(context, options, nesting_method:)
           end
 
-          def render_template_for_nested_fields(context, field_options)
+          def render_template_for_nested_fields(context, options, nesting_method:)
             template_tag data_nested_resource_form_fields_target: "template" do
-              nesting_method = field_options[:collection] ? :nest_many : :nest_one
-              send(nesting_method, context.name, as: context.nested_input_param, template: true, **field_options) do |nested|
-                render_fieldset(nested, context)
+              send(nesting_method, context.name, as: context.nested_fields_input_param, **options, template: true) do |nested|
+                render_nested_fields_fieldset(nested, context)
               end
             end
           end
 
-          def render_existing_nested_fields(context, single: false)
-            nesting_method = single ? :nest_one : :nest_many
-            send(nesting_method, context.name, as: context.nested_input_param) do |nested|
-              render_fieldset(nested, context)
+          def render_existing_nested_fields(context, options, nesting_method:)
+            send(nesting_method, context.name, as: context.nested_fields_input_param, **options) do |nested|
+              render_nested_fields_fieldset(nested, context)
             end
           end
 
-          def render_fieldset(nested, context)
+          def render_nested_fields_fieldset(nested, context)
             fieldset(
               data_new_record: !nested.object&.persisted?,
               class: "nested-resource-form-fields border border-gray-200 dark:border-gray-700 rounded-lg p-4 space-y-4 relative"
             ) do
-              render_fieldset_content(nested, context)
-              render_delete_button(nested, context.options)
+              render_nested_fields_fieldset_content(nested, context)
+              render_nested_fields_delete_button(nested, context.options)
             end
           end
 
-          def render_fieldset_content(nested, context)
+          def render_nested_fields_fieldset_content(nested, context)
             div(class: "grid grid-cols-1 md:grid-cols-2 2xl:grid-cols-4 gap-4 grid-flow-row-dense") do
-              render_hidden_fields(nested, context)
-              render_input_fields(nested, context)
+              render_nested_fields_hidden_fields(nested, context)
+              render_nested_fields_visible_fields(nested, context)
             end
           end
 
-          def render_hidden_fields(nested, context)
+          def render_nested_fields_hidden_fields(nested, context)
             if !context.options[:update_only] && context.options[:class]&.respond_to?(:primary_key)
               render nested.field(context.options[:class].primary_key).hidden_tag
             end
             render nested.field(:_destroy).hidden_tag if context.options[:allow_destroy]
           end
 
-          def render_input_fields(nested, context)
+          def render_nested_fields_visible_fields(nested, context)
             context.permitted_fields.each do |input|
               render_simple_resource_field(input, context.definition, nested)
             end
           end
 
-          def render_delete_button(nested, options)
+          def render_nested_fields_delete_button(nested, options)
             return unless !nested.object&.persisted? || options[:allow_destroy]
 
-            render_delete_button_content
+            render_nested_fields_delete_button_content
           end
 
-          def render_delete_button_content
+          def render_nested_fields_delete_button_content
             div(class: "flex items-center justify-end") do
               label(class: "inline-flex items-center text-md font-medium text-red-900 cursor-pointer") do
                 plain "Delete"
-                render_delete_checkbox
+                render_nested_fields_delete_checkbox
               end
             end
           end
 
-          def render_delete_checkbox
+          def render_nested_fields_delete_checkbox
             input(
               type: :checkbox,
               class: "w-4 h-4 ms-2 text-red-600 bg-red-100 border-red-300 rounded focus:ring-red-500 dark:focus:ring-red-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer",
@@ -235,7 +238,7 @@ module Plutonium
             )
           end
 
-          def render_nested_add_button(context)
+          def render_nested_fields_add_button(context)
             div do
               button(
                 type: :button,
@@ -245,12 +248,12 @@ module Plutonium
                   nested_resource_form_fields_target: "addButton"
                 }
               ) do
-                render_add_button_content(context.name)
+                render_nested_fields_add_button_content(context.name)
               end
             end
           end
 
-          def render_add_button_content(name)
+          def render_nested_fields_add_button_content(name)
             span(class: "bg-secondary-700 text-white hover:bg-secondary-800 focus:ring-secondary-300 dark:bg-secondary-600 dark:hover:bg-secondary-700 dark:focus:ring-secondary-800 flex items-center justify-center px-4 py-1.5 text-sm font-medium rounded-lg focus:outline-none focus:ring-4") do
               render Phlex::TablerIcons::Plus.new(class: "w-4 h-4 mr-1")
               span { "Add #{name.to_s.singularize.humanize}" }

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

@@ -94,7 +94,7 @@ module Plutonium
         end
 
         def render_footer
-          div(class: "sticky bottom-[-2px] mt-1 p-4 pb-6 w-full z-50 bg-gray-50 dark:bg-gray-900") {
+          div(class: "sticky dyna:static bottom-[-2px] mt-1 p-4 pb-6 w-full z-50 bg-gray-50 dark:bg-gray-900") {
             TableInfo(pagy_instance)
             TablePagination(pagy_instance)
           }

data/lib/plutonium/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@radioactive-labs/plutonium",
-      "version": "0.1.5",
+      "version": "0.1.6",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",

data/tailwind.config.js

@@ -1,9 +1,19 @@
 /** @type {import('tailwindcss').Config} */
 
+const tailwindPlugin = require('tailwindcss/plugin')
 const options = require("./tailwind.options.js")
 
 export const content = options.content
 export const darkMode = options.darkMode
-export const plugins = options.plugins.map((plugin) => require(plugin))
+export const plugins = options.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)}`)
+  }
+})
 export const theme = options.theme
 export const safelist = options.safelist

data/tailwind.options.js

@@ -12,7 +12,13 @@ export const darkMode = "selector";
 export const plugins = [
   // requires users to have the required packages installed in their own project.
   "@tailwindcss/forms",
-  "flowbite/plugin"
+  "flowbite/plugin",
+  function ({ addVariant }) {
+    // This creates a variant that applies when an ancestor has data-dyna="true"
+    // addVariant('dyna-frame', '&:has([data-dyna-frame="true"] &)')
+    // Or if you prefer using a class instead of data attribute:
+    addVariant('dyna', ':where(.dyna, .dyna *) &')
+  }
 ];
 export const theme = {
   extend: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.9
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -1039,6 +1039,7 @@ files:
 - docs/guide/getting-started/index.md
 - docs/guide/getting-started/installation.md
 - docs/guide/getting-started/resources.md
+- docs/guide/tutorial.md
 - docs/guide/what-is-plutonium.md
 - docs/index.md
 - docs/markdown-examples.md
@@ -1052,6 +1053,15 @@ files:
 - docs/public/site.webmanifest
 - docs/public/templates/base.rb
 - docs/public/templates/plutonium.rb
+- docs/public/tutorial/plutonium-association-panel.png
+- docs/public/tutorial/plutonium-dashboard.png
+- docs/public/tutorial/plutonium-login-page.png
+- docs/public/tutorial/plutonium-nested-form.png
+- docs/public/tutorial/plutonium-posts-dashboard-customized.png
+- docs/public/tutorial/plutonium-posts-dashboard.png
+- docs/public/tutorial/plutonium-posts-detail-customized.png
+- docs/public/tutorial/plutonium-posts-detail.png
+- docs/public/tutorial/plutonium-publish-post.png
 - esbuild.config.js
 - exe/pug
 - gemfiles/rails_7.gemfile
@@ -1083,6 +1093,8 @@ files:
 - lib/generators/pu/docker/install/templates/docker-compose.yml
 - lib/generators/pu/eject/layout/layout_generator.rb
 - lib/generators/pu/eject/shell/shell_generator.rb
+- lib/generators/pu/extra/colorized_logger/colorized_logger_generator.rb
+- lib/generators/pu/extra/colorized_logger/templates/config/initializers/colorized_logger.rb
 - lib/generators/pu/field/input/input_generator.rb
 - lib/generators/pu/field/input/templates/.keep
 - lib/generators/pu/field/input/templates/input.rb.tt