Make the whole thing more robust

Antonio Terceiro
1 parent cac61e3d
Showing 3 changed files with 13 additions and 5 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
lib/delayed_attachment_fu.rb
test/functional/cms_controller_test.rb
@@ -343,7 +343,7 @@ class CmsController &lt; MyProfileController
   def media_upload
     files_uploaded = []
     parent = check_parent(params[:parent_id])
-    files = [:file1,:file2, :file3].map { |f| params[f] }
+    files = [:file1,:file2, :file3].map { |f| params[f] }.compact
     if request.post?
       files.each do |file|
         files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''
@@ -401,7 +401,7 @@ class CmsController &lt; MyProfileController
     list.map do |item|
       {
         'title' => item.title,
-        'url' => url_for(item.url),
+        'url' => item.image? ? item.public_filename(:uploaded) : url_for(item.url),
         :icon => icon_for_article(item),
         :content_type => item.mime_type
       }
@@ -38,7 +38,11 @@ module DelayedAttachmentFu
     end
     def public_filename(size=nil)
-      if !self.thumbnailable? || self.thumbnails_processed
+      force = (size == :uploaded)
+      if force
+        size = nil
+      end
+      if !self.thumbnailable? || self.thumbnails_processed || force
         super(size)
       else
         size ||= 'thumb'
@@ -1632,7 +1632,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'upload media by AJAX' do
-    post :media_upload, :profile => profile.identifier, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain'), fixture_file_upload('/files/rails.png', 'image/png')]
+    post :media_upload, :profile => profile.identifier, :file1 => fixture_file_upload('/files/test.txt', 'text/plain'), :file2 => fixture_file_upload('/files/rails.png', 'image/png'), :file3 => ''
     assert_match 'test.txt', @response.body
     assert_equal 'application/json', @response.content_type
@@ -1644,10 +1644,14 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_match /text/, data[0]['content_type']
     assert_equal 'rails.png', data[1]['title']
-    assert_match /\/testinguser\/rails.png$/, data[1]['url']
+    assert_no_match /\/public\/articles\/.*\/rails.png$/, data[1]['url']
     assert_match /png$/, data[1]['icon']
     assert_match /image/, data[1]['content_type']
   end
+  should 'not when media upload via AJAX contains empty files' do
+    post :media_upload, :profile => @profile.identifier
+  end
+
 end
	@@ -343,7 +343,7 @@ class CmsController < MyProfileController		@@ -343,7 +343,7 @@ class CmsController < MyProfileController
343	def media_upload	343	def media_upload
344	files_uploaded = []	344	files_uploaded = []
345	parent = check_parent(params[:parent_id])	345	parent = check_parent(params[:parent_id])
346	- files = [:file1,:file2, :file3].map { \|f\| params[f] }	346	+ files = [:file1,:file2, :file3].map { \|f\| params[f] }.compact
347	if request.post?	347	if request.post?
348	files.each do \|file\|	348	files.each do \|file\|
349	files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''	349	files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''
	@@ -401,7 +401,7 @@ class CmsController < MyProfileController		@@ -401,7 +401,7 @@ class CmsController < MyProfileController
401	list.map do \|item\|	401	list.map do \|item\|
402	{	402	{
403	'title' => item.title,	403	'title' => item.title,
404	- 'url' => url_for(item.url),	404	+ 'url' => item.image? ? item.public_filename(:uploaded) : url_for(item.url),
405	:icon => icon_for_article(item),	405	:icon => icon_for_article(item),
406	:content_type => item.mime_type	406	:content_type => item.mime_type
407	}	407	}