rails_bootstrap_helper 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee1c2841c06b59376dd16d81282111b7c08b3a620a08646e1900971153b219a
-  data.tar.gz: d482b6bcf74136d0162b256a21948e4e7511d780566f3d54856d222963a7a315
+  metadata.gz: 4af6430f173e645b08fff8a98f0286c5f1eaadeb3cf6183078fb85c22c99955d
+  data.tar.gz: 48a034bec05931e09393615cf84bd240ee71cdd0f59b7d87da151001a827d092
 SHA512:
-  metadata.gz: 1c8442a396d61298e70d41ed612bbdd3e00f2d26688ad18f1d0acff45aa34f459650652742afeff3a9ff5873c86c8167d7017c17e6c2e25c47217f599b56cbcc
-  data.tar.gz: 2f11d83786de8d5367d274c038c3571da29f39edf7194cf45e2870888b1c3801f18d23937bcd81c1a3002d929bf681c16e5b0d20791e8775d398d41800cdf920
+  metadata.gz: 24d90670fea282c843b38bef5db914cd120aa2d8e2aea113b45c3ce650421ced50d6ea12bf71dcd39f6f9306f9882f17f685a75aab39409a41c60256ab9d9d89
+  data.tar.gz: 4709a255509f5d013dcecab801aa1f91644757f1245ff1b9f428606c25a91157bb6d9bb5e36021e05c2ea5356a7b708afc8033c6fa91d92fb6493c772796bbad

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.7.0 / 2023-03-09
+
+- Support for Bootstrap 5
+
 ## 1.6.2 / 2018-12-30
 
 - Support for nav link [https://getbootstrap.com/docs/4.2/components/navs/#base-nav](https://getbootstrap.com/docs/4.2/components/navs/#base-nav)

data/README.md

@@ -1,4 +1,4 @@
-# Bootstrap Helpers for Ruby on Rails 4 or 5
+# Bootstrap Helpers for Ruby on Rails
 
 [![Build Status](https://semaphoreci.com/api/v1/olimart/rails_bootstrap_helper/branches/bs4/badge.svg)](https://semaphoreci.com/olimart/rails_bootstrap_helper)
 

data/lib/rails_bootstrap_helper/helper.rb

@@ -1,40 +1,25 @@
 # coding: utf-8
 module RailsBootstrapHelper
   module Helper
-    def info_tag(text)
-      content_tag(:i, '', class: 'icon-info-sign', rel: 'tooltip', title: text) + " "
-    end
-
-    def status_tag(status, options = {})
-      klass = ["badge"]
-      if options.has_key?(:level)
-        klass << "badge-#{options.delete(:level).to_s}"
-      else
-        klass << "badge-secondary"
-      end
-      klass << options[:class].strip.split(/\s+/) unless options[:class].blank?
-      options[:class] = klass.flatten.join(" ")
-      content_tag(:span, status, options)
-    end
-
     def badge_tag(status, options = {})
       klass = ["badge"]
       if options.has_key?(:level)
-        klass << "badge-#{options.delete(:level).to_s}"
+        klass << "bg-#{options.delete(:level).to_s}"
       else
-        klass << "badge-secondary"
+        klass << "bg-secondary"
       end
       klass << options[:class].strip.split(/\s+/) unless options[:class].blank?
       options[:class] = klass.flatten.join(" ")
       content_tag(:span, status, options)
     end
+    alias_method :status_tag, :badge_tag
 
     def pill_badge_tag(status, options = {})
-      klass = ["badge badge-pill"]
+      klass = ["badge rounded-pill"]
       if options.has_key?(:level)
-        klass << "badge-#{options.delete(:level).to_s}"
+        klass << "text-bg-#{options.delete(:level).to_s}"
       else
-        klass << "badge-secondary"
+        klass << "text-bg-secondary"
       end
       klass << options[:class].strip.split(/\s+/) unless options[:class].blank?
       options[:class] = klass.flatten.join(" ")
@@ -48,7 +33,7 @@ module RailsBootstrapHelper
 
     def icon_link_to(text, url, options)
       icon = options.delete(:icon) if options.has_key?(:icon)
-      icon_tag = ''
+      icon_tag = ""
       if icon
         icon_klass = ["icon icon-#{icon}"]
         if options.has_key?(:white)
@@ -100,7 +85,7 @@ module RailsBootstrapHelper
       klass = ["icon icon-#{icon}"]
       klass << options[:class].strip.split(/\s+/) unless options[:class].blank?
       options[:class] = klass.flatten.join(" ")
-      content_tag(:span, '', class: options[:class], style: options[:style])
+      content_tag(:span, "", class: options[:class], style: options[:style])
     end
 
     def inline_svg(path)
@@ -109,7 +94,17 @@ module RailsBootstrapHelper
     end
 
     def nav_link(name, path)
-      content_tag :li, link_to(name, path, class: 'nav-link'), class: 'nav-item'
+      content_tag :li, link_to(name, path, class: "nav-link"), class: "nav-item"
+    end
+
+    def alert_tag(text, options = {}, &block)
+      klass = ["alert"]
+      if options.has_key?(:level)
+        klass << "alert-#{options.delete(:level).to_s}"
+      else
+        klass << "alert-secondary"
+      end
+      tag.div sanitize(text), class: klass, role: "alert"
     end
   end
 end

data/lib/rails_bootstrap_helper/version.rb

@@ -1,3 +1,3 @@
 module RailsBootstrapHelper
-  VERSION = "1.6.2"
+  VERSION = "1.7.0"
 end

data/rails_bootstrap_helper.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "railties",    ">= 4.0"
   gem.add_dependency "simple_form", ">= 3.0"
-  gem.add_development_dependency "thor",    "~> 0.14"
-  gem.add_development_dependency "bundler", ">= 1.0.0"
+  gem.add_development_dependency "thor"
+  gem.add_development_dependency "bundler", ">= 2"
   gem.add_development_dependency "rails",   ">= 4.0.0"
   gem.add_development_dependency "sqlite3"
-  gem.add_development_dependency "nokogiri", "~> 1.8.2"
+  gem.add_development_dependency "nokogiri"
 end

data/test/dummy/config/application.rb

@@ -41,11 +41,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.active_record.legacy_connection_handling = false
   end
 end
-

data/test/dummy/test/helpers/rails_bootstrap_helper_test.rb

@@ -5,30 +5,30 @@ class RailsBootstrapHelperTest < ActionView::TestCase
   tests RailsBootstrapHelper::Helper
 
   def test_status_tag
-    assert_equal '<span class="badge badge-secondary">Default</span>', status_tag("Default")
-    assert_equal '<span class="badge badge-success">Success</span>', status_tag("Success", level: 'success')
-    assert_equal '<span class="badge badge-warning">Warning</span>', status_tag("Warning", level: 'warning')
-    assert_equal '<span class="badge badge-important">Important</span>', status_tag("Important", level: 'important')
-    assert_equal '<span class="badge badge-info">Info</span>', status_tag("Info", level: 'info')
-    assert_equal '<span class="badge badge-inverse">Inverse</span>', status_tag("Inverse", level: 'inverse')
-    assert_equal '<span class="badge badge-inverse custom">Custom Class</span>', status_tag("Custom Class", level: 'inverse', class: "custom")
-    assert_equal '<span id="custom" class="badge badge-inverse">Custom ID</span>', status_tag("Custom ID", level: 'inverse', id: "custom")
+    assert_equal '<span class="badge bg-secondary">Default</span>', status_tag("Default")
+    assert_equal '<span class="badge bg-success">Success</span>', status_tag("Success", level: 'success')
+    assert_equal '<span class="badge bg-warning">Warning</span>', status_tag("Warning", level: 'warning')
+    assert_equal '<span class="badge bg-important">Important</span>', status_tag("Important", level: 'important')
+    assert_equal '<span class="badge bg-info">Info</span>', status_tag("Info", level: 'info')
+    assert_equal '<span class="badge bg-inverse">Inverse</span>', status_tag("Inverse", level: 'inverse')
+    assert_equal '<span class="badge bg-inverse custom">Custom Class</span>', status_tag("Custom Class", level: 'inverse', class: "custom")
+    assert_equal '<span id="custom" class="badge bg-inverse">Custom ID</span>', status_tag("Custom ID", level: 'inverse', id: "custom")
   end
 
   def test_badge_tag
-    assert_equal '<span class="badge badge-secondary">Default</span>', badge_tag("Default")
-    assert_equal '<span class="badge badge-success">Success</span>', badge_tag("Success", level: 'success')
-    assert_equal '<span class="badge badge-warning">Warning</span>', badge_tag("Warning", level: 'warning')
-    assert_equal '<span class="badge badge-danger">Danger</span>', badge_tag("Danger", level: 'danger')
-    assert_equal '<span class="badge badge-info">Info</span>', badge_tag("Info", level: 'info')
-    assert_equal '<span class="badge badge-primary">Primary</span>', badge_tag("Primary", level: 'primary')
-    assert_equal '<span class="badge badge-primary custom">Custom Class</span>', badge_tag("Custom Class", level: 'primary', class: "custom")
-    assert_equal '<span id="custom" class="badge badge-primary">Custom ID</span>', badge_tag("Custom ID", level: 'primary', id: "custom")
+    assert_equal '<span class="badge bg-secondary">Default</span>', badge_tag("Default")
+    assert_equal '<span class="badge bg-success">Success</span>', badge_tag("Success", level: 'success')
+    assert_equal '<span class="badge bg-warning">Warning</span>', badge_tag("Warning", level: 'warning')
+    assert_equal '<span class="badge bg-danger">Danger</span>', badge_tag("Danger", level: 'danger')
+    assert_equal '<span class="badge bg-info">Info</span>', badge_tag("Info", level: 'info')
+    assert_equal '<span class="badge bg-primary">Primary</span>', badge_tag("Primary", level: 'primary')
+    assert_equal '<span class="badge bg-primary custom">Custom Class</span>', badge_tag("Custom Class", level: 'primary', class: "custom")
+    assert_equal '<span id="custom" class="badge bg-primary">Custom ID</span>', badge_tag("Custom ID", level: 'primary', id: "custom")
   end
 
   def test_pill_badge_tag
-    assert_equal '<span class="badge badge-pill badge-secondary">Default</span>', pill_badge_tag("Default")
-    assert_equal '<span class="badge badge-pill badge-success">Success</span>', pill_badge_tag("Success", level: 'success')
+    assert_equal '<span class="badge rounded-pill text-bg-secondary">Default</span>', pill_badge_tag("Default")
+    assert_equal '<span class="badge rounded-pill text-bg-success">Success</span>', pill_badge_tag("Success", level: 'success')
   end
 
   def test_button_link_to
@@ -65,4 +65,10 @@ class RailsBootstrapHelperTest < ActionView::TestCase
     # content_tag :li, link_to(name, path, class: 'nav-link'), class: 'nav-item'
     assert_equal '<li class="nav-item"><a class="nav-link" href="http://google.com">Google</a></li>', nav_link("Google", "http://google.com")
   end
+
+  def test_alert_tag
+    assert_equal '<div class="alert alert-secondary" role="alert">boom</div>', alert_tag("boom")
+    assert_equal '<div class="alert alert-success" role="alert">boom</div>', alert_tag("boom", level: "success")
+    assert_equal '<div class="alert alert-secondary" role="alert">boom <a href="http://google.com">here</a></div>', alert_tag("boom #{link_to 'here', 'http://google.com'}")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_helper
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Hoang Nghiem
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -42,30 +42,30 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '0'
 description: Bootstrap Helpers for Ruby on Rails
 email:
 - hoangnghiem1711@gmail.com
@@ -166,7 +166,7 @@ files:
 homepage: https://github.com/olimart/rails_bootstrap_helper
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,9 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Bootstrap Helpers for Ruby on Rails
 test_files: