bootstrap-generators 2.3.1.2 → 2.3.2

data/Rakefile

@@ -8,3 +8,109 @@ Rake::TestTask.new do |t|
 end
 
 task :default => :test
+
+namespace :bootstrap do
+  desc "Update to a new version of Twitter Bootstrap"
+  task :update do
+    bootstrap_version = "2.3.2"
+    striped_bootstrap_generators_version = "2.3"
+
+    twitter_latest_dist_zip_url = "https://github.com/twbs/bootstrap/archive/v#{bootstrap_version}.zip"
+    twitter_sass_lastest_dist_zip_url = "https://github.com/jlong/sass-bootstrap/archive/v#{bootstrap_version}.zip"
+    twitter_bootstrap_dir = "tmp/bootstrap-#{bootstrap_version}"
+    twitter_sass_bootstrap_dir = "tmp/sass-bootstrap-#{bootstrap_version}"
+
+    # Make sure tmp/ dir exists
+    Dir.mkdir('tmp') unless File.exists?('tmp')
+
+    if File.exists?(twitter_bootstrap_dir)
+      puts "Twitter Bootstrap already downloaded."
+    else
+      # Download the latest version of Twitter Bootstrap
+      `wget -O tmp/bootstrap.zip #{twitter_latest_dist_zip_url}`
+
+      # Extract Twitter Bootstrap
+      `unzip -d tmp tmp/bootstrap.zip`
+    end
+
+    if File.exists?(twitter_sass_bootstrap_dir)
+      puts "Twitter Bootstrap Sass already downloaded."
+    else
+      # Download the latest version of Twitter Bootstrap Sass
+      `wget -O tmp/sass-bootstrap.zip #{twitter_sass_lastest_dist_zip_url}`
+
+      # Extract Twitter Bootstrap
+      `unzip -d tmp tmp/sass-bootstrap.zip`
+    end
+
+    # Reset Twitter Bootstrap JS files
+    bootstrap_javascript_dir = 'vendor/assets/javascripts'
+    bootstrap_main_javascript = 'vendor/assets/javascripts/bootstrap.js'
+
+    FileUtils.rm Dir.glob("#{bootstrap_javascript_dir}/*.js")
+    FileUtils.cp Dir.glob("#{twitter_bootstrap_dir}/js/*.js"), bootstrap_javascript_dir
+
+    # Rewrite base bootstrap.js
+    require_files = []
+    Dir.glob("#{bootstrap_javascript_dir}/*.js") do |js_file|
+      require_files << File.basename(js_file, '.*')
+    end
+
+    # Make sure that tooltip.js is before popover.js (Popover requires tooltip.js)
+    tooltip_position = require_files.index('bootstrap-tooltip')
+    popover_position = require_files.index('bootstrap-popover')
+    require_files.insert(popover_position, require_files.delete_at(tooltip_position))
+
+    File.open(bootstrap_main_javascript, 'w') do |file|
+      require_files.each do |require_file|
+        file.write("//= require #{require_file}\n")
+      end
+    end
+
+    # Reset Twitter Bootstrap Images
+    bootstrap_images_dir = 'vendor/assets/images'
+
+    FileUtils.rm Dir.glob("#{bootstrap_images_dir}/*")
+    FileUtils.cp Dir.glob("#{twitter_bootstrap_dir}/img/*"), bootstrap_images_dir
+
+    # Reset Twitter Bootstrap CSS file
+    FileUtils.cp "#{twitter_bootstrap_dir}/docs/assets/css/bootstrap.css", "vendor/assets/stylesheets/bootstrap.css"
+    FileUtils.cp "#{twitter_bootstrap_dir}/docs/assets/css/bootstrap-responsive.css", "vendor/assets/stylesheets/bootstrap-responsive.css"
+
+    # Reset Twitter Bootstrap LESS files
+    bootstrap_less_dir = 'vendor/twitter/bootstrap/less'
+
+    FileUtils.rm Dir.glob("#{bootstrap_less_dir}/*.less")
+    FileUtils.cp Dir.glob("#{twitter_bootstrap_dir}/less/*.less"), bootstrap_less_dir
+
+    # Reset Twitter Bootstrap SASS files
+    bootstrap_sass_dir = 'vendor/twitter/bootstrap/sass'
+
+    FileUtils.rm Dir.glob("#{bootstrap_sass_dir}/*.scss")
+    FileUtils.cp Dir.glob("#{twitter_sass_bootstrap_dir}/lib/*.scss"), bootstrap_sass_dir
+
+    # Copy bootstrap variables
+    FileUtils.cp "#{bootstrap_less_dir}/variables.less", "lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less"
+    FileUtils.cp "#{bootstrap_sass_dir}/_variables.scss", "lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss"
+
+    # Change icon-font-path
+    ["vendor/assets/stylesheets/bootstrap.css", "lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less", "lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss"].each do |filepath|
+      file_content = File.read(filepath).gsub("../img/", "")
+      File.open(filepath, 'w') { |file| file.puts file_content }
+    end
+
+    # Generate README.md
+    require 'erb'
+
+    javascript_bootstrap_content_code = ""
+    File.open(bootstrap_main_javascript, 'r').each_line do |line|
+      javascript_bootstrap_content_code += "    #{line}"
+    end
+
+    template = ERB.new File.read("readme-template.md.erb")
+
+    File.open('README.md', 'w') do |file|
+      file.write(template.result(binding))
+    end
+  end
+end

data/lib/bootstrap/generators/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Generators
-    VERSION = "2.3.1.2"
+    VERSION = "2.3.2"
   end
 end

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

@@ -48,8 +48,11 @@ module Bootstrap
       end
 
       def inject_backbone
-        inject_into_file "app/assets/javascripts/application.js", :before => "//= require_tree" do
-          "//= require bootstrap\n"
+        application_js_path = "app/assets/javascripts/application.js"
+        if File.exists?(File.join(destination_root, application_js_path))
+          inject_into_file application_js_path, :before => "//= require_tree" do
+            "//= require bootstrap\n"
+          end
         end
       end
     end

data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss

@@ -62,9 +62,9 @@ $headingsColor:         inherit !default; // empty to use BS default, $textColor
 // -------------------------
 // Based on 14px font-size and 20px line-height
 
-$fontSizeLarge:         $baseFontSize * 1.25; // ~18px
-$fontSizeSmall:         $baseFontSize * 0.85; // ~12px
-$fontSizeMini:          $baseFontSize * 0.75; // ~11px
+$fontSizeLarge:         $baseFontSize * 1.25 !default; // ~18px
+$fontSizeSmall:         $baseFontSize * 0.85 !default; // ~12px
+$fontSizeMini:          $baseFontSize * 0.75 !default; // ~11px
 
 $paddingLarge:          11px 19px !default; // 44px
 $paddingSmall:          2px 10px !default;  // 26px

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb

@@ -26,7 +26,7 @@
 <% end -%>
       <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
       <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-      <td><%%= link_to 'Destroy', <%= singular_table_name %>, confirm: 'Are you sure?', method: :delete %></td>
+      <td><%%= link_to 'Destroy', <%= singular_table_name %>, data: { confirm: 'Are you sure?' }, method: :delete %></td>
     </tr>
 <%% end %>
   </tbody>

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/index.html.haml

@@ -22,4 +22,4 @@
 <% end -%>
         %td= link_to 'Show', <%= singular_table_name %>
         %td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
-        %td= link_to 'Destroy', <%= singular_table_name %>, :confirm => 'Are you sure?', :method => :delete
+        %td= link_to 'Destroy', <%= singular_table_name %>, :data => { confirm: 'Are you sure?' }, :method => :delete

data/readme-template.md.erb

@@ -0,0 +1,179 @@
+# Bootstrap Generators
+
+[![Build Status](https://travis-ci.org/decioferreira/bootstrap-generators.png?branch=master)](https://travis-ci.org/decioferreira/bootstrap-generators)
+
+Bootstrap-generators provides [Twitter Bootstrap](http://twitter.github.com/bootstrap/) generators for Rails 4 (supported Rails >= 3.1). Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
+
+## Current Twitter Bootstrap version
+
+The current version of Twitter Bootstrap is <%= bootstrap_version %>.
+
+## Installing Gem
+
+In your Gemfile, add this line:
+
+    gem 'bootstrap-generators', '~> <%= striped_bootstrap_generators_version %>'
+
+Or you can install from latest build:
+
+    gem 'bootstrap-generators', :git => 'git://github.com/decioferreira/bootstrap-generators.git'
+
+By default Bootstrap Generators requires [SimpleForm 2.0](https://github.com/plataformatec/simple_form). Add the dependency on your Gemfile:
+
+    gem 'simple_form'
+
+If you don't want to use SimpleForm, just pass the `--form_builder=form_builder` option:
+
+    rails generate bootstrap:install --form_builder=form_builder
+
+Run bundle install:
+
+    bundle install
+
+## Generators
+
+Get started:
+
+    rails generate bootstrap:install -f
+
+Once you've done that, any time you generate a controller or scaffold, you'll get [Bootstrap](http://twitter.github.com/bootstrap/) templates.
+
+### Give it a try
+
+    rails generate scaffold post title:string body:text published:boolean
+
+You can easily customize colors, grid system, fonts, and much more by editing `bootstrap-variables.[less|scss]` on your application assets folder.
+
+## Usage
+
+To print the options and usage run the command `rails generate bootstrap:install --help`
+
+    rails generate bootstrap:install [options]
+
+    Options:
+          [--layout=LAYOUT]                         # Bootstrap layout templates (hero or fluid)
+                                                    # Default: hero
+          [--form-builder=FORM_BUILDER]             # Select your form builder (simple_form or form_builder)
+                                                    # Default: simple_form
+      -e, [--template-engine=TEMPLATE_ENGINE]       # Indicates when to generate template engine
+                                                    # Default: erb
+      -se, [--stylesheet-engine=STYLESHEET_ENGINE]  # Indicates when to generate stylesheet engine
+                                                    # Default: scss
+
+    Runtime options:
+      -f, [--force]    # Overwrite files that already exist
+      -p, [--pretend]  # Run but do not make any changes
+      -q, [--quiet]    # Supress status output
+      -s, [--skip]     # Skip files that already exist
+
+    Copy BootstrapGenerators default files
+
+### Options
+
+#### Layouts
+
+There are the two available layouts, based on Bootstrap's quick-start examples:
+
+* [Basic marketing site](http://getbootstrap.com/<%= bootstrap_version %>/examples/hero.html) (default)
+* [Fluid layout](http://getbootstrap.com/<%= bootstrap_version %>/examples/fluid.html)
+
+To select one of these layouts just pass the option `--layout=LAYOUT` to the install generator.
+
+#### Form builders
+
+* SimpleForm
+
+By default Bootstrap Generators requires SimpleForm 2.0. Add the dependency on your Gemfile:
+
+    gem 'simple_form'
+
+And then run:
+
+    rails generate bootstrap:install --form_builder=simple_form
+
+* Default Rails form builder
+
+If you don't want to use SimpleForm, just pass the `--form_builder=form_builder` option:
+
+    rails generate bootstrap:install --form_builder=form_builder
+
+#### Template engines
+
+Supported template engines:
+
+* ERB
+* Haml
+
+##### Haml
+
+Add the dependency on your Gemfile:
+
+    gem 'haml-rails'
+
+And then run:
+
+    rails generate bootstrap:install --template-engine=haml
+
+#### Stylesheet engines
+
+Supported stylesheet engines:
+
+* CSS
+* SCSS
+* LESS
+
+##### SCSS
+
+Make sure you have `sass-rails` dependency on your Gemfile:
+
+    gem 'sass-rails'
+
+And then run:
+
+    rails generate bootstrap:install --stylesheet-engine=scss
+
+Now you can customize the look and feel of Bootstrap.
+
+##### LESS
+
+Add the dependency on your Gemfile:
+
+    gem 'less-rails'
+
+And then run:
+
+    rails generate bootstrap:install --stylesheet-engine=less
+
+Now you can customize the look and feel of Bootstrap.
+
+## Assets
+
+<a name="customize"></a>
+
+### Customize and extend Bootstrap
+
+In Rails 3.0 and above, generators don’t just look in the source root for templates, they also search for templates in other paths. And one of them is lib/templates.
+
+### Javascript
+
+Select all jQuery plugins (`app/assets/javascripts/bootstrap.js`)
+
+    //= require bootstrap
+
+Or quickly add only the necessary javascript (Transitions: required for any animation; Popovers: requires Tooltips)
+
+<%= javascript_bootstrap_content_code %>
+
+## Customizing Templates
+
+In Rails 3.0 and above, generators don’t just look in the source root for templates, they also search for templates in other paths. And one of them is lib/templates.
+
+Since Bootstrap Generators installs its templates under lib/templates, you can go and customize them.
+
+## Credits
+
+* [Twitter Bootstrap](http://twitter.github.com/bootstrap)
+* [Twitter Bootstrap - Sass Conversion](https://github.com/jlong/sass-twitter-bootstrap)
+* [SimpleForm](https://github.com/plataformatec/simple_form)
+
+[customize]: #customize

data/test/lib/generators/bootstrap/install_generator_test.rb

@@ -44,7 +44,15 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   test "should require javascript bootstrap file" do
     run_generator
 
-    assert_file "app/assets/javascripts/application.js", /require bootstrap/ 
+    assert_file "app/assets/javascripts/application.js", /require bootstrap/
+  end
+
+  test "should work when there is no application.js file" do
+    File.delete(File.join(destination_root, "app/assets/javascripts/application.js"))
+
+    assert_nothing_raised Errno::ENOENT do
+      run_generator
+    end
   end
 
   test "should copy css files" do

data/vendor/assets/javascripts/bootstrap-affix.js

@@ -1,8 +1,8 @@
 /* ==========================================================
- * bootstrap-affix.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#affix
+ * bootstrap-affix.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#affix
  * ==========================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/vendor/assets/javascripts/bootstrap-alert.js

@@ -1,8 +1,8 @@
 /* ==========================================================
- * bootstrap-alert.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * bootstrap-alert.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#alerts
  * ==========================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/vendor/assets/javascripts/bootstrap-button.js

@@ -1,8 +1,8 @@
 /* ============================================================
- * bootstrap-button.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * bootstrap-button.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#buttons
  * ============================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/vendor/assets/javascripts/bootstrap-carousel.js

@@ -1,8 +1,8 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * bootstrap-carousel.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#carousel
  * ==========================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/vendor/assets/javascripts/bootstrap-collapse.js

@@ -1,8 +1,8 @@
 /* =============================================================
- * bootstrap-collapse.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * bootstrap-collapse.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#collapse
  * =============================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/vendor/assets/javascripts/bootstrap-dropdown.js

@@ -1,8 +1,8 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * bootstrap-dropdown.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#dropdowns
  * ============================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,10 @@
       clearMenus()
 
       if (!isActive) {
+        if ('ontouchstart' in document.documentElement) {
+          // if mobile we we use a backdrop because click events don't delegate
+          $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
+        }
         $parent.toggleClass('open')
       }
 
@@ -104,6 +108,7 @@
   }
 
   function clearMenus() {
+    $('.dropdown-backdrop').remove()
     $(toggle).each(function () {
       getParent($(this)).removeClass('open')
     })
@@ -158,7 +163,6 @@
   $(document)
     .on('click.dropdown.data-api', clearMenus)
     .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
     .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)