Fix paperclip tempfile detect

reinaldomendes · May 14, 2012 · 4914510 · 4914510
1 parent a2c3de0
commit 4914510
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/lib/ckeditor/backend/paperclip.rb b/lib/ckeditor/backend/paperclip.rb
@@ -21,7 +21,10 @@ def self.extended(base)
 
       module InstanceMethods
         def geometry
-          @geometry ||= ::Paperclip::Geometry.from_file(data.to_file)
+          @geometry ||= begin
+            file = data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
+            ::Paperclip::Geometry.from_file(file)
+          end
         end
 
         protected

diff --git a/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb b/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb
@@ -10,8 +10,8 @@ def self.up
       t.string  :type, :limit => 30
 
       # Uncomment	it to save images dimensions, if your need it
-#		  t.integer :width
-#		  t.integer :height
+		  t.integer :width
+		  t.integer :height
 
       t.timestamps
     end

diff --git a/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb b/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb
@@ -11,8 +11,8 @@ def self.up
       t.string  :type, :limit => 30
 
       # Uncomment these to save image dimensions, if your need them.
-      # t.integer :data_width
-      # t.integer :data_height
+      t.integer :data_width
+      t.integer :data_height
 
       t.timestamps
     end

diff --git a/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb b/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb
@@ -10,8 +10,8 @@ def self.up
       t.string  :type, :limit => 30
 
       # Uncomment	it to save images dimensions, if your need it
-#		  t.integer :width
-#		  t.integer :height
+		  t.integer :width
+		  t.integer :height
 
       t.timestamps
     end