plutonium 0.15.0.pre.rc3 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405c1eab2d9e447c8a04632503a74cd7738a3e538b9f4c81d3f2f5388cc69db3
-  data.tar.gz: 56abd90667c0ebed5de99983ecda28602d30bce10cfc25f7ea4050db83ae65a1
+  metadata.gz: 307fb5dad4c2e8939eeb21880f8c17875addd10250bbdb0e41657ec7318aacb6
+  data.tar.gz: 9de4a57e5a7f35f4819c832fef7d0d8370b0ec2ff1f8b546e562c7d330e405c1
 SHA512:
-  metadata.gz: facccabb9461dd0948ae6c3ec7ff1cffce5430cf927d628abfc29725faf4155d5acdfe2990f1ecb23255baa5ffd9b8004a4da5cb274a26c50b62c3db921153ac
-  data.tar.gz: 3a87907c78fbedf64c9fa96d4c206d5880f8984cc6dee212eeb1d1435b8c6a87bb410fbcd3e42aec80177ba29b45a17fd7dd76250755eba94c6454587b54ed79
+  metadata.gz: '0391c0561b9d75ab2793f60e80b7084e705c3f4766b83d47c18944c2fd9fe0b0615bbb920e321e2147ac166359ad8038a951d8ddbd2637373bc2ac5ee74bb699'
+  data.tar.gz: cd3a020f588252e9517281887c332fec3b491c12802946d7d3f19f597659a6ca6f77a823aaf016c7a0aeb0bc0df3cd430e73e30cfc7ffa28c3cfc1a522219fdc

data/app/views/components/form/form_builder.rb

@@ -2,7 +2,7 @@ require "simple_form"
 
 module PlutoniumUi
   class FormBuilder < SimpleForm::FormBuilder
-    def input(attribute_name, options = {}, &block)
+    def input(attribute_name, options = {}, &)
       label_class = options.dig(:label_html, :class)
       if object&.errors&.[](attribute_name).present?
         # Don't show the hint
@@ -19,13 +19,13 @@ module PlutoniumUi
       options[:label_html] ||= {}
       options[:label_html][:class] = label_class
 
-      super(attribute_name, options, &block)
+      super
     end
 
     def hint(...)
       return if object.errors[attribute_name].present?
 
-      super(...)
+      super
     end
 
     def return_to(url)

data/app/views/components/table/table_component.rb

@@ -9,7 +9,7 @@ module PlutoniumUi
     #
     # @param options [Hash] The options for the component.
     def initialize(...)
-      super(...)
+      super
       @columns = []
     end
 

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

@@ -0,0 +1 @@
+<%= render @interaction.build_form %>

data/app/views/resource/{interactive_resource_collection_action.html.erb → interactive_bulk_action.html.erb}

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

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

@@ -0,0 +1 @@
+<%= render current_definition.interactive_action_page_class.new %>

data/app/views/resource/{interactive_resource_record_action.html.erb → interactive_resource_action.html.erb}

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

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

@@ -106,7 +106,7 @@ module PlutoniumGenerators
     end
 
     def yes?(statement, color = nil)
-      !interactive? || super(statement, color)
+      !interactive? || super
     end
 
     def interactive?

data/lib/plutonium/action/base.rb

@@ -16,13 +16,14 @@ module Plutonium
     # @attr_reader [Symbol, nil] category The category of the action.
     # @attr_reader [Integer] position The position of the action within its category.
     class Base
-      attr_reader :name, :label, :icon, :route_options, :confirmation, :turbo_frame, :color, :category, :position
+      attr_reader :name, :label, :description, :icon, :route_options, :confirmation, :turbo, :turbo_frame, :color, :category, :position
 
       # Initialize a new action.
       #
       # @param [Symbol] name The name of the action.
       # @param [Hash] options The options for the action.
       # @option options [String] :label The human-readable label for the action.
+      # @option options [String] :description The human-readable description for the action.
       # @option options [String] :icon The icon associated with the action (e.g., 'fa-edit' for Font Awesome).
       # @option options [Symbol] :color The color associated with the action (e.g., :primary, :secondary, :success, :warning, :danger).
       # @option options [String] :confirmation The confirmation message to display before executing the action.
@@ -40,11 +41,13 @@ module Plutonium
       # @option options [Integer] :position (50) The position of the action in its group. Lower numbers appear first.
       def initialize(name, **options)
         @name = name.to_sym
-        @label = options[:label] || name.to_s.humanize
-        @icon = options[:icon]
+        @label = options[:label] || @name.to_s.titleize
+        @description = options[:description]
+        @icon = options[:icon] || Phlex::TablerIcons::ChevronRight
         @color = options[:color]
         @confirmation = options[:confirmation]
         @route_options = build_route_options(options[:route_options])
+        @turbo = options[:turbo]
         @turbo_frame = options[:turbo_frame]
         @bulk_action = options[:bulk_action] || false
         @collection_record_action = options[:collection_record_action] || false

data/lib/plutonium/action/interactive.rb

@@ -15,11 +15,15 @@ module Plutonium
       # @param [Class] interaction The interaction class for this action
       # @param [Boolean] immediate Whether the action is executed immediately
       # @param [Hash] options Additional options for the action
-      def initialize(name, interaction:, immediate:, **)
+      def initialize(name, interaction:, immediate:, **options)
         @interaction = interaction
         @immediate = immediate
 
-        super(name, **)
+        options[:label] ||= interaction.label
+        options[:description] ||= interaction.description
+        options[:icon] ||= interaction.icon
+
+        super(name, **options)
       end
 
       # Get the confirmation message for the action
@@ -31,6 +35,8 @@ module Plutonium
 
       # Factory for creating Interactive actions
       class Factory
+        # TODO: move these into Plutonium::Action::Interactive
+
         # Create a new Interactive action based on the interaction type
         #
         # @param [Symbol] name The name of the action
@@ -50,6 +56,7 @@ module Plutonium
             interaction: interaction,
             immediate: immediate,
             route_options: route_options,
+            turbo: interaction.turbo,
             **action_options,
             **options
           )
@@ -69,11 +76,11 @@ module Plutonium
         # @return [Symbol] The determined action type
         def self.determine_action_type(attribute_names)
           if attribute_names.include?(:resource)
-            :interactive_resource_record_action
+            :interactive_record_action
           elsif attribute_names.include?(:resources)
-            :interactive_resource_collection_action
+            :interactive_collection_action
           else
-            :interactive_resource_recordless_action
+            :interactive_resource_action
           end
         end
 
@@ -91,10 +98,10 @@ module Plutonium
         # @return [Hash] The action options
         def self.determine_action_options(action_type)
           {
-            bulk_action: action_type == :interactive_resource_collection_action,
-            record_action: action_type == :interactive_resource_record_action,
-            collection_record_action: action_type == :interactive_resource_record_action,
-            resource_action: action_type == :interactive_resource_recordless_action
+            bulk_action: action_type == :interactive_collection_action,
+            record_action: action_type == :interactive_record_action,
+            collection_record_action: action_type == :interactive_record_action,
+            resource_action: action_type == :interactive_resource_action
           }
         end
 

data/lib/plutonium/core/actions/basic_action.rb

@@ -2,9 +2,9 @@ module Plutonium
   module Core
     module Actions
       class BasicAction < Plutonium::Core::Action
-        def initialize(*args, **kwargs)
+        def initialize(*, **kwargs)
           kwargs.reverse_merge! action_options
-          super(*args, **kwargs)
+          super
         end
 
         private

data/lib/plutonium/core/actions/interactive_action.rb

@@ -8,12 +8,12 @@ module Plutonium
 
         attr_reader :interaction, :inline, :inputs
 
-        def initialize(name, *args, interaction:, **kwargs)
+        def initialize(name, *, interaction:, **kwargs)
           set_interaction interaction
 
           kwargs[:route_options] ||= build_route_options name
           kwargs.reverse_merge! action_options
-          super(name, *args, **kwargs)
+          super(name, *, **kwargs)
         end
 
         def confirmation

data/lib/plutonium/core/controller.rb

@@ -99,7 +99,7 @@ module Plutonium
       def root_path(*)
         return send(:"#{scoped_entity_param_key}_root_path", *) if scoped_to_entity? && scoped_entity_strategy == :path
 
-        super(*)
+        super
       end
 
       def registered_resources

data/lib/plutonium/core/fields/inputs/attachment_input.rb

@@ -5,9 +5,9 @@ module Plutonium
         class AttachmentInput < SimpleFormInput
           attr_reader :reflection
 
-          def initialize(name, reflection:, **options)
+          def initialize(name, reflection:, **)
             @reflection = reflection
-            super(name, **options)
+            super(name, **)
           end
 
           private

data/lib/plutonium/core/fields/inputs/nested_input.rb

@@ -7,14 +7,14 @@ module Plutonium
 
           attr_reader :inputs, :resource_class
 
-          def initialize(name, inputs:, resource_class:, allow_destroy:, update_only:, limit:, **options)
+          def initialize(name, inputs:, resource_class:, allow_destroy:, update_only:, limit:, **)
             @inputs = inputs
             @resource_class = resource_class
             @allow_destroy = allow_destroy
             @update_only = update_only
             @limit = limit
 
-            super(name, **options)
+            super(name, **)
           end
 
           def render

data/lib/plutonium/definition/base.rb

@@ -27,6 +27,7 @@ module Plutonium
       include DefineableProps
       include ConfigAttr
       include Actions
+      include Sorting
       include Search
 
       class IndexPage < Plutonium::UI::Page::Index; end
@@ -37,6 +38,8 @@ module Plutonium
 
       class EditPage < Plutonium::UI::Page::Edit; end
 
+      class InteractiveActionPage < Plutonium::UI::Page::InteractiveAction; end
+
       class Form < Plutonium::UI::Form::Resource; end
 
       class Table < Plutonium::UI::Table::Resource; end
@@ -47,7 +50,7 @@ module Plutonium
       defineable_props :field, :input, :display, :column
 
       # queries
-      defineable_props :filter, :scope, :sort
+      defineable_props :filter, :scope
 
       # pages
       config_attr \
@@ -76,6 +79,10 @@ module Plutonium
         self.class::EditPage
       end
 
+      def interactive_action_page_class
+        self.class::InteractiveActionPage
+      end
+
       def form_class
         self.class::Form
       end

data/lib/plutonium/definition/sorting.rb

@@ -0,0 +1,15 @@
+module Plutonium
+  module Definition
+    module Sorting
+      extend ActiveSupport::Concern
+
+      included do
+        defineable_props :sort
+
+        def self.sorts(*names)
+          names.each { |name| sort name }
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/interaction/README.md

@@ -255,7 +255,7 @@ class MyInteraction < Plutonium::Interaction::Base
   include Plutonium::Interaction::Concerns::Presentable
 
   presents label: "My Interaction",
-           icon: "star",
+           icon: Phlex::TablerIcons::Activate,
            description: "Does something awesome"
 
   # ... rest of the interaction
@@ -366,4 +366,37 @@ module Orders
   end
 end
 ```
+
+
+  class Sample < Phlex::HTML
+    def view_template
+      p { "my custom template" }
+    end
+  end
+
+  class Rename < ResourceInteraction
+    attribute :resource
+
+    attribute :name
+    validates :name, presence: true
+
+    # input :name, as: :file
+    turbo false
+
+    presents label: "Rename resource",
+      icon: Phlex::TablerIcons::Pencil,
+      description: "Some cool stuff"
+
+    private
+
+    def execute
+      resource.name = name
+      if resource.save
+        succeed.with_message("Action completed").with_render_response(Sample.new)
+      else
+        failed resource.errors
+      end
+    end
+  end
+  # action :rename, interaction: Rename
 -->

data/lib/plutonium/interaction/base.rb

@@ -22,9 +22,16 @@ module Plutonium
     class Base
       include ActiveModel::Model
       include ActiveModel::Attributes
-      # include Concerns::Presentable
+      include Concerns::Presentable
+      include Plutonium::Definition::DefineableProps
+      include Plutonium::Definition::ConfigAttr
       # include Concerns::WorkflowDSL
 
+      class Form < Plutonium::UI::Form::Interaction; end
+
+      config_attr :turbo
+      defineable_props :field, :input
+
       # Executes the interaction with the given arguments.
       #
       # @param args [Hash] The arguments to initialize the interaction.
@@ -33,17 +40,30 @@ module Plutonium
         new(**args).call
       end
 
+      def self.build_form(instance)
+        self::Form.new(instance || new)
+      end
+
       # Executes the interaction.
       #
       # @return [Plutonium::Interaction::Outcome] The result of the interaction.
       def call
         if valid?
-          execute
+          outcome = execute
+          unless outcome.is_a?(Plutonium::Interaction::Outcome)
+            raise "#{self.class}#execute must return an instance of Plutonium::Interaction::Outcome.\n" \
+                  "#{outcome.inspect} received instead"
+          end
+          outcome
         else
-          failure(errors)
+          failure.with_message("An error occurred")
         end
       end
 
+      def build_form
+        self.class.build_form(self)
+      end
+
       private
 
       # Implement the main logic of the interaction.
@@ -59,16 +79,27 @@ module Plutonium
       #
       # @param value [Object] The value to be wrapped in the successful outcome.
       # @return [Plutonium::Interaction::Success] A successful outcome.
-      def success(value)
-        Success.new(value)
+      def succeed(value = nil)
+        Plutonium::Interaction::Outcome::Success.new(value)
+      end
+      alias_method :success, :succeed
+
+      def failed(errors = nil, attribute = :base)
+        case errors
+        when Hash
+          errors.each { |attribute, error| self.errors.add(attribute, error) }
+        else
+          Array(errors).each { |error| self.errors.add(attribute, error) }
+        end
+        failure
       end
 
       # Creates a failure outcome.
       #
       # @param errors [ActiveModel::Errors, Array<String>] The errors to be wrapped in the failure outcome.
       # @return [Plutonium::Interaction::Failure] A failure outcome.
-      def failure(errors)
-        Failure.new(errors)
+      def failure
+        Plutonium::Interaction::Outcome::Failure.new
       end
     end
   end

data/lib/plutonium/interaction/concerns/presentable.rb

@@ -33,27 +33,39 @@ module Plutonium
           def presents(**options)
             self.presentation_metadata = options
           end
+
+          # Returns the label for the interaction.
+          #
+          # @return [String] The label defined in the presentation metadata or a default generated from the class name.
+          def label
+            presentation_metadata[:label] || name.demodulize.titleize
+          end
+
+          # Returns the icon for the interaction.
+          #
+          # @return [String, nil] The icon defined in the presentation metadata.
+          def icon
+            presentation_metadata[:icon]
+          end
+
+          # Returns the description for the interaction.
+          #
+          # @return [String, nil] The description defined in the presentation metadata.
+          def description
+            presentation_metadata[:description]
+          end
         end
 
-        # Returns the label for the interaction.
-        #
-        # @return [String] The label defined in the presentation metadata or a default generated from the class name.
         def label
-          self.class.presentation_metadata[:label] || self.class.name.demodulize.titleize
+          self.class.label
         end
 
-        # Returns the icon for the interaction.
-        #
-        # @return [String, nil] The icon defined in the presentation metadata.
         def icon
-          self.class.presentation_metadata[:icon]
+          self.class.icon
         end
 
-        # Returns the description for the interaction.
-        #
-        # @return [String, nil] The description defined in the presentation metadata.
         def description
-          self.class.presentation_metadata[:description]
+          self.class.description
         end
       end
     end

data/lib/plutonium/interaction/outcome.rb

@@ -7,8 +7,7 @@ module Plutonium
     #
     # @abstract Subclass and override {#and_then}, {#map}, and {#to_response} to implement
     class Outcome
-      # @return [Array<Array(String, Symbol)>] Messages associated with the outcome.
-      attr_reader :messages
+      def messages = @messages || []
 
       # Checks if the outcome is successful.
       #
@@ -27,7 +26,7 @@ module Plutonium
       # Adds a message to the outcome.
       #
       # @param msg [String] The message to add.
-      # @param type [Symbol] The type of the message (e.g., :notice, :error).
+      # @param type [Symbol] The type of the message (e.g., :notice, :alert).
       # @return [self]
       def with_message(msg, type = :notice)
         @messages ||= []
@@ -60,69 +59,92 @@ module Plutonium
       def to_response
         raise NotImplementedError, "#{self.class} must implement #to_response"
       end
-    end
 
-    # Represents a successful outcome of an interaction.
-    class Success < Outcome
-      # @return [Object] The value wrapped by this successful outcome.
-      attr_reader :value
+      # Represents a successful outcome of an interaction.
+      class Success < Outcome
+        # @return [Object] The value wrapped by this successful outcome.
+        attr_reader :value
 
-      # @param value [Object] The value to be wrapped in this successful outcome.
-      def initialize(value)
-        @value = value
-      end
+        # @param value [Object] The value to be wrapped in this successful outcome.
+        def initialize(value)
+          @value = value
+        end
 
-      # Chains another operation to be executed with the value of this outcome.
-      #
-      # @yield [Object] The value wrapped by this outcome.
-      # @return [Outcome] The result of the yielded block.
-      def and_then
-        yield value
-      end
+        # Chains another operation to be executed with the value of this outcome.
+        #
+        # @yield [Object] The value wrapped by this outcome.
+        # @return [Outcome] The result of the yielded block.
+        def and_then
+          yield value
+        end
 
-      # Sets the response for this successful outcome.
-      #
-      # @param response [Plutonium::Interaction::Response::Base] The response to set.
-      # @return [self]
-      def with_response(response)
-        @to_response = nil
-        @response = response
-        self
-      end
+        # Sets the response for this successful outcome.
+        #
+        # @param response [Plutonium::Interaction::Response::Base] The response to set.
+        # @return [self]
+        def with_response(response)
+          @to_response = nil
+          @response = response
+          self
+        end
 
-      # Converts this successful outcome to a response object.
-      #
-      # @return [Plutonium::Interaction::Response::Base] The response object.
-      def to_response
-        @to_response ||= begin
-          @response ||= Response::Null.new(value)
-          @response.with_flash(messages)
+        def with_redirect_response(*, **)
+          with_response(Response::Redirect.new(*, **))
         end
-      end
-    end
 
-    # Represents a failed outcome of an interaction.
-    class Failure < Outcome
-      # @return [ActiveModel::Errors, Array<String>] The errors associated with this failure.
-      attr_reader :errors
+        def with_render_response(*, **)
+          with_response(Response::Render.new(*, **))
+        end
 
-      # @param errors [ActiveModel::Errors, Array<String>] The errors to be wrapped in this failure.
-      def initialize(errors)
-        @errors = errors
-      end
+        def with_file_response(*, **)
+          with_response(Response::File.new(*, **))
+        end
 
-      # Returns self without executing the given block, propagating the failure.
-      #
-      # @return [self]
-      def and_then
-        self
+        # Converts this successful outcome to a response object.
+        #
+        # @return [Plutonium::Interaction::Response::Base] The response object.
+        def to_response
+          @to_response ||= begin
+            @response ||= Response::Null.new(value)
+            @response.with_flash(messages)
+          end
+        end
       end
 
-      # Returns self without setting a response.
-      #
-      # @return [self]
-      def with_response(response)
-        self
+      # Represents a failed outcome of an interaction.
+      class Failure < Outcome
+        # Adds a message to the outcome.
+        #
+        # @param msg [String] The message to add.
+        # @param type [Symbol] The type of the message (e.g., :notice, :alert).
+        # @return [self]
+        def with_message(msg, type = :alert)
+          super
+        end
+
+        # Returns self without executing the given block, propagating the failure.
+        #
+        # @return [self]
+        def and_then
+          self
+        end
+
+        # Returns self without setting a response.
+        #
+        # @return [self]
+        def with_response(response)
+          self
+        end
+
+        # Converts this failure outcome to a response object.
+        #
+        # @return [Plutonium::Interaction::Response::Null] The response object.
+        def to_response
+          @to_response ||= begin
+            @response ||= Response::Failure.new
+            @response.with_flash(messages)
+          end
+        end
       end
     end
   end

data/lib/plutonium/interaction/response/base.rb

@@ -13,7 +13,9 @@ module Plutonium
         attr_reader :flash
 
         # Initializes a new Response::Base instance.
-        def initialize
+        def initialize(*args, **options)
+          @args = args
+          @options = options
           @flash = []
         end