rails_layout 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e1150262e76212d02157ab6fa9a958785356fc
-  data.tar.gz: 81b23773d71f52459fb7a25446787115a2a33faa
+  metadata.gz: 3e34a5527bcaa16a6da0667377342295fa77fec8
+  data.tar.gz: 1a989c4335301f2c027268b18d0265894b76bca1
 SHA512:
-  metadata.gz: 14bfb434e57d09d4205c368dc47f11878586c0371e0c9f2844829babf6de557c0f0291cb64baf84dc2f4b4f943db09d5f8ca3155c8a6fae70637135acbdbdff0
-  data.tar.gz: 7629023203c22dafbcc30d8e3c4880c8ea55d3b3bcf6acdc79f1e44bcb1201941df5ebf86029811ecc23425ffa50ec8e0faec8b3299c83e3a8af6c5457bda848
+  metadata.gz: b5d2bb04acea7cae6d71d9745a0a15ba41401cebaa8aa034c8fb95b112c3e00790a9f153d5bde7c03f68626789677a745b20fb66fe8e9b1cde568ba2c0b9925f
+  data.tar.gz: cab3b7902c13feaee4d87ed4b1259c54b0c6e6e1f249c83159b9a8b3ebc23e8081fecaf72aa82b9c4031b0daab4920604a209bfe3ab9acc524aa5f0855c14193

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 1.0.28 November 4, 2015
+
+* move navigation auth links to a new partial 'app/views/layouts/_nav_links_for_auth.html.erb'
+
 h3. 1.0.27 October 18, 2015
 
 * create a file '1st_load_framework' instead of 'framework_and_overrides' to force loading a framework first (the asset pipeline loads files in a tree in alpha order)

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

@@ -18,7 +18,7 @@ module Layout
         append_file 'app/views/layouts/_navigation_links.html.erb', "<li><%= link_to 'Contact', new_contact_path %></li>\n" if File.exists?("app/views/contacts/new.html.#{ext}")
         # DEVISE
         if File.exists?('config/initializers/devise.rb')
-          append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+          create_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
 <% if user_signed_in? %>
   <li><%= link_to 'Edit account', edit_user_registration_path %></li>
   <li><%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %></li>
@@ -31,7 +31,7 @@ LINKS
         end
         # OMNIAUTH
         if File.exists?('config/initializers/omniauth.rb')
-          append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+          create_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
 <% if user_signed_in? %>
   <li><%= link_to 'Sign out', signout_path %></li>
 <% else %>
@@ -44,7 +44,7 @@ LINKS
         if Dir.glob("app/views/users/index.html.{#{ext},erb}").any?
           if User.column_names.include? 'role'
             # suitable for role-based authorization
-            append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+            append_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
 <% if user_signed_in? %>
   <% if current_user.try(:admin?) %>
     <li><%= link_to 'Users', users_path %></li>
@@ -54,7 +54,7 @@ LINKS
             end
           else
             # suitable for simple authentication
-            append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+            append_file 'app/views/layouts/_nav_links_for_auth.html.erb' do <<-LINKS
 <% if user_signed_in? %>
   <li><%= link_to 'Users', users_path %></li>
 <% end %>
@@ -65,10 +65,18 @@ LINKS
         # UPMIN (administrative dashboard)
         if File.exists?('config/initializers/upmin.rb')
           navlink = "    <li><%= link_to 'Admin', '/admin' %></li>"
-          inject_into_file 'app/views/layouts/_navigation_links.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
+          inject_into_file 'app/views/layouts/_nav_links_for_auth.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
         end
       end
 
+      def modify_layout_for_auth_links
+        return unless File.exists?('app/views/layouts/_nav_links_for_auth.html.erb')
+        app = ::Rails.application
+        ext = app.config.generators.options[:rails][:template_engine] || :erb
+        partial = "<%= render 'layouts/navigation_links' %>\n        <%= render 'layouts/nav_links_for_auth' %>"
+        gsub_file "app/views/layouts/_navigation.html.#{ext}", /<%= render 'layouts\/navigation_links' %>/, partial
+      end
+
       def add_tests
         return unless File.exists?('config/initializers/devise.rb')
         return unless File.exists?('spec/spec_helper.rb')

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.27"
+  VERSION = "1.0.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler