bootstrap-navbar 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ccbc5a37579d9b5af476053a83aa4afcb9fde6f440d434a625a1417ded422d3
-  data.tar.gz: c65fee68a97969d1b79250ed8a5d91a3ce8f75fe3ab54587d0d45620f125b90b
+  metadata.gz: 0cc392ed4fa1d3e83f5fc80c45d3ecdba6f40cc90d461121fd819f1007988041
+  data.tar.gz: 3a38e72073822df3b680f9d83fa3980d5b3d4a934ed4f4284f9a29a421643df7
 SHA512:
-  metadata.gz: 4d7d31ee966cc6d4e38be6ac10bd30487f546f5ffb4ce98692f87882e00edd95477104e301cea43f95821d2d82414930ed9416349e81bb66868983d30e3fc266
-  data.tar.gz: ca5b478631da2d7545688a8c2a5c78b0061bd3de6d3ca14c9a60bcef4a62b2babfe9c1ac9a56e5e20a85e7d92ff28ba0612cde82db5e284c49c109a24ed4ee5b
+  metadata.gz: 0c784e8696061c9e811d56ee4b4d09fba4f3f8060bad3d7881280664f4c54d4116fca3c9f06a342a82adbb90a278524e446b32b6548529fb15f219fc2333d7a6
+  data.tar.gz: bf113aeb8447827cf56e314a00c861840f76c98849caed084584c273fafb7d26d18aa6be36585c261eb65d2dbd4bfdbfcb7beff1b37a7f0d37186880ccbd5b65

data/lib/bootstrap-navbar/helpers/bootstrap5.rb

@@ -101,7 +101,7 @@ module BootstrapNavbar::Helpers::Bootstrap5
                      <a href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" role="button"#{link_attributes}>#{text}</a>
                      <ul#{wrapper_attributes}>
                        #{capture(&block) if block_given?}
-                     </div>
+                     </ul>
                    </li>
                  HTML
   end

data/lib/bootstrap-navbar/helpers.rb

@@ -1,13 +1,19 @@
 module BootstrapNavbar::Helpers
   def self.included(base)
-    if BootstrapNavbar.configuration.bootstrap_version.nil?
-      unless bootstrap_gem = %w(bootstrap bootstrap-sass).detect { |gem| Gem.loaded_specs.keys.include?(gem) }
-        raise 'Bootstrap version is not configured.'
+    BootstrapNavbar.configuration.bootstrap_version ||= begin
+      node_package_config = "node_modules/bootstrap/package.json"
+
+      case
+      when bootstrap_gem = %w(bootstrap bootstrap-sass).detect { |gem| Gem.loaded_specs.keys.include?(gem) }
+        bootstrap_gem_version = Gem.loaded_specs[bootstrap_gem].version
+        bootstrap_gem_version.segments.take(3).join('.')
+      when File.exist?(node_package_config)
+        JSON.load(File.read(node_package_config)).fetch("version")
+      else
+        raise "Could not determine Bootstrap version from gems or Node package."
       end
-      bootstrap_gem_version = Gem.loaded_specs[bootstrap_gem].version
-      bootstrap_version = bootstrap_gem_version.segments.take(3).join('.')
-      BootstrapNavbar.configuration.bootstrap_version = bootstrap_version
     end
+
     helper_version = BootstrapNavbar.configuration.bootstrap_version[0]
     base.send :include, const_get("Bootstrap#{helper_version}")
   end

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '3.2.0'
+  VERSION = '3.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2023-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar