plutonium 0.12.9 → 0.12.10

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

@@ -3,17 +3,23 @@ module Plutonium
     module Fields
       module Inputs
         class Base
-          attr_reader :name, :user_options
+          include Plutonium::Core::Renderable
 
+          attr_reader :name
+
+          # Initializes the Base input class with a name and user-defined options.
+          #
+          # @param name [String] the name of the input field.
+          # @param user_options [Hash] user-defined options for the input field.
           def initialize(name, **user_options)
             @name = name
             @user_options = user_options
           end
 
-          def render(view_context, f, record, **)
-            raise NotImplementedError, "#{self.class}#render"
-          end
-
+          # Collects parameters matching the input field's name with multi-parameter attributes.
+          #
+          # @param params [Hash] the parameters to collect from.
+          # @return [Hash] the collected parameters.
           def collect(params)
             # Handles multi parameter attributes
             # https://www.cookieshq.co.uk/posts/rails-spelunking-date-select
@@ -26,17 +32,77 @@ module Plutonium
             # - parameter(1i)
             # - parameter(2f)
             regex = /^#{param}(\(\d+[if]?\))?$/
-            keys = params.select { |key, value| regex.match?(key) }.keys
+            keys = params.select { |key, _| regex.match?(key) }.keys
             params.slice(*keys)
           end
 
-          protected
+          # Sets the form and record objects on the input field.
+          #
+          # @param form [Object] the form object.
+          # @param record [Object] the record object.
+          # @param render_options [Hash] additional options for rendering.
+          def with(form:, record:, **render_options)
+            @form = form
+            @record = record
+            @render_options = render_options
+            @options = build_options(render_options)
+
+            self
+          end
+
+          private
+
+          # Returns input-specific options, can be overridden by subclasses.
+          #
+          # @return [Hash] the input-specific options.
+          def input_options
+            {}
+          end
+
+          # Returns the parameter name for the input field.
+          #
+          # @return [String] the parameter name.
+          def param
+            name
+          end
+
+          # Raises an error if #options is accessed before rendering.
+          #
+          # @raise [RuntimeError] if accessed before rendering.
+          # @return [Hash] the rendering options.
+          def options
+            raise "cannot access #options before calling #with" unless defined?(@options)
 
-          def input_options = {}
+            @options
+          end
 
-          def param = name
+          # Raises an error if #form is accessed before rendering.
+          #
+          # @raise [RuntimeError] if accessed before rendering.
+          # @return [Object] the form object.
+          def form
+            raise "cannot access #form before calling #with" unless defined?(@form)
+
+            @form
+          end
 
-          def options = @options ||= input_options.deep_merge(@user_options)
+          # Raises an error if #record is accessed before rendering.
+          #
+          # @raise [RuntimeError] if accessed before rendering.
+          # @return [Object] the record object.
+          def record
+            raise "cannot access #record before calling #with" unless defined?(@record)
+
+            @record
+          end
+
+          # Builds the options for rendering by merging input options, user options, and render options.
+          #
+          # @param render_options [Hash] additional options for rendering.
+          # @return [Hash] the merged options.
+          def build_options(render_options)
+            input_options.deep_merge(@user_options).deep_merge(render_options)
+          end
         end
       end
     end

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

@@ -5,7 +5,9 @@ module Plutonium
         class CheckboxInput < SimpleFormInput
           private
 
-          def input_options = {wrapper: :resource_checkbox}
+          def input_options
+            {wrapper: :resource_checkbox}
+          end
         end
       end
     end

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

@@ -5,7 +5,9 @@ module Plutonium
         class DateTimeInput < SimpleFormInput
           private
 
-          def input_options = {wrapper: :resource_multi_select}
+          def input_options
+            {wrapper: :resource_multi_select}
+          end
         end
       end
     end

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

@@ -3,52 +3,67 @@ module Plutonium
     module Fields
       module Inputs
         class NestedInput < Base
-          include Plutonium::Core::Definers::InputDefiner
+          include Plutonium::Core::Definers::FieldInputDefiner
 
           attr_reader :inputs, :resource_class
 
-          def initialize(name, inputs:, resource_class:, allow_destroy:, update_only:, limit:, **user_options)
+          def initialize(name, inputs:, resource_class:, allow_destroy:, update_only:, limit:, **options)
             @inputs = inputs
             @resource_class = resource_class
             @allow_destroy = allow_destroy
             @update_only = update_only
             @limit = limit
 
-            super(name, **user_options)
+            super(name, **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
+          def render
+            render_component :nested_resource_form_fields, form:, **options
           end
 
           def collect(params)
+            nested_params = params[param] || {}
+            attributes = (nested_params.keys.first == "0") ? collect_indexed_attributes(nested_params) : collect_single_attributes(nested_params)
+            {param => attributes}
+          end
+
+          private
+
+          def collect_single_attributes(params)
+            collected = defined_inputs.collect_all(params)
+            collected[:id] = params[:id] if params.key?(:id) && !@update_only
+            collected[:_destroy] = params[:_destroy] if @allow_destroy
+            collected
+          end
+
+          def collect_indexed_attributes(params)
             attributes = {}
-            params[param].each do |index, nested_params|
+            params.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}
+            attributes
           end
 
-          private
-
-          def param = :"#{name}_attributes"
+          def param
+            :"#{name}_attributes"
+          end
 
-          def input_options = {
-            name:,
-            resource_class:,
-            allow_destroy: @allow_destroy,
-            update_only: @update_only,
-            limit: @limit,
-            inputs: defined_inputs
-          }
+          def input_options
+            {
+              name:,
+              resource_class:,
+              allow_destroy: @allow_destroy,
+              update_only: @update_only,
+              limit: @limit,
+              inputs: defined_inputs
+            }
+          end
 
           def defined_inputs
-            @defined_inputs ||= defined_inputs_for(*inputs)
+            @defined_inputs ||= defined_field_inputs_for(*inputs)
           end
         end
       end

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

@@ -3,10 +3,7 @@ module Plutonium
     module Fields
       module Inputs
         class NoopInput
-          def initialize(*)
-          end
-
-          def render(view_context, f, record, **)
+          def render
           end
 
           def collect(params)

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

@@ -3,9 +3,8 @@ module Plutonium
     module Fields
       module Inputs
         class PolymorphicBelongsToAssociationInput < SimpleFormAssociationInput
-          def render(view_context, f, record, **opts)
-            opts = options.deep_merge opts
-            f.input param, **opts
+          def render
+            form.input param, **options
           end
 
           private
@@ -15,12 +14,11 @@ module Plutonium
           end
 
           def input_options
+            collection = @user_options.delete(:collection).presence || associated_classes
             {
               as: :grouped_select,
+              collection:,
               label: reflection.name.to_s.humanize,
-              collection: associated_classes.map { |klass|
-                            [klass.name, klass.all]
-                          }.to_h,
               group_label_method: :first,
               group_method: :last, include_blank: "Select One"
             }
@@ -38,7 +36,10 @@ module Plutonium
                 end
               end
             end
-            associated_classes
+
+            associated_classes.map { |klass|
+              [klass.name, klass.all]
+            }.to_h
           end
         end
       end

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

@@ -5,14 +5,13 @@ module Plutonium
         class SimpleFormAssociationInput < Base
           attr_reader :reflection
 
-          def initialize(name, reflection:, **user_options)
+          def initialize(name, reflection:, **)
             @reflection = reflection
-            super(name, **user_options)
+            super(name, **)
           end
 
-          def render(view_context, f, record, **opts)
-            opts = options.deep_merge opts
-            f.association name, **opts
+          def render
+            form.association name, **options
           end
 
           private

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

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

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

@@ -2,7 +2,7 @@ module Plutonium
   module Core
     module Fields
       module Renderers
-        class AssociationRenderer < BasicRenderer
+        class AssociationRenderer < Base
           attr_reader :reflection
 
           def initialize(name, reflection:, **user_options)
@@ -10,10 +10,16 @@ module Plutonium
             super(name, **user_options)
           end
 
-          def render(view_context, record)
-            value = record.send(name)
-            options = self.options.merge(helper: value.class.include?(Plutonium::Resource::Record) ? :display_association_value : :display_name_of)
-            view_context.display_field value:, **options
+          def render
+            display_field value:, **options
+          end
+
+          private
+
+          def renderer_options
+            {
+              helper: value.class.include?(Plutonium::Resource::Record) ? :display_association_value : :display_name_of
+            }
           end
         end
       end

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

@@ -2,16 +2,9 @@ module Plutonium
   module Core
     module Fields
       module Renderers
-        class AttachmentRenderer < BasicRenderer
-          attr_reader :reflection
-
-          def initialize(name, reflection:, **user_options)
-            @reflection = reflection
-            super(name, **user_options)
-          end
-
-          def render(view_context, record)
-            view_context.attachment_preview record.send(name), **options
+        class AttachmentRenderer < AssociationRenderer
+          def render
+            attachment_preview value, **options
           end
 
           private

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

@@ -0,0 +1,83 @@
+module Plutonium
+  module Core
+    module Fields
+      module Renderers
+        class Base
+          include Plutonium::Core::Renderable
+
+          attr_reader :name
+
+          # Initializes the Base renderer class with a name and user-defined options.
+          #
+          # @param name [String] the name of the renderer.
+          # @param user_options [Hash] user-defined options for the renderer.
+          def initialize(name, **user_options)
+            @name = name
+            @user_options = user_options
+          end
+
+          # Sets the record object on the renderer and merges render options.
+          #
+          # @param record [Object] the record object.
+          # @param render_options [Hash] additional options for rendering.
+          # @return [self] the renderer instance.
+          def with(record:, **render_options)
+            @record = record
+            @render_options = render_options
+            @options = build_options(render_options)
+
+            self
+          end
+
+          def label
+            options[:label] || record.class.human_attribute_name(name)
+          end
+
+          private
+
+          # Returns the merged options for rendering.
+          #
+          # @raise [RuntimeError] if accessed before rendering.
+          # @return [Hash] the merged options.
+          def options
+            raise "cannot access #options before calling #with" unless defined?(@options)
+
+            @options
+          end
+
+          # Returns the record object.
+          #
+          # @raise [RuntimeError] if accessed before rendering.
+          # @return [Object] the record object.
+          def record
+            raise "cannot access #record before calling #with" unless defined?(@record)
+
+            @record
+          end
+
+          # Returns the value of the record's attribute corresponding to the renderer's name.
+          #
+          # @return [Object] the value of the attribute.
+          def value
+            record.public_send(name)
+          end
+
+          # Returns renderer-specific options, can be overridden by subclasses.
+          #
+          # @return [Hash] the renderer-specific options.
+          def renderer_options
+            {}
+          end
+
+          # Builds the options for rendering by merging renderer options, user options, and render options.
+          #
+          # @param render_options [Hash] additional options for rendering.
+          # @return [Hash] the merged options.
+          def build_options(render_options)
+            renderer_options.deep_merge(@user_options).deep_merge(render_options)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,24 +2,10 @@ module Plutonium
   module Core
     module Fields
       module Renderers
-        class BasicRenderer
-          attr_reader :name, :label, :user_options
-
-          def initialize(name, label:, **user_options)
-            @name = name
-            @label = label
-            @user_options = user_options
+        class BasicRenderer < Base
+          def render
+            display_field value:, **options
           end
-
-          def render(view_context, record)
-            view_context.display_field value: record.send(name), **options
-          end
-
-          def options = @options ||= renderer_options.deep_merge(@user_options)
-
-          private
-
-          def renderer_options = {}
         end
       end
     end

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

@@ -17,7 +17,6 @@ module Plutonium
 
           def self.for_resource_attribute(resource_class, attr_name, **options)
             type = nil
-            options[:label] ||= resource_class.human_attribute_name(attr_name)
 
             if (attachment = resource_class.try(:reflect_on_attachment, attr_name))
               type = :attachment

data/lib/plutonium/core/renderable.rb

@@ -0,0 +1,20 @@
+module Plutonium
+  module Core
+    module Renderable
+      extend ActiveSupport::Concern
+
+      included do
+        delegate_missing_to :@view_context
+      end
+
+      def render_in(view_context)
+        @view_context = view_context
+        render
+      end
+
+      def render
+        raise NotImplementedError, "#{self.class}#render"
+      end
+    end
+  end
+end

data/lib/plutonium/helpers/display_helper.rb

@@ -73,7 +73,7 @@ module Plutonium
 
         # Fallback to retrieving the value from a predefined list
         %i[to_label name title].each do |method|
-          name = obj.send(method) if obj.respond_to?(method)
+          name = obj.public_send(method) if obj.respond_to?(method)
           return name if name.present?
         end
 

data/lib/plutonium/resource/controller.rb

@@ -69,7 +69,7 @@ module Plutonium
         override_entity_scoping_params(input_params)
         override_parent_params(input_params)
 
-        current_presenter.defined_inputs_for(*permitted_attributes).collect_all(input_params)
+        current_presenter.defined_field_inputs_for(*permitted_attributes).collect_all(input_params)
       end
 
       # Returns the resource parameter key

data/lib/plutonium/resource/policy.rb

@@ -18,7 +18,7 @@ module Plutonium
           raise NotImplementedError, "#{self.class.name} does not implement the required #{method}"
         end
 
-        send(method)
+        public_send(method)
       end
 
       # Core actions

data/lib/plutonium/resource/presenter.rb

@@ -63,7 +63,7 @@ module Plutonium
 
         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"
+          raise ArgumentError, "model_class is required if your field is not an association or is polymorphic. also ensure you have called `accepts_nested_attributes_for :#{name}`"
         end
         model_class ||= nested_attribute_options_class
 
@@ -83,7 +83,7 @@ module Plutonium
         )
         yield input if block_given?
 
-        define_input name, input:
+        define_field_input name, input:
       end
 
       # Determines the limit for a nested input
@@ -92,7 +92,7 @@ module Plutonium
       # @param [Integer, nil] nested_attribute_limit The limit from nested attributes
       # @return [Integer, nil] The determined limit
       def determine_nested_input_limit(macro, option_limit, nested_attribute_limit)
-        if macro == :has_one
+        if %i[belongs_to has_one].include? macro
           1
         elsif option_limit
           option_limit

data/lib/plutonium/resource/query_object.rb

@@ -5,7 +5,7 @@ module Plutonium
       end
 
       class Query
-        include Plutonium::Core::Definers::InputDefiner
+        include Plutonium::Core::Definers::FieldInputDefiner
 
         # Applies the query to the given scope using the provided parameters.
         #
@@ -65,7 +65,7 @@ module Plutonium
         # @param params [Hash] The parameters for the query.
         # @return [Object] The modified scope.
         def apply_internal(scope, params)
-          scope.send(name, **params)
+          scope.public_send(name, **params)
         end
       end
 
@@ -215,7 +215,7 @@ module Plutonium
         end
 
         sort_definitions[name] = build_query(body) do |query|
-          query.define_input :direction
+          query.define_field_input :direction
         end
       end
 
@@ -224,7 +224,7 @@ module Plutonium
       # @param body [Proc, Symbol] The body of the search filter.
       def define_search(body)
         @search_filter = build_query(body) do |query|
-          query.define_input :search
+          query.define_field_input :search
         end
       end
 

data/lib/plutonium/resource/record.rb

@@ -22,7 +22,7 @@ module Plutonium
           record_association = klass.find_association_to_self(record)
           if record_association
             # TODO: add a warning here about a potentially poor performing query
-            return where(id: record.send(record_association.name))
+            return where(id: record.public_send(record_association.name))
           end
 
           klass.raise_association_error(record, named_scope)

data/lib/plutonium/simple_form/attachment_component.rb

@@ -40,7 +40,7 @@ module Plutonium
       private
 
       def value
-        @value ||= object.send(attribute_name) if object&.respond_to?(attribute_name)
+        @value ||= object.public_send(attribute_name) if object&.respond_to?(attribute_name)
       end
 
       def multiple?

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.12.9"
+  VERSION = "0.12.10"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",