bootstrap5_helper 1.2.1 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6aaec7186d656a26d239a28ddd64ac135a0e734a8f1d90c546186a78cfe967
-  data.tar.gz: dc3fb21a0eaced7579b8dc6b6946b6fc1eadb3354581449e521ea49cde32c778
+  metadata.gz: b80e1976cb72cb25fc00dd66922607696c0ecd768f5a13a4fe4133a0b86c8df0
+  data.tar.gz: 490c5c5908ae56ca91ea9be973a52c3a9fc10d9e98f18b80518663816c939259
 SHA512:
-  metadata.gz: ccc3bd5934a64d589dbefedb634ee3acd27cef1841992663abfa6233fee8bd0824ae2200b690fa2e6f2a70e0ce1cbd5876e9634f4e81ba0821b94a6105917e2e
-  data.tar.gz: c204cc8a8d958f8ce9881e2ba4433a20fa59ec7231d142d578fb2c4c974eb4572320f9f397c4d93688b9d27855b7bbf3677826dab7cc7d2b899acf7379bdec78
+  metadata.gz: 8aa38ac1d5a6577d1f675ad65fee42aa6bd3b4bb9a48193b866ebfab2663de1955e2a5c81cfb3fba19ee51f977bb9bc4e62bad8395b74f3e51f7fec939a1cc2f
+  data.tar.gz: f10d1aedb9e4b448a1d0c11ac157d00733dc46a9f64427a0bfc3d457465ccc12c6a4f9e56892d90811c28a09b994f90a0e0aa6099b442631da21f340f39aeb7e

data/lib/bootstrap5_helper/accordion/item.rb

@@ -17,14 +17,15 @@ module Bootstrap5Helper
         super(template)
 
         @parent         = parent_id
-        @id             = opts.fetch(:id,       uuid)
-        @class          = opts.fetch(:class,    '')
-        @data           = opts.fetch(:data,     {})
-        @expanded       = opts.fetch(:expanded, false)
-        @collapse       = opts.fetch(:collapse, {})
-        @collapse_id    = @collapse.fetch(:id,    uuid)
-        @collapse_klass = @collapse.fetch(:class, '')
-        @collapse_data  = @collapse.fetch(:data,  {})
+        @attrs          = opts
+        @id             = @attrs.delete(:id)       { uuid }
+        @class          = @attrs.delete(:class)    { '' }
+        @data           = @attrs.delete(:data)     { {} }
+        @expanded       = @attrs.delete(:expanded) { false }
+        @collapse       = @attrs.delete(:collapse) { {} }
+        @collapse_id    = @collapse.delete(:id)    { uuid }
+        @collapse_klass = @collapse.delete(:class) { '' }
+        @collapse_data  = @collapse.delete(:data)  { {} }
         @header_id      = uuid
         @content        = block || proc { '' }
       end
@@ -51,15 +52,17 @@ module Bootstrap5Helper
       def header(*tag_or_options, &block)
         tag, args = parse_tag_or_options(*tag_or_options, {})
 
-        @header_id = args.fetch(:id,    @header_id)
-        klass      = args.fetch(:class, '')
-        data       = args.fetch(:data,  {})
+        @header_id = args.delete(:id)    { @header_id }
+        klass      = args.delete(:class) { '' }
+        data       = args.delete(:data)  { {} }
 
         content_tag(
           tag || config({ accordions: :header }, :h2),
-          id:    @header_id,
-          class: "accordion-header #{klass}",
-          data:  data
+          {
+            id:    @header_id,
+            class: "accordion-header #{klass}",
+            data:  data
+          }.merge(args)
         ) do
           content_tag(
             :button,
@@ -90,9 +93,9 @@ module Bootstrap5Helper
       # @return [String]
       #
       def body(opts = {}, &block)
-        id     = opts.fetch(:id,    uuid)
-        klass  = opts.fetch(:class, '')
-        data   = opts.fetch(:data,  {})
+        id     = opts.delete(:id)    { uuid }
+        klass  = opts.delete(:class) { '' }
+        data   = opts.delete(:data)  { {} }
 
         content_tag(
           :div,
@@ -105,9 +108,11 @@ module Bootstrap5Helper
         ) do
           content_tag(
             :div,
-            id:    id,
-            class: "accordion-body #{klass}",
-            data:  data,
+            {
+              id:    id,
+              class: "accordion-body #{klass}",
+              data:  data
+            }.merge(opts),
             &block
           )
         end
@@ -119,7 +124,14 @@ module Bootstrap5Helper
       # @return [String]
       #
       def to_s
-        content_tag :div, id: @id, class: "accordion-item #{@class}", data: @data do
+        content_tag(
+          :div,
+          {
+            id:    @id,
+            class: "accordion-item #{@class}",
+            data:  @data
+          }.merge(@attrs)
+        ) do
           @content.call(self)
         end
       end

data/lib/bootstrap5_helper/accordion.rb

@@ -16,11 +16,12 @@ module Bootstrap5Helper
     def initialize(template, opts = {}, &block)
       super(template)
 
-      @id          = opts.fetch(:id,          uuid)
-      @class       = opts.fetch(:class,       '')
-      @data        = opts.fetch(:data,        {})
-      @always_open = opts.fetch(:always_open, false)
-      @flush       = opts.fetch(:flush,       false)
+      @attrs       = opts
+      @id          = @attrs.delete(:id)          { uuid }
+      @class       = @attrs.delete(:class)       { '' }
+      @data        = @attrs.delete(:data)        { {} }
+      @always_open = @attrs.delete(:always_open) { false }
+      @flush       = @attrs.delete(:flush)       { false }
       @content     = block || proc { '' }
     end
 
@@ -39,9 +40,11 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         :div,
-        id:    @id,
-        class: "accordion #{@flush ? 'accordion-flush' : ''} #{@class}",
-        data:  @data
+        {
+          id:    @id,
+          class: "accordion #{@flush ? 'accordion-flush' : ''} #{@class}",
+          data:  @data
+        }.merge(@attrs)
       ) do
         @content.call(self)
       end

