rails_layout 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1735089b69e5bdbbbf6974b0ecfa1083a1bf3399
-  data.tar.gz: 5cd3a05e8202482fffc9a982e60ae5a405ae5ddf
+  metadata.gz: 3e4a9affc3591e1c1eeef977c0ae1c23317f9bc6
+  data.tar.gz: 32030f79f72ca953fe3ab89217ad7476a00fe0fc
 SHA512:
-  metadata.gz: 1a837969224dbc9911ab502808c85100c685642b5040ba7eef83c4300fa1500e95bb29e803d422b6c5346eec14080ca1d0f584ffb57cc959a1c4f800b5d49e1d
-  data.tar.gz: 98e2c65d8087cbf928d63dd3025b1e303f54150f62c11d70dcd14039135de9572384b88b0824db58ede3406e05b1a59fc30289ee8d7bb04d0dbac8a0f276de8b
+  metadata.gz: 35aba628ba7f072062d3ed4bd629db4a468f645d8baf4ea499a6f25067f4f804aee02680337e6ac81bfab4b7e616d051071a199c3d5309e4f37eecd2b658b2b4
+  data.tar.gz: f27d137ddac4973d8d9382b51df5974d865b5adea7b8e89651100c01fb86bcff3191e8099e26f5afe025e062b91ae9418c43b3c71dd3eb06bac222d52706597f

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h2. 0.2.1 November 2, 2013
+
+* no turbolinks when used with Rails 3.2
+
 h2. 0.2.0 October 31, 2013
 
 * installs a framework by setting up files in the assets folder

data/README.textile

@@ -175,11 +175,11 @@ See the files that are generated:
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/bootstrap_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/bootstrap2_and_overrides.css.scss
+* "app/assets/stylesheets/bootstrap_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/bootstrap-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap-application.js
 
 h2. Twitter Bootstrap 3.0 Layout
 
@@ -203,11 +203,11 @@ See the files that are generated:
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/bootstrap_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/bootstrap3_and_overrides.css.scss
+* "app/assets/stylesheets/bootstrap_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/bootstrap-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap-application.js
 
 h2. Zurb Foundation 4.0 Layout
 
@@ -231,11 +231,11 @@ See the files that are generated:
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/foundation_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/foundation_and_overrides.css.scss
+* "app/assets/stylesheets/foundation_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/foundation4-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.js
 
 h2. Reverting to None
 

data/lib/generators/layout/layout_generator.rb

@@ -39,6 +39,9 @@ module Layout
             remove_file 'app/assets/stylesheets/simple.css'
             remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
         end
+        if Rails::VERSION::MAJOR.to_s == "3"
+          gsub_file 'app/assets/javascripts/application.js', /\/\/= require turbolinks\n/, ''
+        end
       end
 
       # Create an application layout file with partials for messages and navigation
@@ -47,6 +50,9 @@ module Layout
         @app_name = app.class.to_s.split("::").first
         ext = app.config.generators.options[:rails][:template_engine] || :erb
         template "#{framework_name}-application.html.#{ext}", "app/views/layouts/application.html.#{ext}"
+        if Rails::VERSION::MAJOR.to_s == "3"
+          gsub_file "app/views/layouts/application.html.#{ext}", /, "data-turbolinks-track" => true/, ''
+        end
         if framework_name == 'none'
           remove_file "app/views/layouts/_messages.html.#{ext}"
           remove_file "app/views/layouts/_navigation.html.#{ext}"

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler