plutonium 0.8.0 → 0.9.1

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

@@ -11,87 +11,89 @@ module PlutoniumGenerators
       protected
 
       #
-      # Sets the ruby version for the project in .ruby-version and Gemfile to `PlutoniumGenerators::RUBY_VERSION`
+      # Sets the ruby version for the project in .ruby-version and Gemfile to `version`
       #
-      # @return [void]
-      #
-      def set_ruby_version!
-        log :set_ruby_version!, PlutoniumGenerators::RUBY_VERSION
-
-        in_root do
-          create_file ".ruby-version", PlutoniumGenerators::RUBY_VERSION, force: true, verbose: false
-          gsub_file "Gemfile", /^ruby ["'].*["']/, "ruby '~> #{PlutoniumGenerators::RUBY_VERSION}'", verbose: false
-        end
-      end
-
-      #
-      # Adds a new gem into the Gemfile
-      # Existing directives are updated if they do not match
-      # When `:group` is specified, the gem is inserted into the approriate gem group.
-      #
-      # @param [String] name the name of the gem
-      # @param [Hash] **kwargs set of options to append see #super
+      # @param [string] version semantic ruby version you want to use e.g. 3.3.0
       #
       # @return [void]
       #
-      def gem(name, **kwargs)
-        groups = Array(kwargs.delete(:group))
+      def set_ruby_version!(version)
+        log :set_ruby_version!, version
 
         in_root do
-          begin
-            # Create a temp gemfile
-            File.rename("Gemfile", "Gemfile.bak")
-            File.write("Gemfile", "")
-            # Generate the directive
-            super
-            # Get the generated directive
-            directive = gemfile.strip
-          ensure
-            # Restore our gemfile
-            File.delete "Gemfile"
-            File.rename "Gemfile.bak", "Gemfile"
-          end
-
-          pattern = /^# gem ['"]#{name}['"].*/
-          if gemfile.match(pattern)
-            # Replace commented out directive
-            gsub_file("Gemfile", pattern, directive)
-            break
-          end
-
-          # Remove existing directive
-          remove_gem name
-
-          # Insert the new directive
-          if groups != []
-            str = groups.sort.map(&:inspect).join(", ")
-            after_sentinel = "group #{str} do\n"
-
-            unless File.read("Gemfile").match?(/^#{after_sentinel}/)
-              inject_into_file "Gemfile", "\n#{after_sentinel}end\n"
-            end
-          else
-            after_sentinel = "# Project gems\n\n"
-            unless File.read("Gemfile").match?(/^#{after_sentinel}/)
-              inject_into_file "Gemfile", "\n#{after_sentinel}", after: /^ruby .*\n/
-            end
-          end
-
-          inject_into_file "Gemfile", "#{directive}\n", after: /^#{after_sentinel}/
+          create_file ".ruby-version", version, force: true, verbose: false
+          gsub_file "Gemfile", /^ruby ["'].*["']/, "ruby '~> #{version}'", verbose: false
         end
       end
 
-      #
-      # Removes a gem and any preceeding comments from the Gemfile
-      #
-      # @param gem [String] the name of the gem to remove
-      #
-      # @return [void]
-      #
-      def remove_gem(gem)
-        log :remove_gem, gem
-        gsub_file "Gemfile", /(:?^.*#.*\n)*.*gem ['"]#{gem}['"].*\n/, "", verbose: false
-      end
+      # #
+      # # Adds a new gem into the Gemfile
+      # # Existing directives are updated if they do not match
+      # # When `:group` is specified, the gem is inserted into the approriate gem group.
+      # #
+      # # @param [String] name the name of the gem
+      # # @param [Hash] **kwargs set of options to append see #super
+      # #
+      # # @return [void]
+      # #
+      # def gem(name, **kwargs)
+      #   groups = Array(kwargs.delete(:group))
+
+      #   in_root do
+      #     begin
+      #       # Create a temp gemfile
+      #       File.rename("Gemfile", "Gemfile.bak")
+      #       File.write("Gemfile", "")
+      #       # Generate the directive
+      #       super
+      #       # Get the generated directive
+      #       directive = gemfile.strip
+      #     ensure
+      #       # Restore our gemfile
+      #       File.delete "Gemfile"
+      #       File.rename "Gemfile.bak", "Gemfile"
+      #     end
+
+      #     pattern = /^# gem ['"]#{name}['"].*/
+      #     if gemfile.match(pattern)
+      #       # Replace commented out directive
+      #       gsub_file("Gemfile", pattern, directive)
+      #       break
+      #     end
+
+      #     # Remove existing directive
+      #     remove_gem name
+
+      #     # Insert the new directive
+      #     if groups != []
+      #       str = groups.sort.map(&:inspect).join(", ")
+      #       after_sentinel = "group #{str} do\n"
+
+      #       unless File.read("Gemfile").match?(/^#{after_sentinel}/)
+      #         inject_into_file "Gemfile", "\n#{after_sentinel}end\n"
+      #       end
+      #     else
+      #       after_sentinel = "# Project gems\n\n"
+      #       unless File.read("Gemfile").match?(/^#{after_sentinel}/)
+      #         inject_into_file "Gemfile", "\n#{after_sentinel}", after: /^ruby .*\n/
+      #       end
+      #     end
+
+      #     inject_into_file "Gemfile", "#{directive}\n", after: /^#{after_sentinel}/
+      #   end
+      # end
+
+      # #
+      # # Removes a gem and any preceeding comments from the Gemfile
+      # #
+      # # @param gem [String] the name of the gem to remove
+      # #
+      # # @return [void]
+      # #
+      # def remove_gem(gem)
+      #   log :remove_gem, gem
+      #   gsub_file "Gemfile", /(:?^.*#.*\n)*.*gem ['"]#{gem}['"].*\n/, "", verbose: false
+      # end
 
       #
       # Evaluates the given template and merges it with the project's docker-compose.yml
@@ -348,6 +350,18 @@ module PlutoniumGenerators
           File.read("Gemfile")
         end
       end
+
+      def bundle(*gems)
+        Bundler.with_unbundled_env do
+          run "bundle add #{Array(gems).join " "}"
+        end
+      end
+
+      def unbundle(*gems)
+        Bundler.with_unbundled_env do
+          run "bundle remove #{Array(gems).join " "}"
+        end
+      end
     end
   end
 end

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

@@ -64,12 +64,8 @@ module PlutoniumGenerators
       @prompt ||= TTY::Prompt.new
     end
 
-    def rails?
-      PlutoniumGenerators.rails?
-    end
-
     def appname
-      rails? ? Rails.application.class.module_parent.name : "PlutoniumGenerators"
+      defined?(Rails.application) ? Rails.application.class.module_parent.name : "PlutoniumGenerators"
     end
 
     def app_name

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

@@ -1,7 +1,15 @@
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem # (warn_on_extra_files: false)
+loader.inflector.inflect(
+  "cli" => "CLI"
+)
 loader.setup
 
 module PlutoniumGenerators
+  class << self
+    def cli?
+      ENV["PU_CLI"] == "1"
+    end
+  end
 end

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

@@ -18,8 +18,7 @@ module Pu
 
       def add_rodauth
         Bundler.with_unbundled_env do
-          run "bundle add bcrypt"
-          run "bundle add rodauth-rails"
+          run "bundle add bcrypt rodauth-rails"
         end
       end
 

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

@@ -9,7 +9,7 @@ module Plutonium
         end
 
         def permitted_for(policy)
-          Collection.new(@collection.select { |name, action| policy.send :"#{action.name}?" })
+          Collection.new(@collection.select { |name, action| policy.send_with_report :"#{action.name}?" })
         end
 
         def collection_actions

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

@@ -42,7 +42,7 @@ module Plutonium
         end
 
         def permitted_attributes
-          @permitted_attributes ||= current_policy.send :"permitted_attributes_for_#{action_name}"
+          @permitted_attributes ||= current_policy.send_with_report :"permitted_attributes_for_#{action_name}"
         end
 
         def current_policy
@@ -52,9 +52,9 @@ module Plutonium
           end
         end
 
-        def parent_policy
-          @parent_policy ||= policy(current_parent) if current_parent.present?
-        end
+        # def parent_policy
+        #   @parent_policy ||= policy(current_parent) if current_parent.present?
+        # end
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Plutonium
             @user_options = user_options
           end
 
-          def render(f, record, **)
+          def render(view_context, f, record, **)
             raise NotImplementedError, "#{self.class}#render"
           end
 

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

@@ -0,0 +1,57 @@
+module Plutonium
+  module Core
+    module Fields
+      module Inputs
+        class NestedInput < Base
+          include Plutonium::Core::Definers::InputDefiner
+
+          attr_reader :inputs, :resource_class
+
+          def initialize(name, inputs:, resource_class:, allow_destroy:, update_only:, limit:, **user_options)
+            @inputs = inputs
+            @resource_class = resource_class
+            @allow_destroy = allow_destroy
+            @update_only = update_only
+            @limit = limit
+
+            super(name, **user_options)
+          end
+
+          def render(view_context, f, record, **opts)
+            opts = options.deep_merge opts
+            view_context.render_component :nested_resource_form_fields, form: f, **opts
+          end
+
+          def collect(params)
+            attributes = {}
+            params[param].each do |index, nested_params|
+              collected = defined_inputs.collect_all(nested_params)
+              collected[:id] = nested_params[:id] if nested_params.key?(:id) && !@update_only
+              collected[:_destroy] = nested_params[:_destroy] if @allow_destroy
+              attributes[index] = collected
+            end
+
+            {param => attributes}
+          end
+
+          private
+
+          def param = :"#{name}_attributes"
+
+          def input_options = {
+            name:,
+            resource_class:,
+            allow_destroy: @allow_destroy,
+            update_only: @update_only,
+            limit: @limit,
+            inputs: defined_inputs
+          }
+
+          def defined_inputs
+            @defined_inputs ||= defined_inputs_for(*inputs)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Plutonium
           def initialize(*)
           end
 
-          def render(f, record, **)
+          def render(view_context, f, record, **)
           end
 
           def collect(params)

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

@@ -3,7 +3,7 @@ module Plutonium
     module Fields
       module Inputs
         class PhoneInput < SimpleFormInput
-          # def render(f, record, **opts)
+          # def render(view_context, f, record, **opts)
           #   opts = options.deep_merge opts
           #   opts.delete(:as)
           #   f.input name, **opts

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

@@ -3,7 +3,7 @@ module Plutonium
     module Fields
       module Inputs
         class PolymorphicBelongsToAssociationInput < SimpleFormAssociationInput
-          def render(f, record, **opts)
+          def render(view_context, f, record, **opts)
             opts = options.deep_merge opts
             f.input param, **opts
           end

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

@@ -10,7 +10,7 @@ module Plutonium
             super(name, **user_options)
           end
 
-          def render(f, record, **opts)
+          def render(view_context, f, record, **opts)
             opts = options.deep_merge opts
             f.association name, **opts
           end

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

@@ -3,7 +3,7 @@ module Plutonium
     module Fields
       module Inputs
         class SimpleFormInput < Base
-          def render(f, record, **opts)
+          def render(view_context, f, record, **opts)
             opts = options.deep_merge opts
             f.input name, **opts
           end

data/lib/plutonium/pkg/base.rb

@@ -17,10 +17,6 @@ module Plutonium
           add_view_paths_initializer.instance_variable_set(:@block, ->(app) {})
         end
       end
-
-      def scoped_to_entity?
-        raise NotImplementedError, "scoped_to_entity?"
-      end
     end
   end
 end

data/lib/plutonium/railtie.rb

@@ -2,7 +2,15 @@ require "view_component"
 
 module Plutonium
   class Railtie < Rails::Railtie
-    initializer "plutonium.assets_server" do
+    config.plutonium = ActiveSupport::OrderedOptions.new
+
+    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
+    end
+
+    initializer "plutonium.asset_server" do
       # setup a middleware to serve our assets
       config.app_middleware.insert_before(
         ActionDispatch::Static,
@@ -17,7 +25,7 @@ module Plutonium
       )
     end
 
-    initializer "plutonium.view_components" do
+    initializer "plutonium.view_components_capture_compat" do
       config.view_component.capture_compatibility_patch_enabled = true
     end
   end

data/lib/plutonium/resource/policy.rb

@@ -6,6 +6,12 @@ module Plutonium
       class Scope < Plutonium::Policy::Scope
       end
 
+      def send_with_report(method)
+        raise NotImplementedError, "#{self.class.name} does not implement the required #{method}" unless respond_to? method
+
+        send method
+      end
+
       # Core actions
 
       def create?

data/lib/plutonium/resource/presenter.rb

@@ -37,6 +37,41 @@ module Plutonium
         define_action Plutonium::Core::Actions::InteractiveAction.new(name, interaction:, **)
       end
 
+      # TODO: move this to its own definer
+      def define_nested_input(name, inputs:, model_class: nil, **options)
+        nested_attribute_options = resource_class.all_nested_attributes_options[name]
+
+        nested_attribute_options_class = nested_attribute_options&.[](:class)
+        if nested_attribute_options_class.nil? && model_class.nil?
+          raise ArgumentError, "model_class is required if your field is not an association or is polymorphic"
+        end
+        model_class ||= nested_attribute_options_class
+
+        macro = nested_attribute_options&.[](:macro)
+        allow_destroy = nested_attribute_options&.[](:allow_destroy).presence
+        update_only = nested_attribute_options&.[](:update_only).presence
+        limit = if macro == :has_one
+          1
+        elsif options.key?(:limit)
+          options[:limit]
+        else
+          nested_attribute_options&.[](:limit)
+        end
+
+        input = Plutonium::Core::Fields::Inputs::NestedInput.new(
+          name,
+          inputs:,
+          allow_destroy: options.key?(:allow_destroy) ? options[:allow_destroy] : allow_destroy,
+          update_only: options.key?(:update_only) ? options[:update_only] : update_only,
+          limit: limit,
+          resource_class: model_class,
+          **options
+        )
+        yield input if block_given?
+
+        define_input name, input:
+      end
+
       def resource_class = context.resource_class
     end
   end

data/lib/plutonium/resource/record.rb

@@ -117,6 +117,23 @@ module Plutonium
           @has_many_association_routes ||= reflect_on_all_associations(:has_many).map { |assoc| assoc.klass.model_name.plural }
         end
 
+        def all_nested_attributes_options
+          unless Rails.env.local?
+            return @all_nested_attributes_options if defined?(@all_nested_attributes_options)
+          end
+
+          @all_nested_attributes_options = reflect_on_all_associations.map do |association|
+            setter_method = "#{association.name}_attributes="
+            if method_defined?(setter_method)
+              [association.name, {
+                **nested_attributes_options[association.name],
+                macro: association.macro,
+                class: association.polymorphic? ? nil : association.klass
+              }]
+            end
+          end.compact.to_h
+        end
+
         #
         # Returns the strong parameters definition for the given attribute names
         #
@@ -127,6 +144,8 @@ module Plutonium
         #
         def strong_parameters_for(*attributes)
           # attributes that are passed but we do not have a model/database backed definition for e.g. virtual attributes.
+          # if they are passed and we are not expecting them, our inputs will filter them out as they apply an additional level
+          # of filtering
           unbacked = attributes - strong_parameters_definition.keys
 
           # attributes backed by some model/database definition
@@ -147,8 +166,13 @@ module Plutonium
         private
 
         def strong_parameters_definition
-          # @strong_parameters ||= begin
+          unless Rails.env.local?
+            return @strong_parameters if defined?(@strong_parameters)
+          end
+
           @strong_parameters = begin
+            # Columns
+
             content_column_parameters = content_column_field_names.map do |name|
               column = columns_hash[name.to_s]
 
@@ -160,21 +184,30 @@ module Plutonium
             end
             parameters = content_column_parameters.to_h
 
-            # TODO: add nested support
+            # Associations
 
-            # TODO:
             parameters.merge! reflect_on_all_associations(:belongs_to)
               .map { |reflection|
-                                input_param = (reflection.respond_to?(:options) && reflection.options[:foreign_key]) || :"#{reflection.name}_id"
+                                input_param = reflection.respond_to?(:options) ? reflection.options[:foreign_key] : :"#{reflection.name}_id"
                                 [reflection.name, {input_param => nil}]
                               }
               .to_h
 
-            parameters.merge! has_one_association_field_names.map { |name| [name, {name => nil}] }.to_h
+            parameters.merge! has_many_association_field_names
+              .map { |name| [name, {"#{name.to_s.singularize}_ids": []}] }
+              .to_h
+
+            # Attachments
+
+            parameters.merge! has_many_attached_field_names.map { |name| [name, {name => []}] }.to_h
+
             parameters.merge! has_one_attached_field_names.map { |name| [name, {name => nil}] }.to_h
 
-            parameters.merge! has_many_association_field_names.map { |name| [name, {"#{name.to_s.singularize}_ids": []}] }.to_h
-            parameters.merge! has_many_attached_field_names.map { |name| [name, {name: []}] }.to_h
+            # Nested Attributes
+
+            parameters.merge! all_nested_attributes_options.keys
+              .map { |name| [name, {"#{name}_attributes" => {}}] }
+              .to_h
 
             # e.g.
             # {:name=>{:name=>nil}, :cover_image=>{:cover_image=>nil}, :user=>{:user_id=>nil} :comments=>{:comment_ids=>[]}}

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

data/lib/plutonium.rb

@@ -21,28 +21,31 @@ module Plutonium
 
   def self.stylesheet_link
     if Plutonium::Config.development
-      file = JSON.parse(File.read(root.join("css.manifest")))["plutonium-dev.css"]
-      "/plutonium-assets/build/#{file}"
+      base_dir = "/plutonium-assets/build"
+      manifest = "css.dev.manifest"
+      filename = "plutonium-dev.css"
     else
-      raise NotImplementedError, "TODO: implement asset resolution for prod"
-      # @stylesheet ||= begin
-      #   file = JSON.parse(File.read(root.join("css.manifest")))["plutonium.css"]
-      #   "/plutonium-assets/#{file}"
-      # end
+      base_dir = "/plutonium-assets"
+      manifest = "css.manifest"
+      filename = "plutonium.css"
     end
+
+    file = JSON.parse(File.read(root.join(manifest)))[filename]
+    "#{base_dir}/#{file}"
   end
 
   def self.script_link
+    filename = "plutonium-app.js"
     if Plutonium::Config.development
-      file = JSON.parse(File.read(root.join("js.manifest")))["plutonium.js"]
-      "/plutonium-assets/build/#{file}"
+      base_dir = "/plutonium-assets/build"
+      manifest = "js.dev.manifest"
     else
-      raise NotImplementedError, "TODO: implement asset resolution for prod"
-      # @stylesheet ||= begin
-      #   file = JSON.parse(File.read(root.join("css.manifest")))["plutonium.css"]
-      #   "/plutonium-assets/#{file}"
-      # end
+      base_dir = "/plutonium-assets"
+      manifest = "js.manifest"
     end
+
+    file = JSON.parse(File.read(root.join(manifest)))[filename]
+    "#{base_dir}/#{file}"
   end
 end
 

data/package.json

@@ -14,8 +14,9 @@
     "tailwindcss": "^3.4.1"
   },
   "scripts": {
-    "watch": "postcss app/assets/css/plutonium.css -o public/plutonium-assets/build/plutonium-dev.css --watch",
-    "scripts": "node build.js",
-    "build": "postcss app/assets/css/plutonium.css -o public/plutonium-assets/build/plutonium.css --watch"
+    "css:dev": "postcss app/assets/stylesheets/plutonium.css -o public/plutonium-assets/build/plutonium-dev.css --watch",
+    "js:dev": "node esbuild.config.js",
+    "css:prod": "postcss app/assets/stylesheets/plutonium.css -o public/plutonium-assets/plutonium.css --prod",
+    "js:prod": "node esbuild.config.js --prod"
   }
 }

data/postcss.config.js

@@ -5,7 +5,7 @@ module.exports = {
     'postcss-hash': {
       algorithm: 'sha256',
       trim: 20,
-      manifest: './css.manifest'
+      manifest: process.argv.includes("--prod") ? './css.manifest' : './css.dev.manifest'
     },
   }
 }