twitter-bootstrap-markup-rails 0.1.0 → 0.2.0

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 .yardoc
 doc
+pkg

data/.rspec

@@ -0,0 +1 @@
+--order rand

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
   - 1.8.7
-  - ree
+  #- ree
   - 1.9.2
   - 1.9.3
-  - jruby
+  #- jruby
   - rbx

data/README.md

@@ -9,8 +9,8 @@ Installation
 
 Add to your `Gemfile`:
 
-    gem "twitter-bootstrap-markup-rails", :git => "git://github.com/pusewicz/twitter-bootstrap-markup-rails.git"
-    
+    gem "twitter-bootstrap-markup-rails", "0.1.0"
+
 Currently Supported
 ---
 
@@ -50,6 +50,15 @@ Notice Inline Label:
     bootstrap_inline_label_notice_tag("Info")
     # => '<span class="label notice">Info</span>'
 
+Plugins
+---
+
+### For [SimpleNavigation](https://github.com/andi/simple-navigation)
+
+If you are using `simple-navigation` gem you can use the navigation renderer like this:
+
+    render_navigation(level: 1..2, renderer: :bootstrap_topbar_list, expand_all: true)
+
 Contributing
 ---
 
@@ -93,6 +102,4 @@ This library aims to support and is [tested against](http://travis-ci.org/pusewi
 * Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
-* Ruby Enterprise Edition
 * Rubinius
-* JRuby 

data/Rakefile

@@ -7,12 +7,6 @@ require 'yard/rake/yardoc_task'
 
 task :default => :spec
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-  t.verbose = true
-end
-
 desc 'Test the plugin.'
 RSpec::Core::RakeTask.new('spec') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']

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

@@ -10,6 +10,7 @@ module Twitter
         autoload :Components, "twitter-bootstrap-markup-rails/components"
 
         require "twitter-bootstrap-markup-rails/engine" if defined?(::Rails)
+        require "twitter-bootstrap-markup-rails/plugins"
       end
     end
   end

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

@@ -0,0 +1,12 @@
+module Twitter
+  module Bootstrap
+    module Markup
+      module Rails
+        module Plugins
+          require "twitter-bootstrap-markup-rails/plugins/simple_navigation/renderer/bootstrap_topbar_list" if defined?(::SimpleNavigation)
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,67 @@
+# Renders an ItemContainer as a <ul> element and its containing items as <li> elements.
+# Prepared to use inside the topbar of Twitter Bootstrap http://twitter.github.com/bootstrap/#navigation
+#
+# Examples
+#
+#   render_navigation(level: 1..2, renderer: :bootstrap_topbar_list, expand_all: true)
+class SimpleNavigation::Renderer::BootstrapTopbarList < SimpleNavigation::Renderer::Base
+
+  def render(item_container)
+    if options[:is_subnavigation]
+      ul_class = "dropdown-menu"
+    else
+      ul_class = "nav"
+    end
+
+    list_content = item_container.items.inject([]) do |list, item|
+      li_options = item.html_options.reject {|k, v| k == :link}
+      if include_sub_navigation?(item)
+        li_options[:class] = [li_options[:class], "dropdown"].flatten.compact.join(' ')
+      end
+      li_content = tag_for(item)
+      if include_sub_navigation?(item)
+        li_content << render_sub_navigation_for(item)
+      end
+      list << content_tag(:li, li_content, li_options)
+    end.join
+    if skip_if_empty? && item_container.empty?
+      ''
+    else
+      content_tag(:ul, list_content, { :id => item_container.dom_id, :class => [item_container.dom_class, ul_class].flatten.compact.join(' ') })
+    end
+  end
+
+  def render_sub_navigation_for(item)
+    item.sub_navigation.render(self.options.merge(:is_subnavigation => true))
+  end
+
+  protected
+
+  def tag_for(item)
+    if item.url.nil?
+      content_tag('span', item.name, link_options_for(item).except(:method))
+    else
+      link_to(item.name, item.url, link_options_for(item))
+    end
+  end
+
+  # Extracts the options relevant for the generated link
+  #
+  def link_options_for(item)
+    special_options = {:method => item.method}.reject {|k, v| v.nil? }
+    link_options = item.html_options[:link] || {}
+    opts = special_options.merge(link_options)
+    opts[:class] = [link_options[:class], item.selected_class, dropdown_link_class(item)].flatten.compact.join(' ')
+    opts.delete(:class) if opts[:class].nil? || opts[:class] == ''
+    opts
+  end
+
+  def dropdown_link_class(item)
+    if include_sub_navigation?(item) && !options[:is_subnavigation]
+      "dropdown-toggle"
+    end
+  end
+end
+
+SimpleNavigation.register_renderer :bootstrap_topbar_list => SimpleNavigation::Renderer::BootstrapTopbarList
+

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

@@ -2,7 +2,7 @@ module Twitter
   module Bootstrap
     module Markup
       module Rails
-        VERSION = "0.1.0"
+        VERSION = "0.2.0"
       end
     end
   end

data/spec/helpers/alert_helpers_spec.rb

@@ -4,6 +4,53 @@ require 'spec_helper'
 describe Twitter::Bootstrap::Markup::Rails::Helpers::AlertHelpers do
   include BootstrapSpecHelper
 
+  describe "#bootstrap_alert_tag" do
+    before do
+      @output_buffer = ''
+    end
+
+    it "has no heading by default" do
+      concat bootstrap_alert_tag("Message", :heading => nil)
+      output_buffer.should_not have_tag('div strong')
+      output_buffer.should_not have_tag('div h4.alert-heading')
+    end
+
+    it "has alert class" do
+      concat bootstrap_alert_tag("Message")
+      output_buffer.should have_tag("div.alert")
+    end
+
+    it "has a message" do
+      concat bootstrap_alert_tag("Message")
+      output_buffer.should have_tag('div', /Message/)
+    end
+
+    it "has a close button when :close is true" do
+      concat bootstrap_alert_tag("Message", :close => true)
+      output_buffer.should have_tag('div a.close', /×/)
+    end
+
+    it "has no close button when :close is false" do
+      concat bootstrap_alert_tag("Message", :close => false)
+      output_buffer.should_not have_tag('div a.close')
+    end
+
+    it "has a dismiss tag" do
+      concat bootstrap_alert_tag("Message")
+      output_buffer.should have_tag('div a[data-dismiss="alert"]')
+    end
+
+    it "has a h4 heading when :block is true" do
+      concat bootstrap_alert_tag("message", :heading => "heading1", :block => true)
+      output_buffer.should have_tag('div h4.alert-heading', /heading1/)
+    end
+
+    it "has a strong heading when :block is false" do
+      concat bootstrap_alert_tag("Message", :heading => "Heading1", :block => false)
+      output_buffer.should have_tag('div strong', /Heading1/)
+    end
+  end
+
   %w(error success info).each do |type|
     describe "#bootstrap_alert_#{type}_block_tag" do
       before do

data/spec/plugins/bootstrap_topbar_list_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'simple_navigation'
+require "twitter-bootstrap-markup-rails/plugins/simple_navigation/renderer/bootstrap_topbar_list"
+
+describe SimpleNavigation::Renderer::BootstrapTopbarList do
+  it "registers the renderer" do
+    SimpleNavigation.registered_renderers.should include({
+      :bootstrap_topbar_list => SimpleNavigation::Renderer::BootstrapTopbarList
+    })
+  end
+end

data/spec/spec_helper.rb

@@ -5,71 +5,3 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../lib/twitter-boots
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/twitter-bootstrap-markup-rails/engine'))
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
-
-require 'active_support'
-require 'action_pack'
-require 'action_view'
-require 'action_controller'
-require 'action_dispatch'
-
-module FakeHelpersModule
-end
-
-module BootstrapSpecHelper
-  include ActionPack
-  include ActionView::Context if defined?(ActionView::Context)
-  include ActionController::RecordIdentifier
-  include ActionView::Helpers::FormHelper
-  include ActionView::Helpers::FormTagHelper
-  include ActionView::Helpers::FormOptionsHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
-  include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
-  include ActionView::Helpers::DateHelper
-  include ActionView::Helpers::CaptureHelper
-  include ActionView::Helpers::AssetTagHelper
-  include ActiveSupport
-  include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
-
-  def _routes
-    url_helpers = mock('url_helpers')
-    url_helpers.stub!(:hash_for_posts_path).and_return({})
-    url_helpers.stub!(:hash_for_post_path).and_return({})
-    url_helpers.stub!(:hash_for_post_models_path).and_return({})
-    url_helpers.stub!(:hash_for_authors_path).and_return({})
-
-    mock('_routes',
-         :url_helpers => url_helpers,
-         :url_for => "/mock/path"
-        )
-  end
-
-  def controller
-    env = mock('env', :[] => nil)
-    request = mock('request', :env => env)
-    mock('controller', :controller_path= => '', :params => {}, :request => request)
-  end
-
-  def default_url_options
-    {}
-  end
-
-  def self.included(base)
-    base.class_eval do
-
-      attr_accessor :output_buffer
-
-      def protect_against_forgery?
-        false
-      end
-
-      def _helpers
-        FakeHelpersModule
-      end
-
-    end
-  end
-end
-

data/spec/support/bootstrap_spec_helper.rb

@@ -0,0 +1,67 @@
+require 'active_support'
+require 'action_pack'
+require 'action_view'
+require 'action_controller'
+require 'action_dispatch'
+
+module FakeHelpersModule
+end
+
+module BootstrapSpecHelper
+  include ActionPack
+  include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::FormOptionsHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
+  include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
+  include ActionView::Helpers::DateHelper
+  include ActionView::Helpers::CaptureHelper
+  include ActionView::Helpers::AssetTagHelper
+  include ActiveSupport
+  include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
+
+  def _routes
+    url_helpers = mock('url_helpers')
+    url_helpers.stub!(:hash_for_posts_path).and_return({})
+    url_helpers.stub!(:hash_for_post_path).and_return({})
+    url_helpers.stub!(:hash_for_post_models_path).and_return({})
+    url_helpers.stub!(:hash_for_authors_path).and_return({})
+
+    mock('_routes',
+         :url_helpers => url_helpers,
+         :url_for => "/mock/path"
+        )
+  end
+
+  def controller
+    env = mock('env', :[] => nil)
+    request = mock('request', :env => env)
+    mock('controller', :controller_path= => '', :params => {}, :request => request)
+  end
+
+  def default_url_options
+    {}
+  end
+
+  def self.included(base)
+    base.class_eval do
+
+      attr_accessor :output_buffer
+
+      def protect_against_forgery?
+        false
+      end
+
+      def _helpers
+        FakeHelpersModule
+      end
+
+    end
+  end
+end
+

data/twitter-bootstrap-markup-rails.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/twitter-bootstrap-markup-rails/version', __FILE
 Gem::Specification.new do |gem|
   gem.authors       = ["Piotr Usewicz"]
   gem.email         = ["piotr@layer22.com"]
-  gem.description   = %q{Ruby on Rails helpers for HTML, CSS, and JS toolkit from Twitter}
-  gem.summary       = %q{Ruby on Rails helpers for HTML, CSS, and JS toolkit from Twitter}
+  gem.description   = %q{Ruby on Rails helpers for Bootstrap 2.0 - HTML, CSS, and JS toolkit from Twitter}
+  gem.summary       = %q{Ruby on Rails helpers for Bootstrap 2.0 - HTML, CSS, and JS toolkit from Twitter}
   gem.homepage      = "https://github.com/pusewicz/twitter-bootstrap-markup-rails"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -17,13 +17,14 @@ Gem::Specification.new do |gem|
   gem.platform      = Gem::Platform::RUBY
 
   gem.add_dependency "railties", "~> 3.0"
-  gem.add_development_dependency "rails",         "~> 3.0"
-  gem.add_development_dependency "rspec-rails",   "~> 2.8"
-  gem.add_development_dependency "guard",   "~> 0.10"
-  gem.add_development_dependency "guard-rspec",   "~> 0.6"
-  gem.add_development_dependency "rspec_tag_matchers", ">= 1.0.0"
+  gem.add_development_dependency "rails",              "~> 3.0"
+  gem.add_development_dependency "rspec-rails",        "~> 2.8"
+  gem.add_development_dependency "guard",              "~> 1.0"
+  gem.add_development_dependency "guard-rspec",        "~> 0.6"
+  gem.add_development_dependency "rspec_tag_matchers", ">= 1.0"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'yard'
   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.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70188163703920 !ruby/object:Gem::Requirement
+  requirement: &70220979225840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188163703920
+  version_requirements: *70220979225840
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70188163703080 !ruby/object:Gem::Requirement
+  requirement: &70220979225220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70188163703080
+  version_requirements: *70220979225220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70188163702600 !ruby/object:Gem::Requirement
+  requirement: &70220979224720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70188163702600
+  version_requirements: *70220979224720
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70188163701960 !ruby/object:Gem::Requirement
+  requirement: &70220979224240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70188163701960
+  version_requirements: *70220979224240
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70188163701260 !ruby/object:Gem::Requirement
+  requirement: &70220979223640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,21 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70188163701260
+  version_requirements: *70220979223640
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &70188163717020 !ruby/object:Gem::Requirement
+  requirement: &70220979223000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70188163717020
+  version_requirements: *70220979223000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70188163716640 !ruby/object:Gem::Requirement
+  requirement: &70220979222280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188163716640
+  version_requirements: *70220979222280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70188163716100 !ruby/object:Gem::Requirement
+  requirement: &70220979221040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188163716100
+  version_requirements: *70220979221040
 - !ruby/object:Gem::Dependency
   name: yard-tomdoc
-  requirement: &70188163715580 !ruby/object:Gem::Requirement
+  requirement: &70220979220400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,8 +109,20 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188163715580
-description: Ruby on Rails helpers for HTML, CSS, and JS toolkit from Twitter
+  version_requirements: *70220979220400
+- !ruby/object:Gem::Dependency
+  name: simple-navigation
+  requirement: &70220979219880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70220979219880
+description: Ruby on Rails helpers for Bootstrap 2.0 - HTML, CSS, and JS toolkit from
+  Twitter
 email:
 - piotr@layer22.com
 executables: []
@@ -118,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -132,12 +145,16 @@ files:
 - lib/twitter-bootstrap-markup-rails/helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/alert_helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/inline_label_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
 - log/development.log
 - spec/helpers/alert_helpers_spec.rb
 - spec/helpers/inline_label_helpers_spec.rb
 - spec/integration/action_view_spec.rb
+- spec/plugins/bootstrap_topbar_list_spec.rb
 - spec/spec_helper.rb
+- spec/support/bootstrap_spec_helper.rb
 - spec/support/test_environment.rb
 - twitter-bootstrap-markup-rails.gemspec
 homepage: https://github.com/pusewicz/twitter-bootstrap-markup-rails
@@ -160,14 +177,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Ruby on Rails helpers for HTML, CSS, and JS toolkit from Twitter
+summary: Ruby on Rails helpers for Bootstrap 2.0 - HTML, CSS, and JS toolkit from
+  Twitter
 test_files:
 - spec/helpers/alert_helpers_spec.rb
 - spec/helpers/inline_label_helpers_spec.rb
 - spec/integration/action_view_spec.rb
+- spec/plugins/bootstrap_topbar_list_spec.rb
 - spec/spec_helper.rb
+- spec/support/bootstrap_spec_helper.rb
 - spec/support/test_environment.rb
 has_rdoc: