Refactor software_communities methods

Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

Refactor software_communities methods
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Luciano Prestes · Thiago Ribeiro
1 parent 202f0213
Showing 7 changed files with 14 additions and 44 deletions Show diff stats
controllers/software_communities_plugin_controller.rb
controllers/software_communities_plugin_myprofile_controller.rb
lib/database_helper.rb
lib/library_helper.rb
lib/operating_system_helper.rb
lib/software_communities_plugin.rb
lib/software_helper.rb
@@ -42,11 +42,7 @@ class SoftwareCommunitiesPluginController &lt; ApplicationController
   protected
   def get_model_by_params_field
-    case params[:field]
-    when "software_language"
-      return ProgrammingLanguage
-    else
-      return DatabaseDescription
-    end
+    return DatabaseDescription unless params[:field] == "software_language"
+    return ProgrammingLanguage
   end
 end
@@ -26,7 +26,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     return unless request.post?
-    @software_info = constroy_software
+    @software_info = create_software
     software_info_insert_models.call(@list_libraries, 'libraries')
     software_info_insert_models.call(@list_languages, 'software_languages')
     software_info_insert_models.call(@list_databases, 'software_databases')
@@ -87,7 +87,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     }
   end
-  def constroy_software
+  def create_software
     @software_info = @profile.software_info
     params[:software][:public_software] ||= false unless @software_info.public_software?
     @license = LicenseInfo.find(params[:license][:license_infos_id])
@@ -34,12 +34,7 @@ class DatabaseHelper &lt; DynamicTableHelper
   def self.valid_list_database? list_databases
     return false if list_databases.nil? or list_databases.length == 0
-
-    list_databases.each do |database|
-      return false unless database.valid?
-    end
-
-    true
+    return !list_databases.any?{|database| !database.valid?}
   end
   def self.database_as_tables(list_databases, disabled=false)
@@ -51,14 +46,10 @@ class DatabaseHelper &lt; DynamicTableHelper
   def self.database_html_structure(database_data, disabled)
     database_id = database_data[:database_description_id]
-    database_name = if database_data[:database_description_id].blank?
-      ""
-    else
-      DatabaseDescription.find(
+    database_name = database_id.blank? ? "" : DatabaseDescription.find(
         database_data[:database_description_id],
         :select=>"name"
       ).name
-    end
     data = {
       model_name: MODEL_NAME,
@@ -83,4 +74,4 @@ class DatabaseHelper &lt; DynamicTableHelper
   def self.add_dynamic_table
     database_as_tables(nil).first.call
   end
-end
 \ No newline at end of file
+end
@@ -20,12 +20,7 @@ class LibraryHelper &lt; DynamicTableHelper
   def self.valid_list_library? list_libraries
     return true if list_libraries.nil? or list_libraries.length == 0
-
-    list_libraries.each do |library|
-      return false unless library.valid?
-    end
-
-    true
+    return !list_libraries.any?{|library| !library.valid?}
   end
   def self.libraries_as_tables list_libraries, disabled=false
@@ -59,4 +54,4 @@ class LibraryHelper &lt; DynamicTableHelper
   def self.add_dynamic_table
     libraries_as_tables(nil).first.call
   end
-end
 \ No newline at end of file
+end
@@ -25,12 +25,8 @@ class OperatingSystemHelper &lt; DynamicTableHelper
   end
   def self.valid_list_operating_system? list_operating_system
-    return !(list_operating_system.nil? || list_operating_system.length == 0)
-
-    list_operating_system.each do |operating_system|
-      return false unless operating_system.valid?
-    end
-    true
+    return false if (list_operating_system.nil? || list_operating_system.length == 0)
+    return !list_operating_system.any?{|os| !os.valid?}
   end
   def self.operating_system_as_tables(list_operating_system, disabled=false)
@@ -18,8 +18,8 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
   end
   def profile_tabs
-    if context.profile.community?
-      return profile_tabs_software if context.profile.software?
+    if context.profile.community? && context.profile.software?
+      return profile_tabs_software
     end
   end
@@ -23,14 +23,6 @@ module SoftwareHelper
   end
   def self.all_table_is_empty? table, ignored_fields=[]
-    filled_fields = []
-
-    table.each do |key, value|
-      unless ignored_fields.include? key
-        filled_fields << !value.empty?
-      end
-    end
-
-    return !filled_fields.include?(true)
+    return !table.keys.any?{|key| ignored_fields.include?(key) ? false : !table[key].empty?}
   end
 end
	@@ -26,7 +26,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController		@@ -26,7 +26,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController
26		26
27	return unless request.post?	27	return unless request.post?
28		28
29	- @software_info = constroy_software	29	+ @software_info = create_software
30	software_info_insert_models.call(@list_libraries, 'libraries')	30	software_info_insert_models.call(@list_libraries, 'libraries')
31	software_info_insert_models.call(@list_languages, 'software_languages')	31	software_info_insert_models.call(@list_languages, 'software_languages')
32	software_info_insert_models.call(@list_databases, 'software_databases')	32	software_info_insert_models.call(@list_databases, 'software_databases')
	@@ -87,7 +87,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController		@@ -87,7 +87,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController
87	}	87	}
88	end	88	end
89		89
90	- def constroy_software	90	+ def create_software
91	@software_info = @profile.software_info	91	@software_info = @profile.software_info
92	params[:software][:public_software] \|\|= false unless @software_info.public_software?	92	params[:software][:public_software] \|\|= false unless @software_info.public_software?
93	@license = LicenseInfo.find(params[:license][:license_infos_id])	93	@license = LicenseInfo.find(params[:license][:license_infos_id])
	@@ -23,14 +23,6 @@ module SoftwareHelper		@@ -23,14 +23,6 @@ module SoftwareHelper
23	end	23	end
24		24
25	def self.all_table_is_empty? table, ignored_fields=[]	25	def self.all_table_is_empty? table, ignored_fields=[]
26	- filled_fields = []
27	-
28	- table.each do \|key, value\|
29	- unless ignored_fields.include? key
30	- filled_fields << !value.empty?
31	- end
32	- end
33	-
34	- return !filled_fields.include?(true)	26	+ return !table.keys.any?{\|key\| ignored_fields.include?(key) ? false : !table[key].empty?}
35	end	27	end
36	end	28	end