From 787caaa4cc6a1104e9b88c92ee8407d20599f279 Mon Sep 17 00:00:00 2001
From: Carlos Morais <carlos88morais@gmail.com>
Date: Wed, 15 Feb 2012 23:27:19 -0200
Subject: [PATCH] [Mezuro] Refactoring

---
 plugins/mezuro/lib/kalibro/entities/module_node.rb        |  8 --------
 plugins/mezuro/public/javascripts/results.js              |  2 +-
 plugins/mezuro/views/content_viewer/_project_result.rhtml | 29 -----------------------------
 plugins/mezuro/views/content_viewer/_source_tree.rhtml    | 10 +++++-----
 plugins/mezuro/views/content_viewer/show_project.rhtml    | 30 +++++++++++++++++++++++++++++-
 5 files changed, 35 insertions(+), 44 deletions(-)
 delete mode 100644 plugins/mezuro/views/content_viewer/_project_result.rhtml

diff --git a/plugins/mezuro/lib/kalibro/entities/module_node.rb b/plugins/mezuro/lib/kalibro/entities/module_node.rb
index 4ca81a6..22880c5 100644
--- a/plugins/mezuro/lib/kalibro/entities/module_node.rb
+++ b/plugins/mezuro/lib/kalibro/entities/module_node.rb
@@ -6,14 +6,6 @@ class Kalibro::Entities::ModuleNode < Kalibro::Entities::Entity
     @module = to_entity(value, Kalibro::Entities::Module)
   end
 
-  def module_name
-    @module.name
-  end
-
-  def granularity
-    @module.granularity
-  end
-
   def child=(value)
     @child = to_entity_array(value, Kalibro::Entities::ModuleNode)
   end
diff --git a/plugins/mezuro/public/javascripts/results.js b/plugins/mezuro/public/javascripts/results.js
index 5568e6b..c9a8bed 100644
--- a/plugins/mezuro/public/javascripts/results.js
+++ b/plugins/mezuro/public/javascripts/results.js
@@ -4,7 +4,7 @@ function results($) {
 
 function show_module_result(){
   var profile = jQuery('#module-result').attr('data-profile');
-  var project = jQuery('#module-result').attr('data-project-id');
+  var project = jQuery('#module-result').attr('data-content');
   var module_name = jQuery(this).attr('data-module-name');
   var endpoint = '/profile/' + profile + '/plugins/mezuro/module_result/' + project;
   show_loading_message(module_name);
diff --git a/plugins/mezuro/views/content_viewer/_project_result.rhtml b/plugins/mezuro/views/content_viewer/_project_result.rhtml
deleted file mode 100644
index c852653..0000000
--- a/plugins/mezuro/views/content_viewer/_project_result.rhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<% @project_result = content.project_result %>
-
-<h3><%= _('LAST RESULT') %></h3>
-
-<table>
-  <tr>
-    <td><%= _('Date') %></td>
-    <td><%= @project_result.date %></td>
-  </tr>
-  <tr>
-    <td><%= _('Load time') %></td>
-    <td><%= @project_result.formatted_load_time %></td>
-  </tr>
-  <tr>
-    <td><%= _('Analysis time') %></td>
-    <td><%= @project_result.formatted_analysis_time %></td>
-  </tr>
-</table>
-
-<h4><%= _('Source tree') %></h4>
-<%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => @project_result.source_tree } %>
-
-<div id='module-result' data-profile="<%= content.profile.identifier %>" data-content='<%= content.id %>'>
-  <%= render :partial => 'content_viewer/module_result', :locals => { :module_result => content.module_result(content.project.name) } %>
-</div>
-
-<script type="text/javascript">
-  jQuery(results);
-</script>
\ No newline at end of file
diff --git a/plugins/mezuro/views/content_viewer/_source_tree.rhtml b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
index fa561cf..0a7ad6a 100644
--- a/plugins/mezuro/views/content_viewer/_source_tree.rhtml
+++ b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
@@ -1,13 +1,13 @@
-<% module_name = source_tree.module_name %>
-<% module_label = "#{module_name} (#{source_tree.granularity})" %>
+<% module_name = source_tree.module.name %>
+<% module_label = "#{module_name} (#{source_tree.module.granularity})" %>
 <% if source_tree.children %>
   <table>
     <tr>
       <td width="10%">
         <img alt="+" src="/plugins/mezuro/images/plus.png" class="link"
-          id="<%= module_name %>_plus" onclick="toggle('<%= module_name %>')"/>
+          id="<%= module_name %>_plus" onclick="toggle('<%= module_name %>')" style="display: none"/>
         <img alt="-" src="/plugins/mezuro/images/minus.png" class="link"
-          id="<%= module_name %>_minus" onclick="toggle('<%= module_name %>')" style="display: none"/>
+          id="<%= module_name %>_minus" onclick="toggle('<%= module_name %>')"/>
       </td>
       <td>
         <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
@@ -15,7 +15,7 @@
         </a>
       </td>
     </tr> 
-    <tr id="<%= module_name %>_hidden" style="display: none">
+    <tr id="<%= module_name %>_hidden">
       <td></td> 
       <td style="text-align: left">
         <% source_tree.children.each do |child| %>
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 3d46306..7c0296c 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -45,5 +45,33 @@
 <% elsif @project.state.end_with?('ING') %>
   <h3><%= _('Service is ') + @project.state.downcase + ' ' + @project.name + '...' %></h3>
 <% elsif @project.state == 'READY' %>
-  <%= render :partial => 'content_viewer/project_result', :locals => { :content => @page } %>
+  <% @project_result = @page.project_result %>
+
+  <h3><%= _('LAST RESULT') %></h3>
+
+  <table>
+    <tr>
+      <td><%= _('Date') %></td>
+      <td><%= @project_result.date %></td>
+    </tr>
+    <tr>
+      <td><%= _('Load time') %></td>
+      <td><%= @project_result.formatted_load_time %></td>
+    </tr>
+    <tr>
+      <td><%= _('Analysis time') %></td>
+      <td><%= @project_result.formatted_analysis_time %></td>
+    </tr>
+  </table>
+
+  <h4><%= _('Source tree') %></h4>
+  <%= render :partial => 'source_tree', :locals => { :source_tree => @project_result.source_tree } %>
+
+  <div id='module-result' data-profile="<%= @page.profile.identifier %>" data-content='<%= @page.id %>'>
+    <%= render :partial => 'module_result', :locals => { :module_result => @page.module_result(@project.name) } %>
+  </div>
+
+  <script type="text/javascript">
+    jQuery(results);
+  </script>
 <% end %>
\ No newline at end of file
--
libgit2 0.21.2