daisyui 1.0.1 → 1.0.3

data/lib/daisy_ui/hero.rb

@@ -5,20 +5,16 @@ module DaisyUI
   class Hero < Base
     self.component_class = :hero
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def content(**opts, &)
-      div(class: component_classes("hero-content", options: opts), **opts, &)
+    def content(**options, &)
+      div(class: component_classes("hero-content", options:), **options, &)
     end
 
-    def overlay(**opts, &)
-      div(class: component_classes("hero-overlay", options: opts), **opts, &)
+    def overlay(**options, &)
+      div(class: component_classes("hero-overlay", options:), **options, &)
     end
   end
 end

data/lib/daisy_ui/indicator.rb

@@ -5,16 +5,12 @@ module DaisyUI
   class Indicator < Base
     self.component_class = :indicator
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def item(**opts, &)
-      span(class: component_classes("indicator-item", options: opts), **opts, &)
+    def item(**options, &)
+      span(class: component_classes("indicator-item", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/join.rb

@@ -3,16 +3,14 @@
 module DaisyUI
   # @component html class="join"
   class Join < Base
-    def initialize(*, as: :div, **)
-      super
-    end
+    self.component_class = :join
 
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def item(**opts, &)
-      div(class: component_classes("join-item", options: opts), **opts, &)
+    def item(**options, &)
+      div(class: component_classes("join-item", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/label.rb

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

data/lib/daisy_ui/list.rb

@@ -13,8 +13,8 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def row(**opts, &)
-      li(class: component_classes("list-row", options: opts), **opts, &)
+    def row(**options, &)
+      li(class: component_classes("list-row", options:), **options, &)
     end
 
     register_modifiers(

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

@@ -4,16 +4,10 @@ module DaisyUI
   class Mask < Base
     self.component_class = :mask
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:mask-squircle"
       # "@sm:mask-squircle"

data/lib/daisy_ui/menu.rb

@@ -8,12 +8,12 @@ module DaisyUI
       ul(class: classes, **attributes, &)
     end
 
-    def title(*, as: :li, **opts, &)
-      public_send(as, class: component_classes("menu-title", options: opts), **opts, &)
+    def title(*, as: :li, **options, &)
+      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), **options, &block)
+    def title(*, **options, &)
+      h2(class: component_classes("menu-title", options:), **options, &)
     end
 
-    def submenu(*modifiers, **opts, &)
+    def submenu(*modifiers, **, &)
       if modifiers.include?(:collapsible)
-        render CollapsibleSubMenu.new(*modifiers, **opts, &)
+        render CollapsibleSubMenu.new(*modifiers, **, &)
       else
-        render SubMenu.new(*modifiers, **opts, &)
+        render SubMenu.new(*modifiers, **, &)
       end
     end
 
-    private
-
     register_modifiers(
       # "sm:disabled"
       # "@sm:disabled"

data/lib/daisy_ui/mockup_browser.rb

@@ -5,16 +5,12 @@ module DaisyUI
   class MockupBrowser < Base
     self.component_class = "mockup-browser"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def toolbar(**opts, &)
-      div(class: component_classes("mockup-browser-toolbar", options: opts), **opts, &)
+    def toolbar(**options, &)
+      div(class: component_classes("mockup-browser-toolbar", options:), **options, &)
     end
   end
 end

data/lib/daisy_ui/mockup_code.rb

@@ -5,10 +5,6 @@ module DaisyUI
   class MockupCode < Base
     self.component_class = "mockup-code"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end

data/lib/daisy_ui/mockup_phone.rb

@@ -5,20 +5,16 @@ module DaisyUI
   class MockupPhone < Base
     self.component_class = "mockup-phone"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def camera(**opts, &)
-      div(class: component_classes("mockup-phone-camera", options: opts), **opts, &)
+    def camera(**options, &)
+      div(class: component_classes("mockup-phone-camera", options:), **options, &)
     end
 
-    def display(**opts, &)
-      div(class: component_classes("mockup-phone-display", options: opts), **opts, &)
+    def display(**options, &)
+      div(class: component_classes("mockup-phone-display", options:), **options, &)
     end
   end
 end

data/lib/daisy_ui/mockup_window.rb

@@ -5,10 +5,6 @@ module DaisyUI
   class MockupWindow < Base
     self.component_class = "mockup-window"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end

data/lib/daisy_ui/modal.rb

@@ -17,20 +17,20 @@ module DaisyUI
       end
     end
 
-    def body(*, as: :div, **opts, &)
-      public_send(as, class: component_classes("modal-box", options: opts), **opts, &)
+    def body(*, as: :div, **options, &)
+      public_send(as, class: component_classes("modal-box", options:), **options, &)
     end
 
-    def action(*, as: :div, **opts, &block)
-      action_classes = component_classes("modal-action", options: opts)
-      public_send(as, class: action_classes, **opts) do
+    def action(*, as: :div, **options, &block)
+      action_classes = component_classes("modal-action", options:)
+      public_send(as, class: action_classes, **options) do
         block&.call(self)
       end
     end
 
-    def backdrop(*, **opts, &)
-      backdrop_classes = component_classes("modal-backdrop", options: opts)
-      form method: :dialog, class: backdrop_classes, **opts do
+    def backdrop(*, **options, &)
+      backdrop_classes = component_classes("modal-backdrop", options:)
+      form method: :dialog, class: backdrop_classes, **options do
         button
       end
     end
@@ -41,8 +41,6 @@ module DaisyUI
       end
     end
 
-    private
-
     register_modifiers(
       # "sm:modal-open"
       # "@sm:modal-open"

data/lib/daisy_ui/navbar.rb

@@ -12,16 +12,16 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def start(*, as: :div, **opts, &)
-      public_send(as, class: component_classes("navbar-start", options: opts), **opts, &)
+    def start(*, as: :div, **options, &)
+      public_send(as, class: component_classes("navbar-start", options:), **options, &)
     end
 
-    def center(*, as: :div, **opts, &)
-      public_send(as, class: component_classes("navbar-center", options: opts), **opts, &)
+    def center(*, as: :div, **options, &)
+      public_send(as, class: component_classes("navbar-center", options:), **options, &)
     end
 
-    def end(*, as: :div, **opts, &)
-      public_send(as, class: component_classes("navbar-end", options: opts), **opts, &)
+    def end(*, as: :div, **options, &)
+      public_send(as, class: component_classes("navbar-end", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/pagination.rb

@@ -5,16 +5,12 @@ module DaisyUI
   class Pagination < Base
     self.component_class = "join"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def item(**opts, &)
-      div(class: component_classes("join-item", options: opts), **opts, &)
+    def item(**options, &)
+      div(class: component_classes("join-item", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/rating.rb

@@ -5,10 +5,6 @@ module DaisyUI
   class Rating < Base
     self.component_class = :rating
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end

data/lib/daisy_ui/skeleton.rb

@@ -4,16 +4,10 @@ module DaisyUI
   class Skeleton < Base
     self.component_class = :skeleton
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers({})
   end
 end

data/lib/daisy_ui/stack.rb

@@ -5,10 +5,6 @@ module DaisyUI
   class Stack < Base
     self.component_class = :stack
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end

data/lib/daisy_ui/stat.rb

@@ -5,36 +5,32 @@ module DaisyUI
   class Stat < Base
     self.component_class = "stats"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def item(**opts, &)
-      div(class: component_classes("stat", options: opts), **opts, &)
+    def item(**options, &)
+      div(class: component_classes("stat", options:), **options, &)
     end
 
-    def title(**opts, &)
-      div(class: component_classes("stat-title", options: opts), **opts, &)
+    def title(**options, &)
+      div(class: component_classes("stat-title", options:), **options, &)
     end
 
-    def value(**opts, &)
-      div(class: component_classes("stat-value", options: opts), **opts, &)
+    def value(**options, &)
+      div(class: component_classes("stat-value", options:), **options, &)
     end
 
-    def desc(**opts, &)
-      div(class: component_classes("stat-desc", options: opts), **opts, &)
+    def desc(**options, &)
+      div(class: component_classes("stat-desc", options:), **options, &)
     end
 
-    def figure(**opts, &)
-      div(class: component_classes("stat-figure", options: opts), **opts, &)
+    def figure(**options, &)
+      div(class: component_classes("stat-figure", options:), **options, &)
     end
 
-    def actions(**opts, &)
-      div(class: component_classes("stat-actions", options: opts), **opts, &)
+    def actions(**options, &)
+      div(class: component_classes("stat-actions", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/steps.rb

@@ -13,12 +13,12 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def step(**opts, &)
-      li(class: component_classes("step", options: opts), **opts, &)
+    def step(**options, &)
+      li(class: component_classes("step", options:), **options, &)
     end
 
-    def icon(**opts, &)
-      div(class: component_classes("step-icon", options: opts), **opts, &)
+    def icon(**options, &)
+      div(class: component_classes("step-icon", options:), **options, &)
     end
 
     register_modifiers(

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/swap.rb

@@ -13,16 +13,16 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def on(**opts, &)
-      div(class: component_classes("swap-on", options: opts), **opts, &)
+    def on(**options, &)
+      div(class: component_classes("swap-on", options:), **options, &)
     end
 
-    def off(**opts, &)
-      div(class: component_classes("swap-off", options: opts), **opts, &)
+    def off(**options, &)
+      div(class: component_classes("swap-off", options:), **options, &)
     end
 
-    def indeterminate(**opts, &)
-      div(class: component_classes("swap-indeterminate", options: opts), **opts, &)
+    def indeterminate(**options, &)
+      div(class: component_classes("swap-indeterminate", options:), **options, &)
     end
 
     register_modifiers(

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
@@ -25,15 +25,15 @@ module DaisyUI
       end
     end
 
-    def content(*, **opts, &block)
+    def content(*, **options, &block)
       unless id
         raise ArgumentError,
           "You must pass an id to Tabs#new if you want to add content"
       end
 
-      @content = -> do
-        content_classes = component_classes("tab-content", options: opts)
-        div role: :tabpanel, class: content_classes, **opts, &block
+      @content = lambda do
+        content_classes = component_classes("tab-content", options:)
+        div role: :tabpanel, class: content_classes, **options, &block
       end
     end
   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