tailmix 0.4.5 → 0.4.7

data/lib/tailmix/definition/result.rb

@@ -7,25 +7,73 @@ module Tailmix
         def to_h
           {
             elements: elements.transform_values(&:to_h),
-            actions: actions.transform_values(&:to_h)
+            actions: actions.transform_values(&:to_h),
           }
         end
       end
 
-      Element = Struct.new(:name, :attributes, :dimensions, :stimulus, keyword_init: true) do
+      Element = Struct.new(:name, :attributes, :dimensions, :stimulus, :compound_variants, keyword_init: true) do
         def to_h
           {
             name: name,
             attributes: attributes.to_h,
-            dimensions: dimensions,
-            stimulus: stimulus.to_h
+            dimensions: dimensions.transform_values do |dimension|
+              dimension.transform_values do |value|
+                case value
+                when Variant
+                  value.to_h
+                when Hash
+                  value.transform_values { |v| v.respond_to?(:to_h) ? v.to_h : v }
+                else
+                  value
+                end
+              end
+            end,
+            stimulus: stimulus.to_h,
+            compound_variants: compound_variants
           }
         end
       end
 
-      Attributes = Struct.new(:classes, keyword_init: true)
-      Stimulus = Struct.new(:definitions, keyword_init: true)
-      Action = Struct.new(:action, :mutations, keyword_init: true)
+      Variant = Struct.new(:class_groups, :data, :aria, keyword_init: true) do
+        def classes
+          class_groups.flat_map { |group| group[:classes] }
+        end
+
+        def to_h
+          {
+            classes: classes,
+            class_groups: class_groups,
+            data: data,
+            aria: aria
+          }
+        end
+      end
+
+      Attributes = Struct.new(:classes, keyword_init: true) do
+        def to_h
+          {
+            classes: classes
+          }
+        end
+      end
+
+      Stimulus = Struct.new(:definitions, keyword_init: true) do
+        def to_h
+          {
+            definitions: definitions
+          }
+        end
+      end
+
+      Action = Struct.new(:action, :mutations, keyword_init: true) do
+        def to_h
+          {
+            action: action,
+            mutations: mutations
+          }
+        end
+      end
     end
   end
-end
+end

data/lib/tailmix/dev/docs.rb

@@ -19,6 +19,8 @@ module Tailmix
 
         output << generate_dimensions_docs
         output << ""
+        output << generate_compound_variants_docs # <-- Наш новый метод
+        output << ""
         output << generate_actions_docs
         output << ""
         output << generate_stimulus_docs
@@ -43,8 +45,14 @@ module Tailmix
           all_dimensions.each do |dim_name, config|
             default_info = config[:default] ? "(default: #{config[:default].inspect})" : ""
             output << "  - #{dim_name} #{default_info}"
-            config[:options].each do |option_key, option_value|
-              output << "    - #{option_key.inspect}: \"#{option_value.join(' ')}\""
+            config[:variants].each do |variant_name, variant_def|
+              output << "    - #{variant_name.inspect}:"
+              variant_def.class_groups.each do |group|
+                label = group[:options][:group] ? "(group: :#{group[:options][:group]})" : ""
+                output << "      - classes #{label}: \"#{group[:classes].join(' ')}\""
+              end
+              output << "      - data: #{variant_def.data.inspect}" if variant_def.data.any?
+              output << "      - aria: #{variant_def.aria.inspect}" if variant_def.aria.any?
             end
           end
         else
@@ -54,6 +62,35 @@ module Tailmix
         output.join("\n")
       end
 
+      def generate_compound_variants_docs
+        output = []
+
+        compound_variants_by_element = @definition.elements.values.select do |el|
+          el.compound_variants.any?
+        end
+
+        if compound_variants_by_element.any?
+          output << "Compound Variants:"
+          compound_variants_by_element.each do |element|
+            output << "  - on element `:#{element.name}`:"
+            element.compound_variants.each do |cv|
+              conditions = cv[:on].map { |k, v| "#{k}: :#{v}" }.join(", ")
+              output << "    - on: { #{conditions} }"
+
+              modifications = cv[:modifications]
+              modifications.class_groups.each do |group|
+                label = group[:options][:group] ? "(group: :#{group[:options][:group]})" : ""
+                output << "      - classes #{label}: \"#{group[:classes].join(' ')}\""
+              end
+              output << "      - data: #{modifications.data.inspect}" if modifications.data.any?
+              output << "      - aria: #{modifications.aria.inspect}" if modifications.aria.any?
+            end
+          end
+        end
+
+        output.join("\n")
+      end
+
       def generate_actions_docs
         output = []
         actions = @definition.actions

data/lib/tailmix/dev/tools.rb

@@ -21,6 +21,10 @@ module Tailmix
       def stimulus
         StimulusGenerator.new(@definition, @component_class.name)
       end
+
+      def elements
+        @definition.elements.values.map(&:name)
+      end
     end
   end
 end

data/lib/tailmix/dsl.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative "definition/context_builder"
+require_relative "definition/merger"
+require_relative "dev/tools"
+
+module Tailmix
+  # The main DSL for defining component styles and behaviors.
+  # This module is extended into any class that includes Tailmix.
+  module DSL
+    def tailmix(&block)
+      child_context = Definition::ContextBuilder.new
+      child_context.instance_eval(&block)
+      child_definition = child_context.build_definition
+
+      if superclass.respond_to?(:tailmix_definition) && (parent_definition = superclass.tailmix_definition)
+        @tailmix_definition = Definition::Merger.call(parent_definition, child_definition)
+      else
+        @tailmix_definition = child_definition
+      end
+    end
+
+    def tailmix_definition
+      @tailmix_definition || raise(Error, "Tailmix definition not found in #{name}")
+    end
+
+    def tailmix_facade_class
+      @_tailmix_facade_class ||= Runtime::FacadeBuilder.build(tailmix_definition)
+    end
+
+    def dev
+      Dev::Tools.new(self)
+    end
+  end
+end

data/lib/tailmix/html/attributes.rb

@@ -3,18 +3,30 @@
 require "erb"
 require_relative "class_list"
 require_relative "data_map"
+require_relative "selector"
 
 module Tailmix
   module HTML
     class Attributes < Hash
-      attr_reader :element_name
+      attr_reader :element_name, :variant_string
 
-      def initialize(initial_hash = {}, element_name: nil)
+      def initialize(initial_hash = {}, element_name: nil, variant_string: "")
         @element_name = element_name
+        @variant_string = variant_string
         super()
-        self[:class] = ClassList.new
-        self[:data]  = DataMap.new
-        merge!(initial_hash)
+
+        attrs_to_merge = initial_hash.dup
+
+        initial_classes = attrs_to_merge.delete(:class)
+        initial_data = attrs_to_merge.delete(:data)
+        initial_aria = attrs_to_merge.delete(:aria)
+
+        self[:class] = ClassList.new(initial_classes)
+        self[:data]  = DataMap.new("data", initial_data || {})
+        self[:aria]  = DataMap.new("aria", initial_aria || {})
+        self[:tailmix] = Selector.new(element_name, variant_string)
+
+        merge!(attrs_to_merge)
       end
 
       def each(&block)
@@ -22,15 +34,14 @@ module Tailmix
       end
 
       def to_h
-        final_attrs = select { |k, _| !%i[class data].include?(k.to_sym) }
+        final_attrs = select { |k, _| !%i[class data aria tailmix].include?(k.to_sym) }
+
         class_string = self[:class].to_s
         final_attrs[:class] = class_string unless class_string.empty?
-        final_attrs.merge!(self[:data].to_h)
 
-        selector_attr = Tailmix.configuration.element_selector_attribute
-        if selector_attr && @element_name
-          final_attrs[selector_attr] = @element_name
-        end
+        final_attrs.merge!(self[:data].to_h)
+        final_attrs.merge!(self[:aria].to_h)
+        final_attrs.merge!(self[:tailmix].to_h)
 
         final_attrs
       end
@@ -48,10 +59,18 @@ module Tailmix
         self[:data]
       end
 
+      def aria
+        self[:aria]
+      end
+
       def stimulus
         data.stimulus
       end
 
+      def tailmix
+        self[:tailmix]
+      end
+
       def toggle(class_names)
         classes.toggle(class_names)
         self
@@ -66,6 +85,10 @@ module Tailmix
         classes.remove(class_names)
         self
       end
+
+      def each_attribute(&block)
+        [ classes: classes, data: data.to_h, aria: aria.to_h, tailmix: tailmix.to_h ].each(&block)
+      end
     end
   end
 end

data/lib/tailmix/html/data_map.rb

@@ -9,12 +9,14 @@ module Tailmix
     class DataMap
       MERGEABLE_LIST_ATTRIBUTES = %i[controller action target].freeze
 
-      def initialize(initial_data = {})
+      def initialize(prefix, initial_data = {})
+        @prefix = prefix
         @data = {}
         merge!(initial_data)
       end
 
       def stimulus
+        raise "Stimulus builder is only available for data attributes" unless @prefix == "data"
         StimulusBuilder.new(self)
       end
 
@@ -26,7 +28,7 @@ module Tailmix
           key = key.to_sym
           if value.is_a?(Hash) && @data[key].is_a?(Hash)
             @data[key].merge!(value)
-          elsif MERGEABLE_LIST_ATTRIBUTES.include?(key)
+          elsif @prefix == "data" && MERGEABLE_LIST_ATTRIBUTES.include?(key)
             add_to_set(key, value)
           else
             @data[key] = value
@@ -67,15 +69,15 @@ module Tailmix
       end
 
       def to_h
-        flatten_data_hash(@data)
+        flatten_data_hash(@data, @prefix)
       end
 
       private
 
-      def flatten_data_hash(hash, prefix = "data", accumulator = {})
+      def flatten_data_hash(hash, prefix, accumulator = {})
         hash.each do |key, value|
           current_key = "#{prefix}-#{key.to_s.tr('_', '-')}"
-          if key.to_s.end_with?("_value")
+          if @prefix == "data" && key.to_s.end_with?("_value")
             serialized_value = case value
             when Hash, Array then value.to_json
             else value

data/lib/tailmix/html/selector.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Tailmix
+  module HTML
+    class Selector
+      def initialize(element_name, variant_string)
+        @element_name = element_name
+        @variant_string = variant_string
+      end
+
+      def to_h
+        return {} unless @element_name
+
+        key = "data-tailmix-#{@element_name}"
+        { key => @variant_string }
+      end
+    end
+  end
+end

data/lib/tailmix/runtime/context.rb

@@ -38,28 +38,51 @@ module Tailmix
 
       def build_attributes_for(element_name, dimensions)
         element_def = @definition.elements.fetch(element_name)
-        initial_classes = element_def.attributes.classes
-        class_list = HTML::ClassList.new(initial_classes)
 
-        element_def.dimensions.each do |name, dim|
-          value = dimensions.fetch(name, dim[:default])
+        active_dimensions = dimensions.slice(*element_def.dimensions.keys)
+        variant_string = active_dimensions.map { |k, v| "#{k}:#{v}" }.join(",")
+
+        attributes = HTML::Attributes.new(
+          { class: element_def.attributes.classes },
+          element_name: element_def.name,
+          variant_string: variant_string,
+          )
+
+        element_def.dimensions.each do |name, dim_def|
+          value = dimensions.fetch(name, dim_def[:default])
           next if value.nil?
-          classes_for_option = dim.fetch(:options, {}).fetch(value, nil)
-          class_list.add(classes_for_option)
+
+          variant_def = dim_def.fetch(:variants, {}).fetch(value, nil)
+          next unless variant_def
+
+          attributes.classes.add(variant_def.classes)
+          attributes.data.merge!(variant_def.data)
+          attributes.aria.merge!(variant_def.aria)
+        end
+
+        element_def.compound_variants.each do |cv|
+          conditions = cv[:on]
+          modifications = cv[:modifications]
+
+          match = conditions.all? do |key, value|
+            dimensions[key] == value
+          end
+
+          if match
+            attributes.classes.add(modifications.classes)
+            attributes.data.merge!(modifications.data)
+            attributes.aria.merge!(modifications.aria)
+          end
         end
 
-        data_map = HTML::DataMap.new
         Stimulus::Compiler.call(
           definition: element_def.stimulus,
-          data_map: data_map,
+          data_map: attributes.data,
           root_definition: @definition,
           component: @component_instance
         )
 
-        HTML::Attributes.new(
-          { class: class_list, data: data_map },
-          element_name: element_def.name
-        )
+        attributes
       end
     end
   end

data/lib/tailmix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tailmix
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

data/lib/tailmix.rb

@@ -1,66 +1,32 @@
 # frozen_string_literal: true
 
 require_relative "tailmix/version"
+require_relative "tailmix/configuration"
+require_relative "tailmix/dsl"
 require_relative "tailmix/definition"
 require_relative "tailmix/runtime"
-require_relative "tailmix/dev/tools"
 
 module Tailmix
   class Error < StandardError; end
 
   class << self
     attr_writer :configuration
-  end
-
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
-  def self.configure
-    yield(configuration)
-  end
-
-  class Configuration
-    attr_accessor :element_selector_attribute
-
-    def initialize
-      element_selector_attribute = nil
-    end
-  end
-
-  module ClassMethods
-    def tailmix(&block)
-      child_context = Definition::ContextBuilder.new
-      child_context.instance_eval(&block)
-      child_definition = child_context.build_definition
-
-      if superclass.respond_to?(:tailmix_definition) && (parent_definition = superclass.tailmix_definition)
-        @tailmix_definition = Definition::Merger.call(parent_definition, child_definition)
-      else
-        @tailmix_definition = child_definition
-      end
-    end
-
-    def tailmix_definition
-      @tailmix_definition || raise(Error, "Tailmix definition not found in #{name}")
-    end
 
-    def tailmix_facade_class
-      @_tailmix_facade_class ||= Runtime::FacadeBuilder.build(tailmix_definition)
+    def configuration
+      @configuration ||= Configuration.new
     end
 
-    def dev
-      Dev::Tools.new(self)
+    def configure
+      yield(configuration)
     end
   end
 
   def self.included(base)
-    base.extend(ClassMethods)
+    base.extend(DSL)
   end
 
-  def tailmix(options = {})
-    facade_class = self.class.tailmix_facade_class
-    facade_class.new(self, self.class.tailmix_definition, options)
+  def tailmix(dimensions = {})
+    self.class.tailmix_facade_class.new(self, self.class.tailmix_definition, dimensions)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailmix
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Alexander Fokin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-23 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,10 +52,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Tailmix provides a powerful DSL to define component style schemas, including
-  variants and parts. It enables clean, co-located style management and offers a rich
-  runtime API for dynamic class manipulation, perfect for Hotwire/Turbo and utility-first
-  CSS.
+description: Tailmix provides a powerful DSL to define component attribute schemas,
+  including variants, compound variants, and states. It enables clean, co-located
+  presentational logic (CSS classes, data attributes, ARIA roles) and offers a rich
+  runtime API for dynamic manipulation, perfect for Hotwire/Turbo.
 email:
 - alexander.s.fokin@gmail.com
 executables: []
@@ -73,10 +73,18 @@ files:
 - app/javascript/tailmix/mutator.js
 - app/javascript/tailmix/runner.js
 - app/javascript/tailmix/stimulus_adapter.js
+- docs/01_getting_started.md
+- docs/02_dsl_reference.md
+- docs/03_advanced_usage.md
+- docs/04_client_side_bridge.md
+- docs/05_cookbook.md
 - examples/_modal_component.arb
+- examples/button.rb
+- examples/helpers.rb
 - examples/modal_component.rb
 - lib/generators/tailmix/install_generator.rb
 - lib/tailmix.rb
+- lib/tailmix/configuration.rb
 - lib/tailmix/definition.rb
 - lib/tailmix/definition/context_builder.rb
 - lib/tailmix/definition/contexts/action_builder.rb
@@ -85,15 +93,18 @@ files:
 - lib/tailmix/definition/contexts/dimension_builder.rb
 - lib/tailmix/definition/contexts/element_builder.rb
 - lib/tailmix/definition/contexts/stimulus_builder.rb
+- lib/tailmix/definition/contexts/variant_builder.rb
 - lib/tailmix/definition/merger.rb
 - lib/tailmix/definition/result.rb
 - lib/tailmix/dev/docs.rb
 - lib/tailmix/dev/stimulus_generator.rb
 - lib/tailmix/dev/tools.rb
+- lib/tailmix/dsl.rb
 - lib/tailmix/engine.rb
 - lib/tailmix/html/attributes.rb
 - lib/tailmix/html/class_list.rb
 - lib/tailmix/html/data_map.rb
+- lib/tailmix/html/selector.rb
 - lib/tailmix/html/stimulus_builder.rb
 - lib/tailmix/runtime.rb
 - lib/tailmix/runtime/action.rb
@@ -128,5 +139,5 @@ requirements: []
 rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
-summary: A declarative class manager for Ruby UI components.
+summary: A declarative, state-driven attribute manager for Ruby UI components.
 test_files: []