plutonium 0.6.2 → 0.8.0

data/lib/generators/pu/res/scaffold/templates/query_object.rb.tt

@@ -0,0 +1,17 @@
+<% module_namespacing do -%>
+class <%= class_name %>QueryObject < <%= [feature_package_name, "ResourceQueryObject"].join "::" %>
+  private
+
+  def define_filters
+    # define custom filters
+  end
+
+  def define_scopes
+    # define custom scopes
+  end
+
+  def define_sorters
+    # define custom sorters
+  end
+end
+<% end -%>

data/lib/generators/pu/rodauth/account_generator.rb

@@ -28,13 +28,13 @@ module Pu
       end
 
       def create_rodauth_app
-        template "app/misc/account_rodauth_plugin.rb", "app/misc/#{table_prefix}_rodauth_plugin.rb"
+        template "app/misc/account_rodauth_plugin.rb", "app/misc/#{account_path}_rodauth_plugin.rb"
       end
 
       def configure_rodauth_plugin
         in_root do
           plugin_name = indent(
-            "configure ::#{table_prefix.classify}RodauthPlugin#{", :#{table_prefix}" unless primary?}\n", 2
+            "configure ::#{account_path.classify}RodauthPlugin#{", :#{table_prefix}" unless primary?}\n", 2
           )
           gsub_file "app/misc/rodauth_app.rb", /.*# configure RodauthMain\n/, ""
           insert_into_file "app/misc/rodauth_app.rb", plugin_name, after: "# auth configuration\n"
@@ -71,7 +71,7 @@ module Pu
       end
 
       def create_rodauth_controller
-        dest = "app/controllers/rodauth/#{table_prefix}_controller.rb"
+        dest = "app/controllers/rodauth/#{account_path}_controller.rb"
         template "app/controllers/plugin_controller.rb", dest
       end
 
@@ -88,26 +88,15 @@ module Pu
       def create_account_model
         return unless base?
 
-        template "app/models/account.rb", "app/models/#{table_prefix}.rb"
+        template "app/models/account.rb", "app/models/#{account_path}.rb"
       end
 
       def create_mailer
         return unless mails?
 
         template "app/mailers/rodauth_mailer.rb", "app/mailers/rodauth_mailer.rb"
-        template "app/mailers/account_mailer.rb", "app/mailers/rodauth/#{table_prefix}_mailer.rb"
-        directory "app/views/rodauth_mailer", "app/views/rodauth/#{table_prefix}_mailer"
-      end
-
-      def create_views
-        return if only_json? || selected_view_features.empty?
-
-        account_name = primary? ? nil : table_prefix
-        # Use generate here because invoke spawns in the same process
-        # Unfortunately, during the generation process, some new files are created which are not currently loaded,
-        #   causing an error when it attempts to load the rodauth config.
-        # Generate spawns a separate process which loads the new files and ensures it works correctly
-        generate "pu:rodauth:views", account_name, "--features", *selected_view_features
+        template "app/mailers/account_mailer.rb", "app/mailers/rodauth/#{account_path}_mailer.rb"
+        directory "app/views/rodauth_mailer", "app/views/rodauth/#{account_path}_mailer"
       end
 
       private

data/lib/generators/pu/rodauth/concerns/account_selector.rb

@@ -13,8 +13,12 @@ module Pu
           @table ||= account_name.underscore.pluralize
         end
 
+        def account_path
+          @account_path ||= account_name.singularize.underscore
+        end
+
         def table_prefix
-          @table_prefix ||= account_name.underscore.singularize
+          @table_prefix ||= account_path.tr("/", "_")
         end
       end
     end

data/lib/generators/pu/rodauth/migration/active_record/base.erb

@@ -1,7 +1,3 @@
-<% if activerecord_adapter == "postgresql" -%>
-enable_extension "citext"
-
-<% end -%>
 create_table :<%= table_prefix.pluralize %><%= primary_key_type %> do |t|
   t.integer :status, null: false, default: 1
 <% case activerecord_adapter -%>

data/lib/generators/pu/rodauth/migration_generator.rb

@@ -69,7 +69,7 @@ module Pu
       private
 
       def plugin_filename
-        "app/misc/#{table_prefix}_rodauth_plugin.rb"
+        "app/misc/#{account_path}_rodauth_plugin.rb"
       end
 
       def migration_name
@@ -95,7 +95,6 @@ module Pu
       def migration_overrides
         @migration_overrides ||= migration_config.values_at(*selected_features)
           .flat_map(&:to_a)
-          .filter { |config, format| config.ends_with? "_table" }
           .map { |config, format| [config, (format % {plural: table_prefix.pluralize, singular: table_prefix})] }
           .to_h
           .compact
@@ -141,7 +140,6 @@ module Pu
         def primary_key_type(key = :id)
           generators = ::Rails.application.config.generators
           column_type = generators.options[:active_record][:primary_key_type]
-
           if key
             ", #{key}: :#{column_type}" if column_type
           else
@@ -150,7 +148,7 @@ module Pu
         end
 
         def default_primary_key_type
-          if ActiveRecord.version >= Gem::Version.new("5.1") && activerecord_adapter != "sqlite3"
+          if ActiveRecord.version >= Gem::Version.new("5.1")
             :bigint
           else
             :integer

data/lib/generators/pu/rodauth/templates/app/controllers/plugin_controller.rb.tt

@@ -1,6 +1,16 @@
 module Rodauth
-  class <%= table_prefix.classify %>Controller < RodauthController
+  class <%= account_path.classify %>Controller < RodauthController
     # used by Rodauth for rendering views, CSRF protection, and running any
     # registered action callbacks and rescue_from handlers
+
+    private
+
+    def current_account(name = <%= ":#{table_prefix}" %>)
+      super(name)
+    end
+
+    def rodauth(name = <%= ":#{table_prefix}" %>)
+      super(name)
+    end
   end
 end

data/lib/generators/pu/rodauth/templates/app/controllers/rodauth_controller.rb.tt

@@ -1,3 +1,4 @@
+# Base rodauth controller. Inherited by all account controllers.
 class RodauthController < ApplicationController
-  # Base rodauth controller
+  include Plutonium::Rodauth::ControllerMethods
 end

data/lib/generators/pu/rodauth/templates/app/mailers/account_mailer.rb.tt

@@ -1,4 +1,4 @@
 module Rodauth
-  class <%= table_prefix.classify %>Mailer < RodauthMailer
+  class <%= account_path.classify %>Mailer < RodauthMailer
   end
 end

data/lib/generators/pu/rodauth/templates/app/misc/account_rodauth_plugin.rb.tt

@@ -1,6 +1,6 @@
 require "sequel/core"
 
-class <%= table_prefix.classify %>RodauthPlugin < RodauthPlugin
+class <%= account_path.classify %>RodauthPlugin < RodauthPlugin
   configure do
     # This block is running inside of
     #   plugin :rodauth do
@@ -24,7 +24,7 @@ class <%= table_prefix.classify %>RodauthPlugin < RodauthPlugin
     # hmac_secret "<SECRET_KEY>"
 
     # Use path prefix for all routes.
-    <%= '# ' if primary? %>prefix "/<%= table_prefix.pluralize %>"
+    <%= '# ' if primary? %>prefix "/<%= account_path.pluralize %>"
 <% unless separate_passwords? -%>
 
     # Store password hash in a column instead of a separate table.
@@ -32,7 +32,10 @@ class <%= table_prefix.classify %>RodauthPlugin < RodauthPlugin
 <% end -%>
 
     # Specify the controller used for view rendering, CSRF, and callbacks.
-    rails_controller { Rodauth::<%= "#{table_prefix.classify}" %>Controller }
+    rails_controller { Rodauth::<%= account_path.classify %>Controller }
+
+    # Specify the model to be used.
+    rails_account_model { <%= account_path.classify %> }
 <% if verify_account? -%>
 
     # Set password when verifying account.
@@ -42,9 +45,11 @@ class <%= table_prefix.classify %>RodauthPlugin < RodauthPlugin
     # Change some default param keys.
     # login_param "email"
     # password_confirm_param "confirm_password"
+<% if login? -%>
 
     # Redirect back to originally requested location after authentication.
-    # login_return_to_requested_location? true
+    login_return_to_requested_location? true
+<% end -%>
     # two_factor_auth_return_to_requested_location? true # if using MFA
 
     # Autologin the user after they have reset their password.
@@ -85,43 +90,43 @@ class <%= table_prefix.classify %>RodauthPlugin < RodauthPlugin
 <% if reset_password? -%>
 
     create_reset_password_email do
-      Rodauth::<%= table_prefix.classify %>Mailer.reset_password(self.class.configuration_name, account_id, reset_password_key_value)
+      Rodauth::<%= account_path.classify %>Mailer.reset_password(self.class.configuration_name, account_id, reset_password_key_value)
     end
 <% end -%>
 <% if verify_account? -%>
 
     create_verify_account_email do
-      Rodauth::<%= table_prefix.classify %>Mailer.verify_account(self.class.configuration_name, account_id, verify_account_key_value)
+      Rodauth::<%= account_path.classify %>Mailer.verify_account(self.class.configuration_name, account_id, verify_account_key_value)
     end
 <% end -%>
 <% if verify_login_change? -%>
 
     create_verify_login_change_email do |_login|
-      Rodauth::<%= table_prefix.classify %>Mailer.verify_login_change(self.class.configuration_name, account_id, verify_login_change_key_value)
+      Rodauth::<%= account_path.classify %>Mailer.verify_login_change(self.class.configuration_name, account_id, verify_login_change_key_value)
     end
 <% end -%>
 <% if change_password_notify? -%>
 
     create_password_changed_email do
-      Rodauth::<%= table_prefix.classify %>Mailer.change_password_notify(self.class.configuration_name, account_id)
+      Rodauth::<%= account_path.classify %>Mailer.change_password_notify(self.class.configuration_name, account_id)
     end
 <% end -%>
 <% if reset_password_notify? -%>
 
     create_reset_password_notify_email do
-      Rodauth::<%= table_prefix.classify %>Mailer.reset_password_notify(self.class.configuration_name, account_id)
+      Rodauth::<%= account_path.classify %>Mailer.reset_password_notify(self.class.configuration_name, account_id)
     end
 <% end -%>
 <% if email_auth? -%>
 
     create_email_auth_email do
-      Rodauth::<%= table_prefix.classify %>Mailer.email_auth(self.class.configuration_name, account_id, email_auth_key_value)
+      Rodauth::<%= account_path.classify %>Mailer.email_auth(self.class.configuration_name, account_id, email_auth_key_value)
     end
 <% end -%>
 <% if lockout? -%>
 
     create_unlock_account_email do
-      Rodauth::<%= table_prefix.classify %>Mailer.unlock_account(self.class.configuration_name, account_id, unlock_account_key_value)
+      Rodauth::<%= account_path.classify %>Mailer.unlock_account(self.class.configuration_name, account_id, unlock_account_key_value)
     end
 <% end -%>
 
@@ -223,6 +228,16 @@ class <%= table_prefix.classify %>RodauthPlugin < RodauthPlugin
 <% unless only_json? -%>
 
     # ==> Redirects
+<% if create_account? -%>
+
+    # Redirect to home after login.
+    create_account_redirect "/"
+<% end -%>
+<% if login? -%>
+
+    # Redirect to home after login.
+    login_redirect "/"
+<% end -%>
 <% if logout? -%>
 
     # Redirect to home page after logout.

data/lib/generators/pu/rodauth/templates/app/misc/rodauth_plugin.rb.tt

@@ -69,7 +69,7 @@ class RodauthPlugin < Rodauth::Rails::Auth
     # delete_account_on_close? true
 
     # Redirect to the app from login and registration pages if already logged in.
-    # already_logged_in { redirect login_redirect }
+    already_logged_in { redirect login_redirect }
 
     # ==> JWT
 

data/lib/generators/pu/rodauth/templates/app/models/account.rb.tt

@@ -1,8 +1,11 @@
 <% if defined?(ActiveRecord::Railtie) -%>
-class <%= table_prefix.camelize %> < ApplicationRecord
+class <%= account_path.classify %> < ApplicationRecord
   include Rodauth::Rails.model<%= "(:#{table_prefix})" unless primary? %>
   # add concerns above.
 
+  <%- if account_path.include?("/") -%>
+  self.table_name = :<%= table_prefix.pluralize %>
+  <%- end -%>
   # add model configurations above.
 
   # add belongs_to associations above.

data/lib/generators/pu/rodauth/views_generator.rb

@@ -27,10 +27,6 @@ module Pu
         desc: "Generates views for all Rodauth features",
         default: false
 
-      class_option :css, type: :string, enum: %w[bootstrap tailwind tailwindcss],
-        desc: "CSS framework to generate views for",
-        default: "bootstrap"
-
       def validate_selected_features
         if selected_features.empty?
           say "No view features specified!", :yellow
@@ -109,16 +105,7 @@ module Pu
       end
 
       def view_location(view)
-        if tailwind?
-          "app/views/rodauth/tailwind/#{view}.html.erb"
-        else
-          "app/views/rodauth/#{view}.html.erb"
-        end
-      end
-
-      def tailwind?
-        ::Rails.application.config.generators.options[:rails][:template_engine] == :tailwindcss ||
-          options[:css]&.downcase&.start_with?("tailwind")
+        "app/views/rodauth/#{view}.html.erb"
       end
     end
   end

data/lib/plutonium/application/controller.rb

@@ -0,0 +1,43 @@
+module Plutonium
+  module Application
+    module Controller
+      extend ActiveSupport::Concern
+      include Plutonium::Core::Controllers::Base
+
+      included do
+        helper_method :registered_resources
+      end
+
+      private
+
+      # # Menu Builder
+      # def build_namespace_node(namespaces, resource, parent)
+      #   current = namespaces.shift
+      #   if namespaces.size.zero?
+      #     parent[current.pluralize] = url_for(resource_url_for(resource, parent: nil))
+      #   else
+      #     parent[current] = {}
+      #     build_namespace_node(namespaces, resource, parent[current])
+      #   end
+      #   # parent.sort!
+      # end
+
+      # def build_namespace_tree(resources)
+      #   root = {}
+      #   resources.each do |resource|
+      #     namespaces = resource.name.split("::")
+      #     build_namespace_node(namespaces, resource, root)
+      #   end
+      #   root
+      # end
+
+      # def build_sidebar_menu
+      #   build_namespace_tree(current_engine.resource_register)
+      # end
+
+      def registered_resources
+        current_engine.resource_register
+      end
+    end
+  end
+end

data/lib/plutonium/auth/{public_access.rb → public.rb}

@@ -1,6 +1,6 @@
 module Plutonium
   module Auth
-    module PublicAccess
+    module Public
       extend ActiveSupport::Concern
 
       included do

data/lib/plutonium/auth.rb

@@ -1,12 +1,7 @@
 module Plutonium
   module Auth
-    extend ActiveSupport::Autoload
-
     def self.rodauth(name)
       Rodauth.for(name)
     end
-
-    autoload :Rodauth
-    autoload :PublicAccess
   end
 end

data/lib/plutonium/builders/menus/sidebar_menu.rb.bk

@@ -0,0 +1,26 @@
+module Plutonium
+  module Builders
+    class SidebarMenu
+      attr_reader :items
+
+      def initialize(&)
+        @items = []
+        instance_eval(&)
+      end
+
+      def item(name, indicator: nil, url: nil, &block)
+        if block && indicator
+          raise ArgumentError, "Items with children cannot have an indicator."
+        end
+
+        item = SidebarMenuItem.new(name, indicator: indicator)
+        if block
+          item.items(&block)
+        else
+          item.url(url)
+        end
+        @items << item
+      end
+    end
+  end
+end

data/lib/plutonium/builders/menus/sidebar_menu_item.rb.bk

@@ -0,0 +1,28 @@
+module Plutonium
+  module Builders
+    class SidebarMenuItem
+      attr_accessor :name, :value
+      attr_reader :indicator
+
+      def initialize(name, indicator: nil, value: nil)
+        @name = name
+        @indicator = indicator
+        @value = value
+      end
+
+      def url(url)
+        @value = url
+      end
+
+      def items(&)
+        raise ArgumentError, "Indicator not allowed for items with children" if @indicator
+        @value = Menu.new(&).items
+      end
+
+      def indicator=(indicator)
+        raise ArgumentError, "Indicator not allowed for items with children" if @value.is_a?(Array)
+        @indicator = indicator
+      end
+    end
+  end
+end

data/lib/plutonium/component_registry.rb

@@ -0,0 +1,19 @@
+require "active_support/core_ext/class/attribute"
+require "active_support/core_ext/hash/indifferent_access"
+
+module Plutonium
+  class ComponentRegistry
+    class_attribute :mappings, instance_accessor: false, instance_predicate: false, default: {}.with_indifferent_access
+
+    class UnregisteredComponent < StandardError; end
+
+    def self.register(*types, to:)
+      self.mappings = mappings.merge types.each_with_object({}) { |t, m| m[t] = to }
+    end
+
+    def self.resolve(name)
+      raise UnregisteredComponent.new("no such component registered: #{name.inspect}") unless mappings[name]
+      mappings[name]
+    end
+  end
+end

data/lib/plutonium/config.rb

@@ -2,10 +2,25 @@ require "active_support"
 
 module Plutonium
   module Config
-    mattr_accessor :reload_files
-    @@reload_files = defined?(Rails.env) && Rails.env.local?
+    # @return [Boolean] Are we developing plutonium? This is separate from Rails development.
+    mattr_accessor :development
+    @@development = defined?(Rails.env) && Rails.env.development?
+
+    # @return [Boolean] Should hotreload be enabled? Enabled by default in Rails development.
+    mattr_accessor :enable_hotreload
+    @@enable_hotreload = defined?(Rails.env) && Rails.env.development?
 
     mattr_accessor :cache_discovery
     @@cache_discovery = defined?(Rails.env) && !Rails.env.development?
+
+    mattr_accessor :stylesheet_tag
+    @@stylesheet_tag = ->(view_context) {
+      "<link rel=\"stylesheet\" href=\"#{Plutonium.stylesheet_link}\" />"
+    }
+
+    mattr_accessor :script_tag
+    @@script_tag = ->(view_context) {
+      "<script src=\"#{Plutonium.script_link}\"></script>"
+    }
   end
 end

data/lib/plutonium/core/action.rb

@@ -7,23 +7,26 @@ module Plutonium
         end
       end
 
-      attr_reader :name, :label, :icon, :route_options, :confirmation, :turbo_frame, :action_class
+      attr_reader :name, :label, :icon, :route_options, :confirmation, :turbo_frame, :color, :category, :position
 
-      def initialize(name, label: nil, icon: nil, action_class: nil,
-        confirmation: nil,
-        route_options: nil, turbo_frame: nil,
-        collection_action: false, collection_record_action: false, record_action: false, bulk_action: false)
+      def initialize(
+        name, label: nil, icon: nil, color: nil, confirmation: nil, route_options: nil, turbo_frame: nil,
+        collection_action: false, collection_record_action: false, record_action: false, bulk_action: false,
+        category: nil, position: 50
+      )
         @name = name
         @icon = icon
         @label = label || name.to_s.humanize
         @route_options = route_options || RouteOptions.new
         @turbo_frame = turbo_frame
-        @action_class = action_class
+        @color = color
         @confirmation = confirmation
         @collection_action = collection_action
         @collection_record_action = collection_record_action
         @record_action = record_action
         @bulk_action = bulk_action
+        @category = category
+        @position = position
       end
 
       def collection_action?

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

@@ -27,6 +27,10 @@ module Plutonium
         def bulk_actions
           Collection.new(@collection.select { |name, action| action.bulk_action? })
         end
+
+        def values
+          super.sort_by { |value| value.position }
+        end
       end
     end
   end

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

@@ -6,13 +6,15 @@ module Plutonium
 
         def action_options
           {
-            icon: "trash",
+            icon: "outline/trash-bin",
             route_options: Plutonium::Core::Action::RouteOptions.new(method: :delete),
-            action_class: "danger",
+            color: :red,
             confirmation: "Are you sure?",
             turbo_frame: "_top",
             collection_record_action: true,
-            record_action: true
+            record_action: true,
+            category: :standard,
+            position: 100
           }
         end
       end

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

@@ -6,11 +6,13 @@ module Plutonium
 
         def action_options
           {
-            icon: "pencil",
+            icon: "outline/edit",
             route_options: Plutonium::Core::Action::RouteOptions.new(action: :edit),
-            action_class: "warning",
+            color: :yellow,
             collection_record_action: true,
-            record_action: true
+            record_action: true,
+            category: :standard,
+            position: 20
           }
         end
       end

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

@@ -37,7 +37,7 @@ module Plutonium
 
         def set_interaction(interaction)
           @interaction = interaction
-          @inputs = defined_inputs_for(interaction.filters.keys - [:resource, :resources])
+          @inputs = defined_inputs_for(*(interaction.filters.keys - [:resource, :resources]))
           @inline = @inputs.blank? unless inline == false
         end
 

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

@@ -6,10 +6,12 @@ module Plutonium
 
         def action_options
           {
-            icon: "plus-lg",
+            icon: "outline/plus",
             route_options: Plutonium::Core::Action::RouteOptions.new(action: :new),
-            action_class: "primary",
-            collection_action: true
+            color: :primary,
+            collection_action: true,
+            category: :standard,
+            position: 100
           }
         end
       end

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

@@ -6,9 +6,11 @@ module Plutonium
 
         def action_options
           {
-            icon: "box-arrow-up-right",
-            action_class: "primary",
-            collection_record_action: true
+            icon: "outline/arrow-up-right-from-square",
+            color: :primary,
+            collection_record_action: true,
+            category: :standard,
+            position: 10
           }
         end
       end

data/lib/plutonium/core/autodiscovery/input_discoverer.rb

@@ -6,8 +6,6 @@ module Plutonium
         include Discoverer
 
         class_methods do
-          private
-
           def autodiscovery_input_cache = @autodiscovery_input_cache ||= {}
         end
 

data/lib/plutonium/core/autodiscovery/renderer_discoverer.rb

@@ -6,8 +6,6 @@ module Plutonium
         include Discoverer
 
         class_methods do
-          private
-
           def autodiscovery_renderer_cache = @autodiscovery_renderer_cache ||= {}
         end