rails_layout 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e06e3fe9d5d9d363a177913886e0ff652f9899ad
-  data.tar.gz: a0893c3edeb60f1a19c58cd48e02efe5f7816a6c
+  metadata.gz: 3ff73fe74e9a3f956ecd84815ebea2bf4853fcf0
+  data.tar.gz: 1b7fd685c1da4872d3759f3a498af6531e0e4324
 SHA512:
-  metadata.gz: dffa2f15b906234daa51120a99248e2ebc450908dc4516ad0a7fccd6a6e2d795a25ccbb7b9faa574c31bbfb4cf42b06f596e90a5945f322322fbcee7c1f3bf05
-  data.tar.gz: 80f0d4898c0c9e3128bca01e7cd6fcc0ecd045b37a11bad1b60a8869a819d1e7b585a818b7af04289f05d53ca567ab7080ee4e2b51b0eb7eec4fb6ba6c478602
+  metadata.gz: 10c71c0cca3d6e94b56351385e501d5a392463180e0cb087a6859990d70f3f71b9a81a61ae6562afce58fd89fa0867e416cc6c86739834c8944596a80109744b
+  data.tar.gz: b9465e1efb81d288cca6d1eeb49a8d021211d7b3144487a64ac0a269b2553b55ac81fcd5c6b5a61016cb31aea3e6fda2b476fe7eb0f2093754c8cf840f9d50fa

data/CHANGELOG.textile

@@ -1,5 +1,10 @@
 h1. CHANGELOG
 
+h3. 0.5.8 December 15, 2013
+
+* remove 'app/views/layouts/application.html.erb' file before creating a new one
+* fix error in slim templates for 'app_name.underscore.titleize'
+
 h3. 0.5.7 December 15, 2013
 
 * add Slim templates (contributed by benedictleejh)

data/README.textile

@@ -65,11 +65,11 @@ The first file contains no framework-specific styling. It is only a list of link
 
 The second file contains framework-specific styling.
 
-h4. Support for ERB or Haml
+h4. Support for ERB, Haml, or Slim
 
 If you are using ERB for Rails views, the RailsLayout gem will generate ERB files.
 
-If you are using Haml, the RailsLayout gem will generate Haml files instead.
+If you are using Haml or Slim, the RailsLayout gem will generate Haml or Slim files instead.
 
 h4. Rails Composer
 
@@ -110,7 +110,7 @@ gem 'bootstrap-sass'
 h4. Zurb Foundation 4.0
 
 <pre>
-gem 'compass-rails', '~> 2.0.alpha.0'
+gem 'compass-rails'
 gem 'zurb-foundation'
 </pre>
 

data/lib/generators/layout/layout_generator.rb

@@ -56,6 +56,7 @@ module Layout
         app = ::Rails.application
         @app_name = app.class.to_s.split("::").first
         ext = app.config.generators.options[:rails][:template_engine] || :erb
+        remove_file 'app/views/layouts/application.html.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/, ''

data/lib/generators/layout/templates/bootstrap2-application.html.slim

@@ -3,8 +3,8 @@ html
   head
     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}" 
+      = 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", :media => "all", "data-turbolinks-track" => true
     == javascript_include_tag "application", "data-turbolinks-track" => true
     == csrf_meta_tags

data/lib/generators/layout/templates/bootstrap3-application.html.slim

@@ -3,8 +3,8 @@ html
   head
     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}" 
+      = 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", :media => "all", "data-turbolinks-track" => true
     == javascript_include_tag "application", "data-turbolinks-track" => true
     == csrf_meta_tags

data/lib/generators/layout/templates/foundation4-application.html.slim

@@ -3,8 +3,8 @@ html
   head
     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}" 
+      = 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", :media => "all", "data-turbolinks-track" => true
     / Modernizr is required for Zurb Foundation
     == javascript_include_tag "vendor/custom.modernizr"

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

@@ -3,8 +3,8 @@ html
   head
     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}"
+      = 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
     / Modernizr is required for Zurb Foundation

data/lib/generators/layout/templates/simple-application.html.slim

@@ -3,8 +3,8 @@ html
   head
     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}"
+      = 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", :media => "all", "data-turbolinks-track" => true
     == javascript_include_tag "application", "data-turbolinks-track" => true
     == csrf_meta_tags

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Daniel Kehoe