twitter-bootstrap-rails 2.1.6 → 2.1.7

data/README.md

@@ -6,32 +6,41 @@ twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 A
 [![Build Status](https://secure.travis-ci.org/seyhunak/twitter-bootstrap-rails.png)](http://travis-ci.org/seyhunak/twitter-bootstrap-rails)
 [![Dependency Status](https://gemnasium.com/seyhunak/twitter-bootstrap-rails.png)](https://gemnasium.com/seyhunak/twitter-bootstrap-rails)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/seyhunak/twitter-bootstrap-rails)
+[![Still Maintained](https://a248.e.akamai.net/camo.github.com/9c977523be7fce95c026a1b7d9673903f82e59cd/687474703a2f2f7374696c6c6d61696e7461696e65642e636f6d2f7374696c6c6d61696e7461696e65642f7374696c6c6d61696e7461696e65642e706e67)](http://stillmaintained.com/seyhunak/twitter-bootstrap-rails)
+
 
 ## Screencasts
 #### Installing twitter-bootstrap-rails, generators, usage and more
-Screencasts provided by Railscasts (Ryan Bates)
+<img width="180" height="35" src="http://oi49.tinypic.com/s5wn05.jpg"></img>
+
+Screencasts provided by <a href="http://railscasts.com">Railscasts</a> (Ryan Bates)
 
 [Twitter Bootstrap Basics](http://railscasts.com/episodes/328-twitter-bootstrap-basics "Twitter Bootstrap Basics")
 in this episode you will learn how to include Twitter Bootstrap into Rails application with the twitter-bootstrap-rails gem.
 
-[More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap") 
+[More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap")
 in this episode continues on the Twitter Bootstrap project showing how to display flash messages, add form validations with SimpleForm, customize layout with variables, and switch to using Sass.
 (Note: This episode is pro episode)
 
 
-## Installing Gem
-The gem includes the source LESS and JS files. You'll need to choose a javascript runtime.
-ExecJS supports these runtimes:
+## Example Application
+An example application is available at [toadkicker/teststrap](https://github.com/toadkicker/teststrap). You can view it running on heroku [here.](http://teststrap.herokuapp.com/) Contributions welcome.
+
+
+## Installing the Gem
+
+The [Twitter Bootstrap Rails gem](http://rubygems.org/gems/twitter-bootstrap-rails) can provide the Twitter Bootstrap stylesheets in two ways.
+
+The plain CSS way is how Twitter Bootstrap is provided on [the official website](http://twitter.github.com/bootstrap/).
 
-* [therubyracer](https://github.com/cowboyd/therubyracer) - Google V8
-  embedded within Ruby
-* [therubyrhino](https://github.com/cowboyd/therubyrhino) - Mozilla
-  Rhino embedded within JRuby
-* [Node.js](http://nodejs.org/)
-* Apple JavaScriptCore - Included with Mac OS X
-* [Microsoft Windows Script Host](http://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx) (JScript)
+The [Less](http://lesscss.org/) way provides more customisation options, like changing theme colors, and provides useful Less mixins for your code, but requires the
+Less gem and the Ruby Racer Javascript runtime (not available on Microsoft Windows).
 
-Include the [Twitter Bootstrap Rails gem](http://rubygems.org/gems/twitter-bootstrap-rails) in Gemfile to install it from [RubyGems.org](http://rubygems.org):
+### Installing the Less stylesheets
+
+To use Less stylesheets, you'll need the [less-rails gem](http://rubygems.org/gems/less-rails), and one of [Javascript runtimes supported by CommonJS](https://github.com/cowboyd/commonjs.rb#supported-runtimes).
+
+Include these lines in the Gemfile to install the gems from [RubyGems.org](http://rubygems.org):
 
 ```ruby
 gem "therubyracer"
@@ -45,23 +54,29 @@ or you can install from latest build;
 gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
 ```
 
-You can run bundle from command line
+Then run `bundle install` from the command line:
 
     bundle install
 
+Then run the boostrap generator to add Bootstrap includes into your assets:
 
-## Installing to App (using Generators)
+    rails generate bootstrap:install less
 
-You can run following generators to get started with Twitter Bootstrap quickly.
+### Installing the CSS stylesheets
 
+If you don't need to customize the stylesheets using Less, the only gem you need is the `twitter-bootstrap-rails` gem:
 
-Install (requires directives to Asset pipeline.)
+```ruby
+gem "twitter-bootstrap-rails"
+```
 
+After running `bundle install`, run the generator:
 
-Usage:
+    rails generate bootstrap:install static
 
+## Generating layouts and views
 
-    rails g bootstrap:install
+You can run following generators to get started with Twitter Bootstrap quickly.
 
 
 Layout (generates Twitter Bootstrap compatible layout) - (Haml and Slim supported)
@@ -113,6 +128,29 @@ You have to require Bootstrap LESS (bootstrap_and_overrides.css.less) in your ap
 /* Your stylesheets goes here... */
 ```
 
+To use individual components from bootstrap, your bootstrap_and_overrides.less could look like this:
+
+```css
+@import "twitter/bootstrap/reset.less";
+@import "twitter/bootstrap/variables.less";
+@import "twitter/bootstrap/mixins.less";
+@import "twitter/bootstrap/scaffolding.less";
+@import "twitter/bootstrap/grid.less";
+@import "twitter/bootstrap/layouts.less";
+@import "twitter/bootstrap/type.less";
+@import "twitter/bootstrap/forms.less";
+@import "twitter/bootstrap/wells.less";
+@import "twitter/bootstrap/component-animations.less";
+@import "twitter/bootstrap/buttons.less";
+@import "twitter/bootstrap/close.less";
+@import "twitter/bootstrap/navs.less";
+@import "twitter/bootstrap/navbar.less";
+@import "twitter/bootstrap/labels-badges.less";
+@import "twitter/bootstrap/hero-unit.less";
+@import "twitter/bootstrap/utilities.less";
+@import "twitter/bootstrap/responsive";
+```
+
 If you'd like to alter Bootstrap's own variables, or define your LESS
 styles inheriting Bootstrap's mixins, you can do so inside bootstrap_and_overrides.css.less:
 
@@ -133,6 +171,20 @@ $(document).ready(function(){
 });
 ```
 
+If you want to customize what is loaded, your application.js would look something like this
+
+```js
+#= require jquery
+#= require jquery_ujs
+#= require twitter/bootstrap/bootstrap-transition
+#= require twitter/bootstrap/bootstrap-alert
+#= require twitter/bootstrap/bootstrap-modal
+#= require twitter/bootstrap/bootstrap-button
+#= require twitter/bootstrap/bootstrap-collapse
+```
+
+...and so on for each bootstrap js component.
+
 ## Using Coffeescript (optionally)
 
 Using Twitter Bootstrap with the CoffeeScript is easy.
@@ -151,19 +203,6 @@ jQuery ->
 ### Flash helper
 Add flash helper <%= bootstrap_flash %> to your layout (built-in with layout generator)
 
-
-## Using Static CSS, JS (w/o Less)
-
-twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest static CSS, JS files.
-
-You can install from latest build (from branch);
-
-```ruby
-gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git',
-                               :branch => 'static'
-```
-
-
 ## Changelog
 <ul>
   <li>Version 0.0.5 deprecated</li>
@@ -205,6 +244,7 @@ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootst
   <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>
 </ul>
 
 
@@ -226,55 +266,58 @@ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootst
   <li>Nick DeSteffen</li>
   <li>Christian Joudrey</li>
   <li>Todd Baur</li>
+  <li>Leonid Shevtsov</li>
 </ul>
 
 
-## Future
+### Future
 <ul>
   <li>Writing tests (not implemented yet)</li>
   <li>Markup Helpers (alert, tabs, pagination, breadcrumbs etc.)</li>
 </ul>
 
+## About Me
+Lead/ Senior Developer - Programmer @useful (Usefulideas) Istanbul / Turkey
 
-## Credits
+### Contact me
 Seyhun Akyürek - seyhunak [at] gmail com
 
-[Add Me On Twitter](http://twitter.com/seyhunak "Add Me On Twitter")
-
-[Add Me On Linkedin](http://tr.linkedin.com/in/seyhunak "Add Me On Linkedin")
-
-[Add Me On Facebook](https://www.facebook.com/seyhunak "Add Me On Facebook")
+### Follow me
+<a href="http://zerply.com/seyhunak">
+<img width="110" height="40" src="http://zerply.com/img/welcomesteps/zerply_logo.png" />
+</a>
 
-[Add Me On Google+](http://plus.ly/seyhunak "Add Me On Google+")
+(Twitter, Facebook, Linkedin, Google+, Github)
 
-[Visit My Blog](http://www.seyhunakyurek.com/ "Visit My Blog")
+http://zerply.com/seyhunak
 
-## Endorse My Skills
+### Endorse me
 <a href="http://coderwall.com/seyhunak">
 <img src="http://api.coderwall.com/seyhunak/endorsecount.png" />
 </a>
 
-##  Want to Donate?
-<img src="https://www.paypalobjects.com/en_US/i/logo/PayPal_mark_50x34.gif"></img>
-
-[Want to donate for my efforts?. Show your love](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=W8ZLWQBREFP4U
- "Donate")
-
-
-## Score me
+### Klout me
 <img src="https://addons.opera.com/media/extensions/55/14355/1.0.1-rev1/icons/icon_64x64.png"></img>
 
 Please +K my influence in Ruby on Rails on @klout
 
 http://klout.com/#/seyhunak
 
+
+### Want to donate?
+<img src="https://www.paypalobjects.com/en_US/i/logo/PayPal_mark_50x34.gif"></img>
+
+[Want to donate for my efforts?. Show your love](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=W8ZLWQBREFP4U
+ "Donate")
+
+
 ## Thanks
 Twitter Bootstrap and all twitter-bootstrap-rails contributors
 http://twitter.github.com/bootstrap
 
 
 ## License
-Copyright (c) 2011 Seyhun Akyürek
+Copyright (c) 2012 Seyhun Akyürek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

data/Rakefile

@@ -10,5 +10,25 @@ task :bundle do
   sh 'rm *.gem'
 end
 
+desc "Build the static precompiled stylesheets from Less sources"
+task :build_static_stylesheets do
+  require 'less'
+
+  toolkit_path = File.join('vendor', 'toolkit')
+
+  parser = Less::Parser.new :paths => [toolkit_path]
+
+  target_directory = File.expand_path('vendor/assets/stylesheets/twitter-bootstrap-static')
+
+  sh "rm -rf #{target_directory}"
+  sh "mkdir -p #{target_directory}"
+  Dir['vendor/static-source/*.less'].each do |source_file|
+    puts "Compiling #{source_file}"
+    target_file = File.join(target_directory, File.basename(source_file, '.less')+'.css.erb')
+    tree = parser.parse(File.read(source_file))
+    File.open(target_file, 'w') {|f| f.puts tree.to_css(:compress => true) }
+  end
+end
+
 task(:default).clear
 task :default => :bundle

data/app/helpers/bootstrap_flash_helper.rb

@@ -2,8 +2,9 @@ module BootstrapFlashHelper
   def bootstrap_flash
    flash_messages = []
    flash.each do |type, message|
-     # Skip Devise :timeout flag
+     # Skip Devise :timeout and :timedout flags
      next if type == :timeout
+     next if type == :timedout
      type = :success if type == :notice
      type = :error   if type == :alert
      text = content_tag(:div, 

data/lib/generators/bootstrap/install/install_generator.rb

@@ -6,6 +6,7 @@ module Bootstrap
 
       source_root File.expand_path("../templates", __FILE__)
       desc "This generator installs Twitter Bootstrap to Asset Pipeline"
+      argument :stylesheets_type, :type => :string, :default => 'less', :banner => '*less or static'
 
       def add_assets
 
@@ -31,12 +32,16 @@ module Bootstrap
       end
 
       def add_bootstrap
-        if Rails.configuration.app_generators.rails[:javascript_engine] == :coffee
+        if use_coffeescript?
           copy_file "bootstrap.coffee", "app/assets/javascripts/bootstrap.js.coffee"
         else
           copy_file "bootstrap.js", "app/assets/javascripts/bootstrap.js"
         end
-        copy_file "bootstrap_and_overrides.less", "app/assets/stylesheets/bootstrap_and_overrides.css.less"
+        if use_less?
+          copy_file "bootstrap_and_overrides.less", "app/assets/stylesheets/bootstrap_and_overrides.css.less"
+        else
+          copy_file "bootstrap_and_overrides.css", "app/assets/stylesheets/bootstrap_and_overrides.css"
+        end
       end
 
       def cleanup_legacy
@@ -52,6 +57,14 @@ module Bootstrap
         end
       end
 
+    private
+      def use_less?
+        (defined?(Less) && (stylesheets_type!='static') ) || (stylesheets_type=='less')
+      end
+
+      def use_coffeescript?
+        ::Rails.configuration.app_generators.rails[:javascript_engine] == :coffee
+      end
     end
   end
 end

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.css

@@ -0,0 +1,7 @@
+/*
+  =require twitter-bootstrap-static/bootstrap
+
+  Use Font Awesome icons (default)
+  To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
+  =require twitter-bootstrap-static/fontawesome
+  */

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less

@@ -6,9 +6,10 @@
 @iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
+// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
 //       have the proper paths. So for now we use the absolute path.
 @fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
 @fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
 @fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
 @fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");

data/lib/generators/bootstrap/layout/templates/layout.html.erb

@@ -9,7 +9,7 @@
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
     <![endif]-->
 
     <%%= stylesheet_link_tag "application", :media => "all" %>

data/lib/generators/bootstrap/layout/templates/layout.html.haml

@@ -8,7 +8,7 @@
     = csrf_meta_tags
     / Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]
-      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
     %link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
     %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")

data/lib/generators/bootstrap/layout/templates/layout.html.slim

@@ -9,7 +9,7 @@ html lang="en"
 
     /! Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]
-      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
     link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
     link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"

data/lib/generators/bootstrap/themed/themed_generator.rb

@@ -10,6 +10,8 @@ module Bootstrap
       argument :layout,             :type => :string, :default => "application",
                                     :banner => "Specify application layout"
 
+      class_option :excluded_columns, :type => :array, :required => false
+
       def initialize(args, *options)
         super(args, *options)
         initialize_views_variables
@@ -53,18 +55,48 @@ module Bootstrap
       end
 
       def columns
-        excluded_column_names = %w[id created_at updated_at]
+        retrieve_columns.reject {|c| excluded?(c.name) }.map do |c|
+          new_attribute(c.name, c.type.to_s)
+        end
+      end
+
+      def excluded_columns_names
+        %w[id created_at updated_at]
+      end
+
+      def excluded_columns_pattern
+        [
+          /.*_checksum/,
+          /.*_count/,
+        ]
+      end
+
+      def excluded_columns
+        options['excluded_columns']||[]
+      end
+
+      def excluded?(name)
+        excluded_columns_names.include?(name) ||
+        excluded_columns_pattern.any? {|p| name =~ p } ||
+        excluded_columns.include?(name)
+      end
+
+      def retrieve_columns
         if defined?(ActiveRecord)
           rescue_block ActiveRecord::StatementInvalid do
-            @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
+            @model_name.constantize.columns
           end
         else
           rescue_block do
-            @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
+            @model_name.constantize.fields.map {|c| c[1] }
           end
         end
       end
 
+      def new_attribute(name, type)
+        ::Rails::Generators::GeneratedAttribute.new(name, type)
+      end
+
       def rescue_block(exception=Exception)
         yield if block_given?
       rescue exception => e
@@ -82,14 +114,17 @@ module Bootstrap
       end
 
       def generate_views
-        views = {
+        options.engine == generate_erb(selected_views)
+      end
+
+      def selected_views
+        {
           "index.html.#{ext}"                 => File.join('app/views', @controller_file_path, "index.html.#{ext}"),
           "new.html.#{ext}"                   => File.join('app/views', @controller_file_path, "new.html.#{ext}"),
           "edit.html.#{ext}"                  => File.join('app/views', @controller_file_path, "edit.html.#{ext}"),
           "#{form_builder}_form.html.#{ext}"  => File.join('app/views', @controller_file_path, "_form.html.#{ext}"),
-          "show.html.#{ext}"                  => File.join('app/views', @controller_file_path, "show.html.#{ext}")}
-        selected_views = views
-        options.engine == generate_erb(selected_views)
+          "show.html.#{ext}"                  => File.join('app/views', @controller_file_path, "show.html.#{ext}")
+        }
       end
 
       def generate_erb(views)
@@ -108,3 +143,6 @@ module Bootstrap
     end
   end
 end
+
+
+

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

@@ -8,11 +8,12 @@ module Twitter
   module Bootstrap
     module Rails
       class Engine < ::Rails::Engine
-
-        initializer 'twitter-bootstrap-rails.setup', 
-          :after => 'less-rails.after.load_config_initializers', 
+        initializer 'twitter-bootstrap-rails.setup',
+          :after => 'less-rails.after.load_config_initializers',
           :group => :all do |app|
-          app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
+            if defined?(Less)
+              app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
+            end
           end
 
         initializer 'twitter-bootstrap-rails.setup_helpers' do |app|

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

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.1.6"
+      VERSION = "2.1.7"
     end
   end
 end