plutonium 0.10.2 → 0.11.0

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

@@ -5,22 +5,17 @@ module Plutonium
     module Controllers
       module Authorizable
         extend ActiveSupport::Concern
-        include Pundit::Authorization
+        include ::Pundit::Authorization
 
         included do
           after_action :verify_authorized
           after_action :verify_policy_scoped, except: %i[new create]
 
-          helper_method :permitted_attributes
-          helper_method :current_policy
+          helper_method :current_policy, :permitted_attributes
         end
 
         private
 
-        def policy_namespace(scope)
-          [current_package.to_s.underscore.to_sym, scope]
-        end
-
         def policy_context
           raise NotImplementedError, "policy_context"
         end
@@ -29,22 +24,23 @@ module Plutonium
           policy_context
         end
 
-        def policy(scope)
-          super(policy_namespace(scope))
-        end
-
-        def policy_scope(scope)
-          super(policy_namespace(scope))
-        end
-
-        def authorize(record, query = nil)
-          super(policy_namespace(record), query)
+        # @return [Plutonium::Pundit::Context] a new instance of {Plutonium::Pundit::Context} with the current user and package
+        def pundit
+          @pundit ||= Plutonium::Pundit::Context.new(
+            package: current_package.to_s.underscore.to_sym,
+            user: pundit_user,
+            policy_cache: ::Pundit::CacheStore::LegacyStore.new(policies)
+          )
         end
 
         def permitted_attributes
           @permitted_attributes ||= current_policy.send_with_report :"permitted_attributes_for_#{action_name}"
         end
 
+        def permitted_associations
+          @permitted_associations ||= current_policy.permitted_associations
+        end
+
         def current_policy
           @current_policy ||= begin
             policy_subject = resource_record || resource_class

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

@@ -18,7 +18,7 @@ module Plutonium
           end
 
           helper Plutonium::Helpers
-          helper_method :page_title, :resource_url_for, :resource_url_args_for, :root_path, :application_name
+          helper_method :make_page_title, :resource_url_for, :resource_url_args_for, :root_path
 
           append_view_path File.expand_path("app/views", Plutonium.root)
           layout -> { turbo_frame_request? ? false : "resource" }
@@ -30,12 +30,8 @@ module Plutonium
           @page_title = nil
         end
 
-        def page_title(title)
-          [title.presence, application_name].compact.join(" | ")
-        end
-
-        def application_name
-          Rails.application.class.module_parent.name
+        def make_page_title(title)
+          [title.presence, helpers.application_name].compact.join(" | ")
         end
 
         #

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

@@ -43,15 +43,15 @@ module Plutonium
           return unless current_user.present?
 
           @current_scoped_entity ||= case scoped_entity_strategy
-          when :current_user
-            current_user
           when :path
             scoped_entity_class
               .associated_with(current_user)
               .from_path_param(request.path_parameters[scoped_entity_param_key])
               .first! # Raise NotFound if user does not have access to the entity or it does not exist
+          when Symbol
+            send scoped_entity_strategy
           else
-            raise NotImplementedError, "unknown scoped entity strategy: #{scoped_entity_strategy}"
+            raise NotImplementedError, "unknown scoped entity strategy: #{scoped_entity_strategy.inspect}"
           end
         end
 

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

@@ -5,7 +5,7 @@ module Plutonium
         extend ActiveSupport::Concern
 
         included do
-          helper_method :presentable_attributes
+          helper_method :presentable_attributes, :present_associations?
         end
 
         private
@@ -44,6 +44,7 @@ module Plutonium
             resource_class:,
             record: resource_record,
             fields: current_presenter.defined_renderers_for(*presentable_attributes),
+            associations: current_presenter.defined_association_renderers_for(*permitted_associations),
             actions: current_presenter.actions
           )
         end
@@ -54,6 +55,10 @@ module Plutonium
             inputs: current_presenter.defined_inputs_for(*presentable_attributes)
           )
         end
+
+        def present_associations?
+          current_parent.nil?
+        end
       end
     end
   end

data/lib/plutonium/core/definers/association_renderer_definer.rb

@@ -0,0 +1,33 @@
+module Plutonium
+  module Core
+    module Definers
+      module AssociationRendererDefiner
+        extend ActiveSupport::Concern
+        include Plutonium::Core::Autodiscovery::AssociationRendererDiscoverer
+
+        def defined_association_renderers_for(*names)
+          (names - association_renderer_definitions.keys).each do |name|
+            define_association_renderer(name, renderer: autodiscover_association_renderer(name))
+          end
+          association_renderer_definitions.slice(*names)
+        end
+
+        private
+
+        def association_renderer_definitions = @association_renderer_definitions ||= {}
+
+        def define_association_renderer(name, renderer: nil, **options)
+          association_renderer_definitions[name] = if renderer.present?
+            renderer
+          else
+            autodiscover_association_renderer(name)
+          end
+        end
+
+        def association_renderer_defined?(name)
+          association_renderer_definitions.key? name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Plutonium
+  module Core
+    module Fields
+      module Inputs
+        class CheckboxInput < SimpleFormInput
+          private
+
+          def input_options = {wrapper: :resource_checkbox}
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ module Plutonium
           map_type :attachment, to: Plutonium::Core::Fields::Inputs::AttachmentInput
           map_type :datetime, :date, :time, to: Plutonium::Core::Fields::Inputs::DateTimeInput
           map_type :phone, to: Plutonium::Core::Fields::Inputs::PhoneInput
+          map_type :boolean, to: Plutonium::Core::Fields::Inputs::CheckboxInput
           # map_type :text, :string, to: Plutonium::Core::Fields::Inputs::SimpleFormInput
 
           def self.build(name, type:, **options)

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

@@ -27,7 +27,7 @@ module Plutonium
           end
 
           def associated_classes
-            Rails.application.eager_load! unless Rails.application.config.eager_load
+            Plutonium.eager_load_rails!
 
             associated_classes = []
             ActiveRecord::Base.descendants.each do |model|

data/lib/plutonium/core/ui/detail.rb

@@ -7,6 +7,7 @@ module Plutonium
         option :resource_class
         option :record, optional: true
         option :fields, default: proc { {} }
+        option :associations, default: proc { {} }
         option :actions, default: proc { Plutonium::Core::Actions::Collection.new }
       end
     end

data/lib/plutonium/helpers/application_helper.rb

@@ -1,17 +1,16 @@
 module Plutonium
   module Helpers
     module ApplicationHelper
-      # def tooltip(text)
-      #   text = sanitize text
-      #   "title=\"#{text}\" data-controller=\"tooltip\" data-bs-title=\"#{text}\"".html_safe
-      # end
-
-      def resource_name(resource_class, count = 1)
-        resource_class.model_name.human.pluralize(count)
+      def application_name
+        Plutonium.application_name
       end
 
-      def resource_name_plural(resource_class)
-        resource_name resource_class, 2
+      # Renders an icon using the Plutonium Icons library.
+      #
+      # @param icon [Symbol, String] The name or identifier of the icon to render.
+      # @return [String] The HTML-safe string for the rendered icon.
+      def render_icon(icon, **)
+        Plutonium::Icons.render(icon, **)
       end
     end
   end

data/lib/plutonium/helpers/assets_helper.rb

@@ -0,0 +1,33 @@
+module Plutonium
+  module Helpers
+    module AssetsHelper
+      def plutonium_stylesheet_tag
+        url = if Plutonium.development?
+          file = JSON.parse(File.read(Plutonium.root.join("src", "build", "css.manifest")))["plutonium.css"]
+          "/build/#{file}"
+        else
+          "plutonium.css"
+        end
+        stylesheet_link_tag url, "data-turbo-track": "reload"
+      end
+
+      def plutonium_script_tag
+        url = if Plutonium.development?
+          file = JSON.parse(File.read(Plutonium.root.join("src", "build", "js.manifest")))["plutonium.js"]
+          "/build/#{file}"
+        else
+          "plutonium.min.js"
+        end
+        javascript_include_tag url, "data-turbo-track": "reload", type: "module"
+      end
+
+      def logo_tag(classname:)
+        image_tag logo, class: classname
+      end
+
+      def logo
+        Plutonium::Config.logo || "plutonium-logo.png"
+      end
+    end
+  end
+end

data/lib/plutonium/helpers/display_helper.rb

@@ -1,6 +1,19 @@
 module Plutonium
   module Helpers
     module DisplayHelper
+      # def tooltip(text)
+      #   text = sanitize text
+      #   "title=\"#{text}\" data-controller=\"tooltip\" data-bs-title=\"#{text}\"".html_safe
+      # end
+
+      def resource_name(resource_class, count = 1)
+        resource_class.model_name.human.pluralize(count)
+      end
+
+      def resource_name_plural(resource_class)
+        resource_name resource_class, 2
+      end
+
       def display_field(value:, helper: nil, **options)
         return "-" unless value.present?
 

data/lib/plutonium/helpers/form_helper.rb

@@ -6,7 +6,7 @@ module Plutonium
       include ActionView::Helpers::FormHelper
 
       def resource_form_for(record, options = {}, &block)
-        options[:builder] ||= Plutonium::Ui::FormBuilder
+        options[:builder] ||= PlutoniumUi::FormBuilder
         options[:wrapper] ||= :default_resource_form
         options[:html] ||= {}
         unless options[:html].key?(:novalidate)

data/lib/plutonium/helpers.rb

@@ -12,6 +12,7 @@ module Plutonium
         include Plutonium::Helpers::TableHelper
         include Plutonium::Helpers::TurboHelper
         include Plutonium::Helpers::TurboStreamActionsHelper
+        include Plutonium::Helpers::AssetsHelper
       end
     end
   end

data/lib/plutonium/icons.rb

@@ -4,20 +4,27 @@ module Plutonium
     ICON_SIZES = {
       sm: "w-3 h-3",
       md: "w-4 h-4",
-      lg: "w-6 h-6"
+      lg: "w-6 h-6",
+      xl: "w-8 h-8"
     }
 
     class << self
-      def render(name, size: :md)
+      def render(name, size: :md, classname: nil)
+        size = ICON_SIZES.key?(size) ? size : :sm
+        classname = (Array(classname) + [ICON_SIZES[size]]).join(" ")
+
+        resolve(name).sub("<svg ", "<svg class=\"#{classname}\" ").html_safe
+      end
+
+      def resolve(name)
         # This is not threadsafe, but should not cause any issues
         # I believe adding a mutex would be overall more expensive than a few potential
         # concurrent disk accesses for a brief while after boot.
-        size = ICON_SIZES.key?(size) ? size : :sm
-        ICON_CACHE["#{name}:#{size}"] ||= begin
+        ICON_CACHE[name] ||= begin
           path = Plutonium.root.join "app/assets/icons/#{name}.svg"
           raise "Invalid icon: #{name}" unless File.exist?(path)
 
-          File.read(path).sub("<svg ", "<svg class=\"#{ICON_SIZES[size]}\" ")
+          File.read(path)
         end
       end
     end

data/lib/plutonium/pkg/app.rb

@@ -1,3 +1,5 @@
+require "active_support/notifications"
+
 module Plutonium
   module Pkg
     module App
@@ -49,6 +51,14 @@ module Plutonium
         end
 
         def draw_resource_routes
+          ActiveSupport::Notifications.instrument("plutonium.app.draw_resource_routes", app: self.class.module_parent.to_s) do
+            draw_resource_routes_internal
+          end
+        end
+
+        private
+
+        def draw_resource_routes_internal
           custom_routes_block = @custom_routes_block
           registered_resources = resource_register
           scoped_entity_param_key = self.scoped_entity_param_key if scoped_entity_strategy == :path

data/lib/plutonium/pundit/context.rb

@@ -0,0 +1,18 @@
+require "pundit"
+
+module Plutonium
+  module Pundit
+    class Context < ::Pundit::Context
+      def initialize(*, package:, **)
+        super(*, **)
+        @package = package
+      end
+
+      private
+
+      def policy_finder(record)
+        PolicyFinder.new(record, package: @package)
+      end
+    end
+  end
+end

data/lib/plutonium/pundit/policy_finder.rb

@@ -0,0 +1,25 @@
+require "pundit"
+
+module Plutonium
+  module Pundit
+    class PolicyFinder < ::Pundit::PolicyFinder
+      def initialize(*, package:)
+        super(*)
+        @package = package
+      end
+
+      attr_reader :package
+
+      def policy
+        policy_internal([package, object]) || policy_internal(object)
+      end
+
+      private
+
+      def policy_internal(object)
+        klass = find(object)
+        klass.is_a?(String) ? klass.safe_constantize : klass
+      end
+    end
+  end
+end

data/lib/plutonium/railtie.rb

@@ -6,27 +6,39 @@ module Plutonium
     config.plutonium.cache_discovery = defined?(Rails.env) && !Rails.env.development?
     config.plutonium.enable_hotreload = defined?(Rails.env) && Rails.env.development?
 
-    initializer "plutonium.append_assets_path" do |app|
-      config.to_prepare do
-        Rails.application.config.assets.paths << Plutonium.root.join("app/assets/build").to_s
-      end
+    # If you don't want to precompile Plutonium's assets (eg. because you're using webpack),
+    # you can do this in an intiailzer:
+    #
+    # config.after_initialize do
+    #   config.assets.precompile -= Plutonium::Railtie::PRECOMPILE_ASSETS
+    # end
+    PRECOMPILE_ASSETS = %w[plutonium.js plutonium.js.map plutonium.min.js plutonium.min.js.map plutonium.css]
+
+    initializer "plutonium.assets" do
+      next unless Rails.application.config.respond_to?(:assets)
+
+      Rails.application.config.assets.precompile += PRECOMPILE_ASSETS
+      Rails.application.config.assets.paths << Plutonium.root.join("app/assets").to_s
     end
 
-    initializer "plutonium.load_view_components" do
+    initializer "plutonium.load_components" do
       load Plutonium.root.join("app", "views", "components", "base.rb")
     end
 
-    initializer "plutonium.load_initializers" do
+    initializer "plutonium.initializers" do
       Dir.glob(Plutonium.root.join("config", "initializers", "**", "*.rb")) { |file| load file }
     end
 
     initializer "plutonium.asset_server" do
+      next unless Plutonium.development?
+
+      puts "=> [plutonium] starting assets server"
       # setup a middleware to serve our assets
       config.app_middleware.insert_before(
         ActionDispatch::Static,
         Rack::Static,
-        urls: ["/plutonium-assets"],
-        root: Plutonium.root.join("public"),
+        urls: ["/build"],
+        root: Plutonium.root.join("src").to_s,
         cascade: true,
         header_rules: [
           # Cache all static files in public caches (e.g. Rack::Cache) as well as in the browser
@@ -39,6 +51,10 @@ module Plutonium
       config.view_component.capture_compatibility_patch_enabled = true
     end
 
+    rake_tasks do
+      load "tasks/create_rodauth_admin.rake"
+    end
+
     config.after_initialize do
       Plutonium::Reloader.start! if Rails.application.config.plutonium.enable_hotreload
       Plutonium::ZEITWERK_LOADER.eager_load if Rails.env.production?

data/lib/plutonium/reloader.rb

@@ -1,5 +1,6 @@
+require "active_support/notifications"
+
 # Be sure to restart your server when you modify this file.
-# This is a glorified initializer
 
 module Plutonium
   class Reloader
@@ -7,8 +8,11 @@ module Plutonium
       def start!
         puts "=> [plutonium] starting reloader"
 
-        @listener&.stop
-        @listener = initialize_listener
+        ActiveSupport::Notifications.instrument("plutonium.reloader.start") do
+          # Task code here
+          @listener&.stop
+          @listener = initialize_listener
+        end
       end
 
       private
@@ -75,16 +79,23 @@ module Plutonium
       end
 
       def reload_engine_and_routes(file)
-        Plutonium.logger.debug "[plutonium] reloading #{file}"
+        Plutonium.logger.debug "[plutonium] reloading: engine+routes"
         load file
         Rails.application.reload_routes!
       end
 
       def reload_framework_and_file(file)
-        Plutonium.logger.debug "[plutonium] reloading framework"
+        # # Ensure that the file loads correctly before we do any reloading
+        # load file
+
+        Plutonium.logger.debug "[plutonium] reloading: app+framework"
+        Rails.application.reloader.reload!
         Plutonium::ZEITWERK_LOADER.reload
+        # reload components
+        Object.send(:remove_const, "PlutoniumUi")
         load Plutonium.root.join("app", "views", "components", "base.rb")
-        load file # Ensure files that do not contain constants are loaded
+        # # Ensure files that do not contain constants are loaded again e.g. initializers
+        # load file
       end
 
       def reload_file(file)
@@ -92,7 +103,7 @@ module Plutonium
       end
 
       def log_reload_failure(file, error)
-        Plutonium.logger.error "\n[plutonium] reload failed #{file}\n\n#{error}\n"
+        Plutonium.logger.error "\n[plutonium] reloading failed\n\n#{error.message}\n"
       end
     end
   end

data/lib/plutonium/resource/controller.rb

@@ -49,6 +49,7 @@ module Plutonium
       # @return [ActiveRecord::Base, nil] The resource record
       def resource_record
         @resource_record ||= policy_scope(resource_class).from_path_param(params[:id]).first! if params[:id].present?
+        @resource_record
       end
 
       # Returns the submitted resource parameters
@@ -94,6 +95,8 @@ module Plutonium
       def resource_presenter(resource_class, resource_record)
         presenter_class = "#{current_package}::#{resource_class}Presenter".constantize
         presenter_class.new resource_context, resource_record
+      rescue NameError
+        super(resource_class, resource_record)
       end
 
       # Creates a resource query object
@@ -103,6 +106,8 @@ module Plutonium
       def resource_query_object(resource_class, params)
         query_object_class = "#{current_package}::#{resource_class}QueryObject".constantize
         query_object_class.new resource_context, params
+      rescue NameError
+        super(resource_class, params)
       end
 
       # Applies submitted resource params if they have been passed