bootstrap5_helper 1.2.0.pre3 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d017b530462e5d5dfbb5344bedc7496990431dedb528d533940811272a9f074
-  data.tar.gz: 3602757ad95632f48724ef5ef85f35803b9b8cde5081722cae13eb2547370c1f
+  metadata.gz: b80e1976cb72cb25fc00dd66922607696c0ecd768f5a13a4fe4133a0b86c8df0
+  data.tar.gz: 490c5c5908ae56ca91ea9be973a52c3a9fc10d9e98f18b80518663816c939259
 SHA512:
-  metadata.gz: f06b5c4a4dea910830074273ee01fb01798bc21286056ff0f15dc9c3503b5f65c5bb0dc37fbd596be0552909443a7ea8a92c5753909b0a465ee7afc71400ded5
-  data.tar.gz: 3f040da98e4b6c2ec59ae6bec1f32513673bce8dfea85536a33c5bbacbcd428c13d3c08e77c71404bc910d42bbaf6f8998c5b9c481295a5753461a8e4c1ef1bd
+  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

@@ -12,7 +12,6 @@ module Bootstrap5Helper
     # @option opts [String]  :id
     # @option opts [String]  :class
     # @option opts [Hash]    :data
-    # @option opts [Hash]    :wrapper
     # @option opts [Boolean] :scrollable
     # @option opts [Boolean] :vcentered
     # @option opts [Boolean] :static
@@ -22,15 +21,15 @@ module Bootstrap5Helper
     def initialize(template, opts = {}, &block)
       super(template)
 
-      @id         = opts.fetch(:id,         uuid)
-      @class      = opts.fetch(:class,      '')
-      @data       = opts.fetch(:data,       {})
-      @wrapper    = opts.fetch(:wrapper,    {})
-      @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
 
@@ -89,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
@@ -113,25 +117,20 @@ 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,
           class: "modal-dialog #{size} #{scrollable} #{vcentered} #{fullscreen}",
           role:  'document'
         ) do
-          content_tag(
-            :div,
-            id:    @wrapper.fetch(:id, nil),
-            class: "modal-content #{@wrapper.fetch(:class, '')}",
-            data:  @wrapper.fetch(:data, {})
-          ) do
-            @content.call(self)
-          end
+          content_tag(:div, class: 'modal-content') { @content.call(self) }
         end
       end
     end
@@ -160,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
@@ -203,8 +205,10 @@ module Bootstrap5Helper
     #
     def fullscreen
       case @fullscreen
-      when TrueClass      then 'modal-fullscreen'
-      when String, Symbol then "modal-fullscreen-#{@fullscreen}-down "
+      when TrueClass
+        'modal-fullscreen'
+      when String, Symbol
+        "modal-fullscreen-#{@fullscreen}-down "
       else
         ''
       end
@@ -216,9 +220,12 @@ module Bootstrap5Helper
     #
     def size
       case @size.to_s
-      when 'xlarge', 'xl' then 'modal-xl'
-      when 'large', 'lg'  then 'modal-lg'
-      when 'small', 'sm'  then 'modal-sm'
+      when 'xlarge', 'xl'
+        'modal-xl'
+      when 'large', 'lg'
+        'modal-lg'
+      when 'small', 'sm'
+        'modal-sm'
       else
         ''
       end