bs5 0.0.15 → 0.0.20

data/app/views/bs5/examples/spinners/size/_example.html.erb

@@ -0,0 +1,3 @@
+<h2>Size</h2>
+<%= bs5_example(snippet: 'spinners/size/size1') %>
+<%= bs5_example(snippet: 'spinners/size/size2') %>

data/app/views/bs5/examples/spinners/size/size1.html.erb

@@ -0,0 +1,7 @@
+<%= bs5_spinner(text: 'Loading...', size: :small) %>
+
+<%= bs5_spinner(text: 'Loading...', size: :large) %>
+
+<%= bs5_spinner(text: 'Loading...', size: :small, grow: true) %>
+
+<%= bs5_spinner(text: 'Loading...', size: :large, grow: true) %>

data/app/views/bs5/examples/spinners/size/size2.html.erb

@@ -0,0 +1,3 @@
+<%= bs5_spinner(text: 'Loading...', style: 'width: 3rem; height: 3rem;') %>
+
+<%= bs5_spinner(text: 'Loading...', grow: true, style: 'width: 3rem; height: 3rem;') %>

data/app/views/bs5/examples/tooltips/default/buttons.html.erb

@@ -1,9 +1,9 @@
-<%= bs5_button_tag('Tooltip on top', bs5_tooltip('Tooltip on top', placement: :top).merge(style: :secondary)) %>
+<%= bs5_button_tag('Tooltip on top', bs5_tooltip('Tooltip on top', placement: :top).merge(color: :secondary)) %>
 
-<%= bs5_button_tag('Tooltip on right', bs5_tooltip('Tooltip on right', placement: :right).merge(style: :secondary)) %>
+<%= bs5_button_tag('Tooltip on right', bs5_tooltip('Tooltip on right', placement: :right).merge(color: :secondary)) %>
 
-<%= bs5_button_tag('Tooltip on bottom', bs5_tooltip('Tooltip on bottom', placement: :bottom).merge(style: :secondary)) %>
+<%= bs5_button_tag('Tooltip on bottom', bs5_tooltip('Tooltip on bottom', placement: :bottom).merge(color: :secondary)) %>
 
-<%= bs5_button_tag('Tooltip on left', bs5_tooltip('Tooltip on left', placement: :left).merge(style: :secondary)) %>
+<%= bs5_button_tag('Tooltip on left', bs5_tooltip('Tooltip on left', placement: :left).merge(color: :secondary)) %>
 
-<%= bs5_button_tag('Tooltip with HTML', bs5_tooltip('<em>Tooltip</em> <u>with</u> <b>HTML</b>', html: :true).merge(style: :secondary)) %>
+<%= bs5_button_tag('Tooltip with HTML', bs5_tooltip('<em>Tooltip</em> <u>with</u> <b>HTML</b>', html: :true).merge(color: :secondary)) %>

data/app/views/bs5/pages/alert.html.erb

@@ -1,5 +1,5 @@
 <h1 id='alert'>Alert</h1>
 <%= render 'bs5/examples/alert/default/example' %>
-<%= render 'bs5/examples/alert/style/example' %>
+<%= render 'bs5/examples/alert/color/example' %>
 <%= render 'bs5/examples/alert/additional_content/example' %>
 <%= render 'bs5/examples/alert/dismissable/example' %>

data/app/views/bs5/pages/badge.html.erb

@@ -1,4 +1,4 @@
 <h1 id='badge'>Badge</h1>
 <%= render 'bs5/examples/badge/default/example' %>
-<%= render 'bs5/examples/badge/style/example' %>
+<%= render 'bs5/examples/badge/color/example' %>
 <%= render 'bs5/examples/badge/pill/example' %>

data/app/views/bs5/pages/button_group.html.erb

@@ -0,0 +1,5 @@
+<h1>Button group</h1>
+<%= render 'bs5/examples/button_group/default/example' %>
+<%= render 'bs5/examples/button_group/button_toolbar/example' %>
+<%= render 'bs5/examples/button_group/sizing/example' %>
+<%= render 'bs5/examples/button_group/vertical/example' %>

data/app/views/bs5/pages/popovers.html.erb

@@ -0,0 +1,5 @@
+<h1>Popovers</h1>
+<%= render 'bs5/examples/popovers/default/example' %>
+<%= render 'bs5/examples/popovers/four_directions/example' %>
+<%= render 'bs5/examples/popovers/dismissable_on_next_click/example' %>
+<%= render 'bs5/examples/popovers/disabled_elements/example' %>

data/app/views/bs5/pages/spinners.html.erb

@@ -0,0 +1,7 @@
+<h1>Spinners</h1>
+<%= render 'bs5/examples/spinners/border/example' %>
+<%= render 'bs5/examples/spinners/colors/example' %>
+<%= render 'bs5/examples/spinners/growing/example' %>
+<%= render 'bs5/examples/spinners/options/example' %>
+<%= render 'bs5/examples/spinners/size/example' %>
+<%= render 'bs5/examples/spinners/buttons/example' %>

data/app/views/layouts/bs5/pages.html.erb

@@ -13,15 +13,18 @@
       <div class="col">
         <div class="sticky-top">
           <%= bs5_list_group(flush: true) do |lg| %>
-            <% lg.slot(:item, active: current_page?(pages_path('accordion'))) do %><%= link_to 'Accordion', pages_path('accordion') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('alert'))) do %><%= link_to 'Alert', pages_path('alert') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('badge'))) do %><%= link_to 'Badge', pages_path('badge') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('breadcrumb'))) do %><%= link_to 'Breadcrumb', pages_path('breadcrumb') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('buttons'))) do %><%= link_to 'Buttons', pages_path('buttons') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('close_button'))) do %><%= link_to 'Close button', pages_path('close_button') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('collapse'))) do %><%= link_to 'Collapse', pages_path('collapse') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('list_group'))) do %><%= link_to 'List group', pages_path('list_group') %><% end %>
-            <% lg.slot(:item, active: current_page?(pages_path('tooltips'))) do %><%= link_to 'Tooltips', pages_path('tooltips') %><% end %>
+            <% lg.item(active: current_page?(pages_path('accordion'))) do %><%= link_to 'Accordion', pages_path('accordion') %><% end %>
+            <% lg.item(active: current_page?(pages_path('alert'))) do %><%= link_to 'Alert', pages_path('alert') %><% end %>
+            <% lg.item(active: current_page?(pages_path('badge'))) do %><%= link_to 'Badge', pages_path('badge') %><% end %>
+            <% lg.item(active: current_page?(pages_path('breadcrumb'))) do %><%= link_to 'Breadcrumb', pages_path('breadcrumb') %><% end %>
+            <% lg.item(active: current_page?(pages_path('buttons'))) do %><%= link_to 'Buttons', pages_path('buttons') %><% end %>
+            <% lg.item(active: current_page?(pages_path('button_group'))) do %><%= link_to 'Button group', pages_path('button_group') %><% end %>
+            <% lg.item(active: current_page?(pages_path('close_button'))) do %><%= link_to 'Close button', pages_path('close_button') %><% end %>
+            <% lg.item(active: current_page?(pages_path('collapse'))) do %><%= link_to 'Collapse', pages_path('collapse') %><% end %>
+            <% lg.item(active: current_page?(pages_path('list_group'))) do %><%= link_to 'List group', pages_path('list_group') %><% end %>
+            <% lg.item(active: current_page?(pages_path('popovers'))) do %><%= link_to 'Popovers', pages_path('popovers') %><% end %>
+            <% lg.item(active: current_page?(pages_path('spinners'))) do %><%= link_to 'Spinners', pages_path('spinners') %><% end %>
+            <% lg.item(active: current_page?(pages_path('tooltips'))) do %><%= link_to 'Tooltips', pages_path('tooltips') %><% end %>
           <%- end %>
         </div>
       </div>

data/config/initializers/hash_refinement.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module HashRefinement
+  refine Hash do
+    def prefix_keys_with_bs
+      transform_keys! { |k| "bs_#{k}".to_sym }
+    end
+  end
+end

data/lib/bs5/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bs5
-  VERSION = '0.0.15'
+  VERSION = '0.0.20'
 end

data/lib/generators/bs5/install/templates/bs5.js

@@ -2,13 +2,23 @@ import * as bootstrap from "bootstrap";
 
 function tooltipify() {
   const tooltipTriggerList = [].slice.call(
-    document.querySelectorAll('[data-toggle="tooltip"]')
+    document.querySelectorAll('[data-bs-toggle="tooltip"]')
   );
   tooltipTriggerList.map(function (tooltipTriggerEl) {
     return new bootstrap.Tooltip(tooltipTriggerEl);
   });
 }
 
+function popoverify() {
+  const popoverTriggerList = [].slice.call(
+    document.querySelectorAll('[data-bs-toggle="popover"]')
+  );
+  popoverTriggerList.map(function (popoverTriggerEl) {
+    return new bootstrap.Popover(popoverTriggerEl);
+  });
+}
+
 export function start() {
+  popoverify();
   tooltipify();
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bs5
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.20
 platform: ruby
 authors:
 - Patrick Baselier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -59,61 +59,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.25.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.23.0
 - !ruby/object:Gem::Dependency
-  name: view_component
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
-  type: :runtime
+        version: '3.33'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: '3.33'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.33'
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.33'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,20 @@ files:
 - app/components/bs5/badge_component.rb
 - app/components/bs5/breadcrumb_component.html.erb
 - app/components/bs5/breadcrumb_component.rb
+- app/components/bs5/button_group_component.html.erb
+- app/components/bs5/button_group_component.rb
 - app/components/bs5/button_tag_component.rb
 - app/components/bs5/button_to_component.rb
+- app/components/bs5/button_toolbar_component.html.erb
+- app/components/bs5/button_toolbar_component.rb
 - app/components/bs5/close_button_component.html.erb
 - app/components/bs5/close_button_component.rb
 - app/components/bs5/example_component.html.erb
 - app/components/bs5/example_component.rb
 - app/components/bs5/list_group_component.html.erb
 - app/components/bs5/list_group_component.rb
+- app/components/bs5/spinner_component.html.erb
+- app/components/bs5/spinner_component.rb
 - app/controllers/bs5/application_controller.rb
 - app/controllers/bs5/pages_controller.rb
 - app/helpers/bs5/application_helper.rb
@@ -163,6 +169,8 @@ files:
 - app/helpers/bs5/examples_helper.rb
 - app/models/bs5/application_record.rb
 - app/service/bs5/collapse_service.rb
+- app/service/bs5/popover_service.rb
+- app/service/bs5/tooltip_service.rb
 - app/validators/style_validator.rb
 - app/views/bs5/examples/accordion/default/_example.html.erb
 - app/views/bs5/examples/accordion/default/snippet.html.erb
@@ -170,20 +178,30 @@ files:
 - app/views/bs5/examples/accordion/flush/snippet.html.erb
 - app/views/bs5/examples/alert/additional_content/_example.html.erb
 - app/views/bs5/examples/alert/additional_content/snippet.html.erb
+- app/views/bs5/examples/alert/color/_example.html.erb
+- app/views/bs5/examples/alert/color/snippet.html.erb
 - app/views/bs5/examples/alert/default/_example.html.erb
 - app/views/bs5/examples/alert/default/snippet.html.erb
 - app/views/bs5/examples/alert/dismissable/_example.html.erb
 - app/views/bs5/examples/alert/dismissable/snippet.html.erb
-- app/views/bs5/examples/alert/style/_example.html.erb
-- app/views/bs5/examples/alert/style/snippet.html.erb
+- app/views/bs5/examples/badge/color/_example.html.erb
+- app/views/bs5/examples/badge/color/snippet.html.erb
 - app/views/bs5/examples/badge/default/_example.html.erb
+- app/views/bs5/examples/badge/default/button.html.erb
 - app/views/bs5/examples/badge/default/snippet.html.erb
 - app/views/bs5/examples/badge/pill/_example.html.erb
 - app/views/bs5/examples/badge/pill/snippet.html.erb
-- app/views/bs5/examples/badge/style/_example.html.erb
-- app/views/bs5/examples/badge/style/snippet.html.erb
 - app/views/bs5/examples/breadcrumb/default/_example.html.erb
 - app/views/bs5/examples/breadcrumb/default/snippet.html.erb
+- app/views/bs5/examples/button_group/button_toolbar/_example.html.erb
+- app/views/bs5/examples/button_group/button_toolbar/snippet.html.erb
+- app/views/bs5/examples/button_group/button_toolbar/snippet2.html.erb
+- app/views/bs5/examples/button_group/default/_example.html.erb
+- app/views/bs5/examples/button_group/default/snippet.html.erb
+- app/views/bs5/examples/button_group/sizing/_example.html.erb
+- app/views/bs5/examples/button_group/sizing/snippet.html.erb
+- app/views/bs5/examples/button_group/vertical/_example.html.erb
+- app/views/bs5/examples/button_group/vertical/snippet.html.erb
 - app/views/bs5/examples/buttons/button_tag/block_buttons/_example.html.erb
 - app/views/bs5/examples/buttons/button_tag/block_buttons/block_buttons.html.erb
 - app/views/bs5/examples/buttons/button_tag/block_buttons/responsive_block_buttons_1.html.erb
@@ -234,6 +252,32 @@ files:
 - app/views/bs5/examples/list_group/style/default.html.erb
 - app/views/bs5/examples/list_group/with_badges/_example.html.erb
 - app/views/bs5/examples/list_group/with_badges/default.html.erb
+- app/views/bs5/examples/popovers/default/_example.html.erb
+- app/views/bs5/examples/popovers/default/snippet.html.erb
+- app/views/bs5/examples/popovers/disabled_elements/_example.html.erb
+- app/views/bs5/examples/popovers/disabled_elements/snippet.html.erb
+- app/views/bs5/examples/popovers/dismissable_on_next_click/_example.html.erb
+- app/views/bs5/examples/popovers/dismissable_on_next_click/snippet.html.erb
+- app/views/bs5/examples/popovers/four_directions/_example.html.erb
+- app/views/bs5/examples/popovers/four_directions/snippet.html.erb
+- app/views/bs5/examples/spinners/border/_example.html.erb
+- app/views/bs5/examples/spinners/border/snippet.html.erb
+- app/views/bs5/examples/spinners/buttons/_example.html.erb
+- app/views/bs5/examples/spinners/buttons/snippet.html.erb
+- app/views/bs5/examples/spinners/colors/_example.html.erb
+- app/views/bs5/examples/spinners/colors/snippet.html.erb
+- app/views/bs5/examples/spinners/growing/_example.html.erb
+- app/views/bs5/examples/spinners/growing/colors.html.erb
+- app/views/bs5/examples/spinners/growing/snippet.html.erb
+- app/views/bs5/examples/spinners/options/_example.html.erb
+- app/views/bs5/examples/spinners/options/floats.html.erb
+- app/views/bs5/examples/spinners/options/margin.html.erb
+- app/views/bs5/examples/spinners/options/placement_flex1.html.erb
+- app/views/bs5/examples/spinners/options/placement_flex2.html.erb
+- app/views/bs5/examples/spinners/options/text_align.html.erb
+- app/views/bs5/examples/spinners/size/_example.html.erb
+- app/views/bs5/examples/spinners/size/size1.html.erb
+- app/views/bs5/examples/spinners/size/size2.html.erb
 - app/views/bs5/examples/tooltips/default/_example.html.erb
 - app/views/bs5/examples/tooltips/default/buttons.html.erb
 - app/views/bs5/examples/tooltips/default/disabled_elements.html.erb
@@ -242,14 +286,18 @@ files:
 - app/views/bs5/pages/alert.html.erb
 - app/views/bs5/pages/badge.html.erb
 - app/views/bs5/pages/breadcrumb.html.erb
+- app/views/bs5/pages/button_group.html.erb
 - app/views/bs5/pages/buttons.html.erb
 - app/views/bs5/pages/close_button.html.erb
 - app/views/bs5/pages/collapse.html.erb
 - app/views/bs5/pages/list_group.html.erb
+- app/views/bs5/pages/popovers.html.erb
+- app/views/bs5/pages/spinners.html.erb
 - app/views/bs5/pages/tooltips.html.erb
 - app/views/layouts/bs5/application.html.erb
 - app/views/layouts/bs5/pages.html.erb
 - config/definitions.rb
+- config/initializers/hash_refinement.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/bs5.rb

data/app/views/bs5/examples/alert/style/_example.html.erb

@@ -1,2 +0,0 @@
-<h2>Style</h2>
-<%= bs5_example(snippet: 'alert/style/snippet') %>

data/app/views/bs5/examples/badge/style/_example.html.erb

@@ -1,2 +0,0 @@
-<h2>Background colors</h2>
-<%= bs5_example(snippet: 'badge/style/snippet') %>

data/app/views/bs5/examples/badge/style/snippet.html.erb

@@ -1,8 +0,0 @@
-<%= bs5_badge(text: 'Primary', style: :primary) %>
-<%= bs5_badge(text: 'Secondary', style: :secondary) %>
-<%= bs5_badge(text: 'Success', style: :success) %>
-<%= bs5_badge(text: 'Danger', style: :danger) %>
-<%= bs5_badge(text: 'Warning', style: :warning) %>
-<%= bs5_badge(text: 'Info', style: :info) %>
-<%= bs5_badge(text: 'Light', style: :light) %>
-<%= bs5_badge(text: 'Dark', style: :dark) %>