rails_layout 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ccb6085b59fb72a600fa3305f334b29292af235
-  data.tar.gz: f10cd4df4604be63a6811b6504e6fff6410a2adb
+  metadata.gz: 1c20084ec98b6b4346b68560fffb738d81b50a9b
+  data.tar.gz: 9232f2d87284321e9bf234e8fdc2e9917086b5c6
 SHA512:
-  metadata.gz: d4f464d7c213ef3c57140f5a7c1de697fb37d85b069b82c101a052579a49b41c3ed613e68f975e8135cbc0576411d1ecc06a0860d8d86af324898b05332acddf
-  data.tar.gz: 73520aae0cf3f414f66231b8aeef99115ef5f1e924f898b5ab6be5721bcf2b32219524054a4138f7468ccc195223f574bd51c28203228303c0c9b0a0c35f4620
+  metadata.gz: 899524d0346f4f20f87d645abfc6e1b4dbaf61d573748c6189ed68323f4f71f98bbd0a63580b253e992cb515525b0985296e89e1b2ad53be908f757ce58aae10
+  data.tar.gz: c6239a188e170479dc72aa54fb479dae6e09397fc1bdcf1a6089db8d162585fe3b2c93e04aa4e4a68424f34a8ed9e1c21bef85b9f61cfc182b4b33c6cff236ff

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h2. 0.1.7 October 13, 2013
+
+* support for Haml markup
+
 h2. 0.1.6 October 13, 2013
 
 * support for Zurb Foundation 4.0

data/lib/generators/layout/USAGE

@@ -12,3 +12,9 @@ Create simple layout files when no front-end framework is used:
 
 Create layout files suitable for Twitter Bootstrap 2.3:
   rails generate layout bootstrap2
+
+Create layout files suitable for Twitter Bootstrap 3.0:
+  rails generate layout bootstrap3
+
+Create layout files suitable for Zurb Foundation 4.0:
+  rails generate layout foundation4

data/lib/generators/layout/layout_generator.rb

@@ -13,7 +13,7 @@ module Layout
         app = ::Rails.application
         @app_name = app.class.to_s.split("::").first
         ext = app.config.generators.options[:rails][:template_engine] || :erb
-        # so far, I've only got templates for ERB, but Haml and Slim could be added
+        # I've got templates for ERB and Haml (but not Slim)
         template "#{framework_name}-application.html.#{ext}", "app/views/layouts/application.html.#{ext}"
         copy_file "#{framework_name}-messages.html.#{ext}", "app/views/layouts/_messages.html.#{ext}"
         copy_file "#{framework_name}-navigation.html.#{ext}", "app/views/layouts/_navigation.html.#{ext}"
@@ -30,12 +30,18 @@ module Layout
 
       # If 'About' or 'Contact' views exist in known locations, add navigation links
       def add_navigation_links
-        # not yet accommodating Haml and Slim (we'll need different substitutions)
+        # not yet accommodating Slim (we'll need different substitutions)
         if File.exists?('app/views/pages/about.html.erb')
-          insert_into_file 'app/views/layouts/_navigation.html.erb', "\n  <li><%= link_to 'About', page_path('about') %></li>", :before => "\n</ul>"
+          insert_into_file 'app/views/layouts/_navigation.html.erb', "\n  %li= link_to 'About', page_path('about') %></li>", :before => "\n</ul>"
         end
         if File.exists?('app/views/contacts/new.html.erb')
-          insert_into_file 'app/views/layouts/_navigation.html.erb', "\n  <li><%= link_to 'Contact', new_contact_path %></li>", :before => "\n</ul>"
+          insert_into_file 'app/views/layouts/_navigation.html.erb', "\n  %li= link_to 'Contact', new_contact_path %></li>", :before => "\n</ul>"
+        end
+        if File.exists?('app/views/contacts/new.html.haml')
+          insert_into_file 'app/views/layouts/_navigation.html.haml', "\n  %li= link_to 'Contact', new_contact_path", :after => "root_path"
+        end
+        if File.exists?('app/views/pages/about.html.haml')
+          insert_into_file 'app/views/layouts/_navigation.html.haml', "\n  %li= link_to 'About', page_path('about')", :after => "root_path"
         end
       end
 

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

@@ -0,0 +1,23 @@
+!!!
+%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 %>'}"}
+    = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
+    = javascript_include_tag "application", "data-turbolinks-track" => true
+    = csrf_meta_tags
+  %body
+    -# application layout styled for Twitter Bootstrap 2.3
+    %header.navbar.navbar-fixed-top
+      %nav.navbar-inner
+        .container
+          = render 'layouts/navigation'
+    %main{:role => "main"}
+      .container
+        .content
+          .row
+            .span12
+              = render 'layouts/messages'
+              = yield
+          %footer

data/lib/generators/layout/templates/bootstrap2-messages.html.erb

@@ -2,7 +2,7 @@
 <% flash.each do |name, msg| %>
   <% if msg.is_a?(String) %>
     <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
-      <a class="close" data-dismiss="alert">&#215;</a>
+      <a class="close" data-dismiss="alert">&times;</a>
       <%= content_tag :div, msg, :id => "flash_#{name}" %>
     </div>
   <% end %>

data/lib/generators/layout/templates/bootstrap2-messages.html.haml

@@ -0,0 +1,6 @@
+-# Rails flash messages styled for Twitter Bootstrap 2.3
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    %div{:class => "alert alert-#{name == :notice ? "success" : "error"}"}
+      %a.close{"data-dismiss" => "alert"} ×
+      = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/templates/bootstrap2-navigation.html.haml

@@ -0,0 +1,2 @@
+%ul.nav
+  %li= link_to 'Home', root_path

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

@@ -0,0 +1,31 @@
+!!!
+%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 %>'}"}
+    = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
+    = javascript_include_tag "application", "data-turbolinks-track" => true
+    = csrf_meta_tags
+  %body
+    -# application layout styled for Twitter Bootstrap 3.0
+    %header
+      %nav.navbar.navbar-default.navbar-fixed-top
+        .container
+          .navbar-header
+            %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", :type => "button"}
+              %span.sr-only Toggle navigation
+              %span.icon-bar
+              %span.icon-bar
+              %span.icon-bar
+          .collapse.navbar-collapse
+            = render 'layouts/navigation'
+    %main{:role => "main"}
+      .container
+        .container
+          .content
+            .row
+              .col-md-12
+                = render 'layouts/messages'
+                = yield
+            %footer

data/lib/generators/layout/templates/bootstrap3-messages.html.haml

@@ -0,0 +1,6 @@
+-# Rails flash messages styled for Twitter Bootstrap 3.0
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    %div{:class => "alert alert-#{name == :notice ? "success" : "danger"}"}
+      %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} ×
+      = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/templates/bootstrap3-navigation.html.haml

@@ -0,0 +1,2 @@
+%ul.nav.navbar-nav
+  %li= link_to 'Home', root_path

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

@@ -0,0 +1,31 @@
+!!!
+%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 %>'}"}
+    = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
+    -#  Modernizr is required for Zurb Foundation 4
+    = javascript_include_tag "vendor/custom.modernizr"
+    = javascript_include_tag "application", "data-turbolinks-track" => true
+    = csrf_meta_tags
+  %body
+    -# application layout styled for Zurb Foundation 4
+    %header
+      %nav.top-bar
+        %ul.title-area
+          %li.name
+            -# add site name or logo here
+          %li.toggle-topbar.menu-icon
+            %a{:href => "#"}
+              %span Menu
+        %section.top-bar-section
+          = render 'layouts/navigation'
+    %main{:role => "main"}
+      .container
+        .content
+          .row
+            .twelve.columns
+              = render 'layouts/messages'
+              = yield
+          %footer

data/lib/generators/layout/templates/foundation4-messages.html.haml

@@ -0,0 +1,6 @@
+-# Rails flash messages styled for Zurb Foundation 4
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    %div{:class => "alert-box #{name == :notice ? "warning" : "alert"}", "data-alert" => ""}
+      = content_tag :div, msg, :id => "flash_#{name}"
+      %a.close{:href => "#"} ×

data/lib/generators/layout/templates/foundation4-navigation.html.haml

@@ -0,0 +1,2 @@
+%ul
+  %li= link_to 'Home', root_path

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

@@ -9,7 +9,7 @@
     <%%= csrf_meta_tags %>
   </head>
   <body>
-    <div id="container">
+    <div class="container">
       <header>
         <%%= render 'layouts/navigation' %>
       </header>

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

@@ -0,0 +1,17 @@
+!!!
+%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 %>'}"}
+    = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
+    = javascript_include_tag "application", "data-turbolinks-track" => true
+    = csrf_meta_tags
+  %body
+    .container
+      %header
+        = render 'layouts/navigation'
+      %main{:role => "main"}
+        = render 'layouts/messages'
+        = yield
+      %footer

data/lib/generators/layout/templates/simple-messages.html.haml

@@ -0,0 +1,3 @@
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/layout/templates/simple-navigation.html.haml

@@ -0,0 +1,2 @@
+%ul.nav
+  %li= link_to 'Home', root_path

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,17 +55,29 @@ files:
 - lib/generators/layout/USAGE
 - lib/generators/layout/layout_generator.rb
 - lib/generators/layout/templates/bootstrap2-application.html.erb
+- lib/generators/layout/templates/bootstrap2-application.html.haml
 - lib/generators/layout/templates/bootstrap2-messages.html.erb
+- lib/generators/layout/templates/bootstrap2-messages.html.haml
 - lib/generators/layout/templates/bootstrap2-navigation.html.erb
+- lib/generators/layout/templates/bootstrap2-navigation.html.haml
 - lib/generators/layout/templates/bootstrap3-application.html.erb
+- lib/generators/layout/templates/bootstrap3-application.html.haml
 - lib/generators/layout/templates/bootstrap3-messages.html.erb
+- lib/generators/layout/templates/bootstrap3-messages.html.haml
 - lib/generators/layout/templates/bootstrap3-navigation.html.erb
+- lib/generators/layout/templates/bootstrap3-navigation.html.haml
 - lib/generators/layout/templates/foundation4-application.html.erb
+- lib/generators/layout/templates/foundation4-application.html.haml
 - lib/generators/layout/templates/foundation4-messages.html.erb
+- lib/generators/layout/templates/foundation4-messages.html.haml
 - lib/generators/layout/templates/foundation4-navigation.html.erb
+- lib/generators/layout/templates/foundation4-navigation.html.haml
 - lib/generators/layout/templates/simple-application.html.erb
+- lib/generators/layout/templates/simple-application.html.haml
 - lib/generators/layout/templates/simple-messages.html.erb
+- lib/generators/layout/templates/simple-messages.html.haml
 - lib/generators/layout/templates/simple-navigation.html.erb
+- lib/generators/layout/templates/simple-navigation.html.haml
 - lib/generators/layout/templates/simple.css
 - lib/rails_layout.rb
 - lib/rails_layout/version.rb