Refactoring transactions on mpog_software_plugin.

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Refactoring transactions on mpog_software_plugin.
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
David Silva
1 parent 09b2dd37
Showing 4 changed files with 63 additions and 122 deletions Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
lib/library_helper.rb
lib/mpog_software_plugin.rb
test/unit/library_helper_test.rb
@@ -42,7 +42,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
     return unless request.post?
     @software_info = constroy_software
-    software_info_insert_models.call(@list_libraries, 'libraries')
+    software_info_insert_models.call(@list_library, 'libraries')
     software_info_insert_models.call(@list_languages, 'software_languages')
     software_info_insert_models.call(@list_databases, 'software_databases')
     software_info_insert_models.call(@list_operating_systems, 'operating_systems')
@@ -130,7 +130,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
   end
   def create_list_model_helpers
-    @list_libraries = LibraryHelper.list_libraries(params[:library])
+    @list_libraries = LibraryHelper.list_library(params[:library])
     @list_languages = SoftwareLanguageHelper.list_language(params[:language])
     @list_databases = DatabaseHelper.list_database(params[:database])
     @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system])
-class LibraryHelper < DynamicTableHelper
-  MODEL_NAME ="library"
-
-  def self.list_libraries new_libraries
+module LibraryHelper
+  def self.list_library new_libraries
     return [] if new_libraries.nil? or new_libraries.length == 0
     list_libraries = []
@@ -18,7 +16,7 @@ class LibraryHelper &lt; DynamicTableHelper
     list_libraries
   end
-  def self.valid_list_libraries? list_libraries
+  def self.valid_list_library? list_libraries
     return true if list_libraries.nil? or list_libraries.length == 0
     list_libraries.each do |library|
@@ -18,14 +18,16 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   end
   def profile_editor_extras
-    if context.profile.person?
+    profile = context.profile
+
+    if profile.person?
       expanded_template('person_editor_extras.html.erb')
-    elsif context.profile.respond_to?(:software_info) &&
-      !context.profile.software_info.nil?
+    elsif profile.respond_to?(:software_info) &&
+      !profile.software_info.nil?
-      if context.profile.software_info.first_edit?
-        context.profile.software_info.first_edit = false
-        context.profile.software_info.save!
+      if profile.software_info.first_edit?
+        profile.software_info.first_edit = false
+        profile.software_info.save!
         expanded_template('first_edit_software_community_extras.html.erb')
       end
     end
@@ -34,11 +36,12 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   def profile_editor_transaction_extras
     single_hash_transactions = { :user => 'user',
                                  :software_info => 'software_info',
-                                 :version => 'license', :language => 'language',
-                                 :operating_system => 'operating_system',
+                                 :version => 'license', :language => 'generic_model',
+                                 :operating_system => 'generic_model',
                                  :software_categories => 'software_categories',
                                  :instituton => 'instituton',
-                                 :library => 'libraries' }
+                                 :library => 'generic_model',
+                                 :database => 'generic_model' }
     single_hash_transactions.each do |model, transaction|
       call_model_transaction(model, transaction)
@@ -72,7 +75,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   def profile_tabs
     if context.profile.community?
-      profile_tabs_software if context.profile.software?
+      return profile_tabs_software if context.profile.software?
       profile_tabs_institution
     end
   end
@@ -190,21 +193,22 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   def profile_required_list
     fields = {}
-    fields[:person_fields] = %w('cell_phone'
-                                'contact_phone'
-                                'comercial_phone'
-                                'country'
-                                'city'
-                                'state'
-                                'organization_website'
-                                'image',
-                                'identifier'
-                                'name')
-
-    fields[:user_fields] = %w('secondary_email' 'email')
+    fields[:person_fields] = %w(cell_phone
+                                contact_phone
+                                comercial_phone
+                                country
+                                city
+                                state
+                                organization_website
+                                image
+                                identifier
+                                name)
+
+    fields[:user_fields] = %w(secondary_email email)
     fields
   end
+
   def profile_required_empty_list(person)
     empty_fields = []
     required_list = profile_required_list
@@ -218,27 +222,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
     empty_fields
   end
-  def operating_system_transaction
-    OperatingSystem.transaction do
-      list_operating = OperatingSystemHelper.list_operating_system(
-        context.params[:operating_system]
-      )
-
-      if OperatingSystemHelper.valid_list_operating_system?(list_operating)
-        OperatingSystem.where(
-          :software_info_id => context.profile.software_info.id
-        ).destroy_all
-
-        list_operating.each do |operating_system|
-          operating_system.software_info = context.profile.software_info
-          operating_system.save!
-        end
-      else
-        raise 'Invalid Operating System fields'
-      end
-    end
-  end
-
   def user_transaction
     user_editor_institution_actions
@@ -274,80 +257,12 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
     end
   end
-  def libraries_transaction
-    Library.transaction do
-      list_libraries = LibraryHelper.list_libraries(context.params[:library])
-
-      if LibraryHelper.valid_list_libraries?(list_libraries)
-        Library.where(
-          :software_info_id=> context.profile.software_info.id
-        ).destroy_all
-
-        list_libraries.each do |library|
-          library.software_info_id = context.profile.software_info.id
-          library.save!
-        end
-      else
-        raise 'Invalid Library fields'
-      end
-    end
-  end
-
-  def databases_transaction
-    SoftwareDatabase.transaction do
-      list_databases = DatabaseHelper.list_database(context.params[:database])
-
-      if DatabaseHelper.valid_list_database?(list_databases)
-        SoftwareDatabase.where(
-          :software_info_id => context.profile.software_info.id
-        ).destroy_all
-
-        list_databases.each do |database|
-          database.software_info = context.profile.software_info
-          database.save!
-        end
-      else
-        raise 'Invalid Database fields'
-      end
-    end
-  end
-
   def license_transaction
     license = LicenseInfo.find(context.params[:version])
     context.profile.software_info.license_info = license
     context.profile.software_info.save!
   end
-  def language_transaction
-    SoftwareLanguage.transaction do
-      list_language = SoftwareLanguageHelper.list_language(
-        context.params[:language]
-      )
-
-      if SoftwareLanguageHelper.valid_list_language?(list_language)
-        SoftwareLanguage.where(
-          :software_info_id => context.profile.software_info.id
-        ).destroy_all
-
-        list_language.each do |language|
-          language.software_info = context.profile.software_info
-          language.save!
-        end
-      else
-        raise 'Invalid Software Language fields'
-      end
-    end
-  end
-
-  def software_categories_transaction
-    ControlledVocabulary.transaction do
-      context.profile
-        .software_info
-        .software_categories
-        .update_attributes!(context.params[:software_categories])
-    end
-  end
-
   private
   # Add and remove the user from it's institutions communities
@@ -386,6 +301,34 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
     context.profile.institution.save!
   end
+  def generic_model_transaction
+    models_list = [
+                    [SoftwareLanguage, SoftwareLanguageHelper, 'language'],
+                    [SoftwareDatabase, DatabaseHelper, 'database'],
+                    [OperatingSystem, OperatingSystemHelper, 'operating_system'],
+                    [Library, LibraryHelper, 'library']
+                  ]
+    models_list.each do |model|
+      list_of_model = 'list_'+model[2].to_s
+      model[0].transaction do
+        list = model[1].send(list_of_model, context.params[model[2].to_sym])
+
+        if model[2].send('valid_'+list_of_model+'?', list_of_model)
+          model[0].where(
+            :software_info_id => context.profile.software_info.id
+          ).destroy_all
+
+          list.each do |model|
+            model.software_info = context.profile.software_info
+            model.save!
+          end
+        else
+          raise 'Invalid Software #{model[2]} fields'
+        end
+      end
+    end
+  end
+
   def software_info_button
     {
       :title => _('Software Info'),
@@ -17,12 +17,12 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase
   should "return an empty list" do
     empty_list = []
-    assert_equal  [],LibraryHelper.list_libraries(empty_list)
+    assert_equal  [],LibraryHelper.list_library(empty_list)
   end
   should "return a list with current library objects" do
     list_compare = []
-    lib_table = LibraryHelper.list_libraries(@license_objects)
+    lib_table = LibraryHelper.list_library(@license_objects)
     assert_equal  list_compare.class, lib_table.class
   end
@@ -32,13 +32,13 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase
   end
   should "return a list with the same size of the parameter" do
-    list_compare = LibraryHelper.list_libraries(@license_objects)
+    list_compare = LibraryHelper.list_library(@license_objects)
     assert_equal @license_objects.count, list_compare.count
   end
   should "return false if list_database are empty or null" do
     list_compare = []
-    assert_equal true, LibraryHelper.valid_list_libraries?(list_compare)
+    assert_equal true, LibraryHelper.valid_list_library?(list_compare)
   end
   should "return a html text with license name equals to linux" do
	@@ -42,7 +42,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController		@@ -42,7 +42,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController
42		42
43	return unless request.post?	43	return unless request.post?
44	@software_info = constroy_software	44	@software_info = constroy_software
45	- software_info_insert_models.call(@list_libraries, 'libraries')	45	+ software_info_insert_models.call(@list_library, 'libraries')
46	software_info_insert_models.call(@list_languages, 'software_languages')	46	software_info_insert_models.call(@list_languages, 'software_languages')
47	software_info_insert_models.call(@list_databases, 'software_databases')	47	software_info_insert_models.call(@list_databases, 'software_databases')
48	software_info_insert_models.call(@list_operating_systems, 'operating_systems')	48	software_info_insert_models.call(@list_operating_systems, 'operating_systems')
	@@ -130,7 +130,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController		@@ -130,7 +130,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController
130	end	130	end
131		131
132	def create_list_model_helpers	132	def create_list_model_helpers
133	- @list_libraries = LibraryHelper.list_libraries(params[:library])	133	+ @list_libraries = LibraryHelper.list_library(params[:library])
134	@list_languages = SoftwareLanguageHelper.list_language(params[:language])	134	@list_languages = SoftwareLanguageHelper.list_language(params[:language])
135	@list_databases = DatabaseHelper.list_database(params[:database])	135	@list_databases = DatabaseHelper.list_database(params[:database])
136	@list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system])	136	@list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system])
	@@ -18,14 +18,16 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -18,14 +18,16 @@ class MpogSoftwarePlugin < Noosfero::Plugin
18	end	18	end
19		19
20	def profile_editor_extras	20	def profile_editor_extras
21	- if context.profile.person?	21	+ profile = context.profile
		22	+
		23	+ if profile.person?
22	expanded_template('person_editor_extras.html.erb')	24	expanded_template('person_editor_extras.html.erb')
23	- elsif context.profile.respond_to?(:software_info) &&
24	- !context.profile.software_info.nil?	25	+ elsif profile.respond_to?(:software_info) &&
		26	+ !profile.software_info.nil?
25		27
26	- if context.profile.software_info.first_edit?
27	- context.profile.software_info.first_edit = false
28	- context.profile.software_info.save!	28	+ if profile.software_info.first_edit?
		29	+ profile.software_info.first_edit = false
		30	+ profile.software_info.save!
29	expanded_template('first_edit_software_community_extras.html.erb')	31	expanded_template('first_edit_software_community_extras.html.erb')
30	end	32	end
31	end	33	end
	@@ -34,11 +36,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -34,11 +36,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin
34	def profile_editor_transaction_extras	36	def profile_editor_transaction_extras
35	single_hash_transactions = { :user => 'user',	37	single_hash_transactions = { :user => 'user',
36	:software_info => 'software_info',	38	:software_info => 'software_info',
37	- :version => 'license', :language => 'language',
38	- :operating_system => 'operating_system',	39	+ :version => 'license', :language => 'generic_model',
		40	+ :operating_system => 'generic_model',
39	:software_categories => 'software_categories',	41	:software_categories => 'software_categories',
40	:instituton => 'instituton',	42	:instituton => 'instituton',
41	- :library => 'libraries' }	43	+ :library => 'generic_model',
		44	+ :database => 'generic_model' }
42		45
43	single_hash_transactions.each do \|model, transaction\|	46	single_hash_transactions.each do \|model, transaction\|
44	call_model_transaction(model, transaction)	47	call_model_transaction(model, transaction)
	@@ -72,7 +75,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -72,7 +75,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin
72		75
73	def profile_tabs	76	def profile_tabs
74	if context.profile.community?	77	if context.profile.community?
75	- profile_tabs_software if context.profile.software?	78	+ return profile_tabs_software if context.profile.software?
76	profile_tabs_institution	79	profile_tabs_institution
77	end	80	end
78	end	81	end
	@@ -190,21 +193,22 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -190,21 +193,22 @@ class MpogSoftwarePlugin < Noosfero::Plugin
190		193
191	def profile_required_list	194	def profile_required_list
192	fields = {}	195	fields = {}
193	- fields[:person_fields] = %w('cell_phone'
194	- 'contact_phone'
195	- 'comercial_phone'
196	- 'country'
197	- 'city'
198	- 'state'
199	- 'organization_website'
200	- 'image',
201	- 'identifier'
202	- 'name')
203	-
204	- fields[:user_fields] = %w('secondary_email' 'email')	196	+ fields[:person_fields] = %w(cell_phone
		197	+ contact_phone
		198	+ comercial_phone
		199	+ country
		200	+ city
		201	+ state
		202	+ organization_website
		203	+ image
		204	+ identifier
		205	+ name)
		206	+
		207	+ fields[:user_fields] = %w(secondary_email email)
205	fields	208	fields
206	end	209	end
207		210
		211	+
208	def profile_required_empty_list(person)	212	def profile_required_empty_list(person)
209	empty_fields = []	213	empty_fields = []
210	required_list = profile_required_list	214	required_list = profile_required_list
	@@ -218,27 +222,6 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -218,27 +222,6 @@ class MpogSoftwarePlugin < Noosfero::Plugin
218	empty_fields	222	empty_fields
219	end	223	end
220		224
221	- def operating_system_transaction
222	- OperatingSystem.transaction do
223	- list_operating = OperatingSystemHelper.list_operating_system(
224	- context.params[:operating_system]
225	- )
226	-
227	- if OperatingSystemHelper.valid_list_operating_system?(list_operating)
228	- OperatingSystem.where(
229	- :software_info_id => context.profile.software_info.id
230	- ).destroy_all
231	-
232	- list_operating.each do \|operating_system\|
233	- operating_system.software_info = context.profile.software_info
234	- operating_system.save!
235	- end
236	- else
237	- raise 'Invalid Operating System fields'
238	- end
239	- end
240	- end
241	-
242	def user_transaction	225	def user_transaction
243	user_editor_institution_actions	226	user_editor_institution_actions
244		227
	@@ -274,80 +257,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -274,80 +257,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin
274	end	257	end
275	end	258	end
276		259
277	- def libraries_transaction
278	- Library.transaction do
279	- list_libraries = LibraryHelper.list_libraries(context.params[:library])
280	-
281	- if LibraryHelper.valid_list_libraries?(list_libraries)
282	- Library.where(
283	- :software_info_id=> context.profile.software_info.id
284	- ).destroy_all
285	-
286	- list_libraries.each do \|library\|
287	- library.software_info_id = context.profile.software_info.id
288	- library.save!
289	- end
290	- else
291	- raise 'Invalid Library fields'
292	- end
293	- end
294	- end
295	-
296	- def databases_transaction
297	- SoftwareDatabase.transaction do
298	- list_databases = DatabaseHelper.list_database(context.params[:database])
299	-
300	- if DatabaseHelper.valid_list_database?(list_databases)
301	- SoftwareDatabase.where(
302	- :software_info_id => context.profile.software_info.id
303	- ).destroy_all
304	-
305	- list_databases.each do \|database\|
306	- database.software_info = context.profile.software_info
307	- database.save!
308	- end
309	- else
310	- raise 'Invalid Database fields'
311	- end
312	- end
313	- end
314	-
315	def license_transaction	260	def license_transaction
316	license = LicenseInfo.find(context.params[:version])	261	license = LicenseInfo.find(context.params[:version])
317	context.profile.software_info.license_info = license	262	context.profile.software_info.license_info = license
318	context.profile.software_info.save!	263	context.profile.software_info.save!
319	end	264	end
320		265
321	- def language_transaction
322	- SoftwareLanguage.transaction do
323	- list_language = SoftwareLanguageHelper.list_language(
324	- context.params[:language]
325	- )
326	-
327	- if SoftwareLanguageHelper.valid_list_language?(list_language)
328	- SoftwareLanguage.where(
329	- :software_info_id => context.profile.software_info.id
330	- ).destroy_all
331	-
332	- list_language.each do \|language\|
333	- language.software_info = context.profile.software_info
334	- language.save!
335	- end
336	- else
337	- raise 'Invalid Software Language fields'
338	- end
339	- end
340	- end
341	-
342	- def software_categories_transaction
343	- ControlledVocabulary.transaction do
344	- context.profile
345	- .software_info
346	- .software_categories
347	- .update_attributes!(context.params[:software_categories])
348	- end
349	- end
350	-
351	private	266	private
352		267
353	# Add and remove the user from it's institutions communities	268	# Add and remove the user from it's institutions communities
	@@ -386,6 +301,34 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -386,6 +301,34 @@ class MpogSoftwarePlugin < Noosfero::Plugin
386	context.profile.institution.save!	301	context.profile.institution.save!
387	end	302	end
388		303
		304	+ def generic_model_transaction
		305	+ models_list = [
		306	+ [SoftwareLanguage, SoftwareLanguageHelper, 'language'],
		307	+ [SoftwareDatabase, DatabaseHelper, 'database'],
		308	+ [OperatingSystem, OperatingSystemHelper, 'operating_system'],
		309	+ [Library, LibraryHelper, 'library']
		310	+ ]
		311	+ models_list.each do \|model\|
		312	+ list_of_model = 'list_'+model[2].to_s
		313	+ model[0].transaction do
		314	+ list = model[1].send(list_of_model, context.params[model[2].to_sym])
		315	+
		316	+ if model[2].send('valid_'+list_of_model+'?', list_of_model)
		317	+ model[0].where(
		318	+ :software_info_id => context.profile.software_info.id
		319	+ ).destroy_all
		320	+
		321	+ list.each do \|model\|
		322	+ model.software_info = context.profile.software_info
		323	+ model.save!
		324	+ end
		325	+ else
		326	+ raise 'Invalid Software #{model[2]} fields'
		327	+ end
		328	+ end
		329	+ end
		330	+ end
		331	+
389	def software_info_button	332	def software_info_button
390	{	333	{
391	:title => _('Software Info'),	334	:title => _('Software Info'),
	@@ -17,12 +17,12 @@ class LibraryHelperTest < ActiveSupport::TestCase		@@ -17,12 +17,12 @@ class LibraryHelperTest < ActiveSupport::TestCase
17		17
18	should "return an empty list" do	18	should "return an empty list" do
19	empty_list = []	19	empty_list = []
20	- assert_equal [],LibraryHelper.list_libraries(empty_list)	20	+ assert_equal [],LibraryHelper.list_library(empty_list)
21	end	21	end
22		22
23	should "return a list with current library objects" do	23	should "return a list with current library objects" do
24	list_compare = []	24	list_compare = []
25	- lib_table = LibraryHelper.list_libraries(@license_objects)	25	+ lib_table = LibraryHelper.list_library(@license_objects)
26	assert_equal list_compare.class, lib_table.class	26	assert_equal list_compare.class, lib_table.class
27	end	27	end
28		28
	@@ -32,13 +32,13 @@ class LibraryHelperTest < ActiveSupport::TestCase		@@ -32,13 +32,13 @@ class LibraryHelperTest < ActiveSupport::TestCase
32	end	32	end
33		33
34	should "return a list with the same size of the parameter" do	34	should "return a list with the same size of the parameter" do
35	- list_compare = LibraryHelper.list_libraries(@license_objects)	35	+ list_compare = LibraryHelper.list_library(@license_objects)
36	assert_equal @license_objects.count, list_compare.count	36	assert_equal @license_objects.count, list_compare.count
37	end	37	end
38		38
39	should "return false if list_database are empty or null" do	39	should "return false if list_database are empty or null" do
40	list_compare = []	40	list_compare = []
41	- assert_equal true, LibraryHelper.valid_list_libraries?(list_compare)	41	+ assert_equal true, LibraryHelper.valid_list_library?(list_compare)
42	end	42	end
43		43
44	should "return a html text with license name equals to linux" do	44	should "return a html text with license name equals to linux" do