brighter_planet_layout 0.2.47 → 0.2.48

data/VERSION

@@ -1 +1 @@
-0.2.47
+0.2.48

data/app/helpers/brighter_planet_helper.rb

@@ -22,6 +22,10 @@ module BrighterPlanetHelper
   end
   
   def brighter_planet_layout_cdn_url(path)
-    [ request.protocol, ::BrighterPlanetLayout::CDN, "/#{::BrighterPlanetLayout::VERSION}", path ].join
+    if ::Rails.env.production?
+      [ request.protocol, ::BrighterPlanetLayout::CDN, "/#{::BrighterPlanetLayout::VERSION}", path ].join
+    else
+      path
+    end
   end
 end

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

@@ -1,13 +1,15 @@
-<script type="text/javascript">
-//<![CDATA[
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= ::BrighterPlanetLayout.google_analytics_ua_number %>']);
-  _gaq.push(['_trackPageview']);
+<% if ::Rails.env.production? %>
+  <script type="text/javascript">
+  //<![CDATA[
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '<%= ::BrighterPlanetLayout.google_analytics_ua_number %>']);
+    _gaq.push(['_trackPageview']);
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-//]]>
-</script>
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  //]]>
+  </script>
+<% end %>

data/brighter_planet_layout.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brighter_planet_layout}
-  s.version = "0.2.47"
+  s.version = "0.2.48"
 
   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-11-19}
+  s.date = %q{2010-12-10}
   s.description = %q{Layouts, partials, stylesheets, and images}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [

data/lib/brighter_planet_layout.rb

@@ -8,8 +8,8 @@ module BrighterPlanetLayout
   GEM_ROOT = ::File.expand_path ::File.join(::File.dirname(__FILE__), '..')
   VERSION = ::YAML.load ::File.read(::File.join(GEM_ROOT, 'VERSION'))
   TWITTER_RSS = 'http://twitter.com/statuses/user_timeline/15042574.rss'
-  BLOG_ATOM = 'http://numbers.brighterplanet.com/atom.xml'
-  FEED_TIMEOUT = 5 # seconds
+  BLOG_ATOM = 'http://numbers.brighterplanet.com/latest.xml'
+  TIMEOUT = 5 # seconds
   CDN = 'do1ircpq72156.cloudfront.net'
   S3_BUCKET = 'brighterplanetlayout'
     
@@ -75,9 +75,7 @@ module BrighterPlanetLayout
   end
   
   def self.latest_tweet
-    ::Timeout.timeout(FEED_TIMEOUT) do
-      ::SimpleRSS.parse(get(TWITTER_RSS)).entries.first
-    end
+    ::SimpleRSS.parse(get(TWITTER_RSS)).entries.first
   rescue ::SocketError, ::Timeout::Error, ::Errno::ETIMEDOUT, ::Errno::ENETUNREACH, ::Errno::ECONNRESET, ::Errno::ECONNREFUSED
     # nil
   rescue ::NoMethodError
@@ -85,20 +83,24 @@ module BrighterPlanetLayout
   end
   
   def self.latest_blog_post
-    ::Timeout.timeout(FEED_TIMEOUT) do
-      ::SimpleRSS.parse(get(BLOG_ATOM)).entries.first
-    end
+    ::SimpleRSS.parse(get(BLOG_ATOM)).entries.first
   rescue ::SocketError, ::Timeout::Error, ::Errno::ETIMEDOUT, ::Errno::ENETUNREACH, ::Errno::ECONNRESET, ::Errno::ECONNREFUSED
     # nil
   rescue ::NoMethodError
     # nil
   end
   
+  def self.timer
+    defined?(::SystemTimer) ? ::SystemTimer : ::Timeout
+  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('?')
+    uri = ::URI.parse url
+    response = timer.timeout(TIMEOUT) do
+      ::Net::HTTP.start(uri.host, uri.port) do |http|
+        http.get [uri.path, uri.query].compact.join('?')
+      end
     end
     response.body
   end
@@ -109,7 +111,7 @@ module BrighterPlanetLayout
     # ENV['AWS_SECRET_ACCESS_KEY'] = 
     # ENV['AWS_ACCESS_KEY_ID'] = 
     # ENV['AWS_SECRET_ACCESS_KEY'] = 
-    ENV['S3SYNC_NATIVE_CHARSET'] = 'UTF-8'
+    ::ENV['S3SYNC_NATIVE_CHARSET'] = 'UTF-8'
     cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --exclude=\"\\.ai\" -v -r --ssl --public-read #{public_path}/ #{S3_BUCKET}:#{VERSION}/"
     `#{cmd}`
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_layout
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 119
   prerelease: false
   segments: 
   - 0
   - 2
-  - 47
-  version: 0.2.47
+  - 48
+  version: 0.2.48
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -06:00
+date: 2010-12-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency