bootstrap-navbar 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c291f029a11735de42e487164788cb86bbaa462
-  data.tar.gz: 6e8c0b30ba8104a7d88c1cf145bbb42d82855e15
+SHA256:
+  metadata.gz: 15b5f788ee43d7dfc722cf75c28e91c2cb363a36f9a58ca6968301eae9977302
+  data.tar.gz: a2ab4b37f4a2de21dc662ab916849b62aff4ed9dbfea4f04dae19a9206a9464c
 SHA512:
-  metadata.gz: b2351d96b24a8637500d987bf290907659fdce0bc5d096d2a86442b03e69b9ffa488dfd7b8dfcfb4348dd7e9f6ecabb4b419c722961a7877c2b564c4392dc0d9
-  data.tar.gz: dc7e7ddd9a4aa90c073058bcc639fec8ba36e0cb16411e7c2050e203e81a9f9a921f2f739a4db5de0061ce9b990c3093a5008ae45d336611e52d94f1e3b80f0d
+  metadata.gz: 934a989f958b5e39c052e524ebeb49f061f6798bb02957fc464fee322848a918440efc61a6bbea102a728a7102ee784bb1decc8120a9504f58462154abb4eff6
+  data.tar.gz: 3d0d23275914693b2936406a955f9df128e9964e4e2361bf61c09b28b8bfca9502acd9ce4b3e84ac940f0075c91b271adc3b99f86e2cd5a0087307c96004792e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Add support for Bootstrap 4 (for real) - big thanks to Sebastian Menhofer! (https://github.com/bootstrap-ruby/bootstrap-navbar/pull/13)
+
 ## 2.4.0
 
 * Add support for `root_paths` configuration

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

@@ -67,27 +67,36 @@ HTML
 HTML
   end
 
-  def navbar_dropdown(text, target = '', list_item_options = {}, link_options = {}, ul_options = {}, &block)
+  def navbar_dropdown(text, id = '', list_item_options = {}, link_options = {}, &block)
     list_item_options, link_options = list_item_options.dup, link_options.dup
     list_item_options[:class] = [list_item_options[:class], 'nav-item', 'dropdown'].compact.join(' ')
     list_item_attributes = attributes_for_tag(list_item_options)
     link_options[:class] = [link_options[:class], 'nav-link', 'dropdown-toggle'].compact.join(' ')
-    target ||= "navbarDropdownMenuLink#{text}"
+    id ||= "navbarDropdownMenuLink#{text}"
     link_attributes = attributes_for_tag(link_options)
-    ul_options[:class] = [ul_options[:class], 'nav'].compact.join(' ')
-    ul_attributes = attributes_for_tag(ul_options)
     prepare_html <<-HTML.chomp!
 <li#{list_item_attributes}>
-  <a href="#" data-toggle="dropdown" data-target="##{target}"#{link_attributes}>#{text} <b class="caret"></b></a>
-  <div class="collapse" id="#{target}">
-    <ul#{ul_attributes}>
-      #{capture(&block) if block_given?}
-    </ul>
+  <a href="#" data-toggle="dropdown" id="##{id}" aria-haspopup="true" aria-expanded="false" role="button" #{link_attributes}>#{text}</a>
+  <div class="dropdown-menu" aria-labelledby="#{id}">
+    #{capture(&block) if block_given?}
   </div>
 </li>
 HTML
   end
 
+  def navbar_dropdown_item(text, url = '#', link_options = {}, &block)
+    link_options = link_options.dup
+    link_options[:class] = [link_options[:class], 'dropdown-item'].compact
+    link_options[:class] << 'active' if current_url_or_sub_url?(url)
+    link_options[:class]  = link_options[:class].join(' ')
+    link_attributes = attributes_for_tag(link_options)
+    prepare_html <<~HTML.chomp!
+      <a href="#{url}"#{link_attributes}>
+        #{text}
+      </a>
+    HTML
+  end
+
   private
 
   def container(&block)

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Helpers to generate a Bootstrap style navbar