bootstrap5_helper 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69fbf952577b44a22763e9f054dc768bb4a1ad7d2f47ba094dda42612dc2f5b7
-  data.tar.gz: 2d656ebf99bc33d65e49c4ef2f661266958e31366fdfb7730dc9ed08cc782996
+  metadata.gz: 19522a2350e79f5f8dc104a998c2af7da568feb05de8747adc3b2a530eb86ccc
+  data.tar.gz: 15c5cd096185cff3d04305451d10551541eb6abdaaf2fe8886dc0828d212ae67
 SHA512:
-  metadata.gz: aab79e3287bea1f7cbb4d5ddd761840691d8cc319aa6eddfc89d5b87a5aedfe8ff8ce2ad271b75d6155a6e58586c305fb04db88bdfdaca240c9b3375663bca69
-  data.tar.gz: 992edacb8fd535b478cf3e4cfbf1191425d62ea9cf4b7093ce4a374fcb041feb294f96a21e252b2d14f9323b73cc863fe3869a542adad395917d1e3f87a76ac2
+  metadata.gz: cbfadc39eb05885160db4b02a115f984c82d4a434568a777e891fe16ea2d484330a6713944c95a4736d347b1f3c9edb1734764289e404e364f1059f8bb57a1bd
+  data.tar.gz: 565e02e9240376cdbb95a5dfc43eaf034a1af210d041269085b99ddac8f3a87cd38d732e87b4d3f3739d96dde35507ec658d4c0abf8de72b6b96c0a71bc61f1a

data/README.md

@@ -49,11 +49,10 @@ end
 # @option opts [Hash]    :data
 # @option opts [Boolean] :always_open
 # @option opts [Boolean] :flush
+# @yield  [Accordion]
 # @return [Accordion]
 #
-def accordion_helper(opts = {}, &block)
-  Accordion.new(self, opts, &block)
-end
+accordion_helper(opts = {}, &block)
 ```
 
 #### Example:
@@ -99,9 +98,7 @@ Alerts use the context helper, where you can pass the context of the object and
 #
 # @return [String]
 #
-def alert_helper(*args, &block)
-  Alert.new(self, *args, &block)
-end
+alert_helper(*args, &block)
 ```
 
 #### Example:
@@ -132,9 +129,7 @@ The badge helper will build badges realitively quickly. If you are just passing
 #
 # @return [String]
 #
-def badge_helper(*args, &block)
-  Badge.new(self, *args, &block)
-end
+badge_helper(*args, &block)
 ```
 
 #### Example
@@ -164,18 +159,15 @@ Cards support a few methods that make building them easier:
 - `text`
 - `title`
 
-For usage on various card sub components, @see https://getbootstrap.com/docs/4.0/components/card/
-
 ```ruby
 # @param  [Hash] opts
 # @option opts [String] :id
 # @option opts [String] :class
 # @option opts [Hash]   :data
-# @return [String]
+# @yield  [Card]
+# @return [Card]
 #
-def card_helper(opts = {}, &block)
-  Card.new(self, opts, &block)
-end
+card_helper(opts = {}, &block)
 ```
 
 #### Example
@@ -236,79 +228,70 @@ Dropdowns support the following methods:
   - `divider` - A dividing element
 
 ```ruby
-# @overload dropdown_helper(type, opts)
-#   @param [Symbol|String] type - :dropdown, :dropup, :dropstart, :dropend
-#   @param [Hash] opts
+# @overload dropdown_helper(tag, opts)
+#   @param [Symbol|String] tag - The HTML element to use to wrap the component.
+#   @param [Hash]          opts
 #   @option opts [String]  :id
 #   @option opts [String]  :class
 #   @option opts [Hash]    :data
-#   @option opts [Boolean] :split
+#   @option opts [Boolean] :centered
 #
-# @overload dropdown(opts)
-#   @param [Hash] opts
+# @overload dropdown_helper(opts)
+#   @param [Hash]          opts
 #   @option opts [String]  :id
 #   @option opts [String]  :class
 #   @option opts [Hash]    :data
-#   @option opts [Boolean] :split
+#   @option opts [Boolean] :centered
 #
-# @return [String]
+# @yield  [Dropdown]
+# @return [Dropdown]
 #
-def dropdown_helper(*args, &block)
-  Dropdown.new(self, *args, &block)
-end
+dropdown_helper(*args, &block)
 ```
 
 #### Example
 
 ```erb
-<%= dropdown_helper do |dropdown| %>
-    <%= dropdown.button(:primary) { "Action" } %>
-    <%= dropdown.menu do |menu| %>
-        <%= menu.link 'Edit', '#' %>
-        <%= menu.link 'Delete', '#' %>
-        <%= menu.text 'Static text' %>
-    <% end %>
+<%= dropdown_helper class: "btn-group" do |dropdown| %>
+  <button type="button" class="btn btn-primary">Dropdown</button>
+  <%= dropdown.caret :primary >
+  <%= dropdown.menu do |menu| %>
+    <%= menu.link 'Dropdown Link', '#' %>
+    <%= menu.link 'Dropdown Link', '#' %>
+  <% end %>
 <% end %>
 
-<%= dropdown_helper :group, class: 'dropright' do |dropdown| %>
-    <button type="button" class="btn btn-danger">Action 2</button>
-    <%= dropdown.button(:danger, split: true) %>
-    <%= dropdown.menu do |menu| %>
-        <%= menu.header "Crud operations" %>
-        <%= menu.divider %>
-        <%= menu.link 'Edit', 'SOME-URL' %>
-        <%= menu.link 'Delete', 'SOME-URL' %>
-    <% end %>
-<% end %>
+
+// Dropdown menu with a login form inside the menu
 
 <%= dropdown_helper do |dropdown| %>
-    <%= dropdown.button :primary do %>
-        <i class="fas fa-users"></i> User
-    <% end %>
-    <%= dropdown.menu do |menu| %>
-        <form class="px-4 py-3">
-            <div class="form-group">
-                <label for="exampleDropdownFormEmail1">Email address</label>
-                <input type="email" class="form-control" id="exampleDropdownFormEmail1" placeholder="email@example.com">
-            </div>
-            <div class="form-group">
-                <label for="exampleDropdownFormPassword1">Password</label>
-                <input type="password" class="form-control" id="exampleDropdownFormPassword1" placeholder="Password">
-            </div>
-            <div class="form-group">
-                <div class="form-check">
-                    <input type="checkbox" class="form-check-input" id="dropdownCheck">
-                    <label class="form-check-label" for="dropdownCheck">
-                        Remember me
-                    </label>
-                </div>
-            </div>
-            <button type="submit" class="btn btn-primary">Sign in</button>
-        </form>
-        <%= menu.divider %>
-        <%= menu.link "New around here? Sign up", "#" %>
-        <%= menu.link "Forgot password", "#" %>
-    <% end %>
+  <%= dropdown.button :primary do %>
+    Login
+  <% end %>
+  <%= dropdown.menu do |menu| %>
+    <form class="px-4 py-3">
+      <div class="form-group">
+        <label for="exampleDropdownFormEmail1">Email address</label>
+        <input type="email" class="form-control" id="exampleDropdownFormEmail1" placeholder="email@example.com">
+      </div>
+      <div class="form-group">
+        <label for="exampleDropdownFormPassword1">Password</label>
+        <input type="password" class="form-control" id="exampleDropdownFormPassword1" placeholder="Password">
+      </div>
+      <div class="form-group">
+        <div class="form-check">
+          <input type="checkbox" class="form-check-input" id="dropdownCheck">
+          <label class="form-check-label" for="dropdownCheck">
+            Remember me
+          </label>
+        </div>
+      </div>
+      <button type="submit" class="btn btn-primary">Sign in</button>
+    </form>
+    <%= menu.divider %>
+    <%= menu.link "New around here? Sign up", "#" %>
+    <%= menu.link "Forgot password", "#" %>
+  <% end %>
 <% end %>
 ```
 
@@ -324,11 +307,10 @@ end
 # @option opts [Boolean] :static
 # @option opts [Boolean|Symbol] :fullscreen - true, :sm, :lg, :xl etc
 # @option opts [Symbol]  :size - :sm, :md, :lg etc
-# @return [String]
+# @yield  [Modal]
+# @return [Modal]
 #
-def modal_helper(opts = {}, &block)
-  Modal.new(self, opts, &block)
-end
+modal_helper(opts = {}, &block)
 ```
 
 > Note: When the `close_button` is not passed a block, it will default to the X icon.
@@ -381,9 +363,7 @@ The Nav component has the following methods:
 #
 # @return [String]
 #
-def nav_helper(*args, &block)
-  Nav.new(self, *args, &block)
-end
+nav_helper(*args, &block)
 ```
 
 #### Example
@@ -405,10 +385,60 @@ end
 <% end %>
 ```
 
+### Offcanvas
+
+```ruby
+# @overload offcanvas_helper(position, options)
+#   @param  [Symbol] position - :start, :end, :top, :bottom
+#   @param  [Hash] opts
+#   @option opts [String]  :id
+#   @option opts [String]  :class
+#   @option opts [Hash]    :data
+#   @option opts [Hash]    :aria
+#   @option opts [Boolean] :scrollable
+#   @option opts [Boolean|String] :backdrop - true, false, 'static'
+#
+# @overload offcanvas_helper(options)
+#   @param  [Hash] opts
+#   @option opts [String]  :id
+#   @option opts [String]  :class
+#   @option opts [Hash]    :data
+#   @option opts [Hash]    :aria
+#   @option opts [Boolean] :scrollable
+#   @option opts [Boolean|String] :backdrop - true, false, 'static'
+#
+# @yield  [Offcanvas]
+# @return [Offcanvas]
+#
+def offcanvas_helper(*args, &block)
+```
+
+#### Example
+
+```erb
+<%= offcanvas_helper scrollable: true do |off| %>
+  <%= off.link class: 'btn btn-danger' do %>
+      <strong>*</strong> Open sidebar
+  <% end %>
+
+  <%= off.content do |c| %>
+      <%= c.header do %>
+          <%= c.title { 'Sidebar content' } %>
+          <%= c.close_button class: 'btn btn-info' do %>
+              Close
+          <% end %>
+      <% end %>
+      <%= c.body do %>
+          <p>Some content in the sidebar!</p>
+      <% end %>
+  <% end %>
+<% end %>
+```
+
 ### Tabs
 
 ```ruby
- # @overload tab_helper(type, opts)
+# @overload tab_helper(type, opts)
 #   @param [Symbol|String] type - :tabs, :pills
 #   @param  [Hash] opts
 #   @option opts [String]  :id
@@ -421,11 +451,10 @@ end
 #   @option opts [String]  :class
 #   @option opts [Hash]    :data
 #
-# @return [String]
+# @yield  [Tab]
+# @return [Tab]
 #
 def tab_helper(*args, &block)
-  Tab.new(self, *args, &block)
-end
 ```
 
 #### Example
@@ -478,14 +507,13 @@ end
 ```ruby
 # @param  [Hash] args
 # @option opts [Symbol]  :type - :border, :grow
+# @option opts [Symbol]  :size - :sm
 # @option opts [String]  :id
 # @option opts [String]  :class
 # @option opts [Hash]    :data
-# @return [String]
+# @return [Spinner]
 #
-def spinner_helper(opts = {}, &block)
-  Spinner.new(self, opts, &block)
-end
+spinner_helper(opts = {}, &block)
 ```
 
 #### Example

data/lib/bootstrap5_helper/alert.rb

@@ -19,6 +19,7 @@ module Bootstrap5Helper
 
       @id          = args.fetch(:id,          uuid)
       @class       = args.fetch(:class,       '')
+      @data        = args.fetch(:data,        {})
       @dismissible = args.fetch(:dismissible, false)
       @content     = block || proc { '' }
     end
@@ -42,7 +43,7 @@ module Bootstrap5Helper
     # @return [String]
     #
     def to_s
-      content_tag :div, id: @id, class: container_class do
+      content_tag(:div, id: @id, class: container_class, data: @data) do
         concat(@dismissible ? close_button : '')
         @content.call(self)
       end

data/lib/bootstrap5_helper/card.rb

@@ -195,7 +195,7 @@ module Bootstrap5Helper
     # @return [String]
     #
     def image(src, opts = {})
-      (opts[:class] ||= '') << 'card-img'
+      (opts[:class] ||= '') << ' card-img'
       @template.image_tag(src, opts)
     end
 
@@ -207,7 +207,7 @@ module Bootstrap5Helper
     # @return [String]
     #
     def image_cap(src, type = :top, opts = {})
-      (opts[:class] ||= '') << "card-img-#{type}"
+      (opts[:class] ||= '') << " card-img-#{type}"
       @template.image_tag(src, opts)
     end
 

data/lib/bootstrap5_helper/card_with_nav_tab.rb

@@ -48,7 +48,7 @@ module Bootstrap5Helper
     #
     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[:class]   = (args[:class] || '') << ' nav-tabs card-header-tabs'
       args[:data]    = (args[:data]  || {}).merge('bs-toggle' => 'tab')
       args[:child]   = (args[:child] || {}).merge(
         data: {
@@ -80,7 +80,12 @@ module Bootstrap5Helper
     #
     #
     def to_s
-      content_tag :div, class: "card with-nav-tabs-#{@context}" do
+      content_tag(
+        :div,
+        class: "card with-nav-tabs-#{@context} #{@class}",
+        id:    @id,
+        data:  @data
+      ) do
         @content.call(self)
       end
     end

data/lib/bootstrap5_helper/modal.rb

@@ -197,7 +197,7 @@ module Bootstrap5Helper
       when TrueClass
         'modal-fullscreen'
       when String, Symbol
-        "modal-fullscreen-#{@fullscreen}-down	"
+        "modal-fullscreen-#{@fullscreen}-down "
       else
         ''
       end

data/lib/bootstrap5_helper/nav.rb

@@ -117,7 +117,7 @@ module Bootstrap5Helper
     # @return [String]
     #
     def to_s
-      content_tag(@tag, id: @id, class: "nav #{@class}") do
+      content_tag(@tag, id: @id, class: "nav #{@class}", data: @data) do
         @content.call(self)
       end
     end

data/lib/bootstrap5_helper/offcanvas.rb

@@ -146,12 +146,15 @@ module Bootstrap5Helper
 
     # Renders the component as a String, but only to the output bugger.
     #
-    # @return [NilClass]
+    # @note Was updated to return an empty string opposed to nil.
+    # @see changelog.md
+    #
+    # @return [String]
     #
     def to_s
       @content.call(self)
 
-      nil
+      ''
     end
 
     private

data/lib/bootstrap5_helper/overlay/menu.rb

@@ -32,8 +32,13 @@ module Bootstrap5Helper
       # @return [String]
       #
       def link(name = nil, options = nil, html_options = nil, &block)
-        html_options ||= {}
-        html_options[:class] = (html_options[:class] || '') << ' dropdown-item'
+        if block_given?
+          options ||= {}
+          options[:class] = (options[:class] || '') << ' dropdown-item'
+        else
+          html_options ||= {}
+          html_options[:class] = (html_options[:class] || '') << ' dropdown-item'
+        end
 
         nav_item_wrapper do
           @template.link_to(name, options, html_options, &block)

data/lib/bootstrap5_helper/overlay.rb

@@ -92,7 +92,7 @@ module Bootstrap5Helper
       end
     end
 
-    # Used to create a new <tt>Dropdown::Menu</tt>
+    # Used to create a new <tt>Overlay::Menu</tt>
     #
     # @param  [Hash] opts
     # @option opts [String] :id

data/lib/bootstrap5_helper/tab.rb

@@ -68,13 +68,13 @@ module Bootstrap5Helper
     #   string or DOM element, we want to return nil, so that only the output buffer on the sub components are
     #   returned.
     #
-    #   If we return the return value of the block, we will get the last element added to the input
-    #   buffer as an unescaped string.
+    # @note Was updated to return an empty string opposed to nil.
+    # @see changelog.md
     #
     def to_s
       @content.call(self)
 
-      nil
+      ''
     end
 
     def type_or_options(*args)

data/lib/bootstrap5_helper/version.rb

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

data/lib/bootstrap5_helper.rb

@@ -101,7 +101,7 @@ module Bootstrap5Helper
     Badge.new(self, *args, &block)
   end
 
-  # Internal helper, used with personal Bootstrap modifications.
+  # @note Internal helper, used with personal Bootstrap modifications.
   #
   #
   def callout_helper(*args, &block)
@@ -165,6 +165,8 @@ module Bootstrap5Helper
     Card.new(self, opts, &block)
   end
 
+  # @note Internal helper, used with personal Bootstrap modifications.
+  #
   # @overload card_with_nav_tab_helper(context, opts)
   #   @param [Symbol|String] context
   #   @param [Hash] opts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap5_helper
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Robert David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Rails helpers for generating Bootstrap 5 components.