merge with head

.gitignore

@@ -6,3 +6,8 @@ pkg/*
 *.swp
 *~
 .rvmrc
+coverage/*
+.ruby-version
+.ruby-gemset
+
+.idea/

.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ree
+  - 2.0.0
+  - 2.1.1
+script: bundle exec rake spec

CHANGELOG.md

@@ -0,0 +1,54 @@
+<ul>
+  <li>Version 0.0.5 deprecated</li>
+  <li>Asset files updated to latest and removed version numbers</li>
+  <li>Implemented Less::Rails Railtie to use with LESS</li>
+  <li>Fixed railtie to only initialize Less when installed</li>
+  <li>New branch for the static version of Bootstrap (w/o Less) - check static branch</li>
+  <li>Added path to support heroku deploy</li>
+  <li>Rake precompile issue fixed</li>
+  <li>Updated asset files to 1.4.0</li>
+  <li>Updated dependency less-rails (now requires 2.1.0)</li>
+  <li>Added generators</li>
+  <li>Fixed generators</li>
+  <li>Fixed class name conflicts from (bootstrap.js.coffee)</li>
+  <li>Fixed jquery-rails gem version dependency</li>
+  <li>Updated asset files</li>
+  <li>Added new generators (install, layout and themed)</li>
+  <li>Compatibility to Rails 3.2</li>
+  <li>Transitioning to 2.0</li>
+  <li>Released gem v.2.0rc0</li>
+  <li>Added Haml and Slim support</li>
+  <li>Added Responsive layout support</li>
+  <li>Fixes and release 2.0.0</li>
+  <li>Updated to v2.0.1, versioned v2.0.1.0</li>
+  <li>Released gem v.2.0.3</li>
+  <li>Released gem v.2.0.4</li>
+  <li>Released gem v.2.0.5</li>
+  <li>Added SimpleForm support</li>
+  <li>Added FontAwesome support</li>
+  <li>Released gem v.2.0.6</li>
+  <li>Released gem v.2.0.7</li>
+  <li>Released gem v.2.0.8</li>
+  <li>Released gem v.2.0.9 (Bootstrap 2.0.4 and FontAwesome 2.0 support)</li>
+  <li>Released gem v.2.1.0 (JRuby support)</li>
+  <li>Released gem v.2.1.1 (minor fixes)</li>
+  <li>Flash block message helper added</li>
+  <li>Released gem v.2.1.2 (minor fixes and updated to Twitter Bootstrap 2.1.0)</li>
+  <li>Released gem v.2.1.3 (minor fixes and updated to Twitter Bootstrap 2.1.1)</li>
+  <li>Released gem v.2.1.4 (minor fixes)</li>
+  <li>Released gem v.2.1.5 (minor fixes, install generator detects JavaScript template engine, updated to Twitter Bootstrap 2.2.1)</li>
+  <li>Released gem v.2.1.6 (minor fixes)</li>
+  <li>Added static stylesheets support</li>
+  <li>Released gem v.2.1.8 and updated to Twitter Bootstrap 2.2.2</li>
+  <li>Released gem v.2.1.9</li>
+  <li>Released gem v.2.2.0 (Font Awesome 3)</li>
+  <li>Released gem v.2.2.1 (minor fixes and updates)</li>
+  <li>Released gem v.2.2.2 (Bootstrap 2.3.0)</li>
+  <li>Released gem v.2.2.3 (Minor fixes)</li>
+  <li>Released gem v.2.2.4 (Minor fixes)</li>
+  <li>Released gem v.2.2.5 (Bootstrap 2.3.1)</li>
+  <li>Released gem v.2.2.6</li>
+  <li>Released gem v.2.2.7 (Fixes)</li>
+  <li>Releases gem v.2.2.8</li>
+  <li>Releases gem v.3.2.1</li>
+</ul>

CONTRIBUTERS.md

@@ -0,0 +1,20 @@
+<ul>
+  <li>Ben Lovell</li>
+  <li>Daniel Morris</li>
+  <li>Bradly Feeley</li>
+  <li>Guilherme Moreira</li>
+  <li>Alex Behar</li>
+  <li>Brandon Keene</li>
+  <li>Anthony Corcutt</li>
+  <li>Colin Warren</li>
+  <li>Giovanni Cappellotto</li>
+  <li>Masakuni Kato</li>
+  <li>Gudleik Rasch</li>
+  <li>Thomas Volkmar Worm</li>
+  <li>Thiago Almeida</li>
+  <li>Sébastien Grosjean</li>
+  <li>Nick DeSteffen</li>
+  <li>Christian Joudrey</li>
+  <li>Todd Baur</li>
+  <li>Leonid Shevtsov</li>
+</ul>

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+twitter-bootstrap-rails is a volunteer effort. We encourage you to pitch in.
+
+__*We only accept bug reports and pull requests in GitHub*__. Join the team!
+
+* If you have a support question about how to use twitter-bootstrap-rails, please [ask on StackOverflow](http://stackoverflow.com/search?tab=newest&q=twitter-bootstrap-rails).
+
+* Bug reports should include the following:
+  - Minimal example of code to reproduce the bug
+  - Stacktrace
+  - What you expected to see, and what you actually saw.
+
+* Feature requests should be accompanied by a patch, that includes tests.
+* We won't accept any feature requests that come without a patch.
+
+Thanks for the your contributions!

Gemfile

@@ -3,10 +3,21 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in twitter-bootstrap-rails.gemspec
 gemspec
 gem 'less-rails', :path => ENV['LESS_RAILS_SOURCE'] if ENV['LESS_RAILS_SOURCE']
+gem 'activesupport', '< 4.0.0' if RUBY_VERSION < '1.9.3'
 
+group :development, :test do
+  gem 'rb-readline'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'pry'
+end
 group :test do
   gem 'minitest'
   gem 'mocha'
   gem 'rake'
   gem 'turn'
+  gem 'coveralls'
+  gem 'rspec'
+  gem 'rspec-html-matchers'
+  gem 'rspec-activemodel-mocks'
 end

Guardfile

@@ -0,0 +1,61 @@
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+