rails_layout 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0a511796be3874b92dc7796a2fa0a4e76ae15c
-  data.tar.gz: b4b0a01168936acf7461a984dba82384252bb96f
+  metadata.gz: 789a055991b9c9b5e0d81196a96e830f35faaa3b
+  data.tar.gz: a8a4e70ae9a9aad01663186a5f7fa444167eccbf
 SHA512:
-  metadata.gz: ba0415eec489a62285a0251e7de5c061c018de2de218250448c6f63c593d79aa93683767c6510ff57a1600f77f649d26b037b9603934e864565004470b64295d
-  data.tar.gz: 3c2ce9e3163c8ab08a2247c6589286bec60b352e15d53e42a9957b282955b17e8c6553a49a0053103db545020af54c85673dce8728fbf0ffcc44ee47d93b836a
+  metadata.gz: 6b2b7ab3ca2b3acac3aadf7fae4414a7b1d2794ecd63e820ebaf3c253f5929f547979f5eb656f3c06fb5916529951064c0587df8e521ff1ac730408a957df0b1
+  data.tar.gz: 5f80815d397798be0575c69883d67e7fa7969a398f64b71106907f27537c710459ed2164162f0a5247cd5f39e0a5d06db8aa04859fa840a5fa093608d6737151

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 1.0.6 February 13, 2014
+
+* add OmniAuth navigation links
+
 h3. 1.0.5 January 16, 2014
 
 * Modernizr must be loaded before Foundation

data/README.textile

@@ -3,8 +3,11 @@ h1. !http://railsapps.github.io/images/rails-36x36.jpg(RailsLayout Gem)! RailsLa
 Use this gem to set up layout files for your choice of front-end framework:
 
 * Zurb Foundation 5.0
-* Zurb Foundation 4.0
 * Bootstrap 3.0
+
+Or earlier versions:
+
+* Zurb Foundation 4.0
 * Bootstrap 2.3
 
 Plus it will set up "Devise":https://github.com/plataformatec/devise views with styling for Bootstrap or Foundation.
@@ -34,7 +37,7 @@ h4. Generate Application Layout, Navigation, and Flash Message Files
 
 h4. Add Links to the Navigation File
 
-* @$ $ rails generate layout:navigation@
+* @$ rails generate layout:navigation@
 
 h4. Generate Devise Views
 
@@ -163,9 +166,9 @@ Two navigation partials are created:
 * app/views/layouts/_navigation_links.html.erb
 * app/views/layouts/_navigation.html.erb
 
-The first file contains no framework-specific styling. It is only a list of links. You can add additional links to this file as needed.
+The *_navigation_links.html.erb* file is only a list of links. You can add additional links to this file as needed. It contains no framework-specific styling.
 
-The second file contains framework-specific styling.
+The *_navigation.html.erb* file contains framework-specific styling. Separating the files makes it easy to change the front-end framework without disturbing the links.
 
 h4. Support for ERB, Haml, or Slim
 
@@ -201,17 +204,17 @@ $ rails generate layout:install foundation5 --force
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5-application.js
 
 h3. Zurb Foundation 4.0 Layout
 
@@ -229,17 +232,17 @@ $ rails generate layout:install foundation4 --force
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-application.js
 
 h3. Bootstrap 3.0 Layout
 
@@ -257,17 +260,17 @@ $ rails generate layout:install bootstrap3 --force
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap3-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap3-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap3-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/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/templates/bootstrap-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap-application.js
 
 h3. Bootstrap 2.3 Layout
 
@@ -285,17 +288,17 @@ $ rails generate layout:install bootstrap2 --force
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap2-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap2-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap2-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/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/templates/bootstrap-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap-application.js
 
 h3. Generate a Simple Layout
 
@@ -313,14 +316,14 @@ $ rails generate layout:install simple --force
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-navigation.html.erb
-* "app/assets/stylesheets/simple.css":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple.css
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/simple-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/simple-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/simple-navigation.html.erb
+* "app/assets/stylesheets/simple.css":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/simple.css
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/application.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/application.css.scss
+* "app/assets/stylesheets/application.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/application.css.scss
 
 h3. Reverting to None
 
@@ -348,7 +351,7 @@ The file *app/assets/stylesheets/application.css.scss* will contain a CSS rule b
 
 h2. The "layout:navigation" Command
 
-If you are using Devise for authentication, you can generate a navigation links partial containing links for Devise.
+If you are using Devise or OmniAuth for authentication, you can generate a navigation links partial containing appropriate links.
 
 This command is used to populate the navigation bar in starter applications created by the "Rails Composer":http://railsapps.github.io/rails-composer/ tool.
 
@@ -356,7 +359,7 @@ This command is used to populate the navigation bar in starter applications crea
 $ rails generate layout:navigation --force
 </pre>
 
-This creates a file *app/views/layouts/_navigation_links.html.erb*:
+Here's an example of a file *app/views/layouts/_navigation_links.html.erb* appropriate for Devise:
 
 <pre>
 <%# add navigation links to this file %>

data/lib/generators/layout/navigation/navigation_generator.rb

@@ -44,6 +44,17 @@ LINKS
 <% if user_signed_in? %>
   <li><%= link_to 'Users', users_path %></li>
 <% end %>
+LINKS
+          end
+        end
+        # OMNIAUTH
+        if Dir.glob("config/initializers/omniauth.rb").any?
+          append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+<% if user_signed_in? %>
+  <li><%= link_to 'Logout', signout_path %></li>
+<% else %>
+  <li><%= link_to 'Login', signin_path %></li>
+<% end %>
 LINKS
           end
         end

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

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