twitter-bootstrap-markup-rails 0.2.0 → 0.2.1

data/.gitignore

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

data/README.md

@@ -1,21 +1,39 @@
-Twitter Bootstrap 2.0 Markup for Rails [![Build Status](https://secure.travis-ci.org/pusewicz/twitter-bootstrap-markup-rails.png)](http://travis-ci.org/pusewicz/twitter-bootstrap-markup-rails) [![Dependency Status](https://gemnasium.com/pusewicz/twitter-bootstrap-markup-rails.png)](https://gemnasium.com/pusewicz/twitter-bootstrap-markup-rails)
-===
+# Twitter Bootstrap 2.0 Markup for Rails
+
+<table>
+    <tr>
+        <th>Version</th>
+        <td>v0.2.1</td>
+    </tr>
+    <tr>
+        <th>Build Status</th>
+        <td><a href="http://travis-ci.org/pusewicz/twitter-bootstrap-markup-rails"><img src="https://secure.travis-ci.org/pusewicz/twitter-bootstrap-markup-rails.png"></a></td>
+    </tr>
+    <tr>
+        <th>Dependency Status</th>
+        <td><a href="https://gemnasium.com/pusewicz/twitter-bootstrap-markup-rails"><img src="https://gemnasium.com/pusewicz/twitter-bootstrap-markup-rails.png"></a></td>
+    </tr>
+    <tr>
+        <th>Changelog</th>
+        <td><a href="https://github.com/pusewicz/twitter-bootstrap-markup-rails/wiki/Changelog">Changelog</a></td>
+    </tr>
+</table>
 
 This gem focuses on making it easier to use Twitter's Bootstrap 2.0. It's a collection of helpers which should make it faster to use all the components provided by Twitter Bootstrap.
 
 
-Installation
----
+## Installation
 
 Add to your `Gemfile`:
 
-    gem "twitter-bootstrap-markup-rails", "0.1.0"
+    gem 'twitter-bootstrap-markup-rails', '0.2.1'
 
-Currently Supported
----
+## Currently Supported
 
 * Alert messages
 * Inline labels
+* Buttons
+* Button dropdowns
 
 Documentation
 ---
@@ -50,6 +68,30 @@ Notice Inline Label:
     bootstrap_inline_label_notice_tag("Info")
     # => '<span class="label notice">Info</span>'
 
+Buttons:
+
+    bootstrap_button("Button Text", "#")
+    # => '<a class="btn" href="#">Button Text</a>'
+
+Dropdown Buttons:
+
+```
+bootstrap_button_dropdown do |b|
+    b.bootstrap_button "Button Title", "#"
+    b.link_to "First Dropdown Item", @item
+    b.link_to "Second Dropdown Item", @item2
+end
+# => '<div class="btn-group">
+        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+            Button Title
+            <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu">
+            <!-- dropdown menu links -->
+        </ul>
+      </div>'
+```
+
 Plugins
 ---
 

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

@@ -6,6 +6,8 @@ module Twitter
       module Rails
         require "twitter-bootstrap-markup-rails/version"
 
+        require "twitter-bootstrap-markup-rails/helper_collection"
+
         autoload :Helpers, "twitter-bootstrap-markup-rails/helpers"
         autoload :Components, "twitter-bootstrap-markup-rails/components"
 

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

@@ -3,6 +3,10 @@ module Twitter::Bootstrap::Markup::Rails
     autoload :Base, 'twitter-bootstrap-markup-rails/components/base'
     autoload :Alert, 'twitter-bootstrap-markup-rails/components/alert'
     autoload :InlineLabel, 'twitter-bootstrap-markup-rails/components/inline_label'
+    autoload :Form, 'twitter-bootstrap-markup-rails/components/form'
+    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'
   end
 end
 

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

@@ -0,0 +1,66 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class Button < Base
+    attr_reader :text
+
+    def initialize(text, link, options = {})
+      super
+      @text = text
+      @link = link
+    end
+
+    def to_s
+      html_text = ""
+      html_text << build_icon.html_safe << ' ' if options[:icon]
+      html_text << text
+      html_text << ' ' << build_caret.html_safe if options[:dropdown]
+
+      output_buffer << content_tag(:a, html_text.html_safe, build_tag_options).html_safe
+      super
+    end
+
+    private
+    def default_options
+      {
+        :class      => "btn",
+        :type       => [],
+        :disabled   => false,
+        :icon_white => false,
+        :dropdown   => false,
+        :id         => nil
+      }
+    end
+
+    def build_class
+      classes = [options[:class]]
+
+      if options[:type].is_a?(Array)
+        classes = classes | options[:type].map{|c| c.to_s}
+      else
+        classes << options[:type]
+      end
+
+      classes << 'dropdown-toggle' if options[:dropdown]
+      classes << 'disabled' if options[:disabled]
+
+      classes.join(" ")
+    end
+
+    def build_icon
+      klass = options[:icon]
+      klass << ' icon-white' if options[:icon_white]
+      content_tag(:i, nil, :class => klass)
+    end
+
+    def build_caret
+      content_tag(:span, nil, :class => 'caret')
+    end
+
+    def build_tag_options
+      ops = {:href => @link, :class => build_class}
+      ops[:"data-toggle"] = 'dropdown' if options[:dropdown]
+      ops[:id] = options[:id] if options[:id]
+      ops
+    end
+  end
+end
+

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

@@ -0,0 +1,44 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class ButtonDropdown < Base
+    attr_reader :collection
+
+    def initialize(elements, options = {})
+      super
+      @elements = elements
+    end
+
+    def to_s
+      output_buffer << content_tag(:div, :class => 'btn-group') do
+        html=''
+        html << build_dropdown
+
+        html << content_tag(:ul, :class => 'dropdown-menu') do
+          menu = ''
+          @elements.each do |e|
+            menu << content_tag(:li, e.to_s)
+          end
+          menu.html_safe
+        end
+
+        html.html_safe
+      end
+      super
+    end
+
+    private
+    def default_options
+      {}
+    end
+
+    def build_dropdown
+      if @elements.size > 0
+        dropdown = @elements.shift
+        dropdown.options[:dropdown] = true
+        dropdown.to_s
+      else
+        ''
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,14 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class Form < Base
+    autoload :InputField, 'twitter-bootstrap-markup-rails/components/form/input_field'
+    autoload :Label, 'twitter-bootstrap-markup-rails/components/form/label'
+
+    include ActionView::Helpers::FormHelper
+
+    protected
+
+    def default_options
+      {}
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class Form::InputField < Form
+    attr_accessor :input_html, :label_html
+
+    def initialize(object_name, method, input_html, options = {})
+      super(options)
+      @input_html = input_html
+      @label_html = Label.new(object_name, method, options) if options[:label] || options[:label_text]
+    end
+
+    def to_s
+      output_buffer << content_tag(:div, :class => 'control-group') do
+        html = ''
+        html << label_html.to_s
+        html << content_tag(:div, :class => 'controls') do
+          build_input_wrapper << build_help_text
+        end
+        html.html_safe
+      end
+      super
+    end
+
+    private
+
+    def build_input_wrapper
+      if options[:add_on]
+        build_add_on_wrapper
+      else
+        input_html
+      end
+    end
+
+    def build_help_text
+      html = ''
+      html = content_tag(:p, options[:help_text], :class => 'help-block') if options[:help_text]
+      html.html_safe
+    end
+
+    def build_add_on_wrapper
+      content_tag(:div, :class => "input-#{options[:add_on][:position] || 'prepend'}") do
+        add_on = ''
+        add_on << input_html
+        add_on << content_tag(:span, :class => 'add-on') do
+          add_on_content = ''
+          add_on_content << content_tag(:i, '', :class => options[:add_on][:icon]) if options[:add_on][:icon]
+          add_on_content << options[:add_on][:text] if options[:add_on][:text]
+          add_on_content.html_safe
+        end
+        add_on.html_safe
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class Form::Label < Form
+    def initialize(object_name, method, options)
+      super(options)
+      output_buffer << label(object_name, method, options[:label_text], :class => 'control-label')
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class FormBuilder < ActionView::Helpers::FormBuilder
+    def text_field(method, options={})
+      input_html = super(method, options)
+      Form::InputField.new(object_name, method, input_html, options).to_s
+    end
+
+    def password_field(method, options={})
+      input_html = super(method, options)
+      Form::InputField.new(object_name, method, input_html, options).to_s
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module Twitter::Bootstrap::Markup::Rails
       ActiveSupport.on_load(:action_view) do
         include Twitter::Bootstrap::Markup::Rails::Helpers::AlertHelpers
         include Twitter::Bootstrap::Markup::Rails::Helpers::InlineLabelHelpers
+        include Twitter::Bootstrap::Markup::Rails::Helpers::FormHelpers
+        include Twitter::Bootstrap::Markup::Rails::Helpers::ButtonHelpers
       end
     end
   end

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

@@ -0,0 +1,56 @@
+module Twitter::Bootstrap::Markup::Rails
+  class HelperCollection
+    attr_accessor :calls, :view
+
+    def initialize(view)
+      @view = view
+      @calls = []
+    end
+
+    def method_missing(symbol, *args, &block)
+      @calls << HelperMethodCall.new(@view, symbol, args, block)
+    end
+
+    def each
+      @calls.each do |c|
+        yield c
+      end
+    end
+
+    def [](x)
+      @calls[x]
+    end
+
+    def size
+      @calls.size
+    end
+
+    def shift
+      @calls.shift
+    end
+  end
+
+  class HelperMethodCall
+    attr_accessor :method, :options, :args
+
+    def initialize(view, symbol, args, block)
+      @view = view
+      @method = symbol
+      @options = args.extract_options!
+      @args = args
+      @block = block
+    end
+
+    def to_s
+      args = @args
+      args << @options
+
+      if @block
+        @view.send(@method, *args, &@block).html_safe
+      else
+        @view.send(@method, *args).html_safe
+      end
+    end
+
+  end
+end

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

@@ -2,6 +2,8 @@ module Twitter::Bootstrap::Markup::Rails
   module Helpers
     autoload :AlertHelpers, 'twitter-bootstrap-markup-rails/helpers/alert_helpers'
     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'
   end
 end
 

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

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+module Twitter::Bootstrap::Markup::Rails::Helpers
+  module ButtonHelpers
+    # Render a bootstrap button
+    #
+    # @param [String] text for the button face
+    # @param [String] link for the button href
+    # @param [Hash] options hash containing options (default: {}):
+    #           :type       - Additional button type(s). For one, just specify a string, but
+    #                         you can also pass an array (of sym or str) for multiple classes
+    #           :disabled   - Will disable the button if set to true
+    #           :icon       - Specify an icon class from bootstrap to prepend
+    #           :icon_white - Specify true if you want the icon to be white
+    #           :id         - Assign an ID to the button
+    #
+    # Examples
+    #
+    #   bootstrap_button 'Search', '#', :type => 'btn-primary', :icon => 'icon-search'
+    #
+    def bootstrap_button(text, link, options = {})
+      Twitter::Bootstrap::Markup::Rails::Components::Button.new(
+        text,
+        link,
+        options
+      ).to_s
+    end
+
+    # Render a dropdown button
+    #
+    # @param [Hash] options hash containing options (default: {}):
+    #
+    # Examples
+    #
+    #   bootstrap_button_dropdown do |e|
+    #     e.bootstrap_button "Button Title", "http://google.com"
+    #     e.link_to "Blah", @blah
+    #   end
+    #
+    # Returns HTML String for the dropdown
+    #
+    def bootstrap_button_dropdown(options = {})
+      # Elements will hold every call made to this block. Self is passed in so the
+      # elements can be sent to it in order to be evaluated
+      elements = Twitter::Bootstrap::Markup::Rails::HelperCollection.new(self)
+
+      yield elements
+
+      Twitter::Bootstrap::Markup::Rails::Components::ButtonDropdown.new(
+        elements,
+        options
+      ).to_s
+    end
+
+  end
+end
+

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

@@ -0,0 +1,11 @@
+module Twitter::Bootstrap::Markup::Rails::Helpers
+  module FormHelpers
+    # Form builder
+    # TODO add documentation
+    def bootstrap_form_for(*args, &block)
+      options = args.extract_options!
+      options.reverse_merge!(:builder => Twitter::Bootstrap::Markup::Rails::Components::FormBuilder)
+      form_for(*(args + [options]), &block)
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 # 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
 #
+# Source: https://gist.github.com/1550309
+#
 # Examples
 #
 #   render_navigation(level: 1..2, renderer: :bootstrap_topbar_list, expand_all: true)

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

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

data/spec/helpers/button_helpers_spec.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Twitter::Bootstrap::Markup::Rails::Helpers::ButtonHelpers do
+  include BootstrapSpecHelper
+  include BootstrapButtonMacros
+
+  describe "#bootstrap_button" do
+    before do
+      @output_buffer = ''
+    end
+
+    it "should create a button with the btn class" do
+      concat bootstrap_button("Text", "#")
+      output_buffer.should have_tag('a.btn')
+    end
+
+    it "should have text" do
+      concat bootstrap_button("Text", "#")
+      output_buffer.should have_tag('a', /Text/)
+    end
+
+    it "should link to the specified url" do
+      concat bootstrap_button("Text", "http://example.test")
+      output_buffer.should have_tag("a[href='http://example.test']")
+    end
+
+    it "should have disabled class when :disabled is true" do
+      concat bootstrap_button("Text", "#", :disabled => true)
+      output_buffer.should have_tag("a.disabled")
+    end
+
+    it "should add an additional class when :type is a string" do
+      concat bootstrap_button("Text", "#", :type => 'test')
+      output_buffer.should have_tag("a.test")
+    end
+
+    it "should add additional classes when :type is an array" do
+      concat bootstrap_button("Text", "#", :type => ['test1', 'test2'])
+      output_buffer.should have_tag("a.test1")
+      output_buffer.should have_tag("a.test2")
+    end
+
+    it "should add an icon when :icon is specified" do
+      concat bootstrap_button("Text", "#", :icon => 'icon-search')
+      output_buffer.should have_tag("a.btn i.icon-search")
+    end
+
+    it "should add a white icon when :icon_white is true" do
+      concat bootstrap_button("Text", "#", :icon => 'icon-search', :icon_white => true)
+      output_buffer.should have_tag("a.btn i.icon-search")
+      output_buffer.should have_tag("a.btn i.icon-white")
+    end
+
+    it "should add an id when :id is specified" do
+      concat bootstrap_button("Text", "#", :id => "foo")
+      output_buffer.should have_tag("a#foo")
+    end
+  end
+
+
+  describe "#bootstrap_button_dropdown" do
+    before do
+      @output_buffer = ''
+    end
+
+    it "should create a dropdown button when called with a button and one (or more) links" do
+      build_bootstrap_button_dropdown do |d|
+        d.bootstrap_button "Button Text", "#"
+        d.link_to "Link Text", "#"
+      end
+
+      output_buffer.should have_tag('div.btn-group') do |div|
+        div.should have_tag('a.btn')
+        div.should have_tag('ul.dropdown-menu a')
+      end
+    end
+  end
+end

data/spec/helpers/form_helpers_spec.rb

@@ -0,0 +1,126 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Twitter::Bootstrap::Markup::Rails::Helpers::FormHelpers do
+  include BootstrapSpecHelper
+  include BootstrapFormMacros
+
+  describe "#bootstrap_form_for" do
+    it "should create a form tag" do
+      block = Proc.new {}
+      concat bootstrap_form_for 'an_object', :url => 'a_url', &block
+      output_buffer.should have_tag('form')
+    end
+
+    context "text_field" do
+      it "should wrap a text input within the magical div tags" do
+        build_bootstrap_form do |f|
+          f.text_field 'method'
+        end
+
+        output_buffer.should have_tag('div.control-group div.controls input[type=text]')
+      end
+
+      it "should add a label tag if :label is true" do
+        build_bootstrap_form do |f|
+          f.text_field 'method', :label => true
+        end
+
+        output_buffer.should have_tag('div.control-group') do |div|
+          div.should have_tag('label.control-label')
+          div.should have_tag('div.controls') do |div|
+            div.should have_tag('input')
+          end
+        end
+      end
+
+      it "should add a label tag with custom text if :label_text is specified" do
+        build_bootstrap_form do |f|
+          f.text_field 'method', :label_text => 'a custom label'
+        end
+
+        output_buffer.should have_tag('div.control-group') do |div|
+          div.should have_tag('label.control-label', :text => 'a custom label')
+          div.should have_tag('div.controls') do |div|
+            div.should have_tag('input')
+          end
+        end
+      end
+
+      context "add_on" do
+        it "should wrap the input in div.input-prepend if :add_on hash is specified" do
+          build_bootstrap_form do |f|
+            f.text_field 'method', :add_on => {}
+          end
+
+          output_buffer.should have_tag('div.control-group') do |div|
+            div.should have_tag('div.controls') do |div|
+              div.should have_tag('div.input-prepend') do |div|
+                div.should have_tag('input')
+              end
+            end
+          end
+        end
+
+        it "should wrap the input in div.input-append if :position is :append" do
+          build_bootstrap_form do |f|
+            f.text_field 'method', :add_on => {:position => :append}
+          end
+
+          output_buffer.should have_tag('div.control-group') do |div|
+            div.should have_tag('div.controls') do |div|
+              div.should have_tag('div.input-append') do |div|
+                div.should have_tag('input')
+              end
+            end
+          end
+        end
+
+        it "should add a span with text if :text is specified" do
+          build_bootstrap_form do |f|
+            f.text_field 'method', :add_on => {:text => 'a text'}
+          end
+
+          output_buffer.should have_tag('div.control-group') do |div|
+            div.should have_tag('div.controls') do |div|
+              div.should have_tag('div.input-prepend') do |div|
+                div.should have_tag('input')
+                div.should have_tag('span', :class => 'add-on', :text => 'a text')
+              end
+            end
+          end
+        end
+
+        it "should add a span with icon if :icon is specified" do
+          build_bootstrap_form do |f|
+            f.text_field 'method', :add_on => {:icon => 'icon-envelope'}
+          end
+
+          output_buffer.should have_tag('div.control-group') do |div|
+            div.should have_tag('div.controls') do |div|
+              div.should have_tag('div.input-prepend') do |div|
+                div.should have_tag('input')
+                div.should have_tag('span', :class => 'add-on') do |span|
+                  span.should have_tag('i', :class => 'icon-envelope')
+                end
+              end
+            end
+          end
+        end
+
+        it "should add a help-block with custom text if :html_text is specified" do
+          build_bootstrap_form do |f|
+            f.text_field 'method', :help_text => 'You need help!'
+          end
+
+          output_buffer.should have_tag('div.control-group') do |div|
+            div.should have_tag('div.controls') do |div|
+              div.should have_tag('p', :class => 'help-block', :text => 'You need help!')
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/integration/action_view_spec.rb

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

data/spec/integration/readme_spec.rb

@@ -0,0 +1,14 @@
+describe "README.md" do
+  let(:version) {
+    require File.expand_path("../../../lib/twitter-bootstrap-markup-rails/version",
+                             __FILE__)
+    Twitter::Bootstrap::Markup::Rails::VERSION
+  }
+
+  subject { File.read(File.expand_path("../../../README.md", __FILE__)) }
+
+  it "contains correct version number in gem declaration" do
+    subject.should include("gem 'twitter-bootstrap-markup-rails', '#{version}'")
+  end
+end
+

data/spec/support/bootstrap_button_macros.rb

@@ -0,0 +1,8 @@
+module BootstrapButtonMacros
+  def build_bootstrap_button_dropdown(&block)
+    dropdown = bootstrap_button_dropdown do |d|
+      block.call d
+    end
+    concat dropdown
+  end
+end

data/spec/support/bootstrap_form_macros.rb

@@ -0,0 +1,8 @@
+module BootstrapFormMacros
+  def build_bootstrap_form(&block)
+    form_builder = bootstrap_form_for 'object', :url => 'url' do |f|
+      block.call f
+    end
+    concat form_builder
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-markup-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70220979225840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220979225840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70220979225220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70220979225220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70220979224720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70220979224720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70220979224240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70220979224240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70220979223640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70220979223640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &70220979223000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70220979223000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70220979222280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220979222280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70220979221040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220979221040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard-tomdoc
-  requirement: &70220979220400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220979220400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &70220979219880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220979219880
+  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:
@@ -140,20 +190,34 @@ files:
 - lib/twitter-bootstrap-markup-rails/components.rb
 - lib/twitter-bootstrap-markup-rails/components/alert.rb
 - lib/twitter-bootstrap-markup-rails/components/base.rb
+- lib/twitter-bootstrap-markup-rails/components/button.rb
+- lib/twitter-bootstrap-markup-rails/components/button_dropdown.rb
+- lib/twitter-bootstrap-markup-rails/components/form.rb
+- lib/twitter-bootstrap-markup-rails/components/form/input_field.rb
+- 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/engine.rb
+- lib/twitter-bootstrap-markup-rails/helper_collection.rb
 - lib/twitter-bootstrap-markup-rails/helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/alert_helpers.rb
+- 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/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/button_helpers_spec.rb
+- spec/helpers/form_helpers_spec.rb
 - spec/helpers/inline_label_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_spec_helper.rb
 - spec/support/test_environment.rb
 - twitter-bootstrap-markup-rails.gemspec
@@ -177,17 +241,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 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/button_helpers_spec.rb
+- spec/helpers/form_helpers_spec.rb
 - spec/helpers/inline_label_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_spec_helper.rb
 - spec/support/test_environment.rb
 has_rdoc: