stimulus_plumbers 0.2.8 → 0.2.9

data/lib/stimulus_plumbers/form/builder.rb

@@ -2,7 +2,7 @@
 
 require "action_view/version"
 
-require_relative "field_component"
+require_relative "field"
 require_relative "fields/choice"
 require_relative "fields/combobox"
 require_relative "fields/file"
@@ -12,25 +12,27 @@ require_relative "fields/search"
 require_relative "fields/select"
 require_relative "fields/text"
 require_relative "fields/text_area"
-require_relative "../components/plumber/html_options"
+require_relative "fields/submit"
+require_relative "../plumber/html_options"
 
 module StimulusPlumbers
   module Form
     class Builder < ActionView::Helpers::FormBuilder
-      include Components::Plumber::HtmlOptions
+      include Plumber::HtmlOptions
       include Fields::Choice
       include Fields::Combobox
       include Fields::File
       include Fields::Password
       include Fields::Search
       include Fields::Select
+      include Fields::Submit
       include Fields::Text
       include Fields::TextArea
 
       private
 
       def build_field(attribute, form_field_opts, input_id: field_id(attribute))
-        FieldComponent.new(
+        Field.new(
           object:           object,
           attribute:        attribute,
           input_id:         input_id,
@@ -57,7 +59,7 @@ module StimulusPlumbers
       end
 
       def extract_options(options)
-        [options.except(*FieldComponent::OPTIONS), options.slice(*FieldComponent::OPTIONS)]
+        [options.except(*Field::OPTIONS), options.slice(*Field::OPTIONS)]
       end
 
       def field_theme(key, **variants)

data/lib/stimulus_plumbers/form/{field_component.rb → field.rb}

@@ -2,7 +2,7 @@
 
 module StimulusPlumbers
   module Form
-    class FieldComponent
+    class Field
       OPTIONS = %i[label details error required label_visibility layout reveal clearable].freeze
 
       attr_reader :object,

data/lib/stimulus_plumbers/form/fields/combobox.rb

@@ -27,7 +27,7 @@ module StimulusPlumbers
             input:   { name: field_name(attribute), value: current_value },
             popover: { content: popover }
           )
-          wrapper = Components::Combobox::Renderer.new(@template).render(
+          wrapper = Components::Combobox.new(@template).render(
             base_id: base_id,
             options: opts,
             **field_theme(:form_combobox, error: field.error?),

data/lib/stimulus_plumbers/form/fields/error.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Error < Plumber::Base
+        def render(message:, id:)
+          klass = theme.resolve(:form_error).fetch(:classes, "")
+          template.content_tag(:p, message, id: id, class: klass.presence, role: "alert")
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/group.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Group < Plumber::Base
+        def render(layout: :stacked, error: false, &block)
+          klass = theme.resolve(:form_group, layout: layout, error: error).fetch(:classes, "")
+          template.content_tag(:div, class: klass.presence, &block)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/hint.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Hint < Plumber::Base
+        def render(text:, id:)
+          klass = theme.resolve(:form_details).fetch(:classes, "")
+          template.content_tag(:p, text, id: id, class: klass.presence)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/label.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Label < Plumber::Base
+        def render(text:, for_id:, required: false, hidden: false)
+          klass = theme.resolve(:form_label, required: required, hidden: hidden).fetch(:classes, "")
+
+          inner = text.dup.html_safe
+          if required
+            mark_klass = theme.resolve(:form_required_mark).fetch(:classes, "")
+            inner += template.content_tag(:span, "*", "aria-hidden": "true", class: mark_klass.presence)
+          end
+
+          template.content_tag(:label, inner, for: for_id, class: klass.presence)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/form/fields/renderer.rb

@@ -13,41 +13,37 @@ module StimulusPlumbers
         end
 
         def call(input_html)
-          field_klass = theme.resolve(:form_group, layout: field.layout, error: field.error?).fetch(:classes, "")
-
-          template.content_tag(:div, class: field_klass) do
-            label_html + input_html.html_safe + hint_html + errors_html
+          Group.new(template).render(layout: field.layout, error: field.error?) do
+            (field_label + input_html.html_safe + field_hint + field_errors).html_safe
           end
         end
 
         private
 
-        def label_html
-          klass = theme.resolve(:form_label, required: field.required, hidden: field.label_hidden?).fetch(:classes, "")
-
-          inner = field.label_text.dup.html_safe
-          if field.required
-            mark_klass = theme.resolve(:form_required_mark).fetch(:classes, "")
-            inner += template.content_tag(:span, "*", "aria-hidden": "true", class: mark_klass)
-          end
-
-          template.content_tag(:label, inner, for: field.input_id, class: klass)
+        def field_label
+          Label.new(template).render(
+            text:     field.label_text,
+            for_id:   field.input_id,
+            required: field.required,
+            hidden:   field.label_hidden?
+          )
         end
 
-        def hint_html
+        def field_hint
           return "".html_safe unless field.details.present?
 
-          klass = theme.resolve(:form_details).fetch(:classes, "")
-          template.content_tag(:p, field.details, id: field.hint_id, class: klass)
+          Hint.new(template).render(
+            text: field.details,
+            id:   field.hint_id
+          )
         end
 
-        def errors_html
+        def field_errors
           return "".html_safe if field.errors.none?
 
-          klass = theme.resolve(:form_error).fetch(:classes, "")
           field.errors.map.with_index(1) do |message, i|
             id = field.errors.one? ? field.error_id : "#{field.error_id}_#{i}"
-            template.content_tag(:p, message, id: id, class: klass, role: "alert")
+            Error.new(template).render(message: message, id: id)
           end.join.html_safe
         end
       end

data/lib/stimulus_plumbers/form/fields/search.rb

@@ -9,14 +9,26 @@ module StimulusPlumbers
           clearable = form_field_opts.delete(:clearable) { false }
           field     = build_field(attribute, form_field_opts)
 
-          html_opts = merge_html_options(
-            rails_opts,
-            field_theme(:form_input, error: field.error?),
-            field.html_opts
-          )
           input_html = if clearable
-                         build_input_group(super(attribute, html_opts), field, trailing: clear_button)
+                         input_opts = merge_html_options(
+                           rails_opts,
+                           field_theme(:form_input, error: field.error?),
+                           field.html_opts,
+                           { "data-input-search-target": "input", inputmode: "search" }
+                         )
+                         build_input_group(
+                           super(attribute, input_opts),
+                           field,
+                           trailing:          clear_button,
+                           "data-controller": "input-search",
+                           role:              "search"
+                         )
                        else
+                         html_opts = merge_html_options(
+                           rails_opts,
+                           field_theme(:form_input, error: field.error?),
+                           field.html_opts
+                         )
                          super(attribute, html_opts)
                        end
 
@@ -29,9 +41,11 @@ module StimulusPlumbers
           @template.content_tag(
             :button,
             "",
-            type:         "button",
-            class:        field_theme(:form_button_reveal)[:class],
-            "aria-label": "Clear search"
+            type:                       "button",
+            class:                      field_theme(:form_button_reveal)[:class],
+            "aria-label":               "Clear search",
+            "data-input-search-target": "clear",
+            "data-action":              "click->input-search#clear"
           )
         end
       end

data/lib/stimulus_plumbers/form/fields/submit.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      module Submit
+        def submit(value = nil, options = {})
+          if value.is_a?(Hash)
+            options = value
+            value = nil
+          end
+          value   ||= submit_default_value
+          variant   = options.delete(:variant) { :default }
+          @template.tag.input(
+            type:  "submit",
+            value: value,
+            **merge_html_options(field_theme(:form_submit, variant: variant), options)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/helpers/action_list_helper.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Helpers
     module ActionListHelper
       def sp_action_list(**html_options, &block)
-        action_list_renderer.list(**html_options, &block)
+        action_list_renderer.render(**html_options, &block)
       end
 
       def sp_action_list_section(title: nil, **html_options, &block)
@@ -18,7 +18,7 @@ module StimulusPlumbers
       private
 
       def action_list_renderer
-        Components::ActionList::Renderer.new(self)
+        Components::ActionList.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/avatar_helper.rb

@@ -4,13 +4,13 @@ module StimulusPlumbers
   module Helpers
     module AvatarHelper
       def sp_avatar(name: nil, initials: nil, url: nil, color: nil, size: :md, **html_options, &block)
-        avatar_renderer.avatar(name: name, initials: initials, url: url, color: color, size: size, **html_options, &block)
+        avatar_renderer.render(name: name, initials: initials, url: url, color: color, size: size, **html_options, &block)
       end
 
       private
 
       def avatar_renderer
-        Components::Avatar::Renderer.new(self)
+        Components::Avatar.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/button_helper.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Helpers
     module ButtonHelper
       def sp_button(content = nil, url: nil, external: false, variant: :primary, size: :md, **html_options, &block)
-        button_renderer.button(
+        button_renderer.render(
           content,
           url: url, external: external, variant: variant, size: size, **html_options,
           &block
@@ -18,7 +18,7 @@ module StimulusPlumbers
       private
 
       def button_renderer
-        Components::Button::Renderer.new(self)
+        Components::Button.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/calendar_helper.rb

@@ -19,7 +19,7 @@ module StimulusPlumbers
       private
 
       def calendar_renderer
-        Components::Calendar::Renderer.new(self)
+        Components::Calendar.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/calendar_turbo_helper.rb

@@ -24,7 +24,7 @@ module StimulusPlumbers
       private
 
       def calendar_month_turbo_renderer
-        Components::Calendar::Month::Turbo::Renderer.new(self)
+        Components::Calendar::Month::Turbo.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/card_helper.rb

@@ -4,7 +4,7 @@ module StimulusPlumbers
   module Helpers
     module CardHelper
       def sp_card(title: nil, **html_options, &block)
-        card_renderer.card(title: title, **html_options, &block)
+        card_renderer.render(title: title, **html_options, &block)
       end
 
       def sp_card_section(title: nil, **html_options, &block)
@@ -14,7 +14,7 @@ module StimulusPlumbers
       private
 
       def card_renderer
-        Components::Card::Renderer.new(self)
+        Components::Card.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/combobox_helper.rb

@@ -9,7 +9,7 @@ module StimulusPlumbers
           popover: { content: Components::Combobox::Date.new(self).render(value: value) }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: sp_dom_id,
           options: opts,
           data:    { input_format_type_value: "date" },
@@ -23,7 +23,7 @@ module StimulusPlumbers
           popover: { content: Components::Combobox::Dropdown.new(self).render(options: options, value: value, label: label) }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: sp_dom_id,
           options: opts,
           **html_options
@@ -45,12 +45,12 @@ module StimulusPlumbers
           }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: id,
           options: opts,
           data:    {
             input_combobox_combobox_dropdown_outlet: "##{popover_id}",
-            action:                                  "input->input-combobox#filter"
+            action:                                  "input->input-combobox#onInput"
           },
           **html_options
         )
@@ -62,7 +62,7 @@ module StimulusPlumbers
           popover: { content: Components::Combobox::Time.new(self).render(format: format, step: step, value: value) }
         )
         opts = opts.deep_merge(trigger: { aria_label: label }) if label
-        Components::Combobox::Renderer.new(self).render(
+        Components::Combobox.new(self).render(
           base_id: sp_dom_id,
           options: opts,
           data:    { input_format_type_value: "time", input_format_options_value: { format: format }.to_json },

data/lib/stimulus_plumbers/helpers/popover_helper.rb

@@ -4,13 +4,13 @@ module StimulusPlumbers
   module Helpers
     module PopoverHelper
       def sp_popover(interactive: true, **html_options, &block)
-        popover_renderer.popover(interactive: interactive, **html_options, &block)
+        popover_renderer.render(interactive: interactive, **html_options, &block)
       end
 
       private
 
       def popover_renderer
-        Components::Popover::Renderer.new(self)
+        Components::Popover.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/plumber/base.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Plumber
+    class Base
+      include HtmlOptions
+      include Renderer
+
+      attr_reader :template
+
+      def initialize(template)
+        @template = template
+      end
+
+      def theme
+        StimulusPlumbers.config.theme
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/plumber/dispatcher.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+
+module StimulusPlumbers
+  module Plumber
+    module Dispatcher
+      class MethodCall
+        attr_reader :method_name, :args, :kwargs
+
+        def initialize(method_name, *args, **kwargs)
+          @method_name = method_name
+          @args = args
+          @kwargs = kwargs
+          validate!
+        end
+
+        def call(target)
+          raise NotImplementedError, "#{method_name.inspect} not implemented" unless target.respond_to?(method_name, true)
+
+          method_call = target.method(method_name)
+          accepts_args = method_call.arity.negative? ? args : args.take(method_call.arity)
+          accepts_kwargs = method_call.parameters.any? { |type, _| %i[key keyreq keyrest].include?(type) }
+          accepts_kwargs ? method_call.call(*accepts_args, **kwargs) : method_call.call(*accepts_args)
+        end
+
+        private
+
+        def validate!
+          return if method_name.is_a?(String) || method_name.is_a?(Symbol)
+
+          raise ArgumentError, "invalid method name: #{method_name.inspect}"
+        end
+      end
+
+      class InstanceExec
+        attr_reader :block, :args, :kwargs
+
+        def initialize(block, *args, **kwargs)
+          @block = block
+          @args = args
+          @kwargs = kwargs
+          validate!
+        end
+
+        def call(target)
+          accepts_args = block.arity.negative? ? args : args.take(block.arity)
+          accepts_kwargs = block.parameters.any? { |type, _| %i[key keyreq keyrest].include?(type) }
+          if accepts_kwargs
+            target.instance_exec(
+              *accepts_args,
+              **kwargs,
+              &block
+            )
+          else
+            target.instance_exec(*accepts_args, &block)
+          end
+        end
+
+        private
+
+        def validate!
+          raise ArgumentError, "invalid block: #{block.inspect}" unless block.is_a?(Proc)
+        end
+      end
+
+      class KlassProxy
+        attr_reader :klass, :method_name, :args, :kwargs, :init_args, :init_kwargs
+
+        def initialize(klass, method_name, *args, init_args: [], init_kwargs: {}, **kwargs)
+          @klass = klass
+          @method_name = method_name
+          @args = args
+          @kwargs = kwargs
+          @init_args = init_args
+          @init_kwargs = init_kwargs
+          validate!
+        end
+
+        def call(_target)
+          klass.new(*init_args, **init_kwargs).public_send(method_name, *args, **kwargs)
+        end
+
+        private
+
+        def validate!
+          raise ArgumentError, "invalid class: #{klass.inspect}" unless klass.is_a?(Module)
+          return if method_name.is_a?(String) || method_name.is_a?(Symbol)
+
+          raise ArgumentError, "invalid method name: #{method_name.inspect}"
+        end
+      end
+
+      def self.build(callable, *args, method_name: nil, init_args: [], init_kwargs: {}, **kwargs)
+        case callable
+        when Symbol
+          MethodCall.new(callable, *args, **kwargs)
+        when Proc
+          InstanceExec.new(callable, *args, **kwargs)
+        when Module
+          KlassProxy.new(callable, method_name, *args, init_args: init_args, init_kwargs: init_kwargs, **kwargs)
+        when String
+          klass = callable.safe_constantize
+          raise ArgumentError, "could not resolve class from: #{callable.inspect}" unless klass
+
+          KlassProxy.new(klass, method_name, *args, init_args: init_args, init_kwargs: init_kwargs, **kwargs)
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/plumber/html_options.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module StimulusPlumbers
+  module Plumber
+    module HtmlOptions
+      extend ActiveSupport::Concern
+
+      def merge_html_options(*hashes)
+        classes     = hashes.flat_map { |h| [h[:class], h[:classes]] }
+        data_hashes = hashes.map { |h| h[:data] || {} }
+        rest        = hashes.map { |h| h.except(:class, :classes, :data) }.reduce({}, :deep_merge)
+
+        class_value = merge_string_option(*classes).presence
+        merged_data = merge_data_options(*data_hashes)
+
+        result = class_value ? rest.merge(class: class_value) : rest
+        merged_data.present? ? result.merge(data: merged_data) : result
+      end
+
+      STIMULUS_SPACEJOIN_KEYS = %i[controller action].freeze
+
+      def merge_data_options(*hashes, spacejoin: STIMULUS_SPACEJOIN_KEYS)
+        hashes.reduce({}) do |acc, d|
+          acc.merge(d) do |key, old_val, new_val|
+            if spacejoin.include?(key.to_sym)
+              merge_string_option(old_val, new_val).presence || new_val
+            else
+              new_val
+            end
+          end
+        end
+      end
+
+      def merge_string_option(*parts, delimiter: " ")
+        tokens = parts.flat_map { |part| normalize_part(part, delimiter) }
+        tokens.compact.uniq.join(delimiter)
+      end
+
+      def normalize_part(value, delimiter)
+        case value
+        when String then value.present? ? value.split(delimiter) : []
+        when Hash then value.filter_map { |key, val| key if val }
+        when Array then [merge_string_option(*value).presence]
+        else []
+        end
+      end
+    end
+  end
+end