plutonium 0.15.5 → 0.15.7

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/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

@@ -9,7 +9,7 @@ module Plutonium
 
         included do
           authorize :user, through: :current_user
-          authorize :scope, through: :entity_scope_for_authorize
+          authorize :entity_scope, through: :entity_scope_for_authorize
 
           helper_method :policy_for, :authorized_resource_scope
         end

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

@@ -53,10 +53,6 @@ module Plutonium
       extend_action_dispatch
     end
 
-    initializer "plutonium.active_record_extensions" do
-      extend_active_record
-    end
-
     initializer "plutonium.phlexi_themes" do
       setup_phlexi_themes
     end
@@ -114,11 +110,5 @@ module Plutonium
       ActionDispatch::Routing::RouteSet.prepend Plutonium::Routing::RouteSetExtensions
       Rails::Engine.include Plutonium::Routing::ResourceRegistration
     end
-
-    def extend_active_record
-      ActiveSupport.on_load(:active_record) do
-        include Plutonium::Resource::Record
-      end
-    end
   end
 end

data/lib/plutonium/resource/controller.rb

@@ -59,7 +59,7 @@ module Plutonium
       # 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

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

@@ -148,7 +148,7 @@ module Plutonium
         end
 
         def redirect_url_after_destroy
-          if (return_to = url_from(params[:return_to]))
+          if (return_to = url_from(params[:return_to])) && return_to != request.url
             return return_to
           end
 

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,7 @@ module Plutonium
         extend ActiveSupport::Concern
 
         included do
-          helper_method :presentable_attributes, :present_associations?
+          helper_method :presentable_attributes
           helper_method :build_form, :build_detail, :build_collection
         end
 
@@ -31,10 +31,6 @@ module Plutonium
         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?
-        end
       end
     end
   end

data/lib/plutonium/resource/policy.rb

@@ -7,13 +7,12 @@ module Plutonium
     # and to retrieve permitted attributes for these actions.
     class Policy < ActionPolicy::Base
       authorize :user, allow_nil: false
-      authorize :scope, allow_nil: true
+      authorize :entity_scope, allow_nil: true
 
       relation_scope do |relation|
-        if scope.present?
-          relation = relation.associated_with(scope)
-        end
-        relation
+        next relation unless entity_scope
+
+        relation.associated_with(entity_scope)
       end
 
       # Sends a method and raises an error if the method is not implemented.

data/lib/plutonium/resource/register.rb

@@ -21,6 +21,9 @@ module Plutonium
       # @return [void]
       def register(resource)
         raise FrozenRegisterError, "Cannot modify frozen resource register" if @frozen
+        unless resource.include?(Plutonium::Resource::Record)
+          raise ArgumentError, "#{resource} must include Plutonium::Resource::Record before being registered"
+        end
 
         @resources.add(resource.to_s)
       end

data/lib/plutonium/ui/action_button.rb

@@ -80,7 +80,7 @@ module Plutonium
         if @variant == :table
           "h-4 w-4 mr-1"
         else
-          "h-3.5 w-3.5 mr-2 -ml-1"
+          "h-3.5 w-3.5 -ml-1"
         end
       end
 
@@ -91,35 +91,50 @@ module Plutonium
       def color_classes
         case @action.color || @action.category.to_sym
         when :primary
-          table_variant_class(
-            "bg-primary-100 text-primary-700 hover:bg-primary-200 focus:ring-primary-300 dark:bg-primary-700 dark:text-primary-100 dark:hover:bg-primary-600 dark:focus:ring-primary-600",
-            "bg-primary-700 text-white hover:bg-primary-800 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
+          variant_class(
+            "bg-primary-700 text-white hover:bg-primary-800 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800",
+            table: "bg-primary-100 text-primary-700 hover:bg-primary-200 focus:ring-primary-300 dark:bg-primary-700 dark:text-primary-100 dark:hover:bg-primary-600 dark:focus:ring-primary-600"
+          )
+        when :success
+          variant_class(
+            "bg-success-700 text-white hover:bg-success-800 focus:ring-success-300 dark:bg-success-600 dark:hover:bg-success-700 dark:focus:ring-success-800",
+            table: "bg-success-100 text-success-700 hover:bg-success-200 focus:ring-success-300 dark:bg-success-700 dark:text-success-100 dark:hover:bg-success-600 dark:focus:ring-success-600"
+          )
+        when :info
+          variant_class(
+            "bg-info-700 text-white hover:bg-info-800 focus:ring-info-300 dark:bg-info-600 dark:hover:bg-info-700 dark:focus:ring-info-800",
+            table: "bg-info-100 text-info-700 hover:bg-info-200 focus:ring-info-300 dark:bg-info-700 dark:text-info-100 dark:hover:bg-info-600 dark:focus:ring-info-600"
           )
         when :warning
-          table_variant_class(
-            "bg-yellow-100 text-yellow-700 hover:bg-yellow-200 focus:ring-yellow-300 dark:bg-yellow-700 dark:text-yellow-100 dark:hover:bg-yellow-600 dark:focus:ring-yellow-600",
-            "bg-yellow-400 text-white hover:bg-yellow-500 focus:ring-yellow-300 dark:bg-yellow-600 dark:hover:bg-yellow-700 dark:focus:ring-yellow-800"
+          variant_class(
+            "bg-warning-700 text-white hover:bg-warning-800 focus:ring-warning-300 dark:bg-warning-600 dark:hover:bg-warning-700 dark:focus:ring-warning-800",
+            table: "bg-warning-100 text-warning-700 hover:bg-warning-200 focus:ring-warning-300 dark:bg-warning-700 dark:text-warning-100 dark:hover:bg-warning-600 dark:focus:ring-warning-600"
           )
         when :danger
-          table_variant_class(
-            "bg-red-100 text-red-700 hover:bg-red-200 focus:ring-red-300 dark:bg-red-700 dark:text-red-100 dark:hover:bg-red-600 dark:focus:ring-red-600",
-            "bg-red-700 text-white hover:bg-red-800 focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-900"
+          variant_class(
+            "bg-danger-700 text-white hover:bg-danger-800 focus:ring-danger-300 dark:bg-danger-600 dark:hover:bg-danger-700 dark:focus:ring-danger-800",
+            table: "bg-danger-100 text-danger-700 hover:bg-danger-200 focus:ring-danger-300 dark:bg-danger-700 dark:text-danger-100 dark:hover:bg-danger-600 dark:focus:ring-danger-600"
           )
-        when :success
-          table_variant_class(
-            "bg-green-100 text-green-700 hover:bg-green-200 focus:ring-green-300 dark:bg-green-700 dark:text-green-100 dark:hover:bg-green-600 dark:focus:ring-green-600",
-            "bg-green-700 text-white hover:bg-green-800 focus:ring-green-300 dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800"
+        when :accent
+          variant_class(
+            "bg-accent-700 text-white hover:bg-accent-800 focus:ring-accent-300 dark:bg-accent-600 dark:hover:bg-accent-700 dark:focus:ring-accent-800",
+            table: "bg-accent-100 text-accent-700 hover:bg-accent-200 focus:ring-accent-300 dark:bg-accent-700 dark:text-accent-100 dark:hover:bg-accent-600 dark:focus:ring-accent-600"
           )
         else
-          table_variant_class(
-            "bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-300 dark:bg-gray-700 dark:text-gray-100 dark:hover:bg-gray-600 dark:focus:ring-gray-600",
-            "border border-gray-200 bg-white text-gray-900 hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:ring-gray-100 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-200 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
+          variant_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",
+            table: "bg-secondary-100 text-secondary-700 hover:bg-secondary-200 focus:ring-secondary-300 dark:bg-secondary-700 dark:text-secondary-100 dark:hover:bg-secondary-600 dark:focus:ring-secondary-600"
           )
         end
       end
 
-      def table_variant_class(table_class, default_class)
-        (@variant == :table) ? table_class : default_class
+      def variant_class(default, table:)
+        case @variant
+        when :table
+          table
+        else
+          default
+        end
       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, &)
+        end
+      end
+    end
+  end
+end