stimulus_plumbers 0.3.3 → 0.4.0

data/lib/stimulus_plumbers/form/fields/inputs/text.rb

@@ -5,31 +5,38 @@ module StimulusPlumbers
     module Fields
       module Inputs
         module Text
-          FIELD_TYPES = %i[
-            color_field
-            datetime_local_field
-            email_field
-            month_field
-            number_field
-            range_field
-            telephone_field
-            text_field
-            url_field
-            week_field
-          ].freeze
+          TEXT_FIELD_METHODS = {
+            text:           :text_field,
+            email:          :email_field,
+            number:         :number_field,
+            url:            :url_field,
+            tel:            :telephone_field,
+            color:          :color_field,
+            month:          :month_field,
+            week:           :week_field,
+            range:          :range_field,
+            datetime_local: :datetime_local_field
+          }.freeze
 
-          FIELD_TYPES.each do |method_name|
-            define_method(method_name) do |attribute, options = {}|
-              Field.new(@template, **options).render(
-                object,
-                attribute,
-                input_id: field_id(attribute)
-              ) do |html_opts, opts, error|
-                html_options = merge_html_options(opts, html_opts, field_theme(:form_input, error: error))
-                super(attribute, html_options)
-              end
+          TEXT_FIELD_METHODS.each_value do |template_method|
+            define_method(template_method) do |attribute, options = {}|
+              html_options = merge_html_options(theme.resolve(:form_field_input), options)
+              super(attribute, html_options)
             end
           end
+
+          private
+
+          TEXT_FIELD_METHODS.each do |as_key, template_method|
+            define_method(:"render_#{as_key}_input") do |attribute, html_opts, opts, error, **kwargs|
+              render_text(attribute, html_opts, opts, error, template_method, **kwargs)
+            end
+          end
+
+          def render_text(attribute, html_opts, opts, error, template_method, **kwargs)
+            html_options = merge_html_options(theme.resolve(:form_field_input, error: error), opts, html_opts, kwargs)
+            @template.public_send(template_method, @object_name, attribute, objectify_options(html_options))
+          end
         end
       end
     end

data/lib/stimulus_plumbers/form/fields/inputs/text_area.rb

@@ -6,14 +6,15 @@ module StimulusPlumbers
       module Inputs
         module TextArea
           def text_area(attribute, options = {})
-            Field.new(@template, **options).render(
-              object,
-              attribute,
-              input_id: field_id(attribute)
-            ) do |html_opts, opts, error|
-              html_options = merge_html_options(opts, html_opts, field_theme(:form_textarea, error: error))
-              super(attribute, html_options)
-            end
+            html_options = merge_html_options(theme.resolve(:form_field_input_textarea), options)
+            super(attribute, html_options)
+          end
+
+          private
+
+          def render_text_area_input(attribute, html_opts, opts, error, **kwargs)
+            html_options = merge_html_options(theme.resolve(:form_field_input_textarea, error: error), opts, html_opts, kwargs)
+            @template.text_area(@object_name, attribute, objectify_options(html_options))
           end
         end
       end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      class Label
+        class Floating < Plumber::Base
+          def render(text:, for_id:, id:, type:, required:, error:, &block)
+            html_options  = merge_html_options(theme.resolve(:form_field_floating_group, type: type))
+            label_options = merge_html_options(theme.resolve(:form_field_floating_label, type: type, error: error))
+            mark_options  = required && merge_html_options(
+              { aria: { hidden: true } },
+              theme.resolve(:form_field_required_mark)
+            )
+            template.content_tag(:div, **html_options) do
+              template.safe_join(
+                [
+                  template.capture(&block),
+                  render_label(text, mark_options, for: for_id, id: id, **label_options)
+                ]
+              )
+            end
+          end
+
+          private
+
+          def render_label(text, mark_options, **html_options)
+            template.content_tag(:label, **html_options) do
+              template.safe_join(
+                [
+                  text,
+                  mark_options ? template.content_tag(:span, "*", **mark_options) : nil
+                ]
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,10 +7,16 @@ module StimulusPlumbers
         def render(text:, for_id: nil, id: nil, required: false, hidden: false, tag: :label)
           mark_options = required && merge_html_options(
             { aria: { hidden: true } },
-            theme.resolve(:form_required_mark)
+            theme.resolve(:form_field_required_mark)
           )
-          html_options = merge_html_options(theme.resolve(:form_label, required: required, hidden: hidden))
-          template.content_tag(tag, for: for_id, id: id, **html_options) do
+          html_options = merge_html_options(theme.resolve(:form_field_label, required: required, hidden: hidden))
+          render_label(text, mark_options, tag, for: for_id, id: id, **html_options)
+        end
+
+        private
+
+        def render_label(text, mark_options, tag, **html_options)
+          template.content_tag(tag, **html_options) do
             template.safe_join(
               [
                 text,

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Form
+    module Fields
+      module Renderer
+        FIELD = {
+          text:           :render_text_input,
+          email:          :render_email_input,
+          number:         :render_number_input,
+          url:            :render_url_input,
+          tel:            :render_tel_input,
+          color:          :render_color_input,
+          month:          :render_month_input,
+          week:           :render_week_input,
+          range:          :render_range_input,
+          datetime_local: :render_datetime_local_input,
+          text_area:      :render_text_area_input,
+          file:           :render_file_input,
+          password:       :render_password_input,
+          date:           :render_combobox_date,
+          time:           :render_combobox_time,
+          select:         :render_combobox_dropdown,
+          search:         :render_combobox_typeahead
+        }.freeze
+
+        COLLECTION = {
+          collection_select:         :render_collection_combobox_dropdown,
+          grouped_collection_select: :render_grouped_collection_combobox_dropdown
+        }.freeze
+
+        CHOICE = {
+          radio:     :render_collection_radio_button,
+          check_box: :render_check_box
+        }.freeze
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/helpers/button_helper.rb

@@ -8,7 +8,7 @@ module StimulusPlumbers
       end
 
       def sp_button_group(...)
-        button_renderer.group(...)
+        Components::Button::Group.new(self).render(...)
       end
 
       private

data/lib/stimulus_plumbers/helpers/calendar_helper.rb

@@ -3,7 +3,7 @@
 module StimulusPlumbers
   module Helpers
     module CalendarHelper
-      def sp_calendar_month(**kwargs, &block)
+      def sp_calendar_month(**kwargs)
         date = kwargs.delete(:date)
         html_options = if date
                          kwargs.deep_merge(
@@ -16,7 +16,7 @@ module StimulusPlumbers
                        else
                          kwargs
                        end
-        calendar_renderer.month(**html_options, &block)
+        calendar_renderer.render(**html_options)
       end
 
       private

data/lib/stimulus_plumbers/helpers/calendar_turbo_helper.rb

@@ -3,14 +3,66 @@
 module StimulusPlumbers
   module Helpers
     module CalendarTurboHelper
-      def sp_calendar_month_turbo(**kwargs)
-        calendar_month_turbo_renderer.render(**kwargs)
+      def sp_calendar_turbo_month(**kwargs)
+        calendar_turbo_renderer.month(**kwargs)
+      end
+
+      def sp_calendar_turbo_year(**kwargs)
+        calendar_turbo_renderer.year(**kwargs)
+      end
+
+      def sp_calendar_turbo_decade(**kwargs)
+        calendar_turbo_renderer.decade(**kwargs)
+      end
+
+      def sp_calendar_turbo(
+        date: Date.today,
+        today: Date.today,
+        selectable: false,
+        selected_date: nil,
+        show_other_months: false,
+        **kwargs
+      )
+        safe_join(
+          [
+            content_tag(
+              :turbo_frame,
+              id:   "calendar-month-frame",
+              data: { "combobox-date-target": "monthView" }
+            ) do
+              calendar_turbo_renderer.month(
+                date:              date,
+                today:             today,
+                selectable:        selectable,
+                selected_date:     selected_date,
+                show_other_months: show_other_months,
+                **kwargs
+              )
+            end,
+            content_tag(
+              :turbo_frame,
+              id:     "calendar-year-frame",
+              hidden: true,
+              data:   { "combobox-date-target": "yearView" }
+            ) do
+              calendar_turbo_renderer.year(date: date, today: today, selected_date: selected_date)
+            end,
+            content_tag(
+              :turbo_frame,
+              id:     "calendar-decade-frame",
+              hidden: true,
+              data:   { "combobox-date-target": "decadeView" }
+            ) do
+              calendar_turbo_renderer.decade(date: date, today: today, selected_date: selected_date)
+            end
+          ]
+        )
       end
 
       private
 
-      def calendar_month_turbo_renderer
-        Components::Calendar::Month::Turbo.new(self)
+      def calendar_turbo_renderer
+        @calendar_turbo_renderer ||= Components::Calendar::Turbo.new(self)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/card_helper.rb

@@ -4,17 +4,7 @@ module StimulusPlumbers
   module Helpers
     module CardHelper
       def sp_card(...)
-        card_renderer.render(...)
-      end
-
-      def sp_card_section(...)
-        card_renderer.section(...)
-      end
-
-      private
-
-      def card_renderer
-        Components::Card.new(self)
+        Components::Card.new(self).render(...)
       end
     end
   end

data/lib/stimulus_plumbers/helpers/combobox_helper.rb

@@ -3,76 +3,43 @@
 module StimulusPlumbers
   module Helpers
     module ComboboxHelper
-      def sp_combobox_date(**kwargs)
-        label = kwargs.delete(:label)
-        value = kwargs.delete(:value)
-        id    = sp_dom_id
-        opts  = Components::Combobox::Date.default_opts.deep_merge(
-          input:   { value: value },
-          trigger: { id: id, aria: ({ label: label } if label), icon_trailing: "calendar" }.compact
-        )
+      # Single entry point; panel type chosen by a block method (c.dropdown/date/...).
+      def sp_combobox(value: nil, label: nil, id: nil, close_on_select: nil, **kwargs, &block)
         Components::Combobox.new(self).render(
-          **opts,
-          data: { input_formatter_format_value: "date" },
-          **kwargs
-        ) do |popover_id|
-          Components::Combobox::Date.new(self).render(value: value, popover_id: popover_id)
+          id:              id || sp_dom_id,
+          label:           label,
+          input:           { value: value },
+          close_on_select: close_on_select,
+          **kwargs,
+          &block
+        )
+      end
+
+      def sp_combobox_date(value: nil, label: nil, **kwargs)
+        sp_combobox(value: value, label: label, **kwargs) do |c|
+          panel_opts = { value: value }
+          panel_opts[:label] = label if label
+          c.date(**panel_opts)
         end
       end
 
-      def sp_combobox_dropdown(**kwargs)
-        label   = kwargs.delete(:label)
-        value   = kwargs.delete(:value)
-        options = kwargs.delete(:options) { [] }
-        id      = sp_dom_id
-        opts    = Components::Combobox::Dropdown.default_opts.deep_merge(
-          input:   { value: value },
-          trigger: { id: id, aria: ({ label: label } if label), icon_trailing: "chevron-down" }.compact
-        )
-        Components::Combobox.new(self).render(**opts, **kwargs) do
-          Components::Combobox::Dropdown.new(self).render(options: options, value: value, label: label)
+      def sp_combobox_dropdown(options: [], value: nil, label: nil, **kwargs)
+        sp_combobox(value: value, label: label, **kwargs) do |c|
+          c.dropdown(options: options, value: value, label: label)
         end
       end
 
-      def sp_combobox_typeahead(**kwargs)
-        label   = kwargs.delete(:label)
-        value   = kwargs.delete(:value)
-        options = kwargs.delete(:options) { [] }
-        url     = kwargs.delete(:url)
-        id      = sp_dom_id
-        opts    = Components::Combobox::Typeahead.default_opts.deep_merge(
-          input:   { value: value },
-          trigger: { id: id, aria: ({ label: label } if label) }.compact,
-          popover: { data: url ? { combobox_dropdown_url_value: url } : {} }
-        )
-        Components::Combobox.new(self).render(
-          **opts,
-          data: {
-            input_combobox_combobox_dropdown_outlet: "##{Components::Combobox.popover_id_for(id)}",
-            action:                                  "input->input-combobox#onInput"
-          },
-          **kwargs
-        ) do
-          Components::Combobox::Typeahead.new(self).render(options: options, value: value, label: label)
+      def sp_combobox_typeahead(options: [], value: nil, label: nil, url: nil, **kwargs)
+        sp_combobox(value: value, label: label, **kwargs) do |c|
+          c.typeahead(options: options, value: value, label: label, url: url)
         end
       end
 
-      def sp_combobox_time(**kwargs)
-        format = kwargs.delete(:format) { :h12 }
-        label  = kwargs.delete(:label)
-        step   = kwargs.delete(:step) { 1 }
-        value  = kwargs.delete(:value)
-        id     = sp_dom_id
-        opts   = Components::Combobox::Time.default_opts.deep_merge(
-          input:   { value: value },
-          trigger: { id: id, aria: ({ label: label } if label), icon_trailing: "clock" }.compact
-        )
-        Components::Combobox.new(self).render(
-          **opts,
-          data: { input_formatter_format_value: "time", input_formatter_options_value: { format: format }.to_json },
-          **kwargs
-        ) do
-          Components::Combobox::Time.new(self).render(format: format, step: step, value: value)
+      def sp_combobox_time(format: :h12, step: 1, value: nil, label: nil, **kwargs)
+        sp_combobox(value: value, label: label, **kwargs) do |c|
+          panel_opts = { format: format, step: step, value: value }
+          panel_opts[:label] = label if label
+          c.time(**panel_opts)
         end
       end
     end

data/lib/stimulus_plumbers/helpers/icon_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Helpers
+    module IconHelper
+      def sp_icon(name:, **kwargs)
+        Components::Icon.new(self).render(name: name, **kwargs)
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/helpers/link_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Helpers
+    module LinkHelper
+      def sp_link(content = nil, **kwargs, &block)
+        Components::Link.new(self).render(content, **kwargs, &block)
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/helpers/list_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Helpers
+    module ListHelper
+      def sp_list(...)
+        Components::List.new(self).render(...)
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/helpers/plumber_helper.rb

@@ -3,12 +3,9 @@
 module StimulusPlumbers
   module Helpers
     module PlumberHelper
-      def sp_dom_id(record = nil, suffix = nil)
-        if record
-          dom_id(record, suffix)
-        else
-          "#{suffix}_#{SecureRandom.hex(8)}"
-        end
+      def sp_dom_id(record = nil, prefix: nil, suffix: nil)
+        base = record ? dom_id(record, prefix) : SecureRandom.hex(8)
+        ["sp", base, suffix].compact.join("_")
       end
     end
   end

data/lib/stimulus_plumbers/helpers.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "helpers/plumber_helper"
-require_relative "helpers/action_list_helper"
+require_relative "helpers/icon_helper"
+require_relative "helpers/list_helper"
 require_relative "helpers/avatar_helper"
 require_relative "helpers/button_helper"
 require_relative "helpers/calendar_helper"
@@ -9,12 +10,14 @@ require_relative "helpers/calendar_turbo_helper"
 require_relative "helpers/card_helper"
 require_relative "helpers/combobox_helper"
 require_relative "helpers/divider_helper"
+require_relative "helpers/link_helper"
 require_relative "helpers/popover_helper"
 
 module StimulusPlumbers
   module Helpers
     include PlumberHelper
-    include ActionListHelper
+    include IconHelper
+    include ListHelper
     include AvatarHelper
     include ButtonHelper
     include CalendarHelper
@@ -22,6 +25,7 @@ module StimulusPlumbers
     include CardHelper
     include ComboboxHelper
     include DividerHelper
+    include LinkHelper
     include PopoverHelper
   end
 end

data/lib/stimulus_plumbers/logger.rb

@@ -4,17 +4,18 @@ module StimulusPlumbers
   module Logger
     LEVELS = %i[debug info warn error].freeze
 
-    module_function
-
     LEVELS.each do |level|
       define_method(level) do |message|
         tagged = StimulusPlumbers.config.log_formatter.call(message)
         if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
           Rails.logger.public_send(level, tagged)
         else
-          warn(tagged)
+          # Kernel.warn, not bare `warn` which would recurse into this module's own warn.
+          Kernel.warn(tagged)
         end
       end
     end
+
+    module_function(*LEVELS)
   end
 end

data/lib/stimulus_plumbers/plumber/base.rb

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "options/html"
+require_relative "options/aria"
+require_relative "renderer"
+
 module StimulusPlumbers
   module Plumber
     class Base
-      include HtmlOptions
+      include Options::Html
+      include Options::Aria
       include Renderer
 
       attr_reader :template

data/lib/stimulus_plumbers/plumber/dispatcher/klass_proxy.rb

@@ -4,20 +4,21 @@ module StimulusPlumbers
   module Plumber
     module Dispatcher
       class KlassProxy
-        attr_reader :klass, :method_name, :args, :kwargs, :init_args, :init_kwargs
+        attr_reader :klass, :method_name, :args, :kwargs, :init_args, :init_kwargs, :block
 
-        def initialize(klass, method_name, *args, init_args: [], init_kwargs: {}, **kwargs)
+        def initialize(klass, method_name, *args, init_args: [], init_kwargs: {}, **kwargs, &block)
           @klass       = klass
           @method_name = method_name
           @args        = args
           @kwargs      = kwargs
           @init_args   = init_args
           @init_kwargs = init_kwargs
+          @block       = block
           validate!
         end
 
         def call(_target)
-          klass.new(*init_args, **init_kwargs).public_send(method_name, *args, **kwargs)
+          klass.new(*init_args, **init_kwargs).public_send(method_name, *args, **kwargs, &@block)
         end
 
         private

data/lib/stimulus_plumbers/plumber/dispatcher/method_call.rb

@@ -6,12 +6,13 @@ module StimulusPlumbers
       class MethodCall
         include CallableInspector
 
-        attr_reader :method_name, :args, :kwargs
+        attr_reader :method_name, :args, :kwargs, :block
 
-        def initialize(method_name, *args, **kwargs)
+        def initialize(method_name, *args, **kwargs, &block)
           @method_name = method_name
           @args        = args
           @kwargs      = kwargs
+          @block       = block
           validate!
         end
 
@@ -20,7 +21,7 @@ module StimulusPlumbers
 
           method_call = target.method(method_name)
           dispatched  = args_for(method_call)
-          accepts_kwargs?(method_call) ? method_call.call(*dispatched, **kwargs) : method_call.call(*dispatched)
+          accepts_kwargs?(method_call) ? method_call.call(*dispatched, **kwargs, &@block) : method_call.call(*dispatched, &@block)
         end
 
         private

data/lib/stimulus_plumbers/plumber/dispatcher.rb

@@ -8,19 +8,19 @@ require_relative "dispatcher/klass_proxy"
 module StimulusPlumbers
   module Plumber
     module Dispatcher
-      def self.build(callable, *args, method_name: nil, init_args: [], init_kwargs: {}, **kwargs)
+      def self.build(callable, *args, method_name: nil, init_args: [], init_kwargs: {}, **kwargs, &block)
         case callable
         when Symbol
-          MethodCall.new(callable, *args, **kwargs)
+          MethodCall.new(callable, *args, **kwargs, &block)
         when Proc
           InstanceExec.new(callable, *args, **kwargs)
         when Module
-          KlassProxy.new(callable, method_name, *args, init_args: init_args, init_kwargs: init_kwargs, **kwargs)
+          KlassProxy.new(callable, method_name, *args, init_args: init_args, init_kwargs: init_kwargs, **kwargs, &block)
         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)
+          KlassProxy.new(klass, method_name, *args, init_args: init_args, init_kwargs: init_kwargs, **kwargs, &block)
         end
       end
     end

data/lib/stimulus_plumbers/plumber/options/aria.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module StimulusPlumbers
+  module Plumber
+    module Options
+      module Aria
+        extend ActiveSupport::Concern
+
+        def labelled_aria(label, labelledby: nil)
+          { label: (label unless labelledby), labelledby: labelledby }.compact
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/plumber/options/html.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+require_relative "theme"
+require_relative "stimulus"
+
+module StimulusPlumbers
+  module Plumber
+    module Options
+      module Html
+        extend ActiveSupport::Concern
+
+        included do
+          include Theme
+          include Stimulus
+        end
+
+        def merge_html_options(*hashes)
+          class_value = merge_theme_options(*hashes)
+          merged_data = merge_stimulus_data(*hashes.map { |h| h[:data] || {} })
+          rest        = hashes.map { |h| h.except(:class, :classes, :data) }.reduce({}, :deep_merge)
+
+          result = class_value ? rest.merge(class: class_value) : rest
+          merged_data.present? ? result.merge(data: merged_data) : result
+        end
+      end
+    end
+  end
+end