nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ssl s3, attrs

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-17 12:55:16 -08:00
parent 0c8aca3ef8
commit 995d285fdd
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -34,7 +34,7 @@ gem 'thin', '1.2.7', :require => false
gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485' gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
#File uploading #File uploading
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch gem 'carrierwave', :git => 'git://github.com/recruitmilitary/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
gem 'mini_magick', '3.2' gem 'mini_magick', '3.2'
gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.< gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
gem 'fastercsv', '1.5.4', :require => false gem 'fastercsv', '1.5.4', :require => false

4
Gemfile.lock
View file

@ -37,8 +37,8 @@ GIT
simple_oauth (~> 0.1.2) simple_oauth (~> 0.1.2)
GIT GIT
remote: git://github.com/rsofaer/carrierwave.git remote: git://github.com/recruitmilitary/carrierwave.git
revision: a42dfa25023775be82d7eb9bc9edb675986b1f40 revision: a30bb2603a51b646fd771065d6c203abef2e936e
branch: master branch: master
specs: specs:
carrierwave (0.5.0) carrierwave (0.5.0)

4
app/models/photo.rb
View file

@ -9,8 +9,8 @@ class Photo < Post
xml_attr :remote_photo_path xml_attr :remote_photo_path
xml_attr :remote_photo_name xml_attr :remote_photo_name
xml_reader :caption xml_attr :caption
xml_reader :status_message_id xml_attr :status_message_id
belongs_to :status_message belongs_to :status_message

1
config/initializers/carrierwave.rb
View file

@ -8,6 +8,7 @@ CarrierWave.configure do |config|
config.s3_access_key_id = AppConfig[:s3_key] config.s3_access_key_id = AppConfig[:s3_key]
config.s3_secret_access_key = AppConfig[:s3_secret] config.s3_secret_access_key = AppConfig[:s3_secret]
config.s3_bucket = AppConfig[:s3_bucket] config.s3_bucket = AppConfig[:s3_bucket]
config.s3_use_ssl = true
config.cache_dir = "#{Rails.root}/tmp/uploads" config.cache_dir = "#{Rails.root}/tmp/uploads"
else else
config.storage = :file config.storage = :file