rails_layout 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87993f895006e34a5a2bf38ae14e2f1dc4cd7a71
-  data.tar.gz: a643ec17d3863e5e31e6c745a00bbfcd3bf48693
+  metadata.gz: 4eb0ec10a17ea2b86d361cf3976d13efc2b9f8f4
+  data.tar.gz: d7402fe67cfe735389509cab42dacda674ef86de
 SHA512:
-  metadata.gz: 8774ba64cb3ffd028f2d294a1df48d62723ca4e762173ccf50c91c7ffcf0989fac10a8cd8a9a54d300c531558ee16a7721d05fc5f65ccfe10e8a2fafbb84781d
-  data.tar.gz: e347ebf7dbf3905b17ac6a0d3a941c0722a8e0ab6179ad8cf794de042936336fd086e81288f498f69de2256712d1657f4a6f7526a9ef004da2eebfd887509f1b
+  metadata.gz: 42c052e635d5636e8c46133ade9ba41bd5abb9bedb89d3b2ec80d4c0e9793d05f4e2f6f9b6817caeebc2577d878da692053507fc5227bc328d261ddfd30b89cf
+  data.tar.gz: 5c0b67227b631d32fc706a0033c11417a8563aab60e8ab0d4ad3543c0e3b9c8fd0a6598e75137ed81791f04a451956aef8da1ea700a57aea026ca2308e8bac29

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 1.0.4 January 16, 2014
+
+* Foundation 5.0.3 is now compatible with Rails Turbolinks and the asset pipeline
+
 h3. 1.0.3 January 11, 2014
 
 * add missing 'autofocus' to Devise views

data/lib/generators/layout/install/templates/foundation5-application.html.erb

@@ -4,8 +4,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name.underscore.titleize %>" %></title>
     <meta name="description" content="<%%= content_for?(:description) ? yield(:description) : "<%= app_name.underscore.titleize %>" %>">
-    <%%= stylesheet_link_tag "application" %>
-    <%%# Foundation 5 won't work with Rails Turbolinks %>
+    <%%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
+    <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
     <%%# Modernizr is required for Zurb Foundation %>
     <%%= javascript_include_tag "vendor/modernizr" %>
     <%%= csrf_meta_tags %>
@@ -18,7 +18,5 @@
        <%%= render 'layouts/messages' %>
        <%%= yield %>
     </main>
-    <%%# Foundation 5 won't work when application.js is included in HEAD %>
-    <%%= javascript_include_tag "application" %>
   </body>
 </html>

data/lib/generators/layout/install/templates/foundation5-application.html.haml

@@ -4,8 +4,8 @@
     %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
     %title= content_for?(:title) ? yield(:title) : '<%= app_name.underscore.titleize %>'
     %meta{:name => "description", :content => "#{content_for?(:description) ? yield(:description) : '<%= app_name.underscore.titleize %>'}"}
-    = stylesheet_link_tag "application"
-    -# Foundation 5 won't work with Rails Turbolinks
+    = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
+    = javascript_include_tag "application", "data-turbolinks-track" => true
     -# Modernizr is required for Zurb Foundation
     = javascript_include_tag "vendor/modernizr"
     = csrf_meta_tags
@@ -15,5 +15,3 @@
     %main{:role => "main"}
       = render 'layouts/messages'
       = yield
-    -# Foundation 5 won't work when application.js is included in HEAD
-    = javascript_include_tag "application"

data/lib/generators/layout/install/templates/foundation5-application.html.slim

@@ -5,8 +5,8 @@ html
     title
       = content_for?(:title) ? yield(:title) : '<%= app_name.underscore.titleize %>'
     meta name="description" content="#{content_for?(:description) ? yield(:description) : '<%= app_name.underscore.titleize %>'}"
-    = stylesheet_link_tag "application"
-    / Foundation 5 won't work with Rails Turbolinks
+    == stylesheet_link_tag "application", :media => "all", "data-turbolinks-track" => true
+    == javascript_include_tag "application", "data-turbolinks-track" => true
     / Modernizr is required for Zurb Foundation
     == javascript_include_tag "vendor/modernizr"
     == csrf_meta_tags
@@ -16,5 +16,3 @@ html
     main[role="main"]
       == render 'layouts/messages'
       == yield
-    / Foundation 5 won't work when application.js is included in HEAD
-    == javascript_include_tag "application"

data/lib/generators/layout/install/templates/foundation5-application.js

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-// Note: Foundation 5 won't work with turbolinks
+//= require turbolinks
 //= require foundation
 //= require_tree .
 $(function() {

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler