bootstrap-generators 3.1.1.2 → 3.1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d048148c11743f246d2a14f5a5a175d7212e730b
-  data.tar.gz: e67783d4aa19412becc063224fe9ebba80882af8
+  metadata.gz: be32442583b5c9796a6564bed86183982985e2b5
+  data.tar.gz: 441520ca808310e9cc5e70e355140f6ef7afd630
 SHA512:
-  metadata.gz: f608b300dbae9916745531af7f1ce0068ceedc88ceededa3d5eeadd9c820ffa8267a7fa52cbb70c5820691d5ea7f1643cc2cefa5ed02b7a011ff8c0ab1372288
-  data.tar.gz: 9d0cf7956ecae6b6d08aecbb787bbf960724652ff5313867fa9b6c9784b0fc9e4e6ebcfd0c4ecb28031d295ad5bbe25d3afe29155513537af6be753d473dfb19
+  metadata.gz: 56a2f75e6492d642a3c952a8fe25bdf9ecf4cc244ad04dbbe5559d987491d2ec30a25f9b920988a231779b58fe2f910a4b82976fd2a9e2c968294824804cd5ef
+  data.tar.gz: 042c5ddbf18386664b1a2ec155197076d63966d54e5e227c5bb798bbedfdf9271d3be4817776ebbb18313435305eea215d0ba5654896d288c5226c6e578f2707

data/README.md

@@ -6,7 +6,7 @@ Bootstrap-generators provides [Twitter Bootstrap](http://getbootstrap.com/) gene
 
 ## Current Twitter Bootstrap version
 
-The current version of Twitter Bootstrap is 3.1.1.
+The current supported version of Twitter Bootstrap is 3.1.1.
 
 ## Installing Gem
 
@@ -40,19 +40,21 @@ You can easily customize colors, grid system, fonts, and much more by editing `b
 
 To print the options and usage run the command `rails generate bootstrap:install --help`
 
-    rails generate bootstrap:install [options]
+    Usage:
+      rails generate bootstrap:install [options]
 
     Options:
-      -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
+      -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
+          [--skip-turbolinks], [--no-skip-turbolinks]  # Indicates when to generate skip turbolinks
 
     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
+      -f, [--force]                    # Overwrite files that already exist
+      -p, [--pretend], [--no-pretend]  # Run but do not make any changes
+      -q, [--quiet], [--no-quiet]      # Suppress status output
+      -s, [--skip], [--no-skip]        # Skip files that already exist
 
     Copy BootstrapGenerators default files
 
@@ -95,6 +97,8 @@ Supported stylesheet engines:
 * SCSS
 * LESS
 
+##### SCSS
+
 Make sure you have `sass-rails` dependency on your Gemfile:
 
     gem 'sass-rails'
@@ -105,7 +109,7 @@ And then run:
 
 Now you can customize the look and feel of Bootstrap.
 
-* LESS
+##### LESS
 
 Add the dependency on your Gemfile:
 
@@ -118,6 +122,10 @@ And then run:
 
 Now you can customize the look and feel of Bootstrap.
 
+#### Skip turbolinks
+
+Run the generator with option `--skip-turbolinks` to remove turbolinks references from the generated layout.
+
 ## Assets
 
 ### Customize and extend Bootstrap

data/lib/bootstrap/generators/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Generators
-    VERSION = '3.1.1.2'
+    VERSION = '3.1.1.3'
   end
 end

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

@@ -8,6 +8,7 @@ module Bootstrap
 
       class_option :template_engine
       class_option :stylesheet_engine
+      class_option :skip_turbolinks, :type => :boolean, :default => false, :desc => "Skip Turbolinks on assets"
 
       def copy_lib
         directory "lib/templates/#{options[:template_engine]}"

data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb

@@ -12,8 +12,13 @@
     <%%= javascript_include_tag "https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js", "https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js" %>
   <![endif]-->
 
-  <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%- if options[:skip_turbolinks] -%>
+  <%%= stylesheet_link_tag    'application', media: 'all' %>
+  <%%= javascript_include_tag 'application' %>
+  <%- else -%>
+  <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%- end -%>
   <%%= csrf_meta_tags %>
 </head>
 <body>

data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml

@@ -11,8 +11,13 @@
     /[if lt IE 9]
       = javascript_include_tag "https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js", "https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"
 
-    = stylesheet_link_tag    "application", :media => "all", "data-turbolinks-track" => true
-    = javascript_include_tag "application", "data-turbolinks-track" => true
+    <%- if options[:skip_turbolinks] -%>
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
+    <%- else -%>
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    <%- end -%>
     = csrf_meta_tags
   %body
     .navbar.navbar-inverse.navbar-fixed-top

data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim

@@ -10,8 +10,13 @@ html
     /! HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries
     /[if lt IE 9]
       = javascript_include_tag "https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js", "https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"
-    = stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true
-    = javascript_include_tag "application", "data-turbolinks-track" => true
+    <%- if options[:skip_turbolinks] -%>
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
+    <%- else -%>
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    <%- end -%>
     = csrf_meta_tags
   body
     .navbar.navbar-inverse.navbar-fixed-top

data/readme-template.md.erb

@@ -6,7 +6,7 @@ Bootstrap-generators provides [Twitter Bootstrap](http://getbootstrap.com/) gene
 
 ## Current Twitter Bootstrap version
 
-The current version of Twitter Bootstrap is <%= bootstrap_version %>.
+The current supported version of Twitter Bootstrap is <%= bootstrap_version %>.
 
 ## Installing Gem
 
@@ -40,19 +40,21 @@ You can easily customize colors, grid system, fonts, and much more by editing `b
 
 To print the options and usage run the command `rails generate bootstrap:install --help`
 
-    rails generate bootstrap:install [options]
+    Usage:
+      rails generate bootstrap:install [options]
 
     Options:
-      -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
+      -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
+          [--skip-turbolinks], [--no-skip-turbolinks]  # Indicates when to generate skip turbolinks
 
     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
+      -f, [--force]                    # Overwrite files that already exist
+      -p, [--pretend], [--no-pretend]  # Run but do not make any changes
+      -q, [--quiet], [--no-quiet]      # Suppress status output
+      -s, [--skip], [--no-skip]        # Skip files that already exist
 
     Copy BootstrapGenerators default files
 
@@ -95,6 +97,8 @@ Supported stylesheet engines:
 * SCSS
 * LESS
 
+##### SCSS
+
 Make sure you have `sass-rails` dependency on your Gemfile:
 
     gem 'sass-rails'
@@ -105,7 +109,7 @@ And then run:
 
 Now you can customize the look and feel of Bootstrap.
 
-* LESS
+##### LESS
 
 Add the dependency on your Gemfile:
 
@@ -118,6 +122,10 @@ And then run:
 
 Now you can customize the look and feel of Bootstrap.
 
+#### Skip turbolinks
+
+Run the generator with option `--skip-turbolinks` to remove turbolinks references from the generated layout.
+
 ## Assets
 
 ### Customize and extend Bootstrap

data/test/dummy/config/environments/test.rb

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,6 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = 'public, max-age=3600'

data/test/generators/bootstrap/install_generator_test.rb

@@ -46,6 +46,24 @@ class InstallGeneratorTest < Rails::Generators::TestCase
 
       assert_file "app/views/layouts/application.html.#{templating_system}"
     end
+
+    test "should not skip turbolinks by default (#{templating_system} layout)" do
+      run_generator %W(-f --template-engine #{templating_system})
+
+      assert_file "app/views/layouts/application.html.#{templating_system}" do |contents|
+        assert_match(/stylesheet_link_tag\s+'application', media: 'all', 'data-turbolinks-track' => true/, contents)
+        assert_match(/javascript_include_tag\s+'application', 'data-turbolinks-track' => true/, contents)
+      end
+    end
+
+    test "should skip turbolinks (#{templating_system} layout)" do
+      run_generator %W(-f --template-engine #{templating_system} --skip-turbolinks)
+
+      assert_file "app/views/layouts/application.html.#{templating_system}" do |contents|
+        assert_no_match(/stylesheet_link_tag\s+'application', media: 'all', 'data-turbolinks-track' => true/, contents)
+        assert_no_match(/javascript_include_tag\s+'application', 'data-turbolinks-track' => true/, contents)
+      end
+    end
   end
 
   test 'should copy css files' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-generators
 version: !ruby/object:Gem::Version
-  version: 3.1.1.2
+  version: 3.1.1.3
 platform: ruby
 authors:
 - Décio Ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler