ActionItem1144: validating image when save profile

Joenio Costa
1 parent 1e28d592
Showing 11 changed files with 51 additions and 26 deletions Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
app/models/community.rb
app/models/enterprise.rb
app/models/image.rb
app/models/person.rb
app/models/profile.rb
app/models/uploaded_file.rb
app/views/profile_editor/edit.rhtml
test/functional/profile_editor_controller_test.rb
test/unit/profile_test.rb
vendor/plugins/attachment_fu_validates_attachment/init.rb
@@ -13,14 +13,17 @@ class ProfileEditorController &lt; MyProfileController
     @profile_data = profile
     @possible_domains = profile.possible_domains
     if request.post?
-      if profile.update_attributes(params[:profile_data])
-        if profile.image && profile.image.errors.any?
-          @errors = profile.image.errors
-          render :action => 'edit'
-        else
-          redirect_to :action => 'index'
+      begin
+        Profile.transaction do
+        Image.transaction do
+          if profile.update_attributes!(params[:profile_data])
+            redirect_to :action => 'index'
+          end
         end
-      end 
+        end
+      rescue
+        flash[:notice] = _('Cannot update profile')
+      end
     end
   end
@@ -19,6 +19,7 @@ class Community &lt; Organization
   end
   def validate
+    super
     self.required_fields.each do |field|
       if self.send(field).blank?
           self.errors.add(field, _('%{fn} is mandatory'))
@@ -40,9 +40,10 @@ class Enterprise &lt; Organization
   end
   def validate
+    super
     self.required_fields.each do |field|
       if self.send(field).blank?
-          self.errors.add(field, _('%{fn} is mandatory'))
+        self.errors.add(field, _('%{fn} is mandatory'))
       end
     end
   end
@@ -15,5 +15,5 @@ class Image &lt; ActiveRecord::Base
                                   :minor    => '50x50',
                                   :icon     => '20x20!' }
-  validates_attachment :size => N_("The file you uploaded was larger than the maximum size of %s") % Image.max_size.to_humanreadable
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %s") % Image.max_size.to_humanreadable
 end
@@ -73,6 +73,7 @@ class Person &lt; Profile
   end
   def validate
+    super
     self.required_fields.each do |field|
       if self.send(field).blank?
         unless (field == 'custom_area_of_study' && self.area_of_study != 'Others') || (field == 'custom_formation' && self.formation != 'Others')
@@ -624,4 +624,14 @@ class Profile &lt; ActiveRecord::Base
     []
   end
+  def validate
+    unless self.image.nil?
+      self.image.valid?
+      self.image.errors.delete(:empty) # dont validate here if exists uploaded data
+      self.image.errors.each do |attr,msg|
+        self.errors.add(attr, msg)
+      end
+    end
+  end
+
 end
@@ -18,7 +18,7 @@ class UploadedFile &lt; Article
     UploadedFile.attachment_options[:max_size]
   end
-  validates_attachment :size => N_("The file you uploaded was larger than the maximum size of %s") % UploadedFile.max_size.to_humanreadable
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %s") % UploadedFile.max_size.to_humanreadable
   def icon_name
     self.image? ? public_filename(:icon) : self.content_type.gsub('/', '-')
@@ -2,18 +2,6 @@
 <%= error_messages_for :profile %>
-<% if @errors %>
-  <div class="errorExplanation" id="errorExplanation">
-    <h2><%= n_('This file couldn\'t be saved', 'These %{num} files couldn\'t be saved', @errors.size) % { :num => @errors.size } %></h2>
-    <p><%= _('There were problems with the following files:') %> </p>
-    <ul>
-      <% for msg in profile.image.errors.full_messages %>
-        <li><strong><%= profile.image.filename %></strong> : <%= msg %></li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
-
 <% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
@@ -238,14 +238,14 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
   should 'back when update community info fail' do
     org = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
-    Community.any_instance.stubs(:update_attributes).returns(false)
+    Community.any_instance.stubs(:update_attributes!).returns(false)
     post :edit, :profile => 'testorg'
     assert_template 'edit'
   end
   should 'back when update enterprise info fail' do
     org = Enterprise.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact', :environment => Environment.default)
-    Enterprise.any_instance.stubs(:update_attributes).returns(false)
+    Enterprise.any_instance.stubs(:update_attributes!).returns(false)
     post :edit, :profile => 'testorg'
     assert_template 'edit'
   end
@@ -667,6 +667,14 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert_nil Profile.find(profile.id).preferred_domain
   end
+  should 'not be able to upload an image bigger than max size' do
+    Image.any_instance.stubs(:size).returns(Image.attachment_options[:max_size] + 1024)
+    person = create_user('test_profile').person
+    assert_nil person.image
+    post :edit, :profile => person.identifier, :profile_data => { :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png') } }
+    assert_nil person.image
+  end
+
   should 'display error message when image has more than max size' do
     Image.any_instance.stubs(:size).returns(Image.attachment_options[:max_size] + 1024)
     post :edit, :profile => profile.identifier, :profile_data => { :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png') } }
@@ -1346,6 +1346,19 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert !profile.folders.include?(child)
   end
+  should 'validates profile image when save' do
+    profile = Profile.create!(:name => 'Profile for testing ', :identifier => 'profilefortesting', :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    profile.image.expects(:valid?)
+    assert profile.valid?
+  end
+
+  should 'profile is invalid when image not valid' do
+    profile = Profile.create!(:name => 'Profile for testing ', :identifier => 'profilefortesting', :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    profile.image.expects(:valid?)
+    profile.image.errors.add(:size, "fake error")
+    assert !profile.valid?
+  end
+
   private
   def assert_invalid_identifier(id)
@@ -5,12 +5,12 @@ Technoweenie::AttachmentFu::InstanceMethods.module_eval do
   protected
     def attachment_valid?
       if self.filename.nil?
-        errors.add_to_base attachment_validation_options[:empty]
+        errors.add :empty, attachment_validation_options[:empty]
         return
       end
       [:content_type, :size].each do |option|
         if attachment_validation_options[option] && attachment_options[option] && !attachment_options[option].include?(self.send(option))
-          errors.add_to_base attachment_validation_options[option]
+          errors.add option, attachment_validation_options[option]
         end
       end
     end
	@@ -19,6 +19,7 @@ class Community < Organization		@@ -19,6 +19,7 @@ class Community < Organization
19	end	19	end
20		20
21	def validate	21	def validate
		22	+ super
22	self.required_fields.each do \|field\|	23	self.required_fields.each do \|field\|
23	if self.send(field).blank?	24	if self.send(field).blank?
24	self.errors.add(field, _('%{fn} is mandatory'))	25	self.errors.add(field, _('%{fn} is mandatory'))
	@@ -15,5 +15,5 @@ class Image < ActiveRecord::Base		@@ -15,5 +15,5 @@ class Image < ActiveRecord::Base
15	:minor => '50x50',	15	:minor => '50x50',
16	:icon => '20x20!' }	16	:icon => '20x20!' }
17		17
18	- validates_attachment :size => N_("The file you uploaded was larger than the maximum size of %s") % Image.max_size.to_humanreadable	18	+ validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %s") % Image.max_size.to_humanreadable
19	end	19	end
	@@ -73,6 +73,7 @@ class Person < Profile		@@ -73,6 +73,7 @@ class Person < Profile
73	end	73	end
74		74
75	def validate	75	def validate
		76	+ super
76	self.required_fields.each do \|field\|	77	self.required_fields.each do \|field\|
77	if self.send(field).blank?	78	if self.send(field).blank?
78	unless (field == 'custom_area_of_study' && self.area_of_study != 'Others') \|\| (field == 'custom_formation' && self.formation != 'Others')	79	unless (field == 'custom_area_of_study' && self.area_of_study != 'Others') \|\| (field == 'custom_formation' && self.formation != 'Others')
	@@ -624,4 +624,14 @@ class Profile < ActiveRecord::Base		@@ -624,4 +624,14 @@ class Profile < ActiveRecord::Base
624	[]	624	[]
625	end	625	end
626		626
		627	+ def validate
		628	+ unless self.image.nil?
		629	+ self.image.valid?
		630	+ self.image.errors.delete(:empty) # dont validate here if exists uploaded data
		631	+ self.image.errors.each do \|attr,msg\|
		632	+ self.errors.add(attr, msg)
		633	+ end
		634	+ end
		635	+ end
		636	+
627	end	637	end
	@@ -18,7 +18,7 @@ class UploadedFile < Article		@@ -18,7 +18,7 @@ class UploadedFile < Article
18	UploadedFile.attachment_options[:max_size]	18	UploadedFile.attachment_options[:max_size]
19	end	19	end
20		20
21	- validates_attachment :size => N_("The file you uploaded was larger than the maximum size of %s") % UploadedFile.max_size.to_humanreadable	21	+ validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %s") % UploadedFile.max_size.to_humanreadable
22		22
23	def icon_name	23	def icon_name
24	self.image? ? public_filename(:icon) : self.content_type.gsub('/', '-')	24	self.image? ? public_filename(:icon) : self.content_type.gsub('/', '-')
	@@ -2,18 +2,6 @@		@@ -2,18 +2,6 @@
2		2
3	<%= error_messages_for :profile %>	3	<%= error_messages_for :profile %>
4		4
5	-<% if @errors %>
6	- <div class="errorExplanation" id="errorExplanation">
7	- <h2><%= n_('This file couldn\'t be saved', 'These %{num} files couldn\'t be saved', @errors.size) % { :num => @errors.size } %></h2>
8	- <p><%= _('There were problems with the following files:') %> </p>
9	- <ul>
10	- <% for msg in profile.image.errors.full_messages %>
11	- <li><strong><%= profile.image.filename %></strong> : <%= msg %></li>
12	- <% end %>
13	- </ul>
14	- </div>
15	-<% end %>
16	-
17	<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do \|f\| %>	5	<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do \|f\| %>
18		6
19	<%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>	7	<%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
	@@ -1346,6 +1346,19 @@ class ProfileTest < Test::Unit::TestCase		@@ -1346,6 +1346,19 @@ class ProfileTest < Test::Unit::TestCase
1346	assert !profile.folders.include?(child)	1346	assert !profile.folders.include?(child)
1347	end	1347	end
1348		1348
		1349	+ should 'validates profile image when save' do
		1350	+ profile = Profile.create!(:name => 'Profile for testing ', :identifier => 'profilefortesting', :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
		1351	+ profile.image.expects(:valid?)
		1352	+ assert profile.valid?
		1353	+ end
		1354	+
		1355	+ should 'profile is invalid when image not valid' do
		1356	+ profile = Profile.create!(:name => 'Profile for testing ', :identifier => 'profilefortesting', :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
		1357	+ profile.image.expects(:valid?)
		1358	+ profile.image.errors.add(:size, "fake error")
		1359	+ assert !profile.valid?
		1360	+ end
		1361	+
1349	private	1362	private
1350		1363
1351	def assert_invalid_identifier(id)	1364	def assert_invalid_identifier(id)
	@@ -5,12 +5,12 @@ Technoweenie::AttachmentFu::InstanceMethods.module_eval do		@@ -5,12 +5,12 @@ Technoweenie::AttachmentFu::InstanceMethods.module_eval do
5	protected	5	protected
6	def attachment_valid?	6	def attachment_valid?
7	if self.filename.nil?	7	if self.filename.nil?
8	- errors.add_to_base attachment_validation_options[:empty]	8	+ errors.add :empty, attachment_validation_options[:empty]
9	return	9	return
10	end	10	end
11	[:content_type, :size].each do \|option\|	11	[:content_type, :size].each do \|option\|
12	if attachment_validation_options[option] && attachment_options[option] && !attachment_options[option].include?(self.send(option))	12	if attachment_validation_options[option] && attachment_options[option] && !attachment_options[option].include?(self.send(option))
13	- errors.add_to_base attachment_validation_options[option]	13	+ errors.add option, attachment_validation_options[option]
14	end	14	end
15	end	15	end
16	end	16	end