stimulus_plumbers 0.2.9 → 0.3.0

data/lib/stimulus_plumbers/configuration.rb

@@ -1,19 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "themes/base"
-require_relative "themes/tailwind_theme"
+require_relative "themes/configuration"
 
 module StimulusPlumbers
   class Configuration
-    DEFAULT_LOG_FORMATTER  = ->(message) { "[StimulusPlumbers] #{message}" }
-    THEME_KLASS_FORMATTER  = ->(type) { "StimulusPlumbers::Themes::#{type.to_s.classify}Theme" }
+    DEFAULT_LOG_FORMATTER = ->(message) { "[StimulusPlumbers] #{message}" }
 
     def theme
-      @theme ||= build_theme(:tailwind)
-    end
-
-    def theme=(value)
-      @theme = build_theme(value)
+      @theme ||= Themes::Configuration.new
     end
 
     def log_formatter
@@ -25,15 +20,5 @@ module StimulusPlumbers
 
       @log_formatter = callable
     end
-
-    private
-
-    def build_theme(type)
-      return type if type.is_a?(Themes::Base)
-
-      klass_name = THEME_KLASS_FORMATTER.call(type)
-      klass_name.safe_constantize&.new or
-        raise ArgumentError, "Unknown theme #{type.inspect}: #{klass_name} is not defined."
-    end
   end
 end

data/lib/stimulus_plumbers/engine.rb

@@ -8,8 +8,8 @@ module StimulusPlumbers
 
     config.autoload_paths << File.expand_path("../stimulus-plumbers", __dir__)
 
-    initializer "stimulus_plumbers.assets" do |app|
-      app.config.assets.paths << root.join("app/assets/javascripts")
+    initializer "stimulus_plumbers.assets", after: :set_default_precompile do |app|
+      app.config.assets.precompile += %w[stimulus_plumbers/tokens.css] if app.config.respond_to?(:assets)
     end
 
     initializer "stimulus_plumbers.helpers" do

data/lib/stimulus_plumbers/form/builder.rb

@@ -67,7 +67,7 @@ module StimulusPlumbers
       end
 
       def theme
-        StimulusPlumbers.config.theme
+        StimulusPlumbers.config.theme.current
       end
 
       # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity

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

@@ -19,21 +19,24 @@ module StimulusPlumbers
 
           rails_opts, field_opts = extract_options(html_options)
           field         = build_field(attribute, field_opts)
-          base_id       = field_id(attribute)
           current_value = object&.public_send(attribute)
 
+          wrapper = build_combobox_wrapper(klass, attribute, field, current_value, options, rails_opts)
+          render_field(field, wrapper)
+        end
+
+        def build_combobox_wrapper(klass, attribute, field, current_value, options, rails_opts)
           popover = klass.new(@template).render(options: options, value: current_value, **rails_opts)
           opts    = klass.default_opts.deep_merge(
             input:   { name: field_name(attribute), value: current_value },
             popover: { content: popover }
           )
