rails_layout 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8813ff21264efe36c532f1841b818f0f7721c458
-  data.tar.gz: 9518064270333234e5a55fbaf5eb855a372a7f09
+  metadata.gz: 648e4f681b5ad19c5d2ae77d3e995e3fc9b6d700
+  data.tar.gz: 3472f3f3e947acce87a86c3a62296e48281b8da5
 SHA512:
-  metadata.gz: 0d710544f1cb92c8299cedb645f1dfe0130719b4092dacc761fc33d8018380cf11787ea81c214cdc13a97e7c6a7b542ac6ba9b8a24d2f2af409e0a0c71a52e51
-  data.tar.gz: 25034958cafe2cb631b2063b2f7b0205d1c2751b3ff86f9c781cec8fd7a3ba1e730c212886f860d5506adddb4695d4a939e2704b526771dc8beeaa326a47ae68
+  metadata.gz: 5487f8fa993f3191bcc7c700a6355992e94be99580e3d38b30fe389c36e451125cb387906de93da7bfffee122e7a45d0aa0c98b226ab8dcd3922bd4307143c75
+  data.tar.gz: 34ebc9843536c0cc7f64c024dbf13363ddd22a9b40558092e960f49288aa9c6447b4fe662ebf653d395f4fe6b84f6df75edbaa82778786df27eba12a2910a713

data/CHANGELOG.textile

@@ -1,8 +1,13 @@
 h1. CHANGELOG
 
+h3. 1.0.15 May 3, 2014
+
+* update navlinks partial to accommodate role-based authorization
+* drop workaround after release of bootstrap-sass 3.1.1.1 (fixes #20)
+
 h3. 1.0.14 April 9, 2014
 
-* workaround for Rails 4.1.2 pending releaase of bootstrap-sass 3.1.2 (fixes #20)
+* workaround for Rails 4.1.0 pending release of bootstrap-sass 3.1.1.1 (fixes #20)
 * modify 'config/application.rb' for Foundation 5 (fixes #19)
 * remove unnecessary conditional on Bootstrap navlinks partial (contributed by Arnel Bucio)
 

data/README.textile

@@ -5,19 +5,16 @@ Use this gem to set up layout files for your choice of front-end framework:
 * Zurb Foundation 5.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.
+It also will set up "Devise":https://github.com/plataformatec/devise views with styling for Bootstrap or Foundation.
 
 RailsLayout is a utility gem to use during development.
 
-h4. Rails Composer
+h4. Other Tools
 
 The RailsLayout gem is used by "Rails Composer":http://railsapps.github.io/rails-composer/ tool, an application template used to create starter applications. You can use Rails Composer to generate entire applications.
 
+If you like the RailsLayout gem, you might be interested in the "RailsApps Testing gem":https://github.com/RailsApps/rails_apps_testing which sets up a testing framework for Rails.
+
 h4. !http://railsapps.github.io/images/join/join-railsapps.png(Join RailsApps)!:http://railsapps.github.io/
 
 h4. Support the RailsApps Project
@@ -61,6 +58,8 @@ h4. Zurb Foundation 5.0
 gem 'foundation-rails'
 </pre>
 
+See a note below about a necessary change to the *config/application.rb* file.
+
 h4. Zurb Foundation 4.0
 
 <pre>
@@ -214,6 +213,25 @@ and modify the file:
 
 * "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5-application.js
 
+h4. config/application.rb
+
+The rails_layout gem will make a necessary change to the *config/application.rb* file. It will add:
+
+<pre>
+module RailsFoundation
+  class Application < Rails::Application
+    .
+    .
+    .
+    # For Foundation 5
+    config.assets.precompile += %w( vendor/modernizr )
+
+  end
+end
+</pre>
+
+See "issue 19":https://github.com/RailsApps/rails_layout/issues/19 for an explanation.
+
 h3. Zurb Foundation 4.0 Layout
 
 To create layout files for use with Zurb Foundation 4.0:

data/lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss

@@ -1,9 +1,3 @@
-// Temporary workaround for Rails 4.1.2 pending releaase of bootstrap-sass 3.1.2
-//= depend_on_asset "bootstrap/glyphicons-halflings-regular.eot"
-//= depend_on_asset "bootstrap/glyphicons-halflings-regular.svg"
-//= depend_on_asset "bootstrap/glyphicons-halflings-regular.ttf"
-//= depend_on_asset "bootstrap/glyphicons-halflings-regular.woff"
-
 // import the CSS framework
 @import "bootstrap";
 

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

@@ -30,12 +30,29 @@ LINKS
           end
         end
         # USERS
-        if Dir.glob("app/views/users/index.html.{#{ext},erb}").any?
-          append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+        if Object.const_defined?('User')
+          if User.column_names.include? 'role'
+            # suitable for role-based authorization
+            if Dir.glob("app/views/users/index.html.{#{ext},erb}").any?
+              append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
+<% if user_signed_in? %>
+  <% if current_user.admin? %>
+    <li><%= link_to 'Users', users_path %></li>
+  <% end %>
+<% end %>
+LINKS
+              end
+            end
+          else
+            # suitable for simple authentication
+            if Dir.glob("app/views/users/index.html.{#{ext},erb}").any?
+              append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
 <% if user_signed_in? %>
   <li><%= link_to 'Users', users_path %></li>
 <% end %>
 LINKS
+              end
+            end
           end
         end
         # OMNIAUTH

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler