rails_layout 1.0.25 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a8bf021d5ae1aa188562e400f2f6dfe2503d5d
-  data.tar.gz: d912f1ead3b545cfad1a24bf97eb32f057bc0cb9
+  metadata.gz: e229fa2a209b9e826992509aa863411675755c87
+  data.tar.gz: 920f971e942ab205bdd246e17d8f5d93334199f0
 SHA512:
-  metadata.gz: fa6fd0397eb1f89edcc51986a8ce2efe7623f3ea5a215527521888c254b5d09cfca8a9cbc15ed22cb138ba977b905aa718f2ab821cb06098176906aeae09de36
-  data.tar.gz: fbb2946795593cf59b33cf45a650f18d3c271072f4858477fc4cd3ce87eb09b2733215d81e9a0c26466bb6ddfb58f120c5f73f27027a9069de6007fe19018895
+  metadata.gz: ba0a3634fb67fe98836bc08c8bf0ec0b8c58444b5d9511989cee1dd7e5f736c107beea0679820826f9a32b6a0159541c10bd02a09fe9cbec7dd6a66109ee92b1
+  data.tar.gz: b94fd188b6f0c4ed8d3b82286b2a6629e03f5b7f366b0e1b79fc2ce1333b0d861228f34cc5b71c9dbfb9c3c7c9ac1a4d50ee8b8661b2e79cf45ab7e3fec0078a

data/.ruby-gemset

@@ -0,0 +1 @@
+rails-layout

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 1.0.26 May 8, 2015
+
+* use Rails 'try' when testing if the current_user is an admin (contributed by bogdanvlviv)
+
 h3. 1.0.25 March 8, 2015
 
 * only apply styling for 'error_explanation' when not empty

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

@@ -46,7 +46,7 @@ LINKS
             # suitable for role-based authorization
             append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
 <% if user_signed_in? %>
-  <% if current_user.admin? %>
+  <% if current_user.try(:admin?) %>
     <li><%= link_to 'Users', users_path %></li>
   <% end %>
 <% end %>
@@ -65,7 +65,7 @@ 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.admin? %>\n"
+          inject_into_file 'app/views/layouts/_navigation_links.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
         end
       end
 

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.25"
+  VERSION = "1.0.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.textile
 - Gemfile
 - LICENSE.txt
@@ -147,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rails generator creates application layout files for Bootstrap and other