Download as
Browse Code »

Commit 4c7a3b1946515819a7a45b512ab0b964d3991268

Authored by Antonio Terceiro
1 parent 6b958d38
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1022: don't resize images anymore.

Showing 2 changed files with 1 additions and 27 deletions   Show diff stats
app/models/uploaded_file.rb
  Diff comments   View file @4c7a3b1
@@ -12,8 +12,7 @@ class UploadedFile < Article @@ -12,8 +12,7 @@ class UploadedFile < Article
12 has_attachment :storage => :file_system, 12 has_attachment :storage => :file_system,
13 :thumbnails => { :icon => [24,24], :thumb => '130x130>' }, 13 :thumbnails => { :icon => [24,24], :thumb => '130x130>' },
14 :thumbnail_class => Thumbnail, 14 :thumbnail_class => Thumbnail,
15 - :max_size => 5.megabytes,  
16 - :resize_to => '640x480>' 15 + :max_size => 5.megabytes
17 16
18 def self.max_size 17 def self.max_size
19 UploadedFile.attachment_options[:max_size] 18 UploadedFile.attachment_options[:max_size]
test/unit/uploaded_file_test.rb
  Diff comments   View file @4c7a3b1
@@ -102,29 +102,4 @@ class UploadedFileTest < Test::Unit::TestCase @@ -102,29 +102,4 @@ class UploadedFileTest < Test::Unit::TestCase
102 file.destroy 102 file.destroy
103 end 103 end
104 104
105 - should 'resize images bigger than in resize_to' do  
106 - fixture_filename = '/files/test-large-pic.jpg'  
107 - filename = RAILS_ROOT + '/test/fixtures' + fixture_filename  
108 - system('echo "image for test" | convert -background yellow -page 1280x960 text:- %s' % filename)  
109 -  
110 - f = UploadedFile.create(:profile => @profile, :uploaded_data => fixture_file_upload(fixture_filename, 'image/jpg'))  
111 -  
112 - assert_equal [640, 480], [f.width, f.height]  
113 -  
114 - File.rm_f(filename)  
115 - end  
116 -  
117 - should 'resize images on folder bigger than in resize_to' do  
118 - fixture_filename = '/files/test-large-pic.jpg'  
119 - filename = RAILS_ROOT + '/test/fixtures' + fixture_filename  
120 - system('echo "image for test" | convert -background yellow -page 1280x960 text:- %s' % filename)  
121 - f = Folder.create!(:name => 'test_folder', :profile => @profile)  
122 -  
123 - file = UploadedFile.create(:profile => @profile, :uploaded_data => fixture_file_upload(fixture_filename, 'image/jpg'), :parent_id => f.id)  
124 -  
125 - assert_equal [640, 480], [file.width, file.height]  
126 -  
127 - File.rm_f(filename)  
128 - end  
129 -  
130 end 105 end