fix attachment uploader for aws

Dmitriy Zaporozhets
1 parent 2d83e43d
Showing 1 changed file with 10 additions and 1 deletions Show diff stats
app/uploaders/attachment_uploader.rb
@@ -8,6 +8,15 @@ class AttachmentUploader &lt; CarrierWave::Uploader::Base
   end
  
   def image?
-    %w(png jpg jpeg).include?(file.extension)
+    img_ext = %w(png jpg jpeg)
+    if file.respond_to?(:extension)
+      img_ext.include?(file.extension)
+    else
+      # Not all CarrierWave storages respond to :extension
+      ext = file.path.split('.').last
+      img_ext.include?(ext)
+    end
+  rescue
+    false
   end
 end
...	...	@@ -8,6 +8,15 @@ class AttachmentUploader < CarrierWave::Uploader::Base
8	8	end
9	9
10	10	def image?
11		- %w(png jpg jpeg).include?(file.extension)
	11	+ img_ext = %w(png jpg jpeg)
	12	+ if file.respond_to?(:extension)
	13	+ img_ext.include?(file.extension)
	14	+ else
	15	+ # Not all CarrierWave storages respond to :extension
	16	+ ext = file.path.split('.').last
	17	+ img_ext.include?(ext)
	18	+ end
	19	+ rescue
	20	+ false
12	21	end
13	22	end
...	...