data/lib/bootstrap5_helper/alert.rb

@@ -17,10 +17,11 @@ module Bootstrap5Helper
       super(template)
       @context, args = parse_context_or_options(context_or_options, opts)
 
-      @id          = args.fetch(:id,          uuid)
-      @class       = args.fetch(:class,       '')
-      @data        = args.fetch(:data,        {})
-      @dismissible = args.fetch(:dismissible, false)
+      @attrs       = args
+      @id          = @attrs.delete(:id)          { uuid }
+      @class       = @attrs.delete(:class)       { '' }
+      @data        = @attrs.delete(:data)        { {} }
+      @dismissible = @attrs.delete(:dismissible) { false }
       @content     = block || proc { '' }
     end
 
@@ -43,7 +44,14 @@ module Bootstrap5Helper
     # @return [String]
     #
     def to_s
-      content_tag(:div, id: @id, class: container_class, data: @data) do
+      content_tag(
+        :div,
+        {
+          id:    @id,
+          class: container_class,
+          data:  @data
+        }.merge(@attrs)
+      ) do
         concat(@dismissible ? close_button : '')
         @content.call(self)
       end

data/lib/bootstrap5_helper/badge.rb

@@ -16,9 +16,10 @@ module Bootstrap5Helper
       super(template)
       @context, args = parse_context_or_options(context_or_options, opts)
 
-      @id      = args.fetch(:id,    nil)
-      @class   = args.fetch(:class, '')
-      @data    = args.fetch(:data,  {})
+      @attrs   = args
+      @id      = @attrs.delete(:id)    { nil }
+      @class   = @attrs.delete(:class) { '' }
+      @data    = @attrs.delete(:data)  { {} }
       @content = block || proc { '' }
     end
 
@@ -29,9 +30,11 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         config({ badges: :base }, :span),
-        id:    @id,
-        class: container_class,
-        data:  @data
+        {
+          id:    @id,
+          class: container_class,
+          data:  @data
+        }.merge(@attrs)
       ) do
         @content.call(self)
       end

data/lib/bootstrap5_helper/callout.rb

@@ -15,9 +15,10 @@ module Bootstrap5Helper
       super(template)
       @context, args = parse_context_or_options(context_or_options, opts)
 
-      @id      = args.fetch(:id,    nil)
-      @class   = args.fetch(:class, '')
-      @data    = args.fetch(:data,  {})
+      @attrs   = args
+      @id      = @attrs.delete(:id)    { nil }
+      @class   = @attrs.delete(:class) { '' }
+      @data    = @attrs.delete(:data)  { {} }
       @content = block || proc { '' }
     end
 
@@ -40,7 +41,14 @@ module Bootstrap5Helper
     # @return [String]
     #
     def to_s
-      content_tag :div, id: @id, class: container_class, data: @data do
+      content_tag(
+        :div,
+        {
+          id:    @id,
+          class: container_class,
+          data:  @data
+        }.merge(@attrs)
+      ) do
         @content.call(self)
       end
     end

data/lib/bootstrap5_helper/card.rb

@@ -1,7 +1,7 @@
 module Bootstrap5Helper
-  # Used to build Bootstrap Card components.  Cards are wildly used through Bootstrap 4.
-  #
-  #
+  # rubocop:disable Metrics/ClassLength
+
+  # Used to build Bootstrap Card components..
   class Card < Component
     # Used to initialize a new Card component.
     #
@@ -15,9 +15,10 @@ module Bootstrap5Helper
     def initialize(template, opts = {}, &block)
       super(template)
 
-      @id      = opts.fetch(:id,    '')
-      @class   = opts.fetch(:class, '')
-      @data    = opts.fetch(:data,  nil)
+      @attrs   = opts
+      @id      = @attrs.delete(:id)    { '' }
+      @class   = @attrs.delete(:class) { '' }
+      @data    = @attrs.delete(:data)  { {} }
       @content = block || proc { '' }
     end
 
@@ -228,7 +229,14 @@ module Bootstrap5Helper
     # @return [String]
     #
     def to_s
-      content_tag :div, id: @id, class: "card #{@class}", data: @data do
+      content_tag(
+        :div,
+        {
+          id:    @id,
+          class: "card #{@class}",
+          data:  @data
+        }.merge(@attrs)
+      ) do
         @content.call(self)
       end
     end
@@ -256,17 +264,21 @@ module Bootstrap5Helper
     # @return [String]
     #
     def build_sub_component(tag, type, args, &block)
-      id    = args.fetch(:id,    '')
-      klass = args.fetch(:class, '')
-      data  = args.fetch(:data,  {})
+      attrs = args
+      id    = attrs.delete(:id)    { '' }
+      klass = attrs.delete(:class) { '' }
+      data  = attrs.delete(:data)  { {} }
 
       content_tag(
         tag,
-        id:    id,
-        class: "card-#{type} #{klass}",
-        data:  data,
+        {
+          id:    id,
+          class: "card-#{type} #{klass}",
+          data:  data
+        }.merge(attrs),
         &block
       )
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/bootstrap5_helper/card_with_nav_tab.rb

@@ -20,9 +20,11 @@ module Bootstrap5Helper
     def initialize(template, *context_or_options, &block)
       super(template)
       @context, args = parse_context_or_options(*context_or_options, {})
-      @id      = args.fetch(:id,    '')
-      @class   = args.fetch(:class, '')
-      @data    = args.fetch(:data,  nil)
+
+      @attrs   = args
+      @id      = @attrs.delete(:id)    { '' }
+      @class   = @attrs.delete(:class) { '' }
+      @data    = @attrs.delete(:data)  { {} }
       @content = block || proc { '' }
     end
 
@@ -47,13 +49,14 @@ module Bootstrap5Helper
     # @return [Nav]
     #
     def nav(*tag_or_options, &block)
-      tag, args      = parse_tag_or_options(*tag_or_options, {})
-      args[:class]   = (args[:class] || '') << ' nav-tabs card-header-tabs'
-      args[:data]    = (args[:data]  || {}).merge('bs-toggle' => 'tab')
-      args[:child]   = (args[:child] || {}).merge(
-        data: {
-          'bs-toggle'  => 'tab',
-          'bs-display' => 'static'
+      tag, args       = parse_tag_or_options(*tag_or_options, {})
+      args[:class]    = (args[:class]    || '') << ' nav-tabs card-header-tabs'
+      args[:bs_attrs] = (args[:bs_attrs] || {}).merge(
+        {
+          data: {
+            'bs-toggle'  => 'tab',
+            'bs-display' => 'static'
+          }
         }
       )
 
@@ -82,9 +85,11 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         :div,
-        class: "card with-nav-tabs-#{@context} #{@class}",
-        id:    @id,
-        data:  @data
+        {
+          class: "card with-nav-tabs-#{@context} #{@class}",
+          id:    @id,
+          data:  @data
+        }.merge(@attrs)
       ) do
         @content.call(self)
       end

data/lib/bootstrap5_helper/input_group.rb

@@ -18,9 +18,10 @@ module Bootstrap5Helper
 
       @context, args = parse_context_or_options(context_or_options, opts)
 
-      @id      = args.fetch(:id,     nil)
-      @class   = args.fetch(:class,  '')
-      @data    = args.fetch(:data,   {})
+      @attrs   = args
+      @id      = @attrs.delete(:id)     { nil }
+      @class   = @attrs.delete(:class)  { '' }
+      @data    = @attrs.delete(:data)   { {} }
       @content = block || proc { '' }
     end
 
@@ -42,9 +43,11 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         :div,
-        id:    @id,
-        class: "input-group #{size_class} #{@class}",
-        data:  @data
+        {
+          id:    @id,
+          class: "input-group #{size_class} #{@class}",
+          data:  @data
+        }.merge(@attrs)
       ) do
         @content.call(self)
       end

data/lib/bootstrap5_helper/modal.rb

@@ -21,14 +21,15 @@ module Bootstrap5Helper
     def initialize(template, opts = {}, &block)
       super(template)
 
-      @id         = opts.fetch(:id,         uuid)
-      @class      = opts.fetch(:class,      '')
-      @data       = opts.fetch(:data,       {})
-      @scrollable = opts.fetch(:scrollable, false)
-      @vcentered  = opts.fetch(:vcentered,  false)
-      @static     = opts.fetch(:static,     false)
-      @fullscreen = opts.fetch(:fullscreen, false)
-      @size       = opts.fetch(:size,       nil)
+      @attrs      = opts
+      @id         = @attrs.delete(:id)         { uuid }
+      @class      = @attrs.delete(:class)      { '' }
+      @data       = @attrs.delete(:data)       { {} }
+      @scrollable = @attrs.delete(:scrollable) { false }
+      @vcentered  = @attrs.delete(:vcentered)  { false }
+      @static     = @attrs.delete(:static)     { false }
+      @fullscreen = @attrs.delete(:fullscreen) { false }
+      @size       = @attrs.delete(:size)       { nil }
       @content    = block || proc { '' }
     end
 
@@ -87,14 +88,19 @@ module Bootstrap5Helper
     # @return [String]
     #
     def close_button(opts = {})
-      klass = opts.fetch(:class, '')
+      attrs = opts
+      klass = attrs.delete(:class) { '' }
+      data  = attrs.delete(:data)  { {} }
+      aria  = attrs.delete(:aria)  { {} }
 
       content_tag(
         :button,
-        type:  'button',
-        class: block_given? ? klass : 'btn-close',
-        data:  { 'bs-dismiss': 'modal' },
-        aria:  { label: 'Close' }
+        {
+          type:  'button',
+          class: block_given? ? klass : 'btn-close',
+          data:  data.merge('bs-dismiss' => 'modal'),
+          aria:  aria.merge(label: 'Close')
+        }.merge(attrs)
       ) do
         block_given? ? yield : xbutton
       end
@@ -111,11 +117,13 @@ module Bootstrap5Helper
 
       content_tag(
         :div,
-        id:       @id,
-        class:    "modal #{@class}",
-        tabindex: -1,
-        role:     'dialog',
-        data:     @data
+        {
+          id:       @id,
+          class:    "modal #{@class}",
+          tabindex: -1,
+          role:     'dialog',
+          data:     @data
+        }.merge(@attrs)
       ) do
         content_tag(
           :div,
@@ -151,15 +159,18 @@ module Bootstrap5Helper
     # @return [String]
     #
     def build_sub_component(tag, type, opts = {}, &block)
-      id    = opts.fetch(:id,    nil)
-      klass = opts.fetch(:class, '')
-      data  = opts.fetch(:data,  {})
+      attrs = opts
+      id    = attrs.delete(:id)    { nil }
+      klass = attrs.delete(:class) { '' }
+      data  = attrs.delete(:data)  { {} }
 
       content_tag(
         tag,
-        id:    id,
-        class: "modal-#{type} #{klass}",
-        data:  data,
+        {
+          id:    id,
+          class: "modal-#{type} #{klass}",
+          data:  data
+        }.merge(attrs),
         &block
       )
     end

data/lib/bootstrap5_helper/nav.rb

@@ -1,7 +1,7 @@
 module Bootstrap5Helper
+  # rubocop:disable Metrics/ClassLength
+
   # Builds a Nav Component that can be used in other components.
-  #
-  #
   class Nav < Component
     # Class constructor
     #
@@ -11,8 +11,7 @@ module Bootstrap5Helper
     # @option opts [String]  :id
     # @option opts [String]  :class
     # @option opts [Hash]    :data
-    # @option opts [Array]   :dropdown
-    # @option opts []
+    # @option opts [Hash]    :bs_attrs
     #
     def initialize(template, *tag_or_options, &block)
       super(template)
@@ -20,17 +19,16 @@ module Bootstrap5Helper
       @tag, args = parse_tag_or_options(*tag_or_options, {})
       @tag ||= config({ navs: :base }, :ul)
 
-      @id       = args.fetch(:id,    uuid)
-      @class    = args.fetch(:class, '')
-      @data     = args.fetch(:data,  {})
-      @child    = args.fetch(:child, {})
-      @content  = block || proc { '' }
+      @attrs    = args
+      @id       = @attrs.delete(:id)       { uuid }
+      @class    = @attrs.delete(:class)    { '' }
+      @data     = @attrs.delete(:data)     { {} }
+      @bs_attrs = @attrs.delete(:bs_attrs) { {} }
       @dropdown = Dropdown.new(@template)
+      @content  = block || proc { '' }
     end
 
-    # rubocop:disable Metrics/MethodLength
-
-    # Adds an nav-item to the nav component. this method gets used when the nav-item
+    # Adds an nav-item to the nav component. This method gets used when the nav-item
     # links to content in a tab or something.
     #
     # @param [Symbol|String] target
@@ -39,28 +37,17 @@ module Bootstrap5Helper
     # @option opts [String]  :class
     # @option opts [Hash]    :data
     # @option opts [Hash]    :aria
+    # @option opts [Hash]    :child
     # @return [String]
     #
-    def item(target, opts = {})
-      id    = opts.fetch(:id,    nil)
-      klass = opts.fetch(:class, '')
-      data  = opts.fetch(:data,  {})
-      aria  = opts.fetch(:aria,  {})
-
-      nav_item_wrapper id: id, data: data do
-        content_tag(
-          :a,
-          class:    "nav-link #{klass}",
-          href:     "##{target}",
-          tabindex: -1,
-          data:     @child[:data],
-          aria:     aria
-        ) do
-          block_given? ? yield : target.to_s.titleize
-        end
+    def item(target, opts = {}, &block)
+      case @tag
+      when :nav
+        nav_item_without_wrapper(target, opts, &block)
+      when :ul
+        nav_item_with_wrapper(target, opts, &block)
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     # Use this when the nav item is nothing more than a hyperlink.
     #
@@ -88,6 +75,7 @@ module Bootstrap5Helper
     # @option opts [String]  :class
     # @option opts [Hash]    :data
     # @option opts [Hash]    :aria
+    # @option opts [Hash]    :child
     # @return [String]
     #
     def dropdown(name, opts = {}, &block)
@@ -96,9 +84,14 @@ module Bootstrap5Helper
       data  = opts.fetch(:data,  {}).merge('bs-toggle' => 'dropdown')
       aria  = opts.fetch(:aria,  {}).merge(haspopup: true, expanded: false)
 
-      data.merge!('bs-display' => 'static') if @child[:data]&.key?('bs-display')
-
-      nav_item_wrapper id: id, class: 'dropdown', data: data do
+      nav_item_wrapper(
+        id:    id,
+        class: 'dropdown',
+        data:  (@bs_attrs[:data] || {}).merge(
+          'bs-toggle'  => 'dropdown',
+          'bs-display' => 'static'
+        )
+      ) do
         content_tag(
           :a,
           name,
@@ -117,34 +110,114 @@ module Bootstrap5Helper
     # @return [String]
     #
     def to_s
-      content_tag(@tag, id: @id, class: "nav #{@class}", data: @data) do
+      content_tag(
+        @tag,
+        {
+          id:    @id,
+          class: "nav #{@class}",
+          data:  @data
+        }.merge(@attrs)
+      ) do
         @content.call(self)
       end
     end
 
     private
 
+    # rubocop:disable Metrics/AbcSize
+
+    # @note This is one of the few places where things deviate
+    #   a little from the pattern of child elements requiring
+    #   the :child option class needing to be set in order to
+    #   pass on the class. The reason being that the default DOM
+    #   elements built for navs are UL, which means that the
+    #   majority of them will have children elements. Just wanted
+    #   an easy process of setting the active nav, without having
+    #   to remember if you are using :nav or :ul components.
+    #
+    # @example Nav built with UL(default config) would require the
+    #   the following for setting the active nav:
+    #
+    #   ```ruby
+    #     <%= nav_helper do |nav| %>
+    #       <%= nav.item(child: { class: 'active' }) do
+    #       <% end %>
+    #     <% end %>
+    #
+    # @example With the deviation:
+    #
+    #     <%= nav_helper do |nav| %>
+    #       <%= nav.item(class: 'active') do
+    #       <% end %>
+    #     <% end %>
+    #   ```
+    #
+    # @param [Symbol|String] target
+    # @param [Hash] opts
+    # @option opts [String]  :id
+    # @option opts [String]  :class
+    # @option opts [Hash]    :data
+    # @option opts [Hash]    :aria
+    # @option opts [Hash]    :child
+    # @return [String]
+    #
+    def nav_item_with_wrapper(target, opts = {}, &block)
+      attrs = opts
+      child = attrs.delete(:child) { {} }.merge(@bs_attrs)
+      child[:class] = (child[:class] || '') << ' nav-link'
+
+      if attrs.fetch(:class, '').match?('active')
+        attrs[:class].gsub!('active', '')
+        child[:class] << ' active'
+      end
+
+      nav_item_wrapper(attrs) do
+        content_tag(
+          :a,
+          { href: "##{target}", tabindex: -1 }.merge(child)
+        ) do
+          block_given? ? block.call : target.to_s.titleize
+        end
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    # @param [Symbol|String] target
+    # @param [Hash] opts
+    # @option opts [String]  :id
+    # @option opts [String]  :class
+    # @option opts [Hash]    :data
+    # @option opts [Hash]    :aria
+    # @return [String]
+    #
+    def nav_item_without_wrapper(target, opts = {}, &block)
+      attrs = opts.merge(@bs_attrs)
+      attrs[:class] = (attrs[:class] || '') << ' nav-link'
+
+      nav_item_wrapper do
+        content_tag(
+          :a,
+          { href: "##{target}", tabindex: -1 }.merge(attrs)
+        ) do
+          block_given? ? block.call : target.to_s.titleize
+        end
+      end
+    end
+
     # Decorator for elements requiring a wrapper component.
     #
     # @return [String]
     #
     def nav_item_wrapper(opts = {}, &block)
-      id    = opts.fetch(:id,    '')
-      klass = opts.fetch(:class, '')
-      data  = opts.fetch(:data,  {})
+      opts[:class] = (opts[:class] || '') << ' nav-item'
 
       case @tag
       when :nav
         block.call
       when :ul
-        content_tag(
-          :li,
-          id:    id,
-          class: "nav-item #{klass}",
-          data:  data,
-          &block
-        )
+        content_tag(:li, opts, &block)
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/bootstrap5_helper/offcanvas/content.rb

@@ -4,111 +4,112 @@ module Bootstrap5Helper
     #
     #
     class Content < Component
-      # Constructor description...
-      #
-      #
       # @param  [Hash] opts
       # @return [ClassName]
       #
       def initialize(template, opts = {}, &block)
         super(template)
 
-        @id         = opts.fetch(:id,         uuid)
-        @class      = opts.fetch(:class,      '')
-        @data       = opts.fetch(:data,       {})
-        @aria       = opts.fetch(:aria,       {})
-        @scrollable = opts.fetch(:scrollable, false)
-        @position   = opts.fetch(:position,   'start')
-        @backdrop   = opts.fetch(:backdrop,   true)
+        @attrs      = opts
+        @id         = @attrs.delete(:id)         { uuid }
+        @class      = @attrs.delete(:class)      { '' }
+        @data       = @attrs.delete(:data)       { {} }
+        @aria       = @attrs.delete(:aria)       { {} }
+        @scrollable = @attrs.delete(:scrollable) { false }
+        @position   = @attrs.delete(:position)   { 'start' }
+        @backdrop   = @attrs.delete(:backdrop)   { true }
         @content    = block || proc { '' }
       end
 
       # @todo
-      #
-      #
       def header(opts = {}, &block)
-        id    = opts.fetch(:id,    nil)
-        klass = opts.fetch(:class, '')
-        data  = opts.fetch(:data,  {})
+        attrs = opts
+        id    = attrs.delete(:id)    { nil }
+        klass = attrs.delete(:class) { '' }
+        data  = attrs.delete(:data)  { {} }
 
         content_tag(
           config({ offcanvas: :header }, :div),
-          id:    id,
-          class: "offcanvas-header #{klass}",
-          data:  data,
+          {
+            id:    id,
+            class: "offcanvas-header #{klass}",
+            data:  data
+          }.merge(attrs),
           &block
         )
       end
 
       # @todo
-      #
-      #
       def title(text_or_options = nil, opts = {}, &block)
-        text, args = parse_text_or_options(text_or_options, opts)
+        text, attrs = parse_text_or_options(text_or_options, opts)
 
-        id    = args.fetch(:id,    nil)
-        klass = args.fetch(:class, '')
-        data  = args.fetch(:data,  {})
+        id    = attrs.delete(:id)    { nil }
+        klass = attrs.delete(:class) { '' }
+        data  = attrs.delete(:data)  { {} }
 
         content_tag(
           config({ offcanvas: :title }, :h6),
           text,
-          id:    id,
-          class: "offcanvas-title #{klass}",
-          data:  data,
+          {
+            id:    id,
+            class: "offcanvas-title #{klass}",
+            data:  data
+          }.merge(attrs),
           &block
         )
       end
 
       # @todo
-      #
-      #
       def close_button(opts = {})
-        klass = opts.fetch(:class, '')
+        attrs = opts
+        klass = attrs.delete(:class)  { '' }
+        data  = attrs.delete(:data)   { {} }
+        aria  = attrs.delete(:aria)   { {} }
 
         content_tag(
           config({ offcanvas: :close }, :button),
           class: block_given? ? klass : 'btn-close',
-          data:  { 'bs-dismiss': 'offcanvas' },
-          aria:  { label: 'Close' }
+          data:  data.merge('bs-dismiss' => 'offcanvas'),
+          aria:  aria.merge(label: 'Close')
         ) do
           block_given? ? yield : xbutton
         end
       end
 
       # @todo
-      #
-      #
       def body(opts = {}, &block)
-        id    = opts.fetch(:id, nil)
-        klass = opts.fetch(:class, '')
-        data  = opts.fetch(:data, {})
-        aria  = opts.fetch(:aria, {})
+        attrs = opts
+        id    = attrs.delete(:id)    { nil }
+        klass = attrs.delete(:class) { '' }
+        data  = attrs.delete(:data)  { {} }
+        aria  = attrs.delete(:aria)  { {} }
 
         content_tag(
           :div,
-          id:    id,
-          class: "offcanvas-body #{klass}",
-          data:  data,
-          aria:  aria,
+          {
+            id:    id,
+            class: "offcanvas-body #{klass}",
+            data:  data,
+            aria:  aria
+          }.merge(attrs),
           &block
         )
       end
 
       # @todo
-      #
-      #
       def to_s
-        @data.merge!('bs-scroll':   @scrollable)
-        @data.merge!('bs-backdrop': @backdrop)
-
         content_tag(
           :div,
-          id:       @id,
-          class:    "offcanvas offcanvas-#{@position} #{@class}",
-          tabindex: -1,
-          data:     @data,
-          aria:     { labelledby: 'offcanvasExampleLabel' }
+          {
+            id:       @id,
+            class:    "offcanvas offcanvas-#{@position} #{@class}",
+            tabindex: -1,
+            data:     @data.merge!(
+              'bs-scroll'   => @scrollable,
+              'bs-backdrop' => @backdrop
+            ),
+            aria:     @aria.merge!(labelledby: 'offcanvasExampleLabel')
+          }.merge(@attrs)
         ) do
           @content.call(self)
         end

data/lib/bootstrap5_helper/offcanvas.rb

@@ -18,14 +18,14 @@ module Bootstrap5Helper
     #
     def initialize(template, position_or_options = nil, opts = {}, &block)
       super(template)
-      @pos, args  = parse_position_or_options(position_or_options, opts)
-      @id         = args.fetch(:id,         uuid)
-      @class      = args.fetch(:class,      '')
-      @data       = args.fetch(:data,       {})
-      @aria       = args.fetch(:aria,       {})
-      @scrollable = args.fetch(:scrollable, false)
-      @backdrop   = args.fetch(:backdrop,   true)
-      @content    = block || proc { '' }
+      @pos, @attrs  = parse_position_or_options(position_or_options, opts)
+      @id           = @attrs.delete(:id)         { uuid }
+      @class        = @attrs.delete(:class)      { '' }
+      @data         = @attrs.delete(:data)       { {} }
+      @aria         = @attrs.delete(:aria)       { {} }
+      @scrollable   = @attrs.delete(:scrollable) { false }
+      @backdrop     = @attrs.delete(:backdrop)   { true }
+      @content      = block || proc { '' }
     end
     # rubocop:disable Metrics/MethodLength
 
@@ -139,7 +139,7 @@ module Bootstrap5Helper
           scrollable: @scrollable,
           backdrop:   @backdrop,
           position:   @pos
-        },
+        }.merge(@attrs),
         &block
       )
     end

