brighter_planet_layout 0.5.2 → 0.5.3

data/app/views/layouts/_footer.html.erb

@@ -12,7 +12,7 @@
     <div id="slogan">
       <h1>Brighter Planet™</h1>
       <p class="slogan">The computational sustainability platform</p>
-      <p class="description">&copy;2011 Brighter Planet</p>
+      <p class="description">&copy;2012 Brighter Planet</p>
     </div>
     <div id="links">
 <%= render :partial => 'layouts/nav' %>

data/app/views/layouts/brighter_planet.html.erb

@@ -25,7 +25,7 @@
   <% if ::Rails::VERSION::MAJOR >= 3 %>
     <%= javascript_include_tag brighter_planet_layout_cdn_url("/javascripts/rails.rails-#{Rails::VERSION::STRING}.js") %>
   <% end %>
-  <% if File.exist? File.join(::BrighterPlanet.layout.rails_root, 'public', 'javascripts', 'application.js') %>
+  <% if BrighterPlanet.layout.include_application_javascript? %>
     <%= javascript_include_tag "application" %>
   <% end %>
   <!-- END brighter_planet_layout javascripts -->

data/lib/brighter_planet_layout/version.rb

@@ -1,5 +1,5 @@
 module BrighterPlanet
   class Layout
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 end

data/lib/brighter_planet_layout.rb

@@ -85,7 +85,15 @@ module BrighterPlanet
     end
 
     def include_application_stylesheet?
-      File.exist?(File.join(rails_root, 'public', 'stylesheets', 'application.css')) || (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1)
+      supports_asset_pipeline? || File.exist?(File.join(rails_root, 'public', 'stylesheets', 'application.css'))
+    end
+
+    def include_application_javascript?
+      supports_asset_pipeline? || File.exist?(File.join(rails_root, 'public', 'javascripts', 'application.js'))
+    end
+
+    def supports_asset_pipeline?
+      Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
     end
   
     def serve_static_files_using_rack?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_layout
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: simple-rss