From 19330e123c400387596877e0fc0330dbf0754753 Mon Sep 17 00:00:00 2001
From: Fabio Teixeira <fabio1079@gmail.com>
Date: Thu, 18 Dec 2014 15:19:14 -0200
Subject: [PATCH] Call html_structure as callback

---
 lib/database_helper.rb          | 16 ++++++----------
 lib/dynamic_table_helper.rb     |  8 ++++++++
 lib/software_language_helper.rb | 17 +++++++----------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/database_helper.rb b/lib/database_helper.rb
index 46c2023..4b32afe 100644
--- a/lib/database_helper.rb
+++ b/lib/database_helper.rb
@@ -43,17 +43,13 @@ class DatabaseHelper < DynamicTableHelper
   end
 
   def self.database_as_tables(list_databases, disabled=false)
-    return database_html_structure(
-      {:database_description_id => "", :version => ""}, disabled
-    ) if list_databases.nil?
-
-    lambdas_list = []
-
-    list_databases.each do |database|
-      lambdas_list << database_html_structure(database, disabled)
+    model_list = if list_databases.blank?
+      [{:database_description_id => "", :version => ""}]
+    else
+      list_databases
     end
 
-    lambdas_list
+    models_as_tables model_list, "database_html_structure", disabled
   end
 
   def self.database_html_structure(database_data, disabled)
@@ -83,6 +79,6 @@ class DatabaseHelper < DynamicTableHelper
   end
 
   def self.add_dynamic_table
-    database_as_tables(nil).call
+    database_as_tables(nil).first.call
   end
 end
\ No newline at end of file
diff --git a/lib/dynamic_table_helper.rb b/lib/dynamic_table_helper.rb
index 684087a..bb646fc 100644
--- a/lib/dynamic_table_helper.rb
+++ b/lib/dynamic_table_helper.rb
@@ -133,4 +133,12 @@ class DynamicTableHelper
 
     row_data
   end
+
+  def self.models_as_tables models, callback, disabled=false
+    lambdas_list = []
+
+    models.map do |model|
+      send(callback, model, disabled)
+    end
+  end
 end
\ No newline at end of file
diff --git a/lib/software_language_helper.rb b/lib/software_language_helper.rb
index 2884fe9..a3be94c 100644
--- a/lib/software_language_helper.rb
+++ b/lib/software_language_helper.rb
@@ -42,16 +42,13 @@ class SoftwareLanguageHelper < DynamicTableHelper
   end
 
   def self.language_as_tables(list_languages, disabled=false)
-    return language_html_structure(
-      {:programming_language_id => "", :version => ""}, disabled
-    ) if list_languages.nil?
-
-    lambdas_list = []
-
-    list_languages.each do |language|
-      lambdas_list << language_html_structure(language, disabled)
+    model_list = if list_languages.blank?
+      [{:programming_language_id => "", :version => ""}]
+    else
+      list_languages
     end
-    lambdas_list
+
+    models_as_tables model_list, "language_html_structure", disabled
   end
 
   def self.language_html_structure(language_data, disabled)
@@ -81,6 +78,6 @@ class SoftwareLanguageHelper < DynamicTableHelper
   end
 
   def self.add_dynamic_table
-    language_as_tables(nil).call
+    language_as_tables(nil).first.call
   end
 end
--
libgit2 0.21.2