data/lib/bootstrap5_helper/overlay/menu.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: false
+
 module Bootstrap5Helper
   class Overlay
+    # rubocop:disable Metrics/ClassLength
     # Builds a menu component for use in dropdowns.
-    #
-    #
     class Menu < Component
       # Class constructor
       #
@@ -17,9 +18,10 @@ module Bootstrap5Helper
         super(template)
 
         @tag, opts = parse_tag_or_options(*tag_or_options, {})
-        @id        = opts.fetch(:id,    uuid)
-        @class     = opts.fetch(:class, '')
-        @data      = opts.fetch(:data,  {})
+        @attrs     = opts
+        @id        = @attrs.delete(:id)    { uuid }
+        @class     = @attrs.delete(:class) { '' }
+        @data      = @attrs.delete(:data)  { {} }
         @content   = block || proc { '' }
       end
 
@@ -45,8 +47,6 @@ module Bootstrap5Helper
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
-
       # Use this method when you are using the item in the menu as trigger for
       # something like tab content.
       #
@@ -59,25 +59,23 @@ module Bootstrap5Helper
       # @return [String]
       #
       def item(target, opts = {})
-        id    = opts.fetch(:id,    nil)
-        klass = opts.fetch(:class, '')
-        data  = opts.fetch(:data,  {}).merge('bs-toggle' => 'tab')
-        aria  = opts.fetch(:aria,  {})
+        attrs = opts
+        klass = attrs.delete(:class) { '' }
+        data  = attrs.delete(:data)  { {} }
 
         nav_item_wrapper do
           content_tag(
             :a,
-            id:    id,
-            class: "dropdown-item #{klass}",
-            href:  "##{target}",
-            aria:  aria,
-            data:  data
+            {
+              class: "dropdown-item #{klass}",
+              href:  "##{target}",
+              data:  data.merge('bs-toggle' => 'tab')
+            }.merge(attrs)
           ) do
             block_given? ? yield : target.to_s.titleize
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       # Builds a Text component
       #
@@ -142,9 +140,11 @@ module Bootstrap5Helper
       def to_s
         content_tag(
           @tag || config({ overlay_menus: :base }, :div),
-          id:    @id,
-          class: "dropdown-menu #{@class}",
-          data:  @data
+          {
+            id:    @id,
+            class: "dropdown-menu #{@class}",
+            data:  @data
+          }.merge(@attrs)
         ) do
           @content.call(self)
         end
@@ -177,19 +177,23 @@ module Bootstrap5Helper
       # @return [String]
       #
       def build_sub_component(tag, text, type, opts)
-        id    = opts.fetch(:id,    nil)
-        klass = opts.fetch(:class, '')
-        data  = opts.fetch(:data,  {})
+        attrs = opts
+        id    = attrs.delete(:id)    { nil }
+        klass = attrs.delete(:class) { '' }
+        data  = attrs.delete(:data)  { {} }
 
         content_tag(
           tag,
-          id:    id,
-          class: "dropdown-#{type} #{klass}",
-          data:  data
+          {
+            id:    id,
+            class: "dropdown-#{type} #{klass}",
+            data:  data
+          }.merge(attrs)
         ) do
           block_given? ? yield : text || ''
         end
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/bootstrap5_helper/overlay.rb

@@ -28,15 +28,18 @@ module Bootstrap5Helper
       super(template)
 
       @tag, args = parse_tag_or_options(*tag_or_options, {})
-      @split     = args.fetch(:split,    false)
-      @centered  = args.fetch(:centered, false)
-      @id        = args.fetch(:id,       uuid)
-      @class     = args.fetch(:class,    '')
-      @data      = args.fetch(:data,     {})
+      @attrs     = args
+      @split     = @attrs.delete(:split)    { false }
+      @centered  = @attrs.delete(:centered) { false }
+      @id        = @attrs.delete(:id)       { uuid }
+      @class     = @attrs.delete(:class)    { '' }
+      @data      = @attrs.delete(:data)     { {} }
 
       @content   = block || proc { '' }
     end
 
+    # rubocop:disable Metrics/MethodLength
+
     # Used to generate a button for the dropdown.  This button just
     # opens the coresponding dropdown menu.
     #
@@ -48,23 +51,29 @@ module Bootstrap5Helper
     # @return [String]
     #
     def button(context = :primary, opts = {}, &block)
-      id     = opts.fetch(:id,    nil)
-      klass  = opts.fetch(:class, '')
-      data   = opts.fetch(:data,  {}).merge(
-        'bs-toggle'  => 'dropdown',
-        'bs-display' => 'static'
-      )
+      attrs  = opts
+      klass  = attrs.delete(:class) { '' }
+      data   = attrs.delete(:data)  { {} }
+      aria   = attrs.delete(:aria)  { {} }
 
       content_tag(
         :button,
-        id:    id,
-        type:  'button',
-        class: "dropdown-toggle btn btn-#{context} #{klass}",
-        data:  data,
-        aria:  { haspopup: true, expanded: false },
+        {
+          type:  'button',
+          class: "dropdown-toggle btn btn-#{context} #{klass}",
+          data:  data.merge(
+            'bs-toggle'  => 'dropdown',
+            'bs-display' => 'static'
+          ),
+          aria:  aria.merge(
+            haspopup: true,
+            expanded: false
+          )
+        }.merge(attrs),
         &block
       )
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Used to generate a button with just the caret, to open the dropdown.
     #
@@ -112,9 +121,11 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         @tag || :div,
-        id:    @id,
-        class: "#{@type} #{alignment_type_class} #{@class}",
-        data:  @data
+        {
+          id:    @id,
+          class: "#{@type} #{alignment_type_class} #{@class}",
+          data:  @data
+        }.merge(@attrs)
       ) do
         @content.call(self)
       end

data/lib/bootstrap5_helper/page_header.rb

@@ -15,12 +15,12 @@ module Bootstrap5Helper
     def initialize(template, tag_or_options = nil, opts = {}, &block)
       super(template)
 
-      @tag, args = parse_tag_or_options(tag_or_options, opts)
+      @tag, @attrs = parse_tag_or_options(tag_or_options, opts)
       @tag ||= config(:page_header, :h1)
 
-      @id      = args.fetch(:id,    uuid)
-      @class   = args.fetch(:class, '')
-      @data    = args.fetch(:data,  {})
+      @id      = @attrs.delete(:id)    { uuid }
+      @class   = @attrs.delete(:class) { '' }
+      @data    = @attrs.delete(:data)  { {} }
       @content = block || proc { '' }
     end
 
@@ -31,9 +31,11 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         @tag,
-        id:    @id,
-        class: "pb-2 mt-4 mb-2 border-bottom #{@class}",
-        data:  @data
+        {
+          id:    @id,
+          class: "pb-2 mt-4 mb-2 border-bottom #{@class}",
+          data:  @data
+        }.merge(@attrs)
       ) do
         @content.call(self)
       end

data/lib/bootstrap5_helper/spinner.rb

@@ -18,11 +18,12 @@ module Bootstrap5Helper
     def initialize(template, opts = {}, &block)
       super(template)
 
-      @type    = opts.fetch(:type, :border)
-      @size    = opts.fetch(:size,  nil)
-      @id      = opts.fetch(:id,    uuid)
-      @class   = opts.fetch(:class, '')
-      @data    = opts.fetch(:data,  {})
+      @attrs   = opts
+      @type    = @attrs.delete(:type)  { :border }
+      @size    = @attrs.delete(:size)  { nil }
+      @id      = @attrs.delete(:id)    { uuid }
+      @class   = @attrs.delete(:class) { '' }
+      @data    = @attrs.delete(:data)  { {} }
       @content = block || proc { '' }
     end
 
@@ -33,11 +34,13 @@ module Bootstrap5Helper
     def to_s
       content_tag(
         :span,
-        id:    @id,
-        class: component_classes,
-        role:  'status',
-        aria:  { hidden: true },
-        data:  @data
+        {
+          id:    @id,
+          class: component_classes,
+          role:  'status',
+          aria:  { hidden: true },
+          data:  @data
+        }.merge(@attrs)
       ) do
         content_tag :span, 'Loading', class: 'visually-hidden'
       end

data/lib/bootstrap5_helper/tab/content.rb

@@ -15,9 +15,10 @@ module Bootstrap5Helper
       def initialize(template, opts = {}, &block)
         super(template)
 
-        @id      = opts.fetch(:id,    uuid)
-        @class   = opts.fetch(:class, '')
-        @data    = opts.fetch(:data,  {})
+        @attrs   = opts
+        @id      = @attrs.delete(:id)    { uuid }
+        @class   = @attrs.delete(:class) { '' }
+        @data    = @attrs.delete(:data)  { {} }
         @content = block || proc { '' }
       end
 
@@ -30,16 +31,19 @@ module Bootstrap5Helper
       # @return [String]
       #
       def pane(source, opts = {}, &block)
-        id    = opts.fetch(:id,    source)
-        klass = opts.fetch(:class, '')
-        data  = opts.fetch(:data,  {})
+        attrs = opts
+        id    = attrs.delete(:id)    { source }
+        klass = attrs.delete(:class) { '' }
+        data  = attrs.delete(:data)  { {} }
 
         content_tag(
           :div,
-          id:    id,
-          class: "tab-pane #{klass}",
-          role:  'tabpanel',
-          data:  data,
+          {
+            id:    id,
+            class: "tab-pane #{klass}",
+            role:  'tabpanel',
+            data:  data
+          }.merge(attrs),
           &block
         )
       end
@@ -49,7 +53,14 @@ module Bootstrap5Helper
       # @return [String]
       #
       def to_s
-        content_tag :div, id: @id, class: "tab-content #{@class}" do
+        content_tag(
+          :div,
+          {
+            id:    @id,
+            class: "tab-content #{@class}",
+            data:  @data
+          }.merge(@attrs)
+        ) do
           @content.call(self)
         end
       end

data/lib/bootstrap5_helper/tab.rb

@@ -30,14 +30,14 @@ module Bootstrap5Helper
     #   @option opts [String]  :id
     #   @option opts [String]  :class
     #   @option opts [Hash]    :data
-    #   @option opts [Hash]    :child - data attributes for child, NOT wrapper
+    #   @option opts [Hash]    :bs_attrs
     #
     # @overload nav(opts)
     #   @param [Hash] opts
     #   @option opts [String]  :id
     #   @option opts [String]  :class
     #   @option opts [Hash]    :data
-    #   @option opts [Hash]    :child - data attributes for child, NOT wrapper
+    #   @option opts [Hash]    :bs_attrs
     #
     # @yield  [Nav]
     # @return [Nav]
@@ -45,9 +45,14 @@ module Bootstrap5Helper
     def nav(*tag_or_options, &block)
       tag, args = parse_tag_or_options(*tag_or_options, {})
 
-      args[:class] = (args[:class] || '') << " nav-#{@type}"
-      args[:data]  = (args[:data]  || {}).merge('bs-toggle' => 'tab')
-      args[:child] = { data: { 'bs-toggle' => 'tab' } }
+      args[:class]    = (args[:class] || '') << " nav-#{@type}"
+      args[:data]     = (args[:data]  || {})
+      args[:bs_attrs] = {
+        data: {
+          'bs-toggle'  => 'tab',
+          'bs-display' => 'static'
+        }
+      }
 
       Nav.new(@template, tag, args, &block)
     end

data/lib/bootstrap5_helper/version.rb

@@ -1,3 +1,3 @@
 module Bootstrap5Helper
-  VERSION = '1.2.1'.freeze
+  VERSION = '2.0.0.beta'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap5_helper
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Robert David