brighter_planet_layout 0.2.44 → 0.2.45

data/VERSION

@@ -1 +1 @@
-0.2.44
+0.2.45

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

@@ -5,6 +5,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Language" content="en" />
   <!-- START brighter_planet_layout stylesheets -->
+  <%= stylesheet_link_tag 'fonts' %>
   <%= 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') %>

data/brighter_planet_layout.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brighter_planet_layout}
-  s.version = "0.2.44"
+  s.version = "0.2.45"
 
   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-17}
+  s.date = %q{2010-11-18}
   s.description = %q{Layouts, partials, stylesheets, and images}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
@@ -29,47 +29,6 @@ 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.rails-2.3.10.js",
-     "cdn/javascripts/prototype.rails-3.0.1.js",
-     "cdn/javascripts/prototype.rails-3.0.3.js",
-     "cdn/javascripts/rails.rails-3.0.1.js",
-     "cdn/javascripts/rails.rails-3.0.3.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",
@@ -83,7 +42,49 @@ 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.rails-2.3.10.js",
+     "public/javascripts/prototype.rails-3.0.1.js",
+     "public/javascripts/prototype.rails-3.0.3.js",
+     "public/javascripts/rails.rails-3.0.1.js",
+     "public/javascripts/rails.rails-3.0.3.js",
      "public/maintenance.html",
+     "public/stylesheets/brighter_planet.css",
+     "public/stylesheets/fonts.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/andy.jpg",
+     "public/stylesheets/images/bg.png",
+     "public/stylesheets/images/cards.png",
+     "public/stylesheets/images/derek.jpg",
+     "public/stylesheets/images/gears.png",
+     "public/stylesheets/images/ian.jpg",
+     "public/stylesheets/images/logo.png",
+     "public/stylesheets/images/matt.jpg",
+     "public/stylesheets/images/meter.png",
+     "public/stylesheets/images/patti.jpg",
+     "public/stylesheets/images/prism.png",
+     "public/stylesheets/images/radiant_earth-small.png",
+     "public/stylesheets/images/robbie.jpg",
+     "public/stylesheets/images/seamus.jpg",
      "rails/init.rb",
      "test/helper.rb",
      "test/test_brighter_planet_layout.rb"

data/lib/brighter_planet_layout/railtie.rb

@@ -5,6 +5,9 @@ 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

@@ -13,10 +13,6 @@ module BrighterPlanetLayout
   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'
   end
@@ -55,13 +51,17 @@ module BrighterPlanetLayout
   end
   
   def self.copy_static_files?
-    not heroku? and not layout_warning_installed?
+    not heroku? and not serve_static_files_using_rack? 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 ::Rails.env.production? and not heroku?
+  end
+  
   def self.application_name
     (::Rails::VERSION::MAJOR == 3) ? ::Rails.application.name : ::APPLICATION_NAME
   end
@@ -104,16 +104,46 @@ module BrighterPlanetLayout
   end
   
   # sabshere 11/17/10 not worth it --cache-control=\"public, max-age=7776000\"
-  # sabshere 11/17/10 don't --delete
   def self.update_s3
     # ENV['AWS_ACCESS_KEY_ID'] = 
     # ENV['AWS_SECRET_ACCESS_KEY'] = 
     # ENV['AWS_ACCESS_KEY_ID'] = 
     # ENV['AWS_SECRET_ACCESS_KEY'] = 
     ENV['S3SYNC_NATIVE_CHARSET'] = 'UTF-8'
-    cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb -v -r --ssl --public-read #{cdn_path}/ #{S3_BUCKET}:#{VERSION}/"
+    cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --exclude=\"ai\" -v -r --ssl --public-read #{public_path}/ #{S3_BUCKET}:#{VERSION}/"
     `#{cmd}`
   end
+  
+  # sabshere 11/18/10 access control header doesn't work
+  # vidalia:~/github/brighter_planet_layout (master) $ ruby ~/bp/propsgod/s3sync/s3cmd.rb -v -s put brighterplanetlayout:0.2.43/stylesheets/fonts/KievitWebPro.woff public/stylesheets/fonts/KievitWebPro.woff x-amz-acl:public-read "Access-Control-Allow-Origin:*"
+  # put to key brighterplanetlayout:0.2.43/stylesheets/fonts/KievitWebPro.woff from public/stylesheets/fonts/KievitWebPro.woff {"Access-Control-Allow-Origin"=>"*", "x-amz-acl"=>"public-read", "Content-Length"=>"61924"}
+  # 
+  # vidalia:~ $ curl -O -v http://brighterplanetlayout.s3.amazonaws.com/0.2.43/stylesheets/fonts/KievitWebPro.woff* About to connect() to brighterplanetlayout.s3.amazonaws.com port 80 (#0)
+  # *   Trying 72.21.207.165...   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+  #                                  Dload  Upload   Total   Spent    Left  Speed
+  #   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0connected
+  # * Connected to brighterplanetlayout.s3.amazonaws.com (72.21.207.165) port 80 (#0)
+  # > GET /0.2.43/stylesheets/fonts/KievitWebPro.woff HTTP/1.1
+  # > User-Agent: curl/7.20.0 (i386-apple-darwin9.8.0) libcurl/7.20.0 OpenSSL/0.9.8m zlib/1.2.3 libidn/1.16
+  # > Host: brighterplanetlayout.s3.amazonaws.com
+  # > Accept: */*
+  # > 
+  # < HTTP/1.1 200 OK
+  # < x-amz-id-2: lVNwntUjGX/0UxlygqXa+8yR2hFpAV+EZAzITK/ZMJQTnTOuJXvHEULNgPr1r9vt
+  # < x-amz-request-id: 2B46C5DEBD6083E3
+  # < Date: Thu, 18 Nov 2010 15:36:14 GMT
+  # < Last-Modified: Thu, 18 Nov 2010 15:33:11 GMT
+  # < ETag: "83c664104e2127f1b8519b653adc98dd"
+  # < Accept-Ranges: bytes
+  # < Content-Type: 
+  # < Content-Length: 61924
+  # < Server: AmazonS3
+  # < 
+  # { [data not shown]
+  # 100 61924  100 61924    0     0   138k      0 --:--:-- --:--:-- --:--:--  216k* Connection #0 to host brighterplanetlayout.s3.amazonaws.com left intact
+  # 
+  # * Closing connection #0
+  # vidalia:~ $ 
 end
 
 if defined? ::Rails::Railtie and ::Rails::VERSION::MAJOR == 3

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

@@ -1,55 +1,3 @@
-/*------------*/
-
-@font-face {
-  font-family: 'Brighter Planet';
-  src: url('fonts/KievitWebPro.eot');
-  src: local('☺'), url("fonts/KievitWebPro.woff") format("woff"), url("fonts/KievitOT-Regular.otf") format("opentype");
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'Brighter Planet';
-  src: url('fonts/KievitWebPro-Bold.eot');
-  src: local('☺'), url("fonts/KievitWebPro-Bold.woff") format("woff"), url("fonts/KievitOT-Bold.otf") format("opentype");
-  font-weight: bold;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'Brighter Planet';
-  src: url('fonts/KievitWebPro-BoldIta.eot');
-  src: local('☺'), url("fonts/KievitWebPro-BoldIta.woff") format("woff"), url("fonts/KievitOT-BoldItalic.otf") format("opentype");
-  font-weight: bold;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'Brighter Planet';
-  src: url('fonts/KievitWebPro-Ita.eot');
-  src: local('☺'), url("fonts/KievitWebPro-Ita.woff") format("woff"), url("fonts/KievitOT-Italic.otf") format("opentype");
-  font-weight: normal;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'DejaVu Mono';
-  src: url('fonts/DejaVuSansMono.eot');
-  src: local('☺'), url("fonts/DejaVuSansMono.ttf") format("opentype");
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'DejaVu Mono';
-  src: url('fonts/DejaVuSansMono-Oblique.eot');
-  src: local('☺'), url("fonts/DejaVuSansMono-Oblique.ttf") format("opentype");
-  font-weight: normal;
-  font-style: italic;
-}
-
-/* ---------- */
-
 body {
   margin: 0;
   font-size: 13px;

data/public/stylesheets/fonts.css

@@ -0,0 +1,47 @@
+@font-face {
+  font-family: 'Brighter Planet';
+  src: url('fonts/KievitWebPro.eot');
+  src: local('☺'), url("fonts/KievitWebPro.woff") format("woff"), url("fonts/KievitOT-Regular.otf") format("opentype");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Brighter Planet';
+  src: url('fonts/KievitWebPro-Bold.eot');
+  src: local('☺'), url("fonts/KievitWebPro-Bold.woff") format("woff"), url("fonts/KievitOT-Bold.otf") format("opentype");
+  font-weight: bold;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Brighter Planet';
+  src: url('fonts/KievitWebPro-BoldIta.eot');
+  src: local('☺'), url("fonts/KievitWebPro-BoldIta.woff") format("woff"), url("fonts/KievitOT-BoldItalic.otf") format("opentype");
+  font-weight: bold;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Brighter Planet';
+  src: url('fonts/KievitWebPro-Ita.eot');
+  src: local('☺'), url("fonts/KievitWebPro-Ita.woff") format("woff"), url("fonts/KievitOT-Italic.otf") format("opentype");
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'DejaVu Mono';
+  src: url('fonts/DejaVuSansMono.eot');
+  src: local('☺'), url("fonts/DejaVuSansMono.ttf") format("opentype");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'DejaVu Mono';
+  src: url('fonts/DejaVuSansMono-Oblique.eot');
+  src: local('☺'), url("fonts/DejaVuSansMono-Oblique.ttf") format("opentype");
+  font-weight: normal;
+  font-style: italic;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_layout
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: false
   segments: 
   - 0
   - 2
-  - 44
-  version: 0.2.44
+  - 45
+  version: 0.2.45
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -06:00
+date: 2010-11-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,47 +73,6 @@ 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.rails-2.3.10.js
-- cdn/javascripts/prototype.rails-3.0.1.js
-- cdn/javascripts/prototype.rails-3.0.3.js
-- cdn/javascripts/rails.rails-3.0.1.js
-- cdn/javascripts/rails.rails-3.0.3.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
@@ -127,7 +86,49 @@ 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.rails-2.3.10.js
+- public/javascripts/prototype.rails-3.0.1.js
+- public/javascripts/prototype.rails-3.0.3.js
+- public/javascripts/rails.rails-3.0.1.js
+- public/javascripts/rails.rails-3.0.3.js
 - public/maintenance.html
+- public/stylesheets/brighter_planet.css
+- public/stylesheets/fonts.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/andy.jpg
+- public/stylesheets/images/bg.png
+- public/stylesheets/images/cards.png
+- public/stylesheets/images/derek.jpg
+- public/stylesheets/images/gears.png
+- public/stylesheets/images/ian.jpg
+- public/stylesheets/images/logo.png
+- public/stylesheets/images/matt.jpg
+- public/stylesheets/images/meter.png
+- public/stylesheets/images/patti.jpg
+- public/stylesheets/images/prism.png
+- public/stylesheets/images/radiant_earth-small.png
+- public/stylesheets/images/robbie.jpg
+- public/stylesheets/images/seamus.jpg
 - rails/init.rb
 - test/helper.rb
 - test/test_brighter_planet_layout.rb