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

upgrade carrierwave to 0.6.2

Browse source
This commit is contained in:
Maxwell Salzberg 2012-05-17 18:51:12 -07:00
parent 20a63e3497
commit d069865c42
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -62,7 +62,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading # file uploading
gem 'carrierwave', '0.5.8' gem 'carrierwave', '0.6.2'
gem 'fog' gem 'fog'
gem 'fastercsv', '1.5.4', :require => false gem 'fastercsv', '1.5.4', :require => false
gem 'mini_magick', '3.4' gem 'mini_magick', '3.4'

7
Gemfile.lock
View file

@ -91,8 +91,9 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
carrierwave (0.5.8) carrierwave (0.6.2)
activesupport (~> 3.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cgi_multipart_eof_fix (2.5.0) cgi_multipart_eof_fix (2.5.0)
childprocess (0.3.2) childprocess (0.3.2)
ffi (~> 1.0.6) ffi (~> 1.0.6)
@ -472,7 +473,7 @@ DEPENDENCIES
capistrano-ext capistrano-ext
capistrano_colors capistrano_colors
capybara (~> 1.1.2) capybara (~> 1.1.2)
carrierwave (= 0.5.8) carrierwave (= 0.6.2)
client_side_validations client_side_validations
cucumber-rails (= 1.3.0) cucumber-rails (= 1.3.0)
database_cleaner (= 0.7.1) database_cleaner (= 0.7.1)

15
config/initializers/carrierwave.rb
View file

@ -4,16 +4,17 @@
#Excon needs to see the CA Cert Bundle file #Excon needs to see the CA Cert Bundle file
ENV["SSL_CERT_FILE"] = AppConfig[:ca_file] ENV["SSL_CERT_FILE"] = AppConfig[:ca_file]
CarrierWave.configure do |config| CarrierWave.configure do |config|
if !Rails.env.test? && AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket] && AppConfig[:s3_region] if !Rails.env.test? && AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket] && AppConfig[:s3_region]
config.storage = :s3 config.storage = :fog
config.s3_access_key_id = AppConfig[:s3_key]
config.s3_secret_access_key = AppConfig[:s3_secret]
config.s3_bucket = AppConfig[:s3_bucket]
config.s3_region = AppConfig[:s3_region]
config.s3_use_ssl = true
config.cache_dir = "#{Rails.root}/tmp/uploads" config.cache_dir = "#{Rails.root}/tmp/uploads"
config.fog_credentials = {
:provider => 'AWS',
:aws_access_key_id => AppConfig[:s3_key],
:aws_secret_access_key => AppConfig[:s3_secret],
:region => AppConfig[:s3_region]
}
config.fog_directory = AppConfig[:s3_bucket]
else else
config.storage = :file config.storage = :file
end end