twitter-bootstrap-markup-rails 0.3.2 → 0.3.2.1

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
+
 rvm:
   - 1.8.7
-  #- ree
   - 1.9.2
   - 1.9.3
-  #- jruby
   - rbx
+
+gemfile:
+  - Gemfile
+  - rails-3.gemfile
+  - rails-3.1.gemfile
+  - rails-3.2.gemfile

data/CONTRIBUTORS.md

@@ -5,3 +5,5 @@ Carlos Vilhena,  https://github.com/carvil
 Cristian Bica,   https://github.com/cristianbica
 Ryan Feng,       https://github.com/rfeng
 Kai Schlichting, https://github.com/lacco
+Ryan Wilcox,     https://github.com/rwilcox
+Vince Cima,      https://github.com/vincecima

data/Gemfile

@@ -3,13 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in bootstrap-rails.gemspec
 gemspec
 
+gem "rails"
+
 group :development do
-  gem "rails"
-  gem "rspec-rails"
-  gem "rspec_tag_matchers"
-  gem "rake"
   gem "yard"
   gem "redcarpet"
   gem "yard-tomdoc"
-  gem "simple-navigation"
 end

data/README.md

@@ -3,7 +3,7 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>v0.3.2</td>
+        <td>v0.3.2.1</td>
     </tr>
     <tr>
         <th>Build Status</th>
@@ -27,7 +27,7 @@ This gem focuses on making it easier to use Twitter's Bootstrap 2.0. It's a coll
 Add to your `Gemfile`:
 
 ```ruby
-gem 'twitter-bootstrap-markup-rails', '0.3.2'
+gem 'twitter-bootstrap-markup-rails', '0.3.2.1'
 ```
 
 ## Currently Supported

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

@@ -40,6 +40,7 @@ module Twitter::Bootstrap::Markup::Rails::Components
       classes = %w( nav )
       classes << "nav-#{ options[:type] || "tabs" }"
       classes << "nav-stacked" if options[:stacked]
+      classes << options[:custom_classes]
       classes.join(" ")
     end
   end

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

@@ -8,6 +8,7 @@ module Twitter::Bootstrap::Markup::Rails::Helpers
     # @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.
+    #            :custom_classes - add additional classes to the navigation UL
     #
     # Examples
     #

data/lib/twitter-bootstrap-markup-rails/plugins/simple_navigation/renderer/bootstrap_topbar_list.rb

@@ -55,7 +55,8 @@ class SimpleNavigation::Renderer::BootstrapTopbarList < SimpleNavigation::Render
     opts = special_options.merge(link_options)
     opts[:class] = [link_options[:class], item.selected_class, dropdown_link_class(item)].flatten.compact.join(' ')
     if include_sub_navigation?(item) && !options[:is_subnavigation]
-      opts['data-toggle'] = 'dropdown'
+      opts[:'data-toggle'] = 'dropdown'
+      opts[:'data-target'] = '#'
     end
     opts.delete(:class) if opts[:class].nil? || opts[:class] == ''
     opts

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

@@ -2,7 +2,7 @@ module Twitter
   module Bootstrap
     module Markup
       module Rails
-        VERSION = "0.3.2"
+        VERSION = "0.3.2.1"
       end
     end
   end

data/rails-3.1.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in bootstrap-rails.gemspec
+gemspec
+
+gem "rails", '~> 3.1.0'

data/rails-3.2.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in bootstrap-rails.gemspec
+gemspec
+
+gem "rails", '~> 3.2.0'
+

data/rails-3.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in bootstrap-rails.gemspec
+gemspec
+
+gem "rails", '~> 3.0.0'

data/spec/helpers/navigation_helpers_spec.rb

@@ -22,6 +22,18 @@ describe Twitter::Bootstrap::Markup::Rails::Helpers::NavigationHelpers do
       end
     end
 
+    it "should create a basic navigation list of type tabs with a custom, user specified, ID" do
+      build_bootstrap_navigation(:custom_classes => "testing") 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.testing') 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"

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
 # encoding: utf-8
 
-if RUBY_VERSION =~ /^1\.9/
-  require 'simplecov'
-  ENV["COVERAGE"] && SimpleCov.start
-end
-
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/twitter-bootstrap-markup-rails'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/twitter-bootstrap-markup-rails/engine'))
 

data/twitter-bootstrap-markup-rails.gemspec

@@ -17,4 +17,7 @@ Gem::Specification.new do |gem|
   gem.platform      = Gem::Platform::RUBY
 
   gem.add_dependency "railties", "~> 3.0"
+  gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency "rspec_tag_matchers"
+  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.3.2
+  version: 0.3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  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: rspec_tag_matchers
+  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: simple-navigation
+  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'
 description: Ruby on Rails helpers for Bootstrap 2.0 - HTML, CSS, and JS toolkit from
   Twitter
 email:
@@ -71,6 +119,9 @@ files:
 - lib/twitter-bootstrap-markup-rails/plugins/simple_navigation/renderer/bootstrap_topbar_list.rb
 - lib/twitter-bootstrap-markup-rails/version.rb
 - log/development.log
+- rails-3.1.gemfile
+- rails-3.2.gemfile
+- rails-3.gemfile
 - spec/helpers/alert_helpers_spec.rb
 - spec/helpers/button_helpers_spec.rb
 - spec/helpers/form_helpers_spec.rb