Use new --skip-turbolinks flag

thoughtbot · Jan 27, 2015 · 500f1a6 · 500f1a6
1 parent e5d5e43
commit 500f1a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/lib/suspenders/app_builder.rb b/lib/suspenders/app_builder.rb
@@ -140,12 +140,6 @@ def create_application_layout
         force: true
     end
 
-    def remove_turbolinks
-      replace_in_file 'app/assets/javascripts/application.js',
-        /\/\/= require turbolinks\n/,
-        ''
-    end
-
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
         force: true

diff --git a/lib/suspenders/generators/app_generator.rb b/lib/suspenders/generators/app_generator.rb
@@ -18,6 +18,9 @@ class AppGenerator < Rails::Generators::AppGenerator
     class_option :skip_test_unit, type: :boolean, aliases: "-T", default: true,
       desc: "Skip Test::Unit files"
 
+    class_option :skip_turbolinks, type: :boolean, default: true,
+      desc: "Skip turbolinks gem"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -31,7 +34,6 @@ def suspenders_customization
       invoke :setup_staging_environment
       invoke :setup_secret_token
       invoke :create_suspenders_views
-      invoke :setup_coffeescript
       invoke :configure_app
       invoke :setup_stylesheets
       invoke :install_bitters
@@ -119,11 +121,6 @@ def create_suspenders_views
       build :create_application_layout
     end
 
-    def setup_coffeescript
-      say 'Setting up CoffeeScript defaults'
-      build :remove_turbolinks
-    end
-
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer