bootstrap5_helper 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab8982347a3e4e8f5b3f295df1d32c1436c96f6a0e6ed7ebe49be9cb2030acf
-  data.tar.gz: 1f0e37c6a736272b748fab3c8c00107d58d232f177d4fcbb812d212085670d6c
+  metadata.gz: 69fbf952577b44a22763e9f054dc768bb4a1ad7d2f47ba094dda42612dc2f5b7
+  data.tar.gz: 2d656ebf99bc33d65e49c4ef2f661266958e31366fdfb7730dc9ed08cc782996
 SHA512:
-  metadata.gz: 81a56bd544a7aaa270adbde0e361e2c1bf206e9e39980eca8ad8af45295a430c2cb1b21d76af32eb320013715ca5545ba99c784f881786e1df967f9a6df1aad8
-  data.tar.gz: 5aedd70cae3d0fce44b2457a1be9918b4e8c5cf95440970f6eb1dee8c4abb3be40af7b345a6312b7504f42f958304cf1be833fdde375a1bd21f9888888b1351f
+  metadata.gz: aab79e3287bea1f7cbb4d5ddd761840691d8cc319aa6eddfc89d5b87a5aedfe8ff8ce2ad271b75d6155a6e58586c305fb04db88bdfdaca240c9b3375663bca69
+  data.tar.gz: 992edacb8fd535b478cf3e4cfbf1191425d62ea9cf4b7093ce4a374fcb041feb294f96a21e252b2d14f9323b73cc863fe3869a542adad395917d1e3f87a76ac2

data/lib/bootstrap5_helper/card_with_nav_tab.rb

@@ -2,12 +2,20 @@ module Bootstrap5Helper
   class CardWithNavTab < Component # :nodoc:
     # Class constructor
     #
-    # @param [ActionView] template
-    # @param [Symbol|String|Hash] type_or_options
-    # @param [Hash] opts
-    # @option opts [String]  :id
-    # @option opts [String]  :class
-    # @option opts [Hash]    :data
+    # @overload initialize(template, context, opts)
+    #   @param [ActionView]    template
+    #   @param [Symbol|String] context
+    #   @param [Hash] opts
+    #   @option opts [String]  :id
+    #   @option opts [String]  :class
+    #   @option opts [Hash]    :data
+    #
+    # @overload initialize(template, opts)
+    #   @param [ActionView]    template
+    #   @param [Hash] opts
+    #   @option opts [String]  :id
+    #   @option opts [String]  :class
+    #   @option opts [Hash]    :data
     #
     def initialize(template, *context_or_options, &block)
       super(template)
@@ -42,12 +50,12 @@ module Bootstrap5Helper
       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]   = (args[:child] || {}).merge(
         data: {
           'bs-toggle'  => 'tab',
           'bs-display' => 'static'
         }
-      }
+      )
 
       content_tag :div, class: 'card-header' do
         Nav.new(@template, tag, args, &block).to_s

data/lib/bootstrap5_helper/spinner.rb

@@ -10,6 +10,7 @@ module Bootstrap5Helper
     # @param [ActionView] template
     # @param [Hash] opts
     # @option opts [Symbol]  :type
+    # @option opts [Symbol]  :size
     # @option opts [String]  :id
     # @option opts [String]  :class
     # @option opts [Hash]    :data
@@ -18,6 +19,7 @@ module Bootstrap5Helper
       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,  {})
@@ -32,7 +34,7 @@ module Bootstrap5Helper
       content_tag(
         :span,
         id:    @id,
-        class: "spinner-#{@type} #{@class}",
+        class: component_classes,
         role:  'status',
         aria:  { hidden: true },
         data:  @data
@@ -40,5 +42,18 @@ module Bootstrap5Helper
         content_tag :span, 'Loading', class: 'visually-hidden'
       end
     end
+
+    private
+
+    # Cleaner way of getting the base component classes.
+    #
+    # @return [String]
+    #
+    def component_classes
+      string = "spinner-#{@type} #{@class}"
+      string << " spinner-#{@type}-#{@size}" if @size.present?
+
+      string
+    end
   end
 end

data/lib/bootstrap5_helper/version.rb

@@ -1,3 +1,3 @@
 module Bootstrap5Helper
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/lib/bootstrap5_helper.rb

@@ -165,15 +165,15 @@ module Bootstrap5Helper
     Card.new(self, opts, &block)
   end
 
-  # @overload card_with_nav_tab_helper(type, opts)
-  #   @param [Symbol|String] type - :tabs, :pills
-  #   @param  [Hash] opts
+  # @overload card_with_nav_tab_helper(context, opts)
+  #   @param [Symbol|String] context
+  #   @param [Hash] opts
   #   @option opts [String]  :id
   #   @option opts [String]  :class
   #   @option opts [Hash]    :data
   #
   # @overload card_with_nav_tab_helper(opts)
-  #   @param  [Hash] opts
+  #   @param [Hash] opts
   #   @option opts [String]  :id
   #   @option opts [String]  :class
   #   @option opts [Hash]    :data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap5_helper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Robert David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap