@@ -3,6 +3,8 @@ config/database.yml config/deploy.rb config/settings.yml config/newrelic.yml +config/ey-cloud.yml +config/s3.yml db/*.sqlite3 db/schema.rb public/system .gitignore @@ -4,9 +4,13 @@ class Group < ActiveRecord::Base has_attached_file :image, :styles => { :thumb => '50x50#', :medium => "200x150#" }, + :storage => :s3, + :s3_credentials => "#{RAILS_ROOT}/config/s3.yml", + :bucket => S3_BUCKET, + :path => "news_items/" << :default_url => "/images/default_avatar.png", - :path => ":rails_root/public/system/groups/:attachment/:id_partition/:basename_:style.:extension", - :url => "/system/groups/:attachment/:id_partition/:basename_:style.:extension" + :path => "groups/:attachment/:id_partition/:basename_:style.:extension", + :url => "groups/:attachment/:id_partition/:basename_:style.:extension" def donations_for_pitch(pitch) donations.for_pitch(pitch).map(&:amount).sum app/models/group.rb @@ -60,13 +60,16 @@ class NewsItem < ActiveRecord::Base belongs_to :parent, :class_name => 'NewsItem', :foreign_key => "news_item_id" belongs_to :fact_checker, :class_name => 'User' has_many :comments, :as => :commentable, :dependent => :destroy - + has_attached_file :featured_image, :styles => { :thumb => '50x50#', :medium => "200x150#" }, - :path => ":rails_root/public/system/news_items/" << + :storage => :s3, + :s3_credentials => "#{RAILS_ROOT}/config/s3.yml", + :bucket => S3_BUCKET, + :path => "news_items/" << ":attachment/:id_partition/" << ":basename_:style.:extension", - :url => "/system/news_items/:attachment/:id_partition/" << + :url => "news_items/:attachment/:id_partition/" << ":basename_:style.:extension", :default_url => "/images/featured_images/missing_:style.png" app/models/news_item.rb @@ -115,13 +115,16 @@ class User < ActiveRecord::Base before_validation_on_create :generate_activation_code before_save :encrypt_password, :unless => lambda {|user| user.password.blank? } after_create :register_user_to_fb - + has_attached_file :photo, :styles => { :thumb => '50x50#' }, - :path => ":rails_root/public/system/profiles/" << + :storage => :s3, + :s3_credentials => "#{RAILS_ROOT}/config/s3.yml", + :bucket => S3_BUCKET, + :path => "profiles/" << ":attachment/:id_partition/" << ":basename_:style.:extension", - :url => "/system/profiles/:attachment/:id_partition/" << + :url => "profiles/:attachment/:id_partition/" << ":basename_:style.:extension", :default_url => "/images/default_avatar.png" app/models/user.rb @@ -35,3 +35,4 @@ end PAYPAL_POST_URL = "https://www.sandbox.paypal.com/cgi-bin/webscr" PAYPAL_EMAIL = "info+s_1240233800_per@spot.us" +S3_BUCKET = "spotus-development-storage" config/environments/development.rb @@ -19,3 +19,4 @@ config.after_initialize do end PAYPAL_POST_URL = "https://www.paypal.com/cgi-bin/webscr" PAYPAL_EMAIL = "info@spot.us" +S3_BUCKET = "spotus-production-storage" \ No newline at end of file config/environments/production.rb @@ -22,3 +22,4 @@ end PAYPAL_POST_URL = "https://www.sandbox.paypal.com/cgi-bin/webscr" PAYPAL_EMAIL = "info+s_1240233800_per@spot.us" +S3_BUCKET = "spotus-staging-storage" \ No newline at end of file config/environments/staging.rb 594ab4b8e7d24dead7aeb7fb4a49e1aceb2d2fa9 Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/7d7c692cca21de1294fac495762b5064f82c826f 7d7c692cca21de1294fac495762b5064f82c826f 2009-11-09T17:58:01-08:00 2009-11-09T17:58:01-08:00 Implement S3 storage 6c3d5f2958ed5096d4e6af3e591f8434a5e8b827 Dan Newman dpnewman@gmail.com