plutonium 0.8.0 → 0.9.0

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/core/fields/renderers/factory.rb

@@ -9,6 +9,7 @@ module Plutonium
 
           map_type :belongs_to, :has_one, :has_many, to: Plutonium::Core::Fields::Renderers::AssociationRenderer
           map_type :attachment, to: Plutonium::Core::Fields::Renderers::AttachmentRenderer
+          map_type :map, to: Plutonium::Core::Fields::Renderers::MapRenderer
 
           def self.build(name, type:, **)
             mapping = mappings[type] || Plutonium::Core::Fields::Renderers::BasicRenderer

data/lib/plutonium/core/fields/renderers/map_renderer.rb

@@ -0,0 +1,19 @@
+module Plutonium
+  module Core
+    module Fields
+      module Renderers
+        class MapRenderer < BasicRenderer
+          # def initialize(name, reflection:, **user_options)
+          #   @reflection = reflection
+          #   super(name, **user_options)
+          # end
+
+          def render(view_context, record)
+            # view_context.display_field value:, **options
+            view_context.js_map [{latitude: record.lat, longitude: record.lng}]
+          end
+        end
+      end
+    end
+  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.0"
 end

data/package-lock.json

@@ -13,6 +13,7 @@
         "esbuild-plugin-manifest": "^1.0.3",
         "flowbite": "^2.3.0",
         "lodash.debounce": "^4.0.8",
+        "mapkick": "^0.2.6",
         "postcss": "^8.4.35",
         "postcss-cli": "^11.0.0",
         "postcss-hash": "^3.0.0",
@@ -1380,6 +1381,12 @@
         "node": "14 || >=16.14"
       }
     },
+    "node_modules/mapkick": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/mapkick/-/mapkick-0.2.6.tgz",
+      "integrity": "sha512-sDfPCOhTpQrzJc3Yzwg5XOBy5o2TTNEfH2dG2QZM7RUtfQzhY+xErfhQHrQvSOaWbf4zOegPq/dhaWuv2fo4CA==",
+      "dev": true
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",

data/package.json

@@ -11,11 +11,12 @@
     "postcss": "^8.4.35",
     "postcss-cli": "^11.0.0",
     "postcss-hash": "^3.0.0",
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.4.1",
+    "mapkick": "^0.2.6"
   },
   "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"
+    "watch-css": "postcss app/assets/css/plutonium.css -o public/plutonium-assets/build/plutonium-dev.css --watch",
+    "watch-js": "node build.js",
+    "build-css": "postcss app/assets/css/plutonium.css -o public/plutonium-assets/build/plutonium.css --watch"
   }
 }

data/templates/base.rb

@@ -0,0 +1,8 @@
+gem "plutonium"
+
+after_bundle do
+  generate "pu:core:install"
+
+  git add: "."
+  git commit: %( -m 'Install plutonium' )
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -203,7 +203,8 @@ description: Plutonium extends Rails' capabilities with a powerful, generator-dr
   you build applications with Rails, optimizing for rapid application development.
 email:
 - sfroelich01@gmail.com
-executables: []
+executables:
+- pug
 extensions: []
 extra_rdoc_files: []
 files:
@@ -708,8 +709,9 @@ files:
 - app/assets/icons/solid/zoom-in.svg
 - app/assets/icons/solid/zoom-out.svg
 - app/assets/js/controllers/application.js
-- app/assets/js/controllers/dropdown_controller.js
 - app/assets/js/controllers/index.js
+- app/assets/js/controllers/resource_dismiss_controller.js
+- app/assets/js/controllers/resource_drop_down_controller.js
 - app/assets/js/plutonium.js
 - app/assets/js/turbo/index.js
 - app/assets/js/turbo/turbo_actions.js
@@ -745,6 +747,9 @@ files:
 - app/views/components/interactive_action_form/interactive_action_form_component.html.erb
 - app/views/components/interactive_action_form/interactive_action_form_component.rb
 - app/views/components/interactive_action_form/interactive_action_form_controller.js
+- app/views/components/nested_resource_form_fields/nested_resource_form_fields_component.html.erb
+- app/views/components/nested_resource_form_fields/nested_resource_form_fields_component.rb
+- app/views/components/nested_resource_form_fields/nested_resource_form_fields_controller.js
 - app/views/components/pagination/pagination_component.html.erb
 - app/views/components/pagination/pagination_component.rb
 - app/views/components/panel/panel_component.html.erb
@@ -838,6 +843,7 @@ files:
 - config/initializers/pagy.rb
 - config/initializers/rabl.rb
 - config/initializers/simple_form.rb
+- exe/pug
 - lib/active_model/validations/array_validator.rb
 - lib/active_model/validations/attached_validator.rb
 - lib/active_model/validations/url_validator.rb
@@ -866,6 +872,7 @@ files:
 - lib/generators/pu/gen/pug/pug_generator.rb
 - lib/generators/pu/gen/pug/templates/pug.rb.tt
 - lib/generators/pu/lib/plutonium_generators.rb
+- lib/generators/pu/lib/plutonium_generators/cli.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/actions.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/config.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/logger.rb
@@ -1012,6 +1019,7 @@ files:
 - lib/plutonium/core/fields/inputs/date_time_input.rb
 - lib/plutonium/core/fields/inputs/factory.rb
 - lib/plutonium/core/fields/inputs/has_many_association_input.rb
+- lib/plutonium/core/fields/inputs/nested_input.rb
 - lib/plutonium/core/fields/inputs/noop_input.rb
 - lib/plutonium/core/fields/inputs/phone_input.rb
 - lib/plutonium/core/fields/inputs/polymorphic_belongs_to_association_input.rb
@@ -1021,6 +1029,7 @@ files:
 - lib/plutonium/core/fields/renderers/attachment_renderer.rb
 - lib/plutonium/core/fields/renderers/basic_renderer.rb
 - lib/plutonium/core/fields/renderers/factory.rb
+- lib/plutonium/core/fields/renderers/map_renderer.rb
 - lib/plutonium/core/ui/collection.rb
 - lib/plutonium/core/ui/detail.rb
 - lib/plutonium/core/ui/form.rb
@@ -1071,6 +1080,7 @@ files:
 - public/plutonium-assets/logo.png
 - sig/plutonium.rbs
 - tailwind.config.js
+- templates/base.rb
 homepage: https://github.com/radioactive-labs/plutonium-core
 licenses:
 - MIT

data/app/assets/js/controllers/dropdown_controller.js

@@ -1,12 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-// Connects to data-controller="dropdown"
-export default class extends Controller {
-  connect() {
-    console.log(`form connected: ${this.element}`)
-  }
-
-  submit() {
-    this.element.requestSubmit()
-  }
-}