[Mezuro] processing action in processing controller

João M. M. da Silva + Alessandro Palmeira · João M. M. da Silva
1 parent 55a9a0db
Showing 11 changed files with 91 additions and 147 deletions Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_processing_controller.rb
plugins/mezuro/lib/kalibro/processing.rb
plugins/mezuro/test/fixtures/processing_fixtures.rb
plugins/mezuro/test/functional/profile/mezuro_plugin_processing_controller_test.rb
plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb
plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml
plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml
plugins/mezuro/views/mezuro_plugin_project/_error_page.html.erb
plugins/mezuro/views/mezuro_plugin_project/_project_error.rhtml
plugins/mezuro/views/mezuro_plugin_project/_project_result.rhtml
plugins/mezuro/views/mezuro_plugin_project/_source_tree.rhtml
@@ -8,22 +8,13 @@ class MezuroPluginProcessingController &lt; MezuroPluginProfileController
     render :text => last_state
   end
-  def processing_error
-    @content = profile.articles.find(params[:id])
-    @processing = @content.processing
-    if project_content_has_errors?
-      redirect_to_error_page(@content.errors[:base])
-    else
-      render :partial => 'processing_error'
-    end
-  end
-
   def processing
-    @content = profile.articles.find(params[:id])
     date = params[:date]
-    @processing = date.nil? ? @content.processing : @content.processing_with_date(date)
-    if project_content_has_errors?
-      redirect_to_error_page(@content.errors[:base])
+    repository_id = params[:repository_id].to_i
+    processing_class = Kalibro::Processing
+    @processing = date.nil? ? processing_class.processing_of(repository_id) : processing_class.processing_with_date_of(repository_id, date)
+    if @processing.state == 'ERROR'
+      render :partial => 'processing_error'
     else
       render :partial => 'processing'
     end
@@ -6,7 +6,7 @@ class Kalibro::Processing &lt; Kalibro::Model
   def self.processing_of(repository_id)
     if has_ready_processing(repository_id)
       last_ready_processing_of(repository_id)
-    else
+    else #always exists a processing, we send a requisition to kalibro to process repository
       last_processing_of(repository_id)
     end
   end
@@ -37,6 +37,10 @@ class Kalibro::Processing &lt; Kalibro::Model
     process_time
   end
+  def error=(value)
+    @error = Kalibro::Throwable.to_object value
+  end
+
   private
   def self.has_processing(repository_id)
 require File.dirname(__FILE__) + '/process_time_fixtures'
+require File.dirname(__FILE__) + '/throwable_fixtures'
 class ProcessingFixtures
   def self.processing
     Kalibro::Processing.new processing_hash  
   end
-
+ 
   def self.processing_hash
     {
       :id => 31,
       :date => '2011-10-20T18:26:43.151+00:00',
       :state => 'READY',
       :process_time => [ProcessTimeFixtures.process_time_hash],
-      :results_root_id => 13  
+      :results_root_id => 13
     }
   end
-    
+
+  def self.processing_with_error_hash
+    {
+      :id => 31,
+      :date => '2011-10-20T18:26:43.151+00:00',
+      :state => 'ERROR',
+      :process_time => [ProcessTimeFixtures.process_time_hash],
+      :error => ThrowableFixtures.throwable_hash
+    }
+  end
+
 end
@@ -12,9 +12,10 @@ class MezuroPluginProcessingControllerTest &lt; ActionController::TestCase
     @response = ActionController::TestResponse.new
     @profile = fast_create(Community)
-    @repository = RepositoryFixtures.repository
+    @repository_id = RepositoryFixtures.repository.id
     @processing = ProcessingFixtures.processing
-
+    @processing_hash = ProcessingFixtures.processing_hash
+    @processing_with_error_hash = ProcessingFixtures.processing_with_error_hash
 =begin
     @content = MezuroPlugin::ProjectContent.new(:profile => @profile, :name => @project.name, :repository_url => @repository_url)
     @content.expects(:send_project_to_service).returns(nil)
@@ -26,51 +27,40 @@ class MezuroPluginProcessingControllerTest &lt; ActionController::TestCase
   end
   should 'render last processing state' do
-    Kalibro::Processing.expects(:request).with(:last_processing_state, :repository_id => @repository.id).returns({:process_state => @processing.state})
-    get :render_last_state, :profile => @profile.identifier, :repository_id => @repository.id
+    Kalibro::Processing.expects(:request).with(:last_processing_state, :repository_id => @repository_id).returns({:process_state => @processing.state})
+    get :render_last_state, :profile => @profile.identifier, :repository_id => @repository_id
     assert_response 200
     assert_equal @processing.state, @response.body
   end
-#TODO refatorar todos os testes
-=begin
-  should 'test project state with kalibro_error' do
-    Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash.merge({:error => ThrowableFixtures.throwable_hash})})
-    get :project_state, :profile => @profile.identifier, :id => @content.id
-    assert_response 200
-    assert_equal "ERROR", @response.body
-    assert_equal @content, assigns(:content)
-  end
-  should 'test project error' do
-    Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash.merge({:error => ThrowableFixtures.throwable_hash})})
-    get :project_error, :profile => @profile.identifier, :id => @content.id
+  should 'render processing with error' do
+    Kalibro::Processing.expects(:request).with(:has_ready_processing, {:repository_id => @repository_id}).returns({:exists => false})
+    Kalibro::Processing.expects(:request).with(:last_processing, :repository_id => @repository_id).returns({:processing => @processing_with_error_hash})
+    get :processing, :profile => @profile.identifier, :repository_id => @repository_id
     assert_response 200
-    assert_select('h3', 'ERROR')
-    assert_equal @content, assigns(:content)
-    assert_equal @project.name, assigns(:project).name
+    assert_equal @processing_with_error_hash[:state], assigns(:processing).state
+    #TODO How to assert from view? assert_select('h3', 'ERROR')
   end
   should 'test project result without date' do
-    Kalibro::Processing.expects(:request).with("Processing", :get_last_result_of, {:project_name => @project.name}).returns({:project_result => @project_result.to_hash})
-    get :project_result, :profile => @profile.identifier, :id => @content.id, :date => nil
-    assert_equal @content, assigns(:content)
-    assert_equal @project_result.project.name, assigns(:project_result).project.name
+    Kalibro::Processing.expects(:request).with(:has_ready_processing, {:repository_id => @repository_id}).returns({:exists => true})
+    Kalibro::Processing.expects(:request).with(:last_ready_processing, {:repository_id => @repository_id}).returns({:processing => @processing_hash})
+    get :processing, :profile => @profile.identifier, :repository_id => @repository_id
     assert_response 200
     assert_select('h4', 'Last Result')
   end
   should 'test project results from a specific date' do
-    request_body = {:project_name => @project.name, :date => @date}
-    Kalibro::Processing.expects(:request).with("Processing", :has_results_before, request_body).returns({:has_results => true})
-    Kalibro::Processing.expects(:request).with("Processing", :get_last_result_before, request_body).returns({:project_result => @project_result.to_hash})
-    get :project_result, :profile => @profile.identifier, :id => @content.id, :date => @date
-    assert_equal @content, assigns(:content)
-    assert_equal @project_result.project.name, assigns(:project_result).project.name
+    Kalibro::Processing.expects(:request).with(:has_processing_after, {:repository_id => @repository_id, :date => @processing.date}).returns({:exists => true})
+    Kalibro::Processing.expects(:request).with(:first_processing_after, :repository_id => @repository_id, :date => @processing.date).returns({:processing => @processing_hash})
+    get :processing, :profile => @profile.identifier, :repository_id => @repository_id, :date => @processing.date
     assert_response 200
     assert_select('h4', 'Last Result')
   end
+#TODO refatorar todos os testes
+=begin
   should 'test project tree without date' do
     Kalibro::Processing.expects(:request).with("Processing", :get_last_result_of, {:project_name => @project.name}).returns({:project_result => @project_result.to_hash})
     Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash})
@@ -0,0 +1,2 @@
+<h2> An error occured: </h2>
+<%= @processing.error.message %>
@@ -0,0 +1,34 @@
+<div id="current_processing_date" data-date="<%= @processing.date %>"/>
+
+<h4><%= _('Last Result') %></h4>
+
+<table>
+  <tr>
+    <td><%= _('Date') %></td>
+    <td><%= @processing.date %></td>
+  </tr>
+  <% @processing.process_time.each do |process_time| %>
+    <tr>
+      <td><%= _(process_time.state + ' time') %></td>
+      <td><%= process_time.time %></td>
+    </tr>
+  <% end %>
+  <tr>
+    <td>Click to choose specific date:</td>
+    <td><%= link_to(image_tag('/images/calendar_date_select/calendar.png', :width => 20, :height => 20, :onClick => "$( 'datepicker' ).toggle();"), "javascript:void(0)") %></td>
+  </tr>
+</table>
+
+<div id="datepicker"></div>
+
+<script>
+  jQuery(document).ready(function($) {
+    $("#datepicker").datepicker({
+	  								onSelect: function(dateText, inst) {
+	  									reloadProjectWithDate(dateText) } });
+    $("#datepicker").toggle();
+    var date = jQuery("#current_processing_date").attr('data-date').substr(0,10);
+  $("#datepicker").datepicker( "setDate" , date );
+
+  });
+</script>
@@ -0,0 +1,12 @@
+<h3><%= _('ERROR') %></h3>
+<p>
+  <%= "State when error ocurred: #{@processing.state}" %>
+  <br/>
+  <% error = @processing.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>
@@ -1,2 +0,0 @@
-<h2> An error occured: </h2>
-<%= @message %>
@@ -1,12 +0,0 @@
-<h3><%= _('ERROR') %></h3>
-<p>
-  <%= "State when error ocurred: #{@project.state}" %>
-  <br/>
-  <% error = @project.kalibro_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>
@@ -1,41 +0,0 @@
-<% unless @content.errors[:base].nil? %>
-  <%= @content.errors[:base] %>
-<% else %>
-  <div id="current_project_date" data-date="<%= @project_result.date %>"/>
-
-  <h4><%= _('Last Result') %></h4>
-
-  <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>
-    <tr>
-      <td>Click to choose specific date:</td>
-      <td><%= link_to(image_tag('/images/calendar_date_select/calendar.png', :width => 20, :height => 20, :onClick => "$( 'datepicker' ).toggle();"), "javascript:void(0)") %></td>
-    </tr>
-  </table>
-
-  <div id="datepicker"></div>
-
-  <script>
-    jQuery(document).ready(function($) {
-      $("#datepicker").datepicker({
-  	  								onSelect: function(dateText, inst) {
-  	  									reloadProjectWithDate(dateText) } });
-      $("#datepicker").toggle();
-      var date = jQuery("#current_project_date").attr('data-date').substr(0,10);
-	  $("#datepicker").datepicker( "setDate" , date );
-
-    });
-  </script>
-
-<% end %>
@@ -1,45 +0,0 @@
-<% unless @content.errors[:base].nil? %>
-  <%= @content.errors[:base] %>
-<% else %>
-  <h4><%= _('Source tree') %></h4>
-  <% module_name = @source_tree.module.name %>
-  <% module_label = "#{module_name} (#{@source_tree.module.granularity})" %>
-
-  <p><h2 class="path">
-    <% if module_name != @project_name %>
-      <a href="#" class="source-tree-link" data-module-name="<%= @project_name %>">
-        <%= @project_name %>
-      </a>
-    <% end %>
-
-
-    <% split_link = @source_tree.module.ancestor_names %>
-    <% split_link.each do |link| %>
-      /<a href="#" class="source-tree-link" data-module-name="<%= link %>">
-        <%= link.split(".").last %>
-      </a>
-    <% end %>
-  </h2></p>
-    
-  <% if @source_tree.children %>
-    <table border="0" class="source-tree">
-      <% @source_tree.children.each do |child| %>
-        <% if child.module.granularity=='PACKAGE' %>
-          <tr>
-	          <td class="icon"><%= image_tag('/plugins/mezuro/images/folder.png')%></td>
-	          <td class="source-tree-text"><a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>"><%= child.module.name %></a></td>
-          </tr>
-        <% else %>
-          <tr>
-	          <td class="icon"><%= image_tag('/plugins/mezuro/images/file.png') %></td>
-	          <td class="source-tree-text">
-                    <a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>">
-                      <%= child.module.name %>
-                    </a>
-                  </td>
-          </tr>
-        <% end %>
-      <% end %>  
-    </table>
-  <% end %>
-<% end %>
	@@ -8,22 +8,13 @@ class MezuroPluginProcessingController < MezuroPluginProfileController		@@ -8,22 +8,13 @@ class MezuroPluginProcessingController < MezuroPluginProfileController
8	render :text => last_state	8	render :text => last_state
9	end	9	end
10		10
11	- def processing_error
12	- @content = profile.articles.find(params[:id])
13	- @processing = @content.processing
14	- if project_content_has_errors?
15	- redirect_to_error_page(@content.errors[:base])
16	- else
17	- render :partial => 'processing_error'
18	- end
19	- end
20	-
21	def processing	11	def processing
22	- @content = profile.articles.find(params[:id])
23	date = params[:date]	12	date = params[:date]
24	- @processing = date.nil? ? @content.processing : @content.processing_with_date(date)
25	- if project_content_has_errors?
26	- redirect_to_error_page(@content.errors[:base])	13	+ repository_id = params[:repository_id].to_i
		14	+ processing_class = Kalibro::Processing
		15	+ @processing = date.nil? ? processing_class.processing_of(repository_id) : processing_class.processing_with_date_of(repository_id, date)
		16	+ if @processing.state == 'ERROR'
		17	+ render :partial => 'processing_error'
27	else	18	else
28	render :partial => 'processing'	19	render :partial => 'processing'
29	end	20	end
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+<h2> An error occured: </h2>
	2	+<%= @processing.error.message %>
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+<div id="current_processing_date" data-date="<%= @processing.date %>"/>
	2	+
	3	+<h4><%= _('Last Result') %></h4>
	4	+
	5	+<table>
	6	+ <tr>
	7	+ <td><%= _('Date') %></td>
	8	+ <td><%= @processing.date %></td>
	9	+ </tr>
	10	+ <% @processing.process_time.each do \|process_time\| %>
	11	+ <tr>
	12	+ <td><%= _(process_time.state + ' time') %></td>
	13	+ <td><%= process_time.time %></td>
	14	+ </tr>
	15	+ <% end %>
	16	+ <tr>
	17	+ <td>Click to choose specific date:</td>
	18	+ <td><%= link_to(image_tag('/images/calendar_date_select/calendar.png', :width => 20, :height => 20, :onClick => "$( 'datepicker' ).toggle();"), "javascript:void(0)") %></td>
	19	+ </tr>
	20	+</table>
	21	+
	22	+<div id="datepicker"></div>
	23	+
	24	+<script>
	25	+ jQuery(document).ready(function($) {
	26	+ $("#datepicker").datepicker({
	27	+ onSelect: function(dateText, inst) {
	28	+ reloadProjectWithDate(dateText) } });
	29	+ $("#datepicker").toggle();
	30	+ var date = jQuery("#current_processing_date").attr('data-date').substr(0,10);
	31	+ $("#datepicker").datepicker( "setDate" , date );
	32	+
	33	+ });
	34	+</script>
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+<h3><%= _('ERROR') %></h3>
	2	+<p>
	3	+ <%= "State when error ocurred: #{@processing.state}" %>
	4	+ <br/>
	5	+ <% error = @processing.error %>
	6	+ <%= error.message %>
	7	+<ul>
	8	+ <% error.stack_trace.each do \|trace\| %>
	9	+ <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
	10	+ <% end %>
	11	+</ul>
	12	+</p>
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-<h2> An error occured: </h2>
2	-<%= @message %>
	@@ -1,12 +0,0 @@	@@ -1,12 +0,0 @@
1	-<h3><%= _('ERROR') %></h3>
2	-<p>
3	- <%= "State when error ocurred: #{@project.state}" %>
4	- <br/>
5	- <% error = @project.kalibro_error %>
6	- <%= error.message %>
7	-<ul>
8	- <% error.stack_trace.each do \|trace\| %>
9	- <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
10	- <% end %>
11	-</ul>
12	-</p>
	@@ -1,41 +0,0 @@	@@ -1,41 +0,0 @@
1	-<% unless @content.errors[:base].nil? %>
2	- <%= @content.errors[:base] %>
3	-<% else %>
4	- <div id="current_project_date" data-date="<%= @project_result.date %>"/>
5	-
6	- <h4><%= _('Last Result') %></h4>
7	-
8	- <table>
9	- <tr>
10	- <td><%= _('Date') %></td>
11	- <td><%= @project_result.date %></td>
12	- </tr>
13	- <tr>
14	- <td><%= _('Load time') %></td>
15	- <td><%= @project_result.formatted_load_time %></td>
16	- </tr>
17	- <tr>
18	- <td><%= _('Analysis time') %></td>
19	- <td><%= @project_result.formatted_analysis_time %></td>
20	- </tr>
21	- <tr>
22	- <td>Click to choose specific date:</td>
23	- <td><%= link_to(image_tag('/images/calendar_date_select/calendar.png', :width => 20, :height => 20, :onClick => "$( 'datepicker' ).toggle();"), "javascript:void(0)") %></td>
24	- </tr>
25	- </table>
26	-
27	- <div id="datepicker"></div>
28	-
29	- <script>
30	- jQuery(document).ready(function($) {
31	- $("#datepicker").datepicker({
32	- onSelect: function(dateText, inst) {
33	- reloadProjectWithDate(dateText) } });
34	- $("#datepicker").toggle();
35	- var date = jQuery("#current_project_date").attr('data-date').substr(0,10);
36	- $("#datepicker").datepicker( "setDate" , date );
37	-
38	- });
39	- </script>
40	-
41	-<% end %>
	@@ -1,45 +0,0 @@	@@ -1,45 +0,0 @@
1	-<% unless @content.errors[:base].nil? %>
2	- <%= @content.errors[:base] %>
3	-<% else %>
4	- <h4><%= _('Source tree') %></h4>
5	- <% module_name = @source_tree.module.name %>
6	- <% module_label = "#{module_name} (#{@source_tree.module.granularity})" %>
7	-
8	- <p><h2 class="path">
9	- <% if module_name != @project_name %>
10	- <a href="#" class="source-tree-link" data-module-name="<%= @project_name %>">
11	- <%= @project_name %>
12	- </a>
13	- <% end %>
14	-
15	-
16	- <% split_link = @source_tree.module.ancestor_names %>
17	- <% split_link.each do \|link\| %>
18	- /<a href="#" class="source-tree-link" data-module-name="<%= link %>">
19	- <%= link.split(".").last %>
20	- </a>
21	- <% end %>
22	- </h2></p>
23	-
24	- <% if @source_tree.children %>
25	- <table border="0" class="source-tree">
26	- <% @source_tree.children.each do \|child\| %>
27	- <% if child.module.granularity=='PACKAGE' %>
28	- <tr>
29	- <td class="icon"><%= image_tag('/plugins/mezuro/images/folder.png')%></td>
30	- <td class="source-tree-text"><a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>"><%= child.module.name %></a></td>
31	- </tr>
32	- <% else %>
33	- <tr>
34	- <td class="icon"><%= image_tag('/plugins/mezuro/images/file.png') %></td>
35	- <td class="source-tree-text">
36	- <a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>">
37	- <%= child.module.name %>
38	- </a>
39	- </td>
40	- </tr>
41	- <% end %>
42	- <% end %>
43	- </table>
44	- <% end %>
45	-<% end %>