middleman-bootstrap-navbar 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1394a06043afd936ee6992313e020ad936111252
-  data.tar.gz: ec9156a62efa7028869b158797b2ae8feabe658f
+  metadata.gz: d6cc10d2d6d36697f3c8cc98f25cebf6d108a235
+  data.tar.gz: 8739a03d6aa19792f58c5273abded7a0b596b9ab
 SHA512:
-  metadata.gz: 0943ef20efe0e7c10ed6d9b999ef5a2dbfc248bb20becca3d723b701a86a3523a021133b4c1587f12052f5cb925b0d1eea5f868f6da4e7b760c0e961e88cdadb
-  data.tar.gz: 11a8235f81dbb8a9fddc5c0464f1997dcc0782a14bb0e895a981a4b1ec7271b54530f2dc25992753fe6deb8e81683abb3b82e9781abbf5913a07f44104a2c77f
+  metadata.gz: 5404bce3d0fbbe7aaf47c19b6bdcac8c061218b5ea0e6c14a5d4f569bdefcfd80fd439d65d1fde7ac35ba44aabba2f277bd5ceaf5e5a170e50000cfc4a5a8ce1
+  data.tar.gz: 4625390a7f4bfda5ddb6955cb1247c91eb37f20f00a2f6bd0f203b02bc88340e24e42ec4b24142be793cf090cf7475e4eedd9ab034a8de1785abd4f7fb533764

data/README.md

@@ -23,6 +23,14 @@ Or install it yourself as:
 
 ## Usage
 
+Activate in `config.rb` in your Middleman app:
+
+```ruby
+activate :bootstrap_navbar
+```
+
+Then generate your navbar:
+
 ```ruby
 = nav_bar fixed: :top, brand: "My great app", responsive: true do
   = menu_group do

data/Rakefile

@@ -0,0 +1,5 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

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

@@ -1,15 +1,6 @@
-unless defined?(Padrino::Helpers)
-  require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
-  require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
-end
-
 module Middleman
   module BootstrapNavbar
     module Helpers
-      include Padrino::Helpers::TagHelpers
-      include Padrino::Helpers::AssetTagHelpers
-      include Padrino::Helpers::OutputHelpers
-
       def nav_bar(options = {}, &block)
         nav_bar_div options do
           navbar_inner_div do
@@ -21,8 +12,7 @@ module Middleman
       def menu_group(options = {}, &block)
         classes = %w(nav)
         classes << "pull-#{options[:pull]}" if options.has_key?(:pull)
-        content = block_given? ? capture(&block) : nil
-        content_tag :ul, content, class: classes.join(' ')
+        content_tag :ul, nil, class: classes.join(' '), &block
       end
 
       def menu_item(name, path = '#', options = {})
@@ -34,9 +24,8 @@ module Middleman
       def drop_down(name, &block)
         content_tag :li, class: 'dropdown' do
           name_and_caret = "#{name} #{content_tag :b, nil, class: 'caret'}".html_safe
-          content = block_given? ? capture(&block) : nil
           link_to(name_and_caret, '#', class: 'dropdown-toggle', data: { toggle: 'dropdown' }) <<
-            content_tag(:ul, content, class: 'dropdown-menu')
+            content_tag(:ul, nil, class: 'dropdown-menu', &block)
         end
       end
 
@@ -57,8 +46,11 @@ module Middleman
         pull = options.delete(:pull)
         classes << "pull-#{pull}" if pull
         options[:class] = classes.join(' ')
-        content = text || capture(&block) || nil
-        content_tag :p, content, options
+        content_tag :p, text, options, &block
+      end
+
+      def brand_link(name, url = nil)
+        link_to name, (url || '/'), class: 'brand'
       end
 
       private
@@ -85,23 +77,18 @@ module Middleman
 
       def container_div(brand, brand_link, responsive, fluid, &block)
         content_tag :div, class: fluid ? 'container-fluid' : 'container' do
-          content = block_given? ? capture(&block) : nil
           [].tap do |parts|
             parts << responsive_button if responsive
             parts << brand_link(brand, brand_link) if brand || brand_link
             parts << if responsive
-              content_tag :div, content, class: 'nav-collapse collapse'
+              content_tag :div, nil, class: 'nav-collapse collapse', &block
             else
-              content
+              capture(&block)
             end
           end.join("\n").html_safe
         end
       end
 
-      def brand_link(name, url)
-        link_to name, (url || '/'), class: 'brand'
-      end
-
       def responsive_button
         content_tag :a, class: 'btn btn-navbar', data: { toggle: 'collapse', target: '.nav-collapse' } do
           (0..2).map do

data/lib/middleman-bootstrap-navbar/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module BootstrapNavbar
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/middleman-bootstrap-navbar.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r(^(test|spec|features)/))
   gem.require_paths = ['lib']
 
+  gem.add_development_dependency 'rake', '>= 10.0.0'
   gem.add_development_dependency 'rspec', '~> 2.13'
   gem.add_development_dependency 'rspec-html-matchers', '~> 0.4.1'
   gem.add_development_dependency 'guard-rspec', '~> 3.0'

data/spec/spec_helper.rb

@@ -7,3 +7,18 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.order = 'random'
 end
+
+unless defined?(Padrino::Helpers)
+  require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
+  require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
+end
+
+module Middleman
+  module BootstrapNavbar
+    module Helpers
+      include Padrino::Helpers::TagHelpers
+      include Padrino::Helpers::AssetTagHelpers
+      include Padrino::Helpers::OutputHelpers
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Manuel Meurer
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +92,7 @@ files:
 - Guardfile
 - LICENSE.txt
 - README.md
+- Rakefile
 - lib/middleman-bootstrap-navbar.rb
 - lib/middleman-bootstrap-navbar/helpers.rb
 - lib/middleman-bootstrap-navbar/version.rb