-          wrapper = Components::Combobox.new(@template).render(
-            base_id: base_id,
+          Components::Combobox.new(@template).render(
+            base_id: field_id(attribute),
             options: opts,
             **field_theme(:form_combobox, error: field.error?),
             **field.html_opts
           )
-          render_field(field, wrapper)
         end
       end
     end

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

@@ -42,10 +42,13 @@ module StimulusPlumbers
           return "".html_safe if field.errors.none?
 
           field.errors.map.with_index(1) do |message, i|
-            id = field.errors.one? ? field.error_id : "#{field.error_id}_#{i}"
-            Error.new(template).render(message: message, id: id)
+            Error.new(template).render(message: message, id: error_id_for(i))
           end.join.html_safe
         end
+
+        def error_id_for(index)
+          field.errors.one? ? field.error_id : "#{field.error_id}_#{index}"
+        end
       end
     end
   end

data/lib/stimulus_plumbers/plumber/base.rb

@@ -13,7 +13,7 @@ module StimulusPlumbers
       end
 
       def theme
-        StimulusPlumbers.config.theme
+        StimulusPlumbers.config.theme.current
       end
     end
   end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Plumber
+    module Dispatcher
+      module CallableInspector
+        private
+
+        def args_for(callable)
+          callable.arity.negative? ? args : args.take(callable.arity)
+        end
+
+        def accepts_kwargs?(callable)
+          callable.parameters.any? { |type, _| %i[key keyreq keyrest].include?(type) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Plumber
+    module Dispatcher
+      class InstanceExec
+        include CallableInspector
+
+        attr_reader :block, :args, :kwargs
+
+        def initialize(block, *args, **kwargs)
+          @block  = block
+          @args   = args
+          @kwargs = kwargs
+          validate!
+        end
+
+        def call(target)
+          dispatched = args_for(block)
+          if accepts_kwargs?(block)
+            target.instance_exec(*dispatched, **kwargs, &block)
+          else
+            target.instance_exec(*dispatched, &block)
+          end
+        end
+
+        private
+
+        def validate!
+          raise ArgumentError, "invalid block: #{block.inspect}" unless block.is_a?(Proc)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Plumber
+    module Dispatcher
+      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
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Plumber
+    module Dispatcher
+      class MethodCall
+        include CallableInspector
+
+        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)
+          dispatched  = args_for(method_call)
+          accepts_kwargs?(method_call) ? method_call.call(*dispatched, **kwargs) : method_call.call(*dispatched)
+        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
+    end
+  end
+end

data/lib/stimulus_plumbers/plumber/dispatcher.rb

@@ -1,96 +1,13 @@
 # frozen_string_literal: true
 
-# :markup: markdown
+require_relative "dispatcher/callable_inspector"
+require_relative "dispatcher/method_call"
+require_relative "dispatcher/instance_exec"
+require_relative "dispatcher/klass_proxy"
 
 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

data/lib/stimulus_plumbers/plumber/html_options.rb

@@ -8,17 +8,18 @@ module StimulusPlumbers
       extend ActiveSupport::Concern
 
       def merge_html_options(*hashes)
-        classes     = hashes.flat_map { |h| [h[:class], h[:classes]] }
-        data_hashes = hashes.map { |h| h[:data] || {} }
+        class_value = merge_string_option(*extract_classes(*hashes)).presence
+        merged_data = merge_data_options(*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
 
+      def extract_classes(*hashes)
+        hashes.flat_map { |h| [h[:class], h[:classes]] }
+      end
+
       STIMULUS_SPACEJOIN_KEYS = %i[controller action].freeze
 
       def merge_data_options(*hashes, spacejoin: STIMULUS_SPACEJOIN_KEYS)

data/lib/stimulus_plumbers/plumber/renderer.rb

@@ -12,7 +12,7 @@ module StimulusPlumbers
       end
 
       module ClassMethods
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def renders(method_name, with: nil, &block)
           raise ArgumentError, "method_name must be Symbol" unless method_name.is_a?(Symbol)
           raise ArgumentError, "provide either with: or a block" if !with.nil? && block_given?
@@ -26,7 +26,7 @@ module StimulusPlumbers
           self.renderers = renderers.merge(method_name => with)
           ActiveSupport.version >= "7.2" ? generate_renderer_method(method_name) : eval_renderer_method(method_name)
         end
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         private
 

data/lib/stimulus_plumbers/themes/base.rb

@@ -20,6 +20,22 @@ module StimulusPlumbers
         @name ||= self.class.name.demodulize.delete_suffix("Theme")
       end
 
+      def avatar_colors
+        {}
+      end
+
+      def avatar_color_range
+        []
+      end
+
+      def icons
+        {}
+      end
+
+      def icon_range
+        icons.keys
+      end
+
       def attribute_names(component)
         SCHEMA.fetch(component, {}).keys
       end
@@ -49,11 +65,7 @@ module StimulusPlumbers
       def coerce_arg(component, key, value, schema)
         return value unless schema
 
-        range = if schema[:range].is_a?(Symbol)
-                  respond_to?(schema[:range], true) ? send(schema[:range]) : []
-                else
-                  schema[:range]
-                end
+        range = range_for(schema)
         return value if range.empty? || range.include?(value)
 
         StimulusPlumbers::Logger.warn(
@@ -62,6 +74,14 @@ module StimulusPlumbers
         )
         schema[:default]
       end
+
+      def range_for(schema)
+        if schema[:range].is_a?(Symbol)
+          respond_to?(schema[:range], true) ? send(schema[:range]) : []
+        else
+          schema[:range]
+        end
+      end
     end
   end
 end

data/lib/stimulus_plumbers/themes/configuration.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Themes
+    class Configuration
+      def register(name, klass)
+        raise ArgumentError, "#{klass} must be a subclass of Themes::Base" unless klass <= Base
+
+        registry[name.to_sym] = klass
+        self
+      end
+
+      def use(name_or_instance)
+        @current = resolve(name_or_instance)
+        self
+      end
+
+      def current
+        @current ||= Base.new
+      end
+
+      def registry
+        @registry ||= {}
+      end
+
+      private
+
+      def resolve(value)
+        return value if value.is_a?(Base)
+
+        klass = registry[value.to_sym]
+        raise ArgumentError, "Unknown theme #{value.inspect}. Registered: #{registry.keys.inspect}" unless klass
+
+        klass.new
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/themes/schema/form/ranges.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Themes
+    module Schema
+      module Form
+        module Ranges
+          LAYOUT         = %i[stacked inline].freeze
+          SUBMIT_VARIANT = %i[default button].freeze
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/themes/schema/icon.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module StimulusPlumbers
+  module Themes
+    module Schema
+      module Icon
+        DEFAULTS = {
+          fill:            "none",
+          view_box:        "0 0 24 24",
+          width:           "24",
+          height:          "24",
+          stroke:          "currentColor",
+          stroke_width:    1.5,
+          stroke_linecap:  :round,
+          stroke_linejoin: :round
+        }.freeze
+
+        ATTRS = ([:d] + DEFAULTS.keys).freeze
+
+        def self.resolve(icon_data)
+          return unless icon_data.is_a?(Hash)
+
+          merged = DEFAULTS.merge(icon_data.slice(*ATTRS)).transform_values(&:to_s)
+          return merged if merged[:d].present?
+
+          StimulusPlumbers::Logger.warn("Icon missing required :d attribute")
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/stimulus_plumbers/themes/schema/ranges.rb

@@ -8,7 +8,7 @@ module StimulusPlumbers
         SIZE           = %i[sm md lg].freeze
         FLEX_ALIGN     = %i[left center right top bottom].freeze
         FLEX_DIRECTION = %i[row col].freeze
-        FORM_LAYOUT    = %i[stacked inline].freeze
+        BUTTON_VARIANT = %i[primary secondary outline destructive ghost link].freeze
       end
     end
   end

data/lib/stimulus_plumbers/themes/schema.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "schema/ranges"
+require_relative "schema/form/ranges"
+require_relative "schema/icon"
 
 module StimulusPlumbers
   module Themes
@@ -21,7 +23,7 @@ module StimulusPlumbers
 
       BUTTON = {
         button:       {
-          variant: { default: :primary, range: %i[primary secondary outline destructive ghost link].freeze },
+          variant: { default: :primary, range: Ranges::BUTTON_VARIANT },
           size:    { default: :md,      range: Ranges::SIZE }
         }.freeze,
         button_group: {
@@ -33,6 +35,7 @@ module StimulusPlumbers
       CALENDAR = {
         calendar:                           {}.freeze,
         calendar_days_of_week:              {}.freeze,
+        calendar_week:                      {}.freeze,
         calendar_days_of_month:             {}.freeze,
         calendar_day:                       {
           today:    { default: false, range: Ranges::BOOL },
@@ -41,7 +44,9 @@ module StimulusPlumbers
         }.freeze,
         calendar_navigation:                {}.freeze,
         calendar_navigation_navigator:      {}.freeze,
-        calendar_navigation_navigator_icon: {}.freeze
+        calendar_navigation_navigator_icon: {
+          name: { default: "arrow-left", range: :icon_range }
+        }.freeze
       }.freeze
 
       CARD = {
@@ -50,6 +55,7 @@ module StimulusPlumbers
       }.freeze
 
       COMBOBOX = {
+        combobox_trigger:              {}.freeze,
         combobox_option:               {
           selected: { default: false, range: Ranges::BOOL },
           disabled: { default: false, range: Ranges::BOOL }
@@ -63,7 +69,7 @@ module StimulusPlumbers
 
       FORM = {
         form_group:         {
-          layout: { default: :stacked, range: Ranges::FORM_LAYOUT },
+          layout: { default: :stacked, range: Form::Ranges::LAYOUT },
           error:  { default: false,    range: Ranges::BOOL }
         }.freeze,
         form_label:         {
@@ -84,7 +90,7 @@ module StimulusPlumbers
         form_input_reveal:  {}.freeze,
         form_button_reveal: {}.freeze,
         form_submit:        {
-          variant: { default: :default, range: %i[default button].freeze }
+          variant: { default: :default, range: Form::Ranges::SUBMIT_VARIANT }
         }.freeze
       }.freeze
 

data/lib/stimulus_plumbers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StimulusPlumbers
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stimulus_plumbers
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Chang
@@ -10,7 +10,7 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,20 +103,18 @@ files:
 - lib/stimulus_plumbers/logger.rb
 - lib/stimulus_plumbers/plumber/base.rb
 - lib/stimulus_plumbers/plumber/dispatcher.rb
+- lib/stimulus_plumbers/plumber/dispatcher/callable_inspector.rb
+- lib/stimulus_plumbers/plumber/dispatcher/instance_exec.rb
+- lib/stimulus_plumbers/plumber/dispatcher/klass_proxy.rb
+- lib/stimulus_plumbers/plumber/dispatcher/method_call.rb
 - lib/stimulus_plumbers/plumber/html_options.rb
 - lib/stimulus_plumbers/plumber/renderer.rb
 - lib/stimulus_plumbers/themes/base.rb
+- lib/stimulus_plumbers/themes/configuration.rb
 - lib/stimulus_plumbers/themes/schema.rb
+- lib/stimulus_plumbers/themes/schema/form/ranges.rb
+- lib/stimulus_plumbers/themes/schema/icon.rb
 - lib/stimulus_plumbers/themes/schema/ranges.rb
-- lib/stimulus_plumbers/themes/tailwind/action_list.rb
-- lib/stimulus_plumbers/themes/tailwind/avatar.rb
-- lib/stimulus_plumbers/themes/tailwind/button.rb
-- lib/stimulus_plumbers/themes/tailwind/calendar.rb
-- lib/stimulus_plumbers/themes/tailwind/card.rb
-- lib/stimulus_plumbers/themes/tailwind/combobox.rb
-- lib/stimulus_plumbers/themes/tailwind/form.rb
-- lib/stimulus_plumbers/themes/tailwind/layout.rb
-- lib/stimulus_plumbers/themes/tailwind_theme.rb
 - lib/stimulus_plumbers/version.rb
 homepage: https://github.com/ryancyq/stimulus-plumbers
 licenses: