twitter-bootstrap-markup-rails 0.2.1 → 0.2.2

data/.rspec

@@ -1 +1,2 @@
 --order rand
+--color

data/CONTRIBUTORS.md

@@ -0,0 +1,4 @@
+# Contributors
+
+Daniel Jabbour, https://github.com/djabbour
+Carlos Vilhena, https://github.com/carvil

data/README.md

@@ -3,7 +3,7 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>v0.2.1</td>
+        <td>v0.2.2</td>
     </tr>
     <tr>
         <th>Build Status</th>
@@ -26,7 +26,7 @@ This gem focuses on making it easier to use Twitter's Bootstrap 2.0. It's a coll
 
 Add to your `Gemfile`:
 
-    gem 'twitter-bootstrap-markup-rails', '0.2.1'
+    gem 'twitter-bootstrap-markup-rails', '0.2.2'
 
 ## Currently Supported
 
@@ -92,6 +92,68 @@ end
       </div>'
 ```
 
+Navigation lists:
+
+Basic tabs example:
+
+    bootstrap_navigation do |nav|
+      nav.link_to "Nav1", "/link1", :active_nav => true
+      nav.link_to "Nav2", "/link2"
+    end
+    # => <ul class="nav nav-tabs">
+           <li class="active">
+             <a href="/link1">Nav1</a>
+           </li>
+           <li>
+             <a href="/link2">Nav2</a>
+           </li>
+         </ul>
+
+Basic pills example:
+
+    bootstrap_navigation(:type => "pills") do |nav|
+      nav.link_to "Nav1", "/link1"
+      nav.link_to "Nav2", "/link2", :active_nav => true
+    end
+    # => <ul class="nav nav-pills">
+           <li>
+             <a href="/link1">Nav1</a>
+           </li>
+           <li class="active">
+             <a href="/link2">Nav2</a>
+           </li>
+         </ul>
+
+Stacked tabs example:
+
+    bootstrap_navigation(:type => "tabs", :stacked => true) do |nav|
+      nav.link_to "Nav1", "/link1", :active_nav => true
+      nav.link_to "Nav2", "/link2"
+    end
+    # => <ul class="nav nav-tabs nav-stacked">
+           <li class="active">
+             <a href="/link1">Nav1</a>
+           </li>
+           <li>
+             <a href="/link2">Nav2</a>
+           </li>
+         </ul>
+
+Stacked pills example:
+
+    bootstrap_navigation(:type => "pills", :stacked => true) do |nav|
+      nav.link_to "Nav1", "/link1"
+      nav.link_to "Nav2", "/link2", :active_nav => true
+    end
+    # => <ul class="nav nav-pills nav-stacked">
+           <li>
+             <a href="/link1">Nav1</a>
+           </li>
+           <li class="active">
+             <a href="/link2">Nav2</a>
+           </li>
+         </ul>
+
 Plugins
 ---
 

data/lib/twitter-bootstrap-markup-rails/components.rb

@@ -7,6 +7,7 @@ module Twitter::Bootstrap::Markup::Rails
     autoload :FormBuilder, 'twitter-bootstrap-markup-rails/components/form_builder'
     autoload :Button, 'twitter-bootstrap-markup-rails/components/button'
     autoload :ButtonDropdown, 'twitter-bootstrap-markup-rails/components/button_dropdown'
+    autoload :Navigation, 'twitter-bootstrap-markup-rails/components/navigation'
   end
 end
 

data/lib/twitter-bootstrap-markup-rails/components/navigation.rb

@@ -0,0 +1,47 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class Navigation < Base
+    attr_reader :collection
+
+    def initialize(elements, options = {})
+      super
+      @elements = elements
+    end
+
+    def to_s
+      output_buffer << content_tag(:ul, :class => build_class) do
+        html = ""
+
+        @elements.each do |e|
+          html_class = build_html_class(e)
+          html << content_tag(:li, e.to_s, html_class)
+        end
+
+        html.html_safe
+      end
+      super
+    end
+
+    private
+
+    def default_options
+      {}
+    end
+
+    def build_html_class(element)
+      html_class = {}
+      if element.options[:active_nav]
+        element.options.reject! {|k,v| k == :active_nav }
+        html_class = { :class => "active" }
+      end
+      html_class
+    end
+
+    def build_class
+      classes = %w( nav )
+      classes << "nav-#{ options[:type] || "tabs" }"
+      classes << "nav-stacked" if options[:stacked]
+      classes.join(" ")
+    end
+  end
+end
+

data/lib/twitter-bootstrap-markup-rails/engine.rb

@@ -8,6 +8,7 @@ module Twitter::Bootstrap::Markup::Rails
         include Twitter::Bootstrap::Markup::Rails::Helpers::InlineLabelHelpers
         include Twitter::Bootstrap::Markup::Rails::Helpers::FormHelpers
         include Twitter::Bootstrap::Markup::Rails::Helpers::ButtonHelpers
+        include Twitter::Bootstrap::Markup::Rails::Helpers::NavigationHelpers
       end
     end
   end

data/lib/twitter-bootstrap-markup-rails/helpers.rb

@@ -4,6 +4,7 @@ module Twitter::Bootstrap::Markup::Rails
     autoload :InlineLabelHelpers, 'twitter-bootstrap-markup-rails/helpers/inline_label_helpers'
     autoload :FormHelpers, 'twitter-bootstrap-markup-rails/helpers/form_helpers'
     autoload :ButtonHelpers, 'twitter-bootstrap-markup-rails/helpers/button_helpers'
+    autoload :NavigationHelpers, 'twitter-bootstrap-markup-rails/helpers/navigation_helpers'
   end
 end
 

data/lib/twitter-bootstrap-markup-rails/helpers/navigation_helpers.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+module Twitter::Bootstrap::Markup::Rails::Helpers
+  module NavigationHelpers
+
+    # Render a navigation list
+    #
+    # @param [Hash] options hash containing options (default: {}):
+    #            :type    - could be either 'tabs' or 'pills'. Default is 'tabs'.
+    #            :stacked - if true, renders the navigation list in stacked mode.
+    #
+    # Examples
+    #
+    #   bootstrap_navigation(:type => "tabs", :stacked => true) do |nav|
+    #     nav.link_to "Nav1", "/link1", :active_nav => true
+    #     nav.link_to "Nav2", "/link2"
+    #   end
+    #
+    # Returns HTML String for the navigation list
+    def bootstrap_navigation(options = {})
+      elements = Twitter::Bootstrap::Markup::Rails::HelperCollection.new(self)
+
+      yield elements
+
+      Twitter::Bootstrap::Markup::Rails::Components::Navigation.new(
+        elements,
+        options
+      ).to_s
+    end
+
+  end
+end
+

data/lib/twitter-bootstrap-markup-rails/version.rb

@@ -2,7 +2,7 @@ module Twitter
   module Bootstrap
     module Markup
       module Rails
-        VERSION = "0.2.1"
+        VERSION = "0.2.2"
       end
     end
   end

data/spec/helpers/navigation_helpers_spec.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Twitter::Bootstrap::Markup::Rails::Helpers::NavigationHelpers do
+  include BootstrapSpecHelper
+  include BootstrapNavigationMacros
+
+  describe "#bootstrap_navigation" do
+    before do
+      @output_buffer = ''
+    end
+
+    it "should create a basic navigation list of type tabs" do
+      build_bootstrap_navigation do |nav|
+        nav.link_to "Nav1", "/link1", :active_nav => true
+        nav.link_to "Nav2", "/link2"
+      end
+
+      output_buffer.should have_tag('ul.nav.nav-tabs') do |ul|
+        ul.should have_tag('li[@class="active"] a[@href="/link1"]')
+        ul.should have_tag('li a[@href="/link1"]')
+      end
+    end
+
+    it "should create a basic navigation list of type pills" do
+      build_bootstrap_navigation(:type => "pills") do |nav|
+        nav.link_to "Nav1", "/link1"
+        nav.link_to "Nav2", "/link2", :active_nav => true
+      end
+
+      output_buffer.should have_tag('ul.nav.nav-pills') do |ul|
+        ul.should have_tag('li a[@href="/link1"]')
+        ul.should have_tag('li[class="active"] a[@href="/link2"]')
+      end
+    end
+
+    it "should create a vertical navigation list of type tabs when called with a list of links" do
+      build_bootstrap_navigation(:type => "tabs", :stacked => true) do |nav|
+        nav.link_to "Nav1", "/link1", :active_nav => true
+        nav.link_to "Nav2", "/link2"
+      end
+
+      output_buffer.should have_tag('ul.nav.nav-tabs.nav-stacked') do |ul|
+        ul.should have_tag('li[@class="active"] a[@href="/link1"]')
+        ul.should have_tag('li a[@href="/link1"]')
+      end
+    end
+
+    it "should create a vertical navigation list of type pills when called with a list of links" do
+      build_bootstrap_navigation(:type => "pills", :stacked => true) do |nav|
+        nav.link_to "Nav1", "/link1"
+        nav.link_to "Nav2", "/link2", :active_nav => true
+      end
+
+      output_buffer.should have_tag('ul.nav.nav-pills.nav-stacked') do |ul|
+        ul.should have_tag('li a[@href="/link1"]')
+        ul.should have_tag('li[@class="active"] a[@href="/link2"]')
+      end
+    end
+  end
+end

data/spec/integration/action_view_spec.rb

@@ -16,4 +16,8 @@ describe ActionView::Base do
   it "includes inline form helpers" do
     @view.ancestors.should include(Twitter::Bootstrap::Markup::Rails::Helpers::FormHelpers)
   end
+
+  it "includes inline navigation helpers" do
+    @view.ancestors.should include(Twitter::Bootstrap::Markup::Rails::Helpers::NavigationHelpers)
+  end
 end

data/spec/support/bootstrap_navigation_macros.rb

@@ -0,0 +1,8 @@
+module BootstrapNavigationMacros
+  def build_bootstrap_navigation(options = {}, &block)
+    nav = bootstrap_navigation(options) do |d|
+      block.call d
+    end
+    concat nav
+  end
+end

data/twitter-bootstrap-markup-rails.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec_tag_matchers", ">= 1.0"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'redcarpet'
   gem.add_development_dependency 'yard-tomdoc'
   gem.add_development_dependency 'simple-navigation'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-markup-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard-tomdoc
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +198,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CONTRIBUTORS.md
 - Gemfile
 - Guardfile
 - README.md
@@ -197,6 +214,7 @@ files:
 - lib/twitter-bootstrap-markup-rails/components/form/label.rb
 - lib/twitter-bootstrap-markup-rails/components/form_builder.rb
 - lib/twitter-bootstrap-markup-rails/components/inline_label.rb
+- lib/twitter-bootstrap-markup-rails/components/navigation.rb
 - lib/twitter-bootstrap-markup-rails/engine.rb
 - lib/twitter-bootstrap-markup-rails/helper_collection.rb
 - lib/twitter-bootstrap-markup-rails/helpers.rb
@@ -204,6 +222,7 @@ files:
 - lib/twitter-bootstrap-markup-rails/helpers/button_helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/form_helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/inline_label_helpers.rb
+- lib/twitter-bootstrap-markup-rails/helpers/navigation_helpers.rb
 - lib/twitter-bootstrap-markup-rails/plugins.rb
 - lib/twitter-bootstrap-markup-rails/plugins/simple_navigation/renderer/bootstrap_topbar_list.rb
 - lib/twitter-bootstrap-markup-rails/version.rb
@@ -212,12 +231,14 @@ files:
 - spec/helpers/button_helpers_spec.rb
 - spec/helpers/form_helpers_spec.rb
 - spec/helpers/inline_label_helpers_spec.rb
+- spec/helpers/navigation_helpers_spec.rb
 - spec/integration/action_view_spec.rb
 - spec/integration/readme_spec.rb
 - spec/plugins/bootstrap_topbar_list_spec.rb
 - spec/spec_helper.rb
 - spec/support/bootstrap_button_macros.rb
 - spec/support/bootstrap_form_macros.rb
+- spec/support/bootstrap_navigation_macros.rb
 - spec/support/bootstrap_spec_helper.rb
 - spec/support/test_environment.rb
 - twitter-bootstrap-markup-rails.gemspec
@@ -251,12 +272,14 @@ test_files:
 - spec/helpers/button_helpers_spec.rb
 - spec/helpers/form_helpers_spec.rb
 - spec/helpers/inline_label_helpers_spec.rb
+- spec/helpers/navigation_helpers_spec.rb
 - spec/integration/action_view_spec.rb
 - spec/integration/readme_spec.rb
 - spec/plugins/bootstrap_topbar_list_spec.rb
 - spec/spec_helper.rb
 - spec/support/bootstrap_button_macros.rb
 - spec/support/bootstrap_form_macros.rb
+- spec/support/bootstrap_navigation_macros.rb
 - spec/support/bootstrap_spec_helper.rb
 - spec/support/test_environment.rb
 has_rdoc: