refs #860, fixes images to be not animated

fairmondo · Nov 26, 2014 · 5890d8b · 5890d8b
1 parent daf01b4
commit 5890d8b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/app/models/images/article_image.rb b/app/models/images/article_image.rb
@@ -2,11 +2,19 @@ class ArticleImage < Image
   extend STI
     PROCESSING_IMAGE_URL = "pending.png"
 
-    has_attached_file :image, styles: { original: "900>x600>", medium: "520>x360>", thumb: "280x200>"},
-                            convert_options: { medium: "-quality 75 -strip", thumb: "-quality 75 -strip -background white -gravity center -extent 260x180" },
-                            default_url: "missing.png",
-                            url: "/system/images/:id_partition/:style/:filename",
-                            path: "public/system/images/:id_partition/:style/:filename"
+    has_attached_file :image,
+      styles: {
+        original: {geometry: "900>x600>", animated: false},
+        medium: {geometry: "520>x360>", animated: false},
+        thumb: {geometry: "280x200>", animated: false}
+      },
+      convert_options: {
+        medium: "-quality 75 -strip",
+        thumb: "-quality 75 -strip -background white -gravity center -extent 260x180"
+      },
+      default_url: "missing.png",
+      url: "/system/images/:id_partition/:style/:filename",
+      path: "public/system/images/:id_partition/:style/:filename"
 
     process_in_background :image, :processing_image_url => PROCESSING_IMAGE_URL
 

diff --git a/app/models/images/feedback_image.rb b/app/models/images/feedback_image.rb
@@ -1,10 +1,14 @@
 class FeedbackImage < Image
   extend STI
 
-  has_attached_file :image, styles: { original: "300>x300>" },
-                          default_url: "/assets/missing.png",
-                          url: "/system/images/:id_partition/:style/:filename",
-                          path: "public/system/images/:id_partition/:style/:filename"
+  has_attached_file :image,
+    styles: {
+      original: {geometry: "300>x300>", animated: false}
+    },
+    default_url: "/assets/missing.png",
+    url: "/system/images/:id_partition/:style/:filename",
+    path: "public/system/images/:id_partition/:style/:filename"
+
   belongs_to :feedback, foreign_key: "imageable_id"
 
   validates_attachment_presence :image, unless: :external_url

diff --git a/app/models/images/user_image.rb b/app/models/images/user_image.rb
@@ -1,11 +1,16 @@
 class UserImage < Image
   extend STI
-  has_attached_file :image, styles: { original: "300>x300>", profile: "300x300>" },
-                          convert_options: { profile: "-quality 75 -strip -background white -gravity center -extent 300x300" },
-                          default_url: "/assets/missing.png",
-                          url: "/system/images/:id_partition/:style/:filename",
-                          path: "public/system/images/:id_partition/:style/:filename",
-                          only_process: [:profile]
+  has_attached_file :image,
+    styles: {
+      original: {geometry: "300>x300>", animated: false},
+      profile: {geometry: "300x300>", animated: false}
+    },
+    convert_options: { profile: "-quality 75 -strip -background white -gravity center -extent 300x300" },
+    default_url: "/assets/missing.png",
+    url: "/system/images/:id_partition/:style/:filename",
+    path: "public/system/images/:id_partition/:style/:filename",
+    only_process: [:profile]
+
   belongs_to :user, foreign_key: "imageable_id"
 
   validates_attachment_presence :image, :unless => :external_url