brighter_planet_layout 0.2.42 → 0.2.43

data/VERSION

@@ -1 +1 @@
-0.2.42
+0.2.43

data/app/helpers/brighter_planet_helper.rb

@@ -20,4 +20,8 @@ module BrighterPlanetHelper
     end
     link_to text, path
   end
+  
+  def brighter_planet_layout_cdn_url(path)
+    [ request.protocol, ::BrighterPlanetLayout::CDN, "/#{::BrighterPlanetLayout::VERSION}", path ].join
+  end
 end

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

@@ -4,10 +4,31 @@
   <title><%= title = @title ? "#{@title} [#{::BrighterPlanetLayout.application_name}]" : ::BrighterPlanetLayout.application_name %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Language" content="en" />
-  <%= stylesheet_link_tag 'brighter_planet', 'application', 'idle' %>
-  <%= javascript_include_tag :defaults %>
+  <!-- START brighter_planet_layout stylesheets -->
+  <%= stylesheet_link_tag brighter_planet_layout_cdn_url("/stylesheets/brighter_planet.css") %>
+  <%= stylesheet_link_tag brighter_planet_layout_cdn_url("/stylesheets/idle.css") %>
+  <% if File.exist? File.join(::BrighterPlanetLayout.rails_root, 'public', 'stylesheets', 'application.css') %>
+    <%= stylesheet_link_tag "application" %>
+  <% end %>
+  <!-- END brighter_planet_layout stylesheets -->
+  <!-- START brighter_planet_layout javascripts -->
+  <%= javascript_include_tag brighter_planet_layout_cdn_url("/javascripts/prototype.js") %>
+  <%= javascript_include_tag brighter_planet_layout_cdn_url("/javascripts/effects.js") %>
+  <%= javascript_include_tag brighter_planet_layout_cdn_url("/javascripts/dragdrop.js") %>
+  <%= javascript_include_tag brighter_planet_layout_cdn_url("/javascripts/controls.js") %>
+  <% if ::Rails::VERSION::MAJOR == 3 %>
+    <%= javascript_include_tag brighter_planet_layout_cdn_url("/javascripts/rails.js") %>
+  <% end %>
+  <% if File.exist? File.join(::BrighterPlanetLayout.rails_root, 'public', 'javascripts', 'slider.js') %>
+    <!-- required by scriptaculous_slider -->
+    <%= javascript_include_tag "slider" %>
+  <% end %>
+  <% if File.exist? File.join(::BrighterPlanetLayout.rails_root, 'public', 'javascripts', 'application.js') %>
+    <%= javascript_include_tag "application" %>
+  <% end %>
+  <!-- END brighter_planet_layout javascripts -->
   <%= csrf_meta_tag if ::Rails::VERSION::MAJOR == 3 %>
-  <link rel="shortcut icon" type="image/ico" href="/favicon.ico" />
+  <link rel="shortcut icon" type="image/ico" href="<%= brighter_planet_layout_cdn_url('/favicon.ico') %>" />
   <%= render_or_nothing :partial => 'layouts/head' %>
   <%= yield :head %>
 </head>

data/brighter_planet_layout.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brighter_planet_layout}
-  s.version = "0.2.42"
+  s.version = "0.2.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2010-11-17}
   s.description = %q{Layouts, partials, stylesheets, and images}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
@@ -29,6 +29,44 @@ Gem::Specification.new do |s|
      "app/views/layouts/_header.html.erb",
      "app/views/layouts/brighter_planet.html.erb",
      "brighter_planet_layout.gemspec",
+     "cdn/favicon.ico",
+     "cdn/javascripts/controls.js",
+     "cdn/javascripts/dragdrop.js",
+     "cdn/javascripts/effects.js",
+     "cdn/javascripts/prototype.js",
+     "cdn/javascripts/rails.js",
+     "cdn/stylesheets/brighter_planet.css",
+     "cdn/stylesheets/fonts/DejaVuSansMono-Oblique.eot",
+     "cdn/stylesheets/fonts/DejaVuSansMono-Oblique.ttf",
+     "cdn/stylesheets/fonts/DejaVuSansMono.eot",
+     "cdn/stylesheets/fonts/DejaVuSansMono.ttf",
+     "cdn/stylesheets/fonts/KievitOT-Bold.otf",
+     "cdn/stylesheets/fonts/KievitOT-BoldItalic.otf",
+     "cdn/stylesheets/fonts/KievitOT-Italic.otf",
+     "cdn/stylesheets/fonts/KievitOT-Regular.otf",
+     "cdn/stylesheets/fonts/KievitWebPro-Bold.eot",
+     "cdn/stylesheets/fonts/KievitWebPro-Bold.woff",
+     "cdn/stylesheets/fonts/KievitWebPro-BoldIta.eot",
+     "cdn/stylesheets/fonts/KievitWebPro-BoldIta.woff",
+     "cdn/stylesheets/fonts/KievitWebPro-Ita.eot",
+     "cdn/stylesheets/fonts/KievitWebPro-Ita.woff",
+     "cdn/stylesheets/fonts/KievitWebPro.eot",
+     "cdn/stylesheets/fonts/KievitWebPro.woff",
+     "cdn/stylesheets/idle.css",
+     "cdn/stylesheets/images/andy.jpg",
+     "cdn/stylesheets/images/bg.png",
+     "cdn/stylesheets/images/cards.png",
+     "cdn/stylesheets/images/derek.jpg",
+     "cdn/stylesheets/images/gears.png",
+     "cdn/stylesheets/images/ian.jpg",
+     "cdn/stylesheets/images/logo.png",
+     "cdn/stylesheets/images/matt.jpg",
+     "cdn/stylesheets/images/meter.png",
+     "cdn/stylesheets/images/patti.jpg",
+     "cdn/stylesheets/images/prism.png",
+     "cdn/stylesheets/images/radiant_earth-small.png",
+     "cdn/stylesheets/images/robbie.jpg",
+     "cdn/stylesheets/images/seamus.jpg",
      "lib/brighter_planet_layout.rb",
      "lib/brighter_planet_layout/rails.rb",
      "lib/brighter_planet_layout/railtie.rb",
@@ -42,38 +80,7 @@ Gem::Specification.new do |s|
      "public/409.html",
      "public/422.html",
      "public/500.html",
-     "public/favicon.ico",
-     "public/javascripts/controls.js",
-     "public/javascripts/dragdrop.js",
-     "public/javascripts/effects.js",
-     "public/javascripts/prototype.js",
-     "public/javascripts/rails.js",
      "public/maintenance.html",
-     "public/stylesheets/brighter_planet.css",
-     "public/stylesheets/fonts/DejaVuSansMono-Oblique.eot",
-     "public/stylesheets/fonts/DejaVuSansMono-Oblique.ttf",
-     "public/stylesheets/fonts/DejaVuSansMono.eot",
-     "public/stylesheets/fonts/DejaVuSansMono.ttf",
-     "public/stylesheets/fonts/KievitOT-Bold.otf",
-     "public/stylesheets/fonts/KievitOT-BoldItalic.otf",
-     "public/stylesheets/fonts/KievitOT-Italic.otf",
-     "public/stylesheets/fonts/KievitOT-Regular.otf",
-     "public/stylesheets/fonts/KievitWebPro-Bold.eot",
-     "public/stylesheets/fonts/KievitWebPro-Bold.woff",
-     "public/stylesheets/fonts/KievitWebPro-BoldIta.eot",
-     "public/stylesheets/fonts/KievitWebPro-BoldIta.woff",
-     "public/stylesheets/fonts/KievitWebPro-Ita.eot",
-     "public/stylesheets/fonts/KievitWebPro-Ita.woff",
-     "public/stylesheets/fonts/KievitWebPro.eot",
-     "public/stylesheets/fonts/KievitWebPro.woff",
-     "public/stylesheets/idle.css",
-     "public/stylesheets/images/bg.png",
-     "public/stylesheets/images/cards.png",
-     "public/stylesheets/images/gears.png",
-     "public/stylesheets/images/logo.png",
-     "public/stylesheets/images/meter.png",
-     "public/stylesheets/images/prism.png",
-     "public/stylesheets/images/radiant_earth-small.png",
      "rails/init.rb",
      "test/helper.rb",
      "test/test_brighter_planet_layout.rb"

data/{public → cdn}/stylesheets/brighter_planet.css

@@ -744,13 +744,13 @@ p.flash.error:before {
   background-repeat: no-repeat;
   background-position: 100% 100%;
 }
-#footer #map #elsewhere #blog.derek { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/derek.jpg); }
-#footer #map #elsewhere #blog.andy { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/andy.jpg); }
-#footer #map #elsewhere #blog.ian { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/ian.jpg); }
-#footer #map #elsewhere #blog.matt { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/matt.jpg); }
-#footer #map #elsewhere #blog.patti { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/patti.jpg); }
-#footer #map #elsewhere #blog.robbie { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/robbie.jpg); }
-#footer #map #elsewhere #blog.seamus { background-image: url(http://numbers.brighterplanet.com/stylesheets/images/seamus.jpg); }
+#footer #map #elsewhere #blog.derek { background-image: url(images/derek.jpg); }
+#footer #map #elsewhere #blog.andy { background-image: url(images/andy.jpg); }
+#footer #map #elsewhere #blog.ian { background-image: url(images/ian.jpg); }
+#footer #map #elsewhere #blog.matt { background-image: url(images/matt.jpg); }
+#footer #map #elsewhere #blog.patti { background-image: url(images/patti.jpg); }
+#footer #map #elsewhere #blog.robbie { background-image: url(images/robbie.jpg); }
+#footer #map #elsewhere #blog.seamus { background-image: url(images/seamus.jpg); }
 
 #footer #map #elsewhere>div p {
   background: #222;

data/lib/brighter_planet_layout/railtie.rb

@@ -5,9 +5,6 @@ module BrighterPlanetLayout
     end
     initializer 'brighter_planet_layout' do |app|
       app.paths.app.views.push ::BrighterPlanetLayout.view_path
-      if ::BrighterPlanetLayout.serve_static_files_using_rack?
-        app.middleware.use '::ActionDispatch::Static', ::BrighterPlanetLayout.public_path
-      end
       if ::BrighterPlanetLayout.copy_static_files?
         ::BrighterPlanetLayout.copy_static_files_to_web_server_document_root
       end

data/lib/brighter_planet_layout.rb

@@ -1,8 +1,8 @@
 require 'fileutils'
 require 'yaml'
 require 'simple-rss'
-require 'open-uri'
 require 'timeout'
+require 'net/http'
 
 module BrighterPlanetLayout
   GEM_ROOT = ::File.expand_path ::File.join(::File.dirname(__FILE__), '..')
@@ -10,6 +10,12 @@ module BrighterPlanetLayout
   TWITTER_RSS = 'http://twitter.com/statuses/user_timeline/15042574.rss'
   BLOG_ATOM = 'http://numbers.brighterplanet.com/atom.xml'
   FEED_TIMEOUT = 5 # seconds
+  CDN = 'do1ircpq72156.cloudfront.net'
+  S3_BUCKET = 'brighterplanetlayout'
+    
+  def self.cdn_path
+    ::File.join GEM_ROOT, 'cdn'
+  end
   
   def self.view_path
     ::File.join GEM_ROOT, 'app', 'views'
@@ -27,6 +33,7 @@ module BrighterPlanetLayout
     ::File.join GEM_ROOT, 'public'
   end
   
+  # sabshere 11/17/10 now this is only really useful for syncing error pages
   def self.copy_static_files_to_web_server_document_root
     ::Dir[::File.join(public_path, '*')].each do |source_path|
       dest_path = ::File.join(rails_root, 'public', source_path.gsub(public_path, ''))
@@ -48,17 +55,13 @@ module BrighterPlanetLayout
   end
   
   def self.copy_static_files?
-    not heroku? and not serve_static_files_using_rack? and not layout_warning_installed?
+    not heroku? and not layout_warning_installed?
   end
   
   def self.heroku?
     ::File.readable? '/home/heroku_rack/heroku.ru'
   end
   
-  def self.serve_static_files_using_rack?
-    not heroku? and not ::Rails.env.production?
-  end
-  
   def self.application_name
     (::Rails::VERSION::MAJOR == 3) ? ::Rails.application.name : ::APPLICATION_NAME
   end
@@ -73,10 +76,8 @@ module BrighterPlanetLayout
   
   def self.latest_tweet
     ::Timeout.timeout(FEED_TIMEOUT) do
-      ::SimpleRSS.parse(open(TWITTER_RSS)).entries.first
+      ::SimpleRSS.parse(get(TWITTER_RSS)).entries.first
     end
-  rescue ::OpenURI::HTTPError
-    # nil
   rescue ::SocketError, ::Timeout::Error, ::Errno::ETIMEDOUT, ::Errno::ENETUNREACH, ::Errno::ECONNRESET, ::Errno::ECONNREFUSED
     # nil
   rescue ::NoMethodError
@@ -85,15 +86,33 @@ module BrighterPlanetLayout
   
   def self.latest_blog_post
     ::Timeout.timeout(FEED_TIMEOUT) do
-      ::SimpleRSS.parse(open(BLOG_ATOM)).entries.first
+      ::SimpleRSS.parse(get(BLOG_ATOM)).entries.first
     end
-  rescue ::OpenURI::HTTPError
-    # nil
   rescue ::SocketError, ::Timeout::Error, ::Errno::ETIMEDOUT, ::Errno::ENETUNREACH, ::Errno::ECONNRESET, ::Errno::ECONNREFUSED
     # nil
   rescue ::NoMethodError
     # nil
   end
+  
+  # sabshere 11/17/10 thanks dkastner
+  def self.get(url)
+    uri = URI.parse url
+    response = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.get [uri.path, uri.query].compact.join('?')
+    end
+    response.body
+  end
+  
+  # sabshere 11/17/10 not worth it --cache-control=\"public, max-age=7776000\"
+  def self.update_s3
+    # ENV['S3SYNC_DIR'] = 
+    # ENV['SSL_CERT_DIR'] = 
+    # ENV['AWS_ACCESS_KEY_ID'] = 
+    # ENV['AWS_SECRET_ACCESS_KEY'] = 
+    ENV['S3SYNC_NATIVE_CHARSET'] = 'UTF-8'
+    cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --delete -v -r --ssl --public-read #{cdn_path}/ #{S3_BUCKET}:#{VERSION}/"
+    `#{cmd}`
+  end
 end
 
 if defined? ::Rails::Railtie and ::Rails::VERSION::MAJOR == 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_layout
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: false
   segments: 
   - 0
   - 2
-  - 42
-  version: 0.2.42
+  - 43
+  version: 0.2.43
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,44 @@ files:
 - app/views/layouts/_header.html.erb
 - app/views/layouts/brighter_planet.html.erb
 - brighter_planet_layout.gemspec
+- cdn/favicon.ico
+- cdn/javascripts/controls.js
+- cdn/javascripts/dragdrop.js
+- cdn/javascripts/effects.js
+- cdn/javascripts/prototype.js
+- cdn/javascripts/rails.js
+- cdn/stylesheets/brighter_planet.css
+- cdn/stylesheets/fonts/DejaVuSansMono-Oblique.eot
+- cdn/stylesheets/fonts/DejaVuSansMono-Oblique.ttf
+- cdn/stylesheets/fonts/DejaVuSansMono.eot
+- cdn/stylesheets/fonts/DejaVuSansMono.ttf
+- cdn/stylesheets/fonts/KievitOT-Bold.otf
+- cdn/stylesheets/fonts/KievitOT-BoldItalic.otf
+- cdn/stylesheets/fonts/KievitOT-Italic.otf
+- cdn/stylesheets/fonts/KievitOT-Regular.otf
+- cdn/stylesheets/fonts/KievitWebPro-Bold.eot
+- cdn/stylesheets/fonts/KievitWebPro-Bold.woff
+- cdn/stylesheets/fonts/KievitWebPro-BoldIta.eot
+- cdn/stylesheets/fonts/KievitWebPro-BoldIta.woff
+- cdn/stylesheets/fonts/KievitWebPro-Ita.eot
+- cdn/stylesheets/fonts/KievitWebPro-Ita.woff
+- cdn/stylesheets/fonts/KievitWebPro.eot
+- cdn/stylesheets/fonts/KievitWebPro.woff
+- cdn/stylesheets/idle.css
+- cdn/stylesheets/images/andy.jpg
+- cdn/stylesheets/images/bg.png
+- cdn/stylesheets/images/cards.png
+- cdn/stylesheets/images/derek.jpg
+- cdn/stylesheets/images/gears.png
+- cdn/stylesheets/images/ian.jpg
+- cdn/stylesheets/images/logo.png
+- cdn/stylesheets/images/matt.jpg
+- cdn/stylesheets/images/meter.png
+- cdn/stylesheets/images/patti.jpg
+- cdn/stylesheets/images/prism.png
+- cdn/stylesheets/images/radiant_earth-small.png
+- cdn/stylesheets/images/robbie.jpg
+- cdn/stylesheets/images/seamus.jpg
 - lib/brighter_planet_layout.rb
 - lib/brighter_planet_layout/rails.rb
 - lib/brighter_planet_layout/railtie.rb
@@ -86,38 +124,7 @@ files:
 - public/409.html
 - public/422.html
 - public/500.html
-- public/favicon.ico
-- public/javascripts/controls.js
-- public/javascripts/dragdrop.js
-- public/javascripts/effects.js
-- public/javascripts/prototype.js
-- public/javascripts/rails.js
 - public/maintenance.html
-- public/stylesheets/brighter_planet.css
-- public/stylesheets/fonts/DejaVuSansMono-Oblique.eot
-- public/stylesheets/fonts/DejaVuSansMono-Oblique.ttf
-- public/stylesheets/fonts/DejaVuSansMono.eot
-- public/stylesheets/fonts/DejaVuSansMono.ttf
-- public/stylesheets/fonts/KievitOT-Bold.otf
-- public/stylesheets/fonts/KievitOT-BoldItalic.otf
-- public/stylesheets/fonts/KievitOT-Italic.otf
-- public/stylesheets/fonts/KievitOT-Regular.otf
-- public/stylesheets/fonts/KievitWebPro-Bold.eot
-- public/stylesheets/fonts/KievitWebPro-Bold.woff
-- public/stylesheets/fonts/KievitWebPro-BoldIta.eot
-- public/stylesheets/fonts/KievitWebPro-BoldIta.woff
-- public/stylesheets/fonts/KievitWebPro-Ita.eot
-- public/stylesheets/fonts/KievitWebPro-Ita.woff
-- public/stylesheets/fonts/KievitWebPro.eot
-- public/stylesheets/fonts/KievitWebPro.woff
-- public/stylesheets/idle.css
-- public/stylesheets/images/bg.png
-- public/stylesheets/images/cards.png
-- public/stylesheets/images/gears.png
-- public/stylesheets/images/logo.png
-- public/stylesheets/images/meter.png
-- public/stylesheets/images/prism.png
-- public/stylesheets/images/radiant_earth-small.png
 - rails/init.rb
 - test/helper.rb
 - test/test_brighter_planet_layout.rb