daisyui 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75db7da2ecbc50158da82bbf662b754ed98691102f006f24298f2d754f33e27b
-  data.tar.gz: 036e8f6362a4fedf58a2d924ea40ab5720006224e2bc71f3c9b8aef42bd9b1e3
+  metadata.gz: 0dfd69755019e48481d090083a5165c37b04d50af7d76b145a2f76dae4ebb594
+  data.tar.gz: c4b804a2a61d7018f6db355629b9d90525dfe89508b63a236829d7dcd72e25a6
 SHA512:
-  metadata.gz: 708df86e95e6c50e3a2270d299a0b13147ae78d56b660b7fa6ea0867258ed964006aa23c104123d9ba4db5dfab1c42b49735190e3937892be792d37fc3ba0aae
-  data.tar.gz: 8009d960b83e5bd5033469a10d59bb1d1d254d4e244356250df01ccf0ef6f35f34dec000a398c4733c6d8bf8e78cefbe26a76c9b845289923aea6e383ba91898
+  metadata.gz: 976568cac60b3cb8ce9ce4d1270630660dd60507447c6e4304336f7c58296204a84acbc4ccc41dc628f17b77180cf5b75a6889d28ce7a3f424aba064a0914183
+  data.tar.gz: b7c07d86fe55bc2722e6730dcd021197d8f98b13e54d0560736bc7e97d57f38bd1bd6da028ee7fc99f5ddb1c5077093094bf2c67205e04a7697e7bcad3f02f0c

data/lib/daisy_ui/alert.rb

@@ -8,8 +8,6 @@ module DaisyUI
       public_send(as, role: :alert, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:alert-info"
       # "@sm:alert-info"

data/lib/daisy_ui/avatar.rb

@@ -8,8 +8,6 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:online"
       # "@sm:online"

data/lib/daisy_ui/avatar_group.rb

@@ -8,8 +8,8 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def avatar(*, **, &)
-      render DaisyUI::Avatar.new(*, **, &)
+    def avatar(...)
+      render DaisyUI::Avatar.new(...)
     end
   end
 end

data/lib/daisy_ui/badge.rb

@@ -12,8 +12,6 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:badge-neutral"
       # "@sm:badge-neutral"

data/lib/daisy_ui/base.rb

@@ -1,7 +1,41 @@
 # frozen_string_literal: true
 
 module DaisyUI
+  # Base class for all DaisyUI components.
+  #
+  # ## Architecture Overview
+  #
+  # Components accept three types of arguments:
+  # 1. **Modifiers** - Positional symbol arguments that map to DaisyUI CSS classes
+  #    Example: Dropdown.new(:top, :hover) → "dropdown-top dropdown-hover"
+  #
+  # 2. **Options** - Keyword arguments for the component (as:, id:)
+  #    Example: Dropdown.new(as: :div, id: "my-dropdown")
+  #
+  # 3. **Attributes** - Additional keyword arguments for HTML attributes (data:, aria:, class:)
+  #    Example: Dropdown.new(data: {controller: "dropdown"}, class: "my-custom-class")
+  #
+  # ## Key Methods
+  #
+  # - `classes` - Builds the final CSS class string by combining base class,
+  #   modifiers, responsive classes, and user-provided classes. DESTRUCTIVELY
+  #   removes :class from options.
+  #
+  # - `attributes` - Returns the hash of HTML attributes to splat into the element.
+  #   By default includes all remaining options (after :class was removed) plus :id.
+  #   Override in subclasses if different behavior is needed.
+  #
+  # ## Typical Usage Pattern
+  #
+  # In a component's view_template:
+  #   def view_template(&)
+  #     div(class: classes, **attributes, &)
+  #   end
+  #
+  # This renders: <div class="[generated classes]" id="..." data-...="..." ...>
+  #
   class Base < Phlex::HTML
+    BOOLS = [true, false].freeze
     # Shared color modifiers used across multiple components
     # Maps color names to their DaisyUI background/text class combinations
     COLOR_MODIFIERS = {
@@ -105,9 +139,9 @@ module DaisyUI
         super
         subclass.modifiers = (modifiers || {}).dup
         # Inherit component_class if it was explicitly set
-        if instance_variable_defined?(:@component_class)
-          subclass.component_class = @component_class
-        end
+        return unless instance_variable_defined?(:@component_class)
+
+        subclass.component_class = @component_class
       end
 
       def register_modifiers(mods)
@@ -122,7 +156,10 @@ module DaisyUI
       @modifiers = modifiers + boolean_modifiers
       @as = as
       @id = id
+      # Store all keyword arguments (class, data, aria, etc.)
+      # This will be processed by `classes` and `attributes` methods
       @options = options
+      super()
     end
 
     private
@@ -130,6 +167,15 @@ module DaisyUI
     attr_reader :modifiers, :options, :as, :id
 
     # Main extension points - override these in your project!
+
+    # Builds the final CSS class string from:
+    # 1. Component base class (e.g., "dropdown")
+    # 2. Modifier classes (e.g., "dropdown-top")
+    # 3. Responsive classes (e.g., "sm:dropdown-hover")
+    # 4. User-provided classes via `class:` option
+    #
+    # Note: This method DESTRUCTIVELY removes :class from options
+    # so it won't appear again in attributes
     def classes
       merge_classes(
         base_class,
@@ -139,8 +185,15 @@ module DaisyUI
       )
     end
 
+    # Returns the hash of HTML attributes to splat into the element.
+    # By default, includes all options (except :class which was removed by `classes`)
+    # and adds :id if provided.
+    #
+    # Override this method in subclasses if you need different behavior.
+    # For example, Drawer overrides this to exclude :id because it uses
+    # id internally for toggle/overlay elements.
     def attributes
-      merge_attributes(**options)
+      options.dup.merge(id: id).compact
     end
 
     # Simple defaults - easy to override
@@ -149,16 +202,10 @@ module DaisyUI
       result.empty? ? nil : result
     end
 
-    def merge_attributes(**attrs)
-      attrs
-    end
-
     # Core functionality
     def base_class
       # If responsive option includes `true`, base class should only appear with responsive prefix
-      if options[:responsive]&.values&.any? { |mods| Array(mods).include?(true) }
-        return nil
-      end
+      return nil if options[:responsive]&.values&.any? { |mods| Array(mods).include?(true) }
 
       apply_prefix(self.class.component_class&.to_s)
     end
@@ -206,9 +253,7 @@ module DaisyUI
       boolean_mods = []
 
       modifier_keys.each do |key|
-        if options.key?(key) && (options[key] == true || options[key] == false)
-          boolean_mods << key if options.delete(key) == true
-        end
+        boolean_mods << key if options.key?(key) && BOOLS.include?(options[key]) && (options.delete(key) == true)
       end
 
       boolean_mods

data/lib/daisy_ui/breadcrumbs.rb

@@ -13,8 +13,8 @@ module DaisyUI
     def crumb(**options, &)
       li(class: component_classes(options: options), **options, &)
     end
-    alias_method :breadcrumb, :crumb
-    alias_method :item, :crumb
+    alias breadcrumb crumb
+    alias item crumb
 
     register_modifiers({})
   end

data/lib/daisy_ui/calendar.rb

@@ -28,8 +28,8 @@ module DaisyUI
 
     attr_reader :type
 
-    def render_cally(&block)
-      calendar_date(class: classes, **attributes, &block)
+    def render_cally(&)
+      calendar_date(class: classes, **attributes, &)
     end
 
     def render_pikaday

data/lib/daisy_ui/collapsible_sub_menu.rb

@@ -18,12 +18,10 @@ module DaisyUI
       details_attrs[:open] = true if modifiers.include?(:open) || options.delete(:open) == true
 
       details(**details_attrs) do
-        if @title
-          summary do
-            render @title
-          end
-        else
-          raise ArgumentError, "A collapsible submenu requires a title"
+        raise ArgumentError, "A collapsible submenu requires a title" unless @title
+
+        summary do
+          render @title
         end
 
         if @items.any?
@@ -37,18 +35,14 @@ module DaisyUI
     end
 
     def title(&block)
-      if @title
-        raise ArgumentError, "A collapsible submenu can only have one title"
-      else
-        @title = block
-      end
-    end
+      raise ArgumentError, "A collapsible submenu can only have one title" if @title
 
-    def item(*, **, &)
-      @items << MenuItem.new(*, **, &)
+      @title = block
     end
 
-    private
+    def item(...)
+      @items << MenuItem.new(...)
+    end
 
     register_modifiers(COLOR_MODIFIERS)
   end

data/lib/daisy_ui/configurable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DaisyUI
   module Configurable
     def configure

data/lib/daisy_ui/drawer.rb

@@ -37,6 +37,14 @@ module DaisyUI
 
     private
 
+    # Override Base#attributes to exclude :id from the main drawer element.
+    # The Drawer component requires an :id parameter, but it's used internally
+    # to wire up the toggle checkbox, overlay, and button elements - NOT for
+    # the main drawer container.
+    def attributes
+      options
+    end
+
     register_modifiers(
         # "sm:drawer-end"
         # "@sm:drawer-end"

data/lib/daisy_ui/dropdown.rb

@@ -4,8 +4,12 @@ module DaisyUI
   class Dropdown < Base
     self.component_class = :dropdown
 
+    def initialize(*modifiers, as: :div, id: nil, **options)
+      super
+    end
+
     def view_template(&)
-      if modifiers.include?(:tap_to_close)
+      if tap_to_close?
         details(class: classes, **attributes, &)
       else
         public_send(as, class: classes, **attributes, &)
@@ -13,7 +17,7 @@ module DaisyUI
     end
 
     def button(*, **, &)
-      if modifiers.include?(:tap_to_close)
+      if tap_to_close?
         render Button.new(*, as: :summary, **, &)
       else
         render Button.new(*, as: :div, role: :button, tabindex: 0, **, &)
@@ -23,7 +27,7 @@ module DaisyUI
     def content(*, as: :div, **options, &)
       content_classes = component_classes("dropdown-content", options:)
 
-      if modifiers.include?(:tap_to_close)
+      if tap_to_close?
         render_as(*, as:, class: content_classes, **options, &)
       else
         render_as(*, as:, tabindex: 0, class: content_classes, **options, &)
@@ -33,14 +37,16 @@ module DaisyUI
     def menu(*, **options, &)
       menu_classes = component_classes("dropdown-content", options:)
 
-      if modifiers.include?(:tap_to_close)
+      if tap_to_close?
         render Menu.new(*, class: menu_classes, **options, &)
       else
         render Menu.new(*, tabindex: 0, class: menu_classes, **options, &)
       end
     end
 
-    private
+    def tap_to_close?
+      modifiers.include?(:tap_to_close)
+    end
 
     register_modifiers(
         # "sm:dropdown-end"

data/lib/daisy_ui/label.rb

@@ -54,7 +54,7 @@ module DaisyUI
     #   label.text("Username")
     #   label.text { "Email Address" }
     #   label.text("https://", class: "custom-class")
-    def text(content = nil, **options, &block)
+    def text(content = nil, **options)
       span(class: component_classes("label", options:), **options) do
         content || yield
       end

data/lib/daisy_ui/loading.rb

@@ -12,8 +12,6 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:loading-spinner"
       # "@sm:loading-spinner"

data/lib/daisy_ui/mask.rb

@@ -8,8 +8,6 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:mask-squircle"
       # "@sm:mask-squircle"

data/lib/daisy_ui/menu.rb

@@ -12,8 +12,8 @@ module DaisyUI
       public_send(as, class: component_classes("menu-title", options:), **options, &)
     end
 
-    def item(*, **, &)
-      render MenuItem.new(*, **, &)
+    def item(...)
+      render MenuItem.new(...)
     end
 
     def submenu(*modifiers, **, &)
@@ -28,8 +28,6 @@ module DaisyUI
       end
     end
 
-    private
-
     register_modifiers(
       # "sm:menu-xs"
       # "@sm:menu-xs"

data/lib/daisy_ui/menu_item.rb

@@ -9,20 +9,18 @@ module DaisyUI
       li(class: classes, **attributes, &)
     end
 
-    def title(*, **options, &block)
-      h2(class: component_classes("menu-title", options:), **options, &block)
+    def title(*, **options, &)
+      h2(class: component_classes("menu-title", options:), **options, &)
     end
 
-    def submenu(*modifiers, **options, &)
+    def submenu(*modifiers, **, &)
       if modifiers.include?(:collapsible)
-        render CollapsibleSubMenu.new(*modifiers, **options, &)
+        render CollapsibleSubMenu.new(*modifiers, **, &)
       else
-        render SubMenu.new(*modifiers, **options, &)
+        render SubMenu.new(*modifiers, **, &)
       end
     end
 
-    private
-
     register_modifiers(
       # "sm:disabled"
       # "@sm:disabled"

data/lib/daisy_ui/modal.rb

@@ -41,8 +41,6 @@ module DaisyUI
       end
     end
 
-    private
-
     register_modifiers(
       # "sm:modal-open"
       # "@sm:modal-open"

data/lib/daisy_ui/skeleton.rb

@@ -8,8 +8,6 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers({})
   end
 end

data/lib/daisy_ui/sub_menu.rb

@@ -17,11 +17,11 @@ module DaisyUI
         end
       end
 
-      if @items.any?
-        ul do
-          @items.each do |item|
-            render item
-          end
+      return unless @items.any?
+
+      ul do
+        @items.each do |item|
+          render item
         end
       end
     end
@@ -30,8 +30,8 @@ module DaisyUI
       @title = block
     end
 
-    def item(*, **, &)
-      @items << MenuItem.new(*, **, &)
+    def item(...)
+      @items << MenuItem.new(...)
     end
   end
 end

data/lib/daisy_ui/tab.rb

@@ -3,8 +3,8 @@
 module DaisyUI
   # @private
   class Tab < Base
-    def initialize(*modifiers, label: nil, id: nil, **options)
-      super(*modifiers, **options)
+    def initialize(*modifiers, label: nil, id: nil, **)
+      super(*modifiers, **)
       @label = label
       @id = id
     end
@@ -31,7 +31,7 @@ module DaisyUI
           "You must pass an id to Tabs#new if you want to add content"
       end
 
-      @content = -> do
+      @content = lambda do
         content_classes = component_classes("tab-content", options:)
         div role: :tabpanel, class: content_classes, **options, &block
       end

data/lib/daisy_ui/tab_with_content.rb

@@ -17,9 +17,9 @@ module DaisyUI
       tab_attrs = {
         type: :radio,
         name: id,
-        class: classes,  # This deletes :class from options
+        class: classes, # This deletes :class from options
         role: :tab,
-        aria: {label: @label}
+        aria: { label: @label }
       }
 
       # Now get remaining attributes (class has been deleted by classes method)
@@ -52,6 +52,13 @@ module DaisyUI
 
     private
 
+    # Override Base#attributes to exclude :id from the tab input.
+    # The TabWithContent component uses :id for the `name` attribute
+    # to group radio inputs together - NOT for the id attribute.
+    def attributes
+      options
+    end
+
     register_modifiers(
       # "sm:tab-active"
       # "@sm:tab-active"

data/lib/daisy_ui/tab_without_content.rb

@@ -18,8 +18,6 @@ module DaisyUI
       div role: :tab, class: classes, **attrs, &
     end
 
-    private
-
     register_modifiers(
       # "sm:tab-active"
       # "@sm:tab-active"

data/lib/daisy_ui/table.rb

@@ -8,24 +8,22 @@ module DaisyUI
       table(class: classes, **attributes, &)
     end
 
-    def header(*, **, &)
-      thead(*, **, &)
+    def header(...)
+      thead(...)
     end
 
-    def row(*, **, &)
-      render TableRow.new(*, **, &)
+    def row(...)
+      render TableRow.new(...)
     end
 
-    def body(*, **, &)
-      tbody(*, **, &)
+    def body(...)
+      tbody(...)
     end
 
-    def footer(*, **, &)
-      tfoot(*, **, &)
+    def footer(...)
+      tfoot(...)
     end
 
-    private
-
     register_modifiers(
       # "sm:table-zebra"
       # "@sm:table-zebra"

data/lib/daisy_ui/table_row.rb

@@ -8,16 +8,14 @@ module DaisyUI
       tr(class: classes, **attributes, &)
     end
 
-    def head(*, **, &)
-      th(*, **, &)
+    def head(...)
+      th(...)
     end
 
-    def column(*, **, &)
-      td(*, **, &)
+    def column(...)
+      td(...)
     end
-    alias_method :cell, :column
-
-    private
+    alias cell column
 
     register_modifiers(
       # "sm:table-row-hover"

data/lib/daisy_ui/tabs.rb

@@ -16,15 +16,20 @@ module DaisyUI
     def tab(*args, label: nil, **, &)
       # If first arg is a string, it's the label, rest are modifiers
       # Otherwise all args are modifiers
-      if args.first.is_a?(String)
-        label = args.shift
-      end
+      label = args.shift if args.first.is_a?(String)
 
       render Tab.new(*args, label:, id:, **, &)
     end
 
     private
 
+    # Override Base#attributes to exclude :id from the main tabs container.
+    # The Tabs component uses :id internally to wire up the radio inputs
+    # and their associated content panels - NOT for the main container.
+    def attributes
+      options
+    end
+
     register_modifiers(
       # "sm:tabs-boxed"
       # "@sm:tabs-boxed"

data/lib/daisy_ui/theme_controller.rb

@@ -36,7 +36,7 @@ module DaisyUI
       # Input always has just the theme-controller class
       input_classes = self.class.component_class.to_s
 
-      attrs = {type: :checkbox, class: input_classes}
+      attrs = { type: :checkbox, class: input_classes }
       attrs[:value] = theme_value if theme_value
       attrs[:checked] = true if checked
       attrs.merge!(options)
@@ -48,7 +48,7 @@ module DaisyUI
         label(class: wrapper_classes) do
           public_send(as, **attrs)
           whitespace
-          block.call
+          yield
           whitespace
         end
       else

data/lib/daisy_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaisyUI
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/daisy_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "phlex"
 require "zeitwerk"
 require_relative "daisy_ui/version"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: daisyui
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mikael Henriksson
 bindir: bin
 cert_chain: []
-date: 2025-11-16 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -136,6 +136,7 @@ metadata:
   source_code_uri: https://github.com/mhenrixon/daisy_ui
   changelog_uri: https://github.com/mhenrixon/daisy_ui/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/mhenrixon/daisy_ui/issues
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib