bootstrap-navbar 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae340ec10d941708a38d6e780fbca4dfc5e8c0bb5ad8d298b6c878aa8a8a0488
-  data.tar.gz: f9af62705e941e551cc67f600ee85527cafb8806b990a355b9365573bd180d70
+  metadata.gz: 0cc392ed4fa1d3e83f5fc80c45d3ecdba6f40cc90d461121fd819f1007988041
+  data.tar.gz: 3a38e72073822df3b680f9d83fa3980d5b3d4a934ed4f4284f9a29a421643df7
 SHA512:
-  metadata.gz: 4c1f91305af0eb3be5dc7fb62088252e936dce5f54bcb51d37270b00ee45ca050c55a8698c156e2c906c43b802f231d8a02c463d1c66d27cbdfbaff9e3582272
-  data.tar.gz: 754164f984fb18dfd737fa1fd3ace7328919c383d476702fc2645df60561853e21515960c2b73a1a94aecacc5f9b1d3c173e53a516b7e3c70b3048d7115fcddb
+  metadata.gz: 0c784e8696061c9e811d56ee4b4d09fba4f3f8060bad3d7881280664f4c54d4116fca3c9f06a342a82adbb90a278524e446b32b6548529fb15f219fc2333d7a6
+  data.tar.gz: bf113aeb8447827cf56e314a00c861840f76c98849caed084584c273fafb7d26d18aa6be36585c261eb65d2dbd4bfdbfcb7beff1b37a7f0d37186880ccbd5b65

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.1'
+  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.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 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.3.13
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar