plutonium 0.14.1 → 0.15.0.pre.rc1

data/lib/generators/pu/lib/plutonium_generators/concerns/actions.rb

@@ -287,7 +287,7 @@ module PlutoniumGenerators
           replace_existing.call file, data
           break if File.read(file).match? regexify_config(data)
 
-          inject_into_file file, data, before: /.*# Configure plutonium above this.*/, verbose: false
+          inject_into_file file, data, before: /.*# Configure plutonium above.*/, verbose: false
         end
       end
 

data/lib/generators/pu/lib/plutonium_generators/concerns/logger.rb

@@ -21,7 +21,7 @@ module PlutoniumGenerators
       end
 
       def exception(msg, err)
-        error "#{msg}\n\n#{err}\n#{err.backtrace.join("\n")}"
+        error "#{msg}\n\n#{err.class}: #{err}\n#{err.backtrace.join("\n")}"
       end
 
       private

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

@@ -19,11 +19,13 @@ module PlutoniumGenerators
     protected
 
     def reserved_packages
-      %w[core reactor app main]
+      %w[core reactor app main plutonium pluton8 plutonate]
     end
 
     def validate_package_name(package_name)
+      package_name = package_name.underscore
       error("Package name is reserved\n\n#{reserved_packages.join "\n"}") if reserved_packages.include?(package_name)
+      error("Package name cannot end in `_app` or `_portal`") if /(_app|_portal)$/i.match?(package_name)
     end
 
     def available_packages
@@ -34,11 +36,11 @@ module PlutoniumGenerators
     end
 
     def available_apps
-      @available_apps ||= ["main_app"] + available_packages.select { |pkg| pkg.ends_with? "_app" }.sort
+      @available_apps ||= ["main_app"] + available_packages.select { |pkg| pkg.ends_with?("_app") || pkg.ends_with?("_portal") }.sort
     end
 
     def available_features
-      @available_features ||= ["main_app"] + available_packages.select { |pkg| !pkg.ends_with?("_app") }.sort
+      @available_features ||= ["main_app"] + available_packages.select { |pkg| !(pkg.ends_with?("_app") || pkg.ends_with?("_portal")) }.sort
     end
 
     def select_package(selected_package = nil, msg: "Select package", pkgs: nil)

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

@@ -111,6 +111,19 @@ module PlutoniumGenerators
 
         private
 
+        def parse_type_and_options(type)
+          parsed_type, parsed_options = super
+
+          if type&.ends_with?("?")
+            parsed_type.remove!("?")
+            parsed_options[:null] = true
+          end
+
+          [parsed_type, parsed_options]
+        end
+
+        private
+
         def find_shared_namespace(model1, model2, separator: "::")
           # Split the model names by separator to get the namespaces and class names as arrays
           parts1 = model1.split(separator)
@@ -134,8 +147,19 @@ module PlutoniumGenerators
       end
 
       def required?
-        # TODO: make it such that we can override fields as nullable
-        super || true
+        super || attr_options[:null] != true
+      end
+
+      def cents?
+        type == :integer && name.ends_with?("_cents")
+      end
+
+      def attribute_name
+        if cents?
+          name.sub("_cents", "")
+        else
+          name
+        end
       end
 
       def options_for_migration

data/lib/generators/pu/pkg/{feature/feature_generator.rb → package/package_generator.rb}

@@ -4,12 +4,12 @@ require_relative "../../lib/plutonium_generators"
 
 module Pu
   module Pkg
-    class FeatureGenerator < Rails::Generators::Base
+    class PackageGenerator < Rails::Generators::Base
       include PlutoniumGenerators::Generator
 
       source_root File.expand_path("templates", __dir__)
 
-      desc "Create a plutonium feature package"
+      desc "Create a plutonium package"
 
       argument :name
 
@@ -18,7 +18,7 @@ module Pu
 
         template "lib/engine.rb", "packages/#{package_namespace}/lib/engine.rb"
 
-        %w[controllers interactions models policies presenters query_objects].each do |dir|
+        %w[controllers interactions models policies definitions].each do |dir|
           directory "app/#{dir}", "packages/#{package_namespace}/app/#{dir}/#{package_namespace}"
         end
         create_file "packages/#{package_namespace}/app/views/#{package_namespace}/.keep"
@@ -37,7 +37,7 @@ module Pu
       end
 
       def package_type
-        "Pkg::Feature"
+        "Package::Engine"
       end
     end
   end

data/lib/generators/pu/pkg/{feature → package}/templates/app/controllers/resource_controller.rb.tt

@@ -1,7 +1,5 @@
 module <%= package_name %>
   class ResourceController < ::ResourceController
     # add concerns above.
-
-    boot <%= package_name %>
   end
 end

data/lib/generators/pu/pkg/package/templates/app/definitions/resource_definition.rb.tt

@@ -0,0 +1,4 @@
+module <%= package_name %>
+  class ResourceDefinition < ::ResourceDefinition
+  end
+end

data/lib/generators/pu/pkg/package/templates/app/query_objects/resource_query_object.rb.tt

@@ -0,0 +1,4 @@
+module <%= package_name %>
+  class ResourceDefinition < ::ResourceDefinition
+  end
+end

data/lib/generators/pu/pkg/{app/app_generator.rb → portal/portal_generator.rb}

@@ -4,17 +4,17 @@ require_relative "../../lib/plutonium_generators"
 
 module Pu
   module Pkg
-    class AppGenerator < Rails::Generators::Base
+    class PortalGenerator < Rails::Generators::Base
       include PlutoniumGenerators::Generator
 
       source_root File.expand_path("templates", __dir__)
 
-      desc "Create a plutonium app package"
+      desc "Create a plutonium portal package"
 
       argument :name
 
       def start
-        validate_package_name package_name
+        validate_package_name name
 
         if defined?(RodauthApp) && (rodauths = RodauthApp.opts[:rodauths].keys).present?
           rodauth_account = prompt.select("Select rodauth account to authenticate with:", rodauths + [:none])
@@ -30,15 +30,17 @@ module Pu
 
         template "app/controllers/concerns/controller.rb",
           "packages/#{package_namespace}/app/controllers/#{package_namespace}/concerns/controller.rb"
-        template "app/controllers/controller.rb",
-          "packages/#{package_namespace}/app/controllers/#{package_namespace}/controller.rb"
+        template "app/controllers/plutonium_controller.rb",
+          "packages/#{package_namespace}/app/controllers/#{package_namespace}/plutonium_controller.rb"
+        template "app/controllers/resource_controller.rb",
+          "packages/#{package_namespace}/app/controllers/#{package_namespace}/resource_controller.rb"
 
         template "app/controllers/dashboard_controller.rb",
           "packages/#{package_namespace}/app/controllers/#{package_namespace}/dashboard_controller.rb"
         copy_file "app/views/package/dashboard/index.html.erb",
           "packages/#{package_namespace}/app/views/#{package_namespace}/dashboard/index.html.erb"
 
-        %w[policies presenters query_objects].each do |dir|
+        %w[policies definitions].each do |dir|
           directory "app/#{dir}", "packages/#{package_namespace}/app/#{dir}/#{package_namespace}"
         end
         create_file "packages/#{package_namespace}/app/views/#{package_namespace}/.keep"
@@ -55,7 +57,7 @@ module Pu
       attr_reader :rodauth_account
 
       def package_name
-        name.camelize + "App"
+        name.camelize + "Portal"
       end
 
       def package_namespace
@@ -63,7 +65,7 @@ module Pu
       end
 
       def package_type
-        "Pkg::App"
+        "Portal::Engine"
       end
 
       def public_access? = @public_access

data/lib/generators/pu/pkg/{app → portal}/templates/app/controllers/concerns/controller.rb.tt

@@ -2,22 +2,18 @@ module <%= package_name %>
   module Concerns
     module Controller
       extend ActiveSupport::Concern
-      include Plutonium::Application::Controller
+      include Plutonium::Portal::Controller
       <%- if rodauth_account.present? -%>
-      include Plutonium::Auth.rodauth(:<%= rodauth_account %>)
+      include Plutonium::Auth::Rodauth(:<%= rodauth_account %>)
       <%- elsif public_access? -%>
       include Plutonium::Auth::Public
       <%- end -%>
       # add concerns above.
+      <%- if bring_your_own_auth? -%>
 
       included do
-        boot <%= package_name %>
-        <%- if bring_your_own_auth? -%>
-
         helper_method :current_user
-        <%- end -%>
       end
-      <%- if bring_your_own_auth? -%>
 
       def current_user
         raise NotImplementedError, "#{self.class}#current_user must return a non nil value"

data/lib/generators/pu/pkg/{app → portal}/templates/app/controllers/dashboard_controller.rb.tt

@@ -1,5 +1,5 @@
 module <%= package_name %>
-  class DashboardController < Controller
+  class DashboardController < PlutoniumController
     def index
     end
   end

data/lib/generators/pu/pkg/portal/templates/app/controllers/plutonium_controller.rb.tt

@@ -0,0 +1,5 @@
+module <%= package_name %>
+  class PlutoniumController < ::PlutoniumController
+    include <%= package_name %>::Concerns::Controller
+  end
+end

data/lib/generators/pu/pkg/{app/templates/app/controllers/controller.rb.tt → portal/templates/app/controllers/resource_controller.rb.tt}

@@ -1,5 +1,5 @@
 module <%= package_name %>
-  class Controller < ::ApplicationController
+  class ResourceController < ::ResourceController
     include <%= package_name %>::Concerns::Controller
   end
 end

data/lib/generators/pu/pkg/portal/templates/app/definitions/resource_definition.rb.tt

@@ -0,0 +1,4 @@
+module <%= package_name %>
+  module ResourceDefinition
+  end
+end

data/lib/generators/pu/pkg/{app → portal}/templates/app/views/package/dashboard/index.html.erb

@@ -5,6 +5,7 @@
   <div class="flow-root">
     <ul role="list" class="divide-y divide-gray-200 dark:divide-gray-700">
       <% registered_resources.each do |resource| %>
+        <% next unless allowed_to? :index?, resource %>
         <li class="py-3 sm:py-4">
           <div class="flex items-center">
             <div class="flex-1 min-w-0 ms-4">
@@ -13,7 +14,7 @@
               </a>
             </div>
             <div class="inline-flex items-center text-base font-semibold text-gray-900 dark:text-white">
-              <%= resource.count %>
+              <%= authorized_resource_scope(resource).count %>
             </div>
           </div>
         </li>

data/lib/generators/pu/res/conn/conn_generator.rb

@@ -19,6 +19,7 @@ module Pu
 
         Plutonium.eager_load_rails!
         available_resources = source_module.constantize.descendants.map(&:to_s).sort
+        error "No resources found" if available_resources.blank?
         selected_resources = prompt.multi_select("Select resources", available_resources)
 
         @app_namespace = select_app.camelize
@@ -27,9 +28,10 @@ module Pu
           @resource_class = resource
 
           template "app/controllers/resource_controller.rb", "packages/#{package_namespace}/app/controllers/#{package_namespace}/#{resource.pluralize.underscore}_controller.rb"
-          # template "app/policies/resource_policy.rb", "packages/#{package_namespace}/app/policies/#{package_namespace}/#{resource.underscore}_policy.rb"
-          # template "app/presenters/resource_presenter.rb", "packages/#{package_namespace}/app/presenters/#{package_namespace}/#{resource.underscore}_presenter.rb"
-          # template "app/query_objects/resource_query_object.rb", "packages/#{package_namespace}/app/query_objects/#{package_namespace}/#{resource.underscore}_query_object.rb"
+          template "app/policies/resource_policy.rb", "packages/#{package_namespace}/app/policies/#{package_namespace}/#{resource.underscore}_policy.rb" unless expected_parent_policy
+          # template "app/presenters/resource_presenter.rb", "packages/#{package_namespace}/app/presenters/#{package_namespace}/#{resource.underscore}_presenter.rb" unless expected_parent_presenter
+          # template "app/query_objects/resource_query_object.rb", "packages/#{package_namespace}/app/query_objects/#{package_namespace}/#{resource.underscore}_query_object.rb" unless expected_parent_query_object
+          template "app/definitions/resource_definition.rb", "packages/#{package_namespace}/app/definitions/#{package_namespace}/#{resource.underscore}_definition.rb" unless expected_parent_definition
 
           insert_into_file "packages/#{package_namespace}/config/routes.rb",
             indent("register_resource ::#{resource}\n", 2),
@@ -50,6 +52,79 @@ module Pu
       def resource_namespace
         app_namespace.underscore
       end
+
+      def expected_parent_controller
+        expected_parent_controller = "::#{resource_class.pluralize}Controller".safe_constantize
+        expected_parent_controller if expected_parent_controller.present? && expected_parent_controller < ::ResourceController
+      end
+
+      def parent_controller
+        expected_parent_controller || "#{app_namespace}::ResourceController"
+      end
+
+      def expected_parent_policy
+        expected_parent_policy = "::#{resource_class.classify}Policy".safe_constantize
+        expected_parent_policy if expected_parent_policy.present? && expected_parent_policy < ::ResourcePolicy
+      end
+
+      def parent_policy
+        expected_parent_policy || "ResourcePolicy"
+      end
+
+      def expected_parent_presenter
+        expected_parent_presenter = "::#{resource_class.classify}Presenter".safe_constantize
+        expected_parent_presenter if expected_parent_presenter.present? && expected_parent_presenter < ::ResourcePresenter
+      end
+
+      def parent_presenter
+        expected_parent_presenter || "ResourcePresenter"
+      end
+
+      def expected_parent_query_object
+        expected_parent_query_object = "::#{resource_class.classify}QueryObject".safe_constantize
+        expected_parent_query_object if expected_parent_query_object.present? && expected_parent_query_object < ::ResourceQueryObject
+      end
+
+      def parent_query_object
+        expected_parent_query_object || "ResourceQueryObject"
+      end
+
+      def expected_parent_definition
+        expected_parent_definition = "::#{resource_class.classify}Definition".safe_constantize
+        expected_parent_definition if expected_parent_definition.present? && expected_parent_definition < ::ResourceDefinition
+      end
+
+      def parent_definition
+        expected_parent_definition || "ResourceDefinition"
+      end
+
+      def attributes
+        resource_klass = resource_class.constantize
+        unwanted_attrs = [
+          resource_klass.primary_key.to_sym, # primary_key
+          :created_at, :updated_at # timestamps
+        ]
+        resource_klass.content_columns.filter_map { |col|
+          next if unwanted_attrs.include? col.name.to_sym
+
+          PlutoniumGenerators::ModelGeneratorBase::GeneratedAttribute.parse resource_class, "#{col.name}:#{col.type}"
+        }
+      rescue ActiveRecord::StatementInvalid
+        say format_log("An error occurred while building attributes. Ensure any migrations have been run and try again.", :error), :red
+        []
+      end
+
+      def default_policy_attributes
+        attributes.select { |a| !a.rich_text? && !a.password_digest? && !a.token? }.map(&:attribute_name).map(&:to_sym)
+      end
+
+      def policy_attributes_for_create
+        default_policy_attributes
+      end
+
+      def policy_attributes_for_read
+        default_policy_attributes + [:created_at, :updated_at]
+      end
     end
   end
 end

data/lib/generators/pu/res/conn/templates/app/controllers/resource_controller.rb.tt

@@ -1,3 +1,3 @@
-class <%= app_namespace %>::<%= resource_class.pluralize %>Controller < ::<%= resource_class.pluralize %>Controller
+class <%= app_namespace %>::<%= resource_class.pluralize %>Controller < ::<%= parent_controller %>
   include <%= app_namespace %>::Concerns::Controller
 end

data/lib/generators/pu/res/conn/templates/app/definitions/resource_definition.rb.tt

@@ -0,0 +1,3 @@
+class <%= app_namespace %>::<%= resource_class %>Definition < ::<%= parent_definition %>
+  include <%= app_namespace %>::ResourceDefinition
+end

data/lib/generators/pu/res/conn/templates/app/policies/resource_policy.rb.tt

@@ -1,3 +1,31 @@
-class <%= app_namespace %>::<%= resource_class %>Policy < ::<%= resource_class %>Policy
+class <%= app_namespace %>::<%= resource_class %>Policy < ::<%= parent_policy %>
   include <%= app_namespace %>::ResourcePolicy
+  <%- unless expected_parent_policy -%>
+
+  # Core actions
+
+  def create?
+    true
+  end
+
+  def read?
+    true
+  end
+
+  # Core attributes
+
+  def permitted_attributes_for_create
+    <%= policy_attributes_for_create.inspect %>
+  end
+
+  def permitted_attributes_for_read
+    <%= policy_attributes_for_read.inspect %>
+  end
+
+  # Associations
+
+  def permitted_associations
+    %i[]
+  end
+  <%- end -%>
 end

data/lib/generators/pu/res/conn/templates/app/presenters/resource_presenter.rb.tt

@@ -1,3 +1,3 @@
-class <%= app_namespace %>::<%= resource_class %>Presenter < ::<%= resource_class %>Presenter
+class <%= app_namespace %>::<%= resource_class %>Presenter < ::<%= parent_presenter %>
   include <%= app_namespace %>::ResourcePresenter
 end

data/lib/generators/pu/res/conn/templates/app/query_objects/resource_query_object.rb.tt

@@ -1,3 +1,3 @@
-class <%= app_namespace %>::<%= resource_class %>QueryObject < ::<%= resource_class %>QueryObject
+class <%= app_namespace %>::<%= resource_class %>QueryObject < ::<%= parent_query_object %>
   include <%= app_namespace %>::ResourceQueryObject
 end

data/lib/generators/pu/res/model/model_generator.rb

@@ -12,13 +12,6 @@ module Pu
       end
 
       def run_create_model
-        model_class = class_name.safe_constantize
-        if model_class.present? && !model_class.include?(Plutonium::Resource::Record)
-          gsub_file File.join("app/models", class_path, "#{file_name}.rb"),
-            "< ApplicationRecord",
-            "< ResourceRecord"
-        end
-
         create_model_file if create_files?
       end
 

data/lib/generators/pu/res/model/templates/model.rb.tt

@@ -6,6 +6,9 @@ require_relative "../<%= class_path.last.underscore %>"
 class <%= class_name %> < <%= [feature_package_name, "ResourceRecord"].join "::" %>
   # add concerns above.
 
+<% attributes.select(&:cents?).each do |attribute| -%>
+  has_cents :<%= attribute.name %>
+<% end -%>
   # add model configurations above.
 
 <% attributes.select(&:reference?).each do |attribute| -%>
@@ -29,7 +32,7 @@ class <%= class_name %> < <%= [feature_package_name, "ResourceRecord"].join "::"
 
 <% attributes.select(&:required?).each do |attribute| -%>
   <%- next if attribute.reference? || attribute.rich_text? || attribute.token? || attribute.password_digest? -%>
-  validates :<%= attribute.name %>, presence: true
+  validates :<%= attribute.attribute_name %>, presence: true
 <% end -%>
   # add validations above.
 

data/lib/generators/pu/res/scaffold/scaffold_generator.rb

@@ -37,12 +37,30 @@ module Pu
         template "policy.rb", File.join("app/policies", class_path, "#{file_name}_policy.rb")
       end
 
-      def create_presenter
-        template "presenter.rb", File.join("app/presenters", class_path, "#{file_name}_presenter.rb")
+      def create_definition
+        template "definition.rb", File.join("app/definitions", class_path, "#{file_name}_definition.rb")
       end
 
-      def create_query_object
-        template "query_object.rb", File.join("app/query_objects", class_path, "#{file_name}_query_object.rb")
+      # def create_presenter
+      #   template "presenter.rb", File.join("app/presenters", class_path, "#{file_name}_presenter.rb")
+      # end
+
+      # def create_query_object
+      #   template "query_object.rb", File.join("app/query_objects", class_path, "#{file_name}_query_object.rb")
+      # end
+
+      private
+
+      def default_policy_attributes
+        attributes.select { |a| !a.rich_text? && !a.password_digest? && !a.token? }.map(&:attribute_name).map(&:to_sym)
+      end
+
+      def policy_attributes_for_create
+        default_policy_attributes
+      end
+
+      def policy_attributes_for_read
+        default_policy_attributes + [:created_at, :updated_at]
       end
     end
   end

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

@@ -1,5 +1,4 @@
 <% module_namespacing do -%>
 class <%= class_name.pluralize %>Controller < <%= [feature_package_name, "ResourceController"].join "::" %>
-  controller_for ::<%= class_name %>
 end
 <% end -%>

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

@@ -0,0 +1,4 @@
+<% module_namespacing do -%>
+class <%= class_name %>Definition < <%= [feature_package_name, "ResourceDefinition"].join "::" %>
+end
+<% end -%>

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

@@ -13,11 +13,11 @@ class <%= class_name %>Policy < <%= [feature_package_name, "ResourcePolicy"].joi
   # Core attributes
 
   def permitted_attributes_for_create
-    <%= attributes.select{ |a| !a.rich_text? && !a.password_digest? && !a.token? }.map(&:name).map(&:to_sym).inspect %>
+    <%= policy_attributes_for_create.inspect %>
   end
 
   def permitted_attributes_for_read
-    <%= attributes.select{ |a| !a.rich_text? && !a.password_digest? && !a.token? }.map(&:name).map(&:to_sym).inspect %>
+    <%= policy_attributes_for_read.inspect %>
   end
 
   # Associations

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

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