Use cloudfuji_paperclip with STS awareness

kandanapp · Apr 27, 2012 · c12d67e · c12d67e
1 parent 7577714
commit c12d67e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -20,7 +20,7 @@ gem '_bushido-faye', '0.8.2'
 # Helper gems
 gem 'kaminari'
 gem 'aws-sdk'
-gem 'paperclip'
+gem 'cloudfuji_paperclip'
 gem 'remotipart'
 gem 'jquery-rails'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -53,6 +53,12 @@ GEM
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
       rest-client (>= 1.6.1)
+    cloudfuji_paperclip (3.0.3)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (>= 0.0.2)
+      mime-types
     cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -103,16 +109,11 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.2)
     multi_xml (0.4.2)
     nokogiri (1.5.0)
     orm_adapter (0.0.6)
-    paperclip (2.7.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
-      mime-types
     pg (0.12.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -163,7 +164,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -180,14 +181,14 @@ DEPENDENCIES
   aws-sdk
   bourbon
   cloudfuji
+  cloudfuji_paperclip
   coffee-rails (~> 3.2.1)
   devise
   devise_cloudfuji_authenticatable
   eco
   execjs
   jquery-rails
   kaminari
-  paperclip
   pg (= 0.12.2)
   rails (= 3.2.2)
   remotipart

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
@@ -1,4 +1,4 @@
-require 'paperclip'
+require 'cloudfuji_paperclip'
 
 class Attachment < ActiveRecord::Base
   belongs_to :channel