Moving service call from view to project_content

Carlos Morais + Paulo Meirelles · Paulo Meireles
1 parent 8f4bd8de
Showing 2 changed files with 25 additions and 11 deletions Show diff stats
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -17,26 +17,39 @@ class MezuroPlugin::ProjectContent &lt; Article
     end
   end
+  def project
+    Kalibro::Client::ProjectClient.new.project(title)
+  end
+
+  def project_result
+    @project_result ||= Kalibro::Client::ProjectResultClient.new.last_result(title)
+  end
+
+  def module_result(module_name)
+    @module_client ||= Kalibro::Client::ModuleResultClient.new
+    @module_client.module_result(title, module_name, project_result.date)
+  end
+
   after_save :send_project_to_service
   private
   def send_project_to_service
-    Kalibro::Client::ProjectClient.save(project)
+    Kalibro::Client::ProjectClient.save(create_project)
     Kalibro::Client::KalibroClient.process_project(title)
   end
-  def project
+  def create_project
     project = Kalibro::Entities::Project.new
     project.name = title
     project.license = license
     project.description = description
-    project.repository = repository
+    project.repository = create_repository
     project.configuration_name = configuration_name
     project
   end
-  def repository
+  def create_repository
     repository = Kalibro::Entities::Repository.new
     repository.type = repository_type
     repository.address = repository_url
-<% @project = Kalibro::Client::ProjectClient.new.project(@page.name) %>
+<% @project = @page.project %>
 <table id="project_info">
   <tr>
@@ -29,14 +29,16 @@
 <br />
+
+
 <% if ! @project.error.nil? %>
   <h3><%= _('ERROR') %></h3>
-  <% @error = @project.error %>
   <p>
     <%= "State when error ocurred: #{@project.state}" %>
     <br/>
-    <%= @error.message %>
-    <ul><% @error.stack_trace.each do |trace| %>
+    <% error = @project.error %>
+    <%= error.message %>
+    <ul><% error.stack_trace.each do |trace| %>
       <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
     <% end %></ul>
   </p>
@@ -48,8 +50,7 @@
   </p>
 <% elsif @project.state == 'READY' %>
   <h3><%= _('LAST RESULT') %></h3>
-  <% @project_result = Kalibro::Client::ProjectResultClient.new.last_result(@project.name) %>
-  <% @module_client = Kalibro::Client::ModuleResultClient.new %>
+  <% @project_result = @page.project_result %>
   <table id="project_result_info">
     <tr>
@@ -68,7 +69,7 @@
   <h5><%= _('Source tree') %></h5>
   <%= @project_result.source_tree.print %>
-  <% @module_result = @module_client.module_result(@project.name, @project.name, @project_result.date) %>
+  <% @module_result = @page.module_result(@project.name) %>
   <h5><%= _('Metric Result') %> </h5>
   <strong>