db/migrate/20090702030411_reset_current_theme.rb lib/tasks/s3.rake @@ -33,11 +33,12 @@ script/server sudo gem install heroku --no-ri --no-rdoc heroku create # Set the variables for your production environment in config/config.yml +rake s3:create rake heroku:config git push heroku master heroku rake db:schema:load heroku open -# Note that uploads and email don't work (yet...) +# Note that email won't work (yet...) # Read more about Heroku here: http://heroku.com/ README @@ -22,7 +22,7 @@ module ApplicationHelper def theme_css return '<style type="text/css">@import "/stylesheets/application.css";</style>' if @settings.theme.blank? - return '<style type="text/css">@import "/themes/' + @settings.theme + '";</style>' + return "<style type=\"text/css\">@import #{@settings.theme};</style>" end def page_title app/helpers/application_helper.rb @@ -5,8 +5,15 @@ class Avatar < ActiveRecord::Base belongs_to :user belongs_to :current_avatar_user, :foreign_key => 'current_user_id', :class_name => 'User' - has_attached_file :attachment, :url => "/avatars/:filename", :storage => :filesystem - + if CONFIG['s3'] + has_attached_file :attachment, :storage => :s3, :path => "avatars/:filename", + :bucket => CONFIG['s3_bucket_name'], # TODO is there a way to share this between models? + :s3_credentials => { :access_key_id => CONFIG['s3_access_id'], :secret_access_key => CONFIG['s3_secret_key'] }, + :s3_headers => { 'Cache-Control' => 'max-age=315576000', 'Expires' => 10.years.from_now.httpdate } + else + has_attached_file :attachment, :storage => :filesystem, :url => "/avatars/:filename" + end + validates_attachment_size :attachment, :less_than => 500.kilobytes validates_attachment_content_type :attachment, :content_type => /image/ app/models/avatar.rb @@ -5,8 +5,15 @@ class Header < ActiveRecord::Base attr_accessible :description belongs_to :user - - has_attached_file :attachment, :url => "/headers/:filename", :storage => :filesystem + + if CONFIG['s3'] + has_attached_file :attachment, :storage => :s3, :path => "headers/:filename", + :bucket => CONFIG['s3_bucket_name'], # TODO is there a way to share this between models? + :s3_credentials => { :access_key_id => CONFIG['s3_access_id'], :secret_access_key => CONFIG['s3_secret_key'] }, + :s3_headers => { 'Cache-Control' => 'max-age=315576000', 'Expires' => 10.years.from_now.httpdate } + else + has_attached_file :attachment, :storage => :filesystem, :url => "/headers/:filename" + end validates_attachment_size :attachment, :less_than => 500.kilobytes validates_attachment_content_type :attachment, :content_type => /image/ app/models/header.rb @@ -19,7 +19,8 @@ class Setting < ActiveRecord::Base end def self.current_theme - Theme.find_by_attachment_file_name(Setting.first.theme) # TODO refactor to use has_one :current_theme etc + current_url = Setting.first.theme + Theme.all.detect {|t| t.attachment.url == current_url } end def to_s app/models/setting.rb @@ -4,16 +4,22 @@ class Theme < ActiveRecord::Base belongs_to :user - has_attached_file :attachment, :url => "/themes/:filename", :storage => :filesystem + if CONFIG['s3'] + has_attached_file :attachment, :storage => :s3, :path => "themes/:filename", + :bucket => CONFIG['s3_bucket_name'], # TODO is there a way to share this between models? + :s3_credentials => { :access_key_id => CONFIG['s3_access_id'], :secret_access_key => CONFIG['s3_secret_key'] }, + :s3_headers => { 'Cache-Control' => 'max-age=315576000', 'Expires' => 10.years.from_now.httpdate } + else + has_attached_file :attachment, :storage => :filesystem, :url => "/themes/:filename" + end validates_attachment_size :attachment, :less_than => 50.kilobytes - validates_attachment_content_type :attachment, :content_type => /css/ after_destroy :deselect def select - Setting.first.update_attribute(:theme, self.attachment_file_name) + Setting.first.update_attribute(:theme, self.attachment.url) end def deselect app/models/theme.rb @@ -5,11 +5,12 @@ class Upload < ActiveRecord::Base belongs_to :user if CONFIG['s3'] - has_attached_file :attachment, :path => "files/:filename", :storage => :s3, :bucket => CONFIG['s3_bucket_name'], + has_attached_file :attachment, :storage => :s3, :path => "files/:filename", + :bucket => CONFIG['s3_bucket_name'], # TODO is there a way to share this between models? :s3_credentials => { :access_key_id => CONFIG['s3_access_id'], :secret_access_key => CONFIG['s3_secret_key'] }, :s3_headers => { 'Cache-Control' => 'max-age=315576000', 'Expires' => 10.years.from_now.httpdate } else - has_attached_file :attachment, :url => "/files/:filename", :storage => :filesystem + has_attached_file :attachment, :storage => :filesystem, :url => "/files/:filename" end validates_attachment_size :attachment, :less_than => 100.megabytes app/models/upload.rb @@ -9,7 +9,7 @@ <p> <%= link_to h(theme), theme.attachment.url %> by <%= link_to h(theme.user), theme.user %> - <% if @current_theme == theme %> + <% if theme == @current_theme %> <%= link_to '(deselect)', deselect_theme_path(theme), :method => :post %> <% else %> <%= link_to '(select)', select_theme_path(theme), :method => :post %> app/views/themes/index.html.erb @@ -13,6 +13,6 @@ production: session_secret: # at least 32 char random string and should be unique to your installation and kept secret domain: # http://example.com mailer: # noreply@example.com - s3_access_id: # s3 is generall optional, but required for heroku - s3_secret_key: # see https://s3.amazonaws.com/ to sign up for an account - s3_bucket_name: # ... + s3_access_id: # s3 is generally optional, but required for heroku + s3_secret_key: # see the Amazon S3 site to sign up: https://s3.amazonaws.com/ + s3_bucket_name: # provide a unique bucket name and run "rake s3:create" to create it automatically config/config.example.yml ee33101662a29b6b07ebad8c6f4f48f7923b8b2d Trevor Turk trevorturk@yahoo.com http://github.com/trevorturk/eldorado/commit/d7bdbd3ae39b240e304ecc1199ba2fb48666397e d7bdbd3ae39b240e304ecc1199ba2fb48666397e 2009-07-01T20:18:13-07:00 2009-07-01T20:18:13-07:00 finish up optional s3 support, needed migration to change the way the current theme is stored in settings ee5d49d01dc0e228753a5bd89802bae8d5839e40 Trevor Turk trevorturk@yahoo.com