migrated to carrierwave-aws

mdeiters · mdeiters · commit f927d42a5f29 · 2016-02-18T22:14:35.000-08:00
diff --git a/.env.sample b/.env.sample
@@ -1,6 +1,7 @@
 LEGACY_DB_URL=you_only_need_this_to_migrate
 LEGACY_REDIS_URL=you_only_need_this_to_migrate
 GOOGLE_ANALYTICS_UA=UA-XXXXXXXX-X
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-FOG_DIRECTORY=
+AWS_ACCESS_ID=
+AWS_ACCESS_SECRET=
+AWS_BUCKET=
+AWS_REGION=
diff --git a/Gemfile b/Gemfile
@@ -20,9 +20,8 @@ gem 'github-markup'
 gem 'clearance'
 gem 'kaminari'
 gem 'mini_magick'
-gem 'carrierwave'
+gem 'carrierwave-aws'
 gem 'carrierwave_backgrounder'
-gem 'fog-aws'
 gem 'friendly_id'
 gem 'browser'
 gem 'postmark-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,6 +38,12 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
+    aws-sdk (2.2.18)
+      aws-sdk-resources (= 2.2.18)
+    aws-sdk-core (2.2.18)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.18)
+      aws-sdk-core (= 2.2.18)
     babel-source (5.8.26)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -60,6 +66,9 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
+    carrierwave-aws (1.0.0)
+      aws-sdk (~> 2.0)
+      carrierwave (~> 0.7)
     carrierwave_backgrounder (0.4.2)
       carrierwave (~> 0.5)
     chronic_duration (0.10.6)
@@ -87,24 +96,7 @@ GEM
     email_validator (1.6.0)
       activemodel
     erubis (2.7.0)
-    excon (0.45.4)
     execjs (2.6.0)
-    fog-aws (0.8.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (1.35.0)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
     friendly_id (5.1.0)
       activerecord (>= 4.0.0)
     github-markup (1.4.0)
@@ -128,7 +120,7 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    ipaddress (0.8.3)
+    jmespath (1.1.3)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -154,7 +146,6 @@ GEM
     mini_magick (4.4.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    multi_json (1.11.2)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     numerizer (0.1.1)
@@ -270,13 +261,12 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   browser
   capybara
-  carrierwave
+  carrierwave-aws
   carrierwave_backgrounder
   clearance
   coderay
   coffee-rails (~> 4.1.0)
   dotenv-rails
-  fog-aws
   friendly_id
   github-markup
   green_monkey
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
@@ -1,8 +1,6 @@
 module UsersHelper
 
   def current_user_liked_list
-    # what it was on protip
-    #signed-in-user-liked-payload.hide=current_user.likes?(@protip) && [dom_id(@protip)]
     if signed_in?
       current_user.liked
     else
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
@@ -10,19 +10,20 @@
     config.storage = :file
   else
     config.enable_processing = true
-    config.storage           = :fog
-    config.asset_host        = "https://#{['FOG_DIRECTORY']}.s3.amazonaws.com"
-    config.fog_directory     = ENV['FOG_DIRECTORY']
-    config.fog_attributes    = { 'Cache-Control' => "max-age=#{365.day.to_i}" }
-    config.fog_credentials   = {
-      provider: 'AWS',
-      aws_access_key_id:      ENV['AWS_ACCESS_KEY_ID'],
-      aws_secret_access_key:  ENV['AWS_SECRET_ACCESS_KEY']
+    config.storage           = :aws
+    config.asset_host        = "https://#{ENV['AWS_BUCKET']}.s3.amazonaws.com"
+    config.aws_acl           = 'public-read'
+    config.aws_bucket        = ENV['AWS_BUCKET']
+    config.aws_credentials   = {
+      access_key_id:     ENV['AWS_ACCESS_ID'],
+      secret_access_key: ENV['AWS_ACCESS_SECRET'],
+      region:            ENV['AWS_REGION']
     }
-    # config.asset_host = proc do |file|
-    #   identifier = ENV['FOG_DIRECTORY']
-    #   "http://#{identifier}.cdn.rackspacecloud.com"
-    # end
+    config.aws_attributes    = {
+       expires: 1.week.from_now.httpdate,
+       cache_control: 'max-age=604800'
+    }
+    config.aws_authenticated_url_expiration = 60 * 60 * 24 * 7
   end
 end
 
diff --git a/lib/avatar_uploader.rb b/lib/avatar_uploader.rb
@@ -2,12 +2,6 @@ class AvatarUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
   process resize_and_pad: [100, 100]
-  # storage :fog
-
-  def default_url
-    model_name = model.class.name.downcase
-    ActionController::Base.helpers.asset_path "#{model_name}-avatar.png"
-  end
 
   def extension_white_list
     %w(jpg jpeg gif png)
