[work-assignment] Fixing loop with callbacks

* Must fix the class calls commented on Article class

[work-assignment] Fixing loop with callbacks
* Must fix the class calls commented on Article class
Rodrigo Souto
1 parent 8f28228d
Showing 6 changed files with 40 additions and 28 deletions Show diff stats
app/models/article.rb
plugins/work_assignment/lib/ext/uploaded_file.rb
plugins/work_assignment/lib/work_assignment_plugin.rb
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
plugins/work_assignment/test/functional/cms_controller_test.rb
plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
@@ -640,16 +640,16 @@ class Article &lt; ActiveRecord::Base
   # Subclasses aren't (re)loaded, and acts_as_solr
   # depends on subclasses method to search
   # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
-  UploadedFile
-  TextArticle
-  TinyMceArticle
-  TextileArticle
-  Folder
-  EnterpriseHomepage
-  Gallery
-  Blog
-  Forum
-  Event
+#  UploadedFile
+#  TextArticle
+#  TinyMceArticle
+#  TextileArticle
+#  Folder
+#  EnterpriseHomepage
+#  Gallery
+#  Blog
+#  Forum
+#  Event
   def self.f_type_proc(klass)
     klass.constantize.type_name
@@ -0,0 +1,13 @@
+require_dependency 'uploaded_file'
+
+class UploadedFile < Article
+  after_save do |uploaded_file|
+    if uploaded_file.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+      author_folder = uploaded_file.parent.find_or_create_author_folder(uploaded_file.author)
+      uploaded_file.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(uploaded_file, author_folder)
+      uploaded_file.parent = author_folder
+      logger.info("\n\n==> #{uploaded_file.name}\n\n")
+      uploaded_file.save!
+    end
+  end
+end
+require_dependency 'ext/uploaded_file'
+
 class WorkAssignmentPlugin < Noosfero::Plugin
   def self.plugin_name
 class WorkAssignmentPlugin::WorkAssignment < Folder
-  after_save do |work_assignment|
-    work_assignment.children.select {|child| child.kind_of?(UploadedFile)}.each do |submission|
-      author_folder = work_assignment.find_or_create_author_folder(submission.author)
-      submission.name = versioned_name(submission, author_folder)
-      submission.parent = author_folder
-      submission.save(false)
-    end
-  end
-
   settings_items :publish_submissions, :type => :boolean, :default => false
   def self.icon_name(article = nil)
@@ -24,9 +15,7 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
   end
   def self.versioned_name(submission, folder)
-    return submission.name if submission.name =~ /\(V[0-9]*\)/
-    count = folder.children.include?(submission) ? folder.children.count : folder.children.count + 1 
-    "(V#{count}) #{submission.name}"
+    "(V#{folder.children.count + 1}) #{submission.name}"
   end
   def accept_comments?
@@ -44,7 +33,7 @@ class WorkAssignmentPlugin::WorkAssignment &lt; Folder
   end
   def find_or_create_author_folder(author)
-    children.find_by_slug(author.identifier) || Folder.create!(:name => author.name, :slug => author.identifier, :parent => self, :profile => profile)
+    children.find_by_slug(author.identifier.to_slug) || Folder.create!(:name => author.name, :slug => author.identifier.to_slug, :parent => self, :profile => profile)
   end
   def submissions
@@ -30,5 +30,15 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_response :success
   end
+  should 'upload submission and automatically move it to the author folder' do
+    organization = fast_create(Organization)
+    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
+    organization.add_member(person)
+    post :upload_files, :profile => organization.identifier, :parent_id => work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
+
+    submission = UploadedFile.last
+    assert_equal work_assignment.find_or_create_author_folder(person), submission.parent
+  end
+
 end
@@ -9,12 +9,10 @@ class WorkAssignmentPluginTest &lt; ActiveSupport::TestCase
     work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
     content.parent = work_assignment
     content.save!
-    assert !WorkAssignmentPlugin.is_submission?(content)
-
-    author_folder = work_assignment.find_or_create_author_folder(fast_create(Person))
-    content.parent = author_folder
-    content.save!
     assert WorkAssignmentPlugin.is_submission?(content)
+
+    author_folder = work_assignment.find_or_create_author_folder(content.author)
+    assert_equal author_folder, content.parent
   end
   should 'be able to download submission if work_assignment published submissions' do
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+require_dependency 'uploaded_file'
	2	+
	3	+class UploadedFile < Article
	4	+ after_save do \|uploaded_file\|
	5	+ if uploaded_file.parent.kind_of?(WorkAssignmentPlugin::WorkAssignment)
	6	+ author_folder = uploaded_file.parent.find_or_create_author_folder(uploaded_file.author)
	7	+ uploaded_file.name = WorkAssignmentPlugin::WorkAssignment.versioned_name(uploaded_file, author_folder)
	8	+ uploaded_file.parent = author_folder
	9	+ logger.info("\n\n==> #{uploaded_file.name}\n\n")
	10	+ uploaded_file.save!
	11	+ end
	12	+ end
	13	+end
		1	+require_dependency 'ext/uploaded_file'
		2	+
1	class WorkAssignmentPlugin < Noosfero::Plugin	3	class WorkAssignmentPlugin < Noosfero::Plugin
2		4
3	def self.plugin_name	5	def self.plugin_name
	@@ -30,5 +30,15 @@ class CmsControllerTest < ActionController::TestCase		@@ -30,5 +30,15 @@ class CmsControllerTest < ActionController::TestCase
30	assert_response :success	30	assert_response :success
31	end	31	end
32		32
		33	+ should 'upload submission and automatically move it to the author folder' do
		34	+ organization = fast_create(Organization)
		35	+ work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Work Assignment', :profile => organization)
		36	+ organization.add_member(person)
		37	+ post :upload_files, :profile => organization.identifier, :parent_id => work_assignment.id, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain')]
		38	+
		39	+ submission = UploadedFile.last
		40	+ assert_equal work_assignment.find_or_create_author_folder(person), submission.parent
		41	+ end
		42	+
33	end	43	end
34		44