[Mezuro] showing message of not existent project in kalibro, not working yet for configuration

João M. M. da Silva + Alessandro Palmeira · Paulo Meireles
1 parent feec92ee
Showing 9 changed files with 131 additions and 103 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
plugins/mezuro/views/content_viewer/show_configuration.rhtml
plugins/mezuro/views/content_viewer/show_project.rhtml
plugins/mezuro/views/mezuro_plugin_myprofile/error_page.html.erb
plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb
@@ -8,6 +8,7 @@ class MezuroPluginMyprofileController &lt; ProfileController
   end
   def error_page
+    @message = params[:message]
   end
   def choose_base_tool
@@ -4,15 +4,17 @@ class MezuroPluginProfileController &lt; ProfileController
   rescue_from Exception do |exception|
     message = URI.escape(CGI.escape(exception.message),'.')
-    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
+    redirect_to_error_page message
   end
   def error_page
+    @message = params[:message]
   end
   def project_state
     @content = profile.articles.find(params[:id])
     project = @content.project
+    redirect_to_error_page(project.errors[0].message) if not project.errors.empty?
     state = project.kalibro_error.nil? ? project.state : "ERROR"
     render :text => state
   end
@@ -75,4 +77,10 @@ class MezuroPluginProfileController &lt; ProfileController
       metric_result.value
     end
   end
+
+  def redirect_to_error_page(message)
+    redirect_to "/profile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
+  end
+
 end
+
@@ -55,10 +55,6 @@ class Kalibro::Model
 	    false
 	  end
   end
-    
-  def add_error(exception)
-    @errors << exception
-  end
   def destroy
     begin
@@ -133,4 +129,9 @@ class Kalibro::Model
     {"#{class_name.underscore}_name".to_sym => self.name}
   end
+  def add_error(exception)
+    @errors << exception
+  end
+
 end
+
@@ -25,6 +25,7 @@ class MezuroPlugin::ProjectContent &lt; Article
       @project ||= Kalibro::Project.find_by_name(name)
     rescue Exception => error
       errors.add_to_base(error.message)
+      @project
     end
   end
@@ -105,7 +106,7 @@ Kalibro::ProjectResult.first_result_after(name, date)
   end
   def destroy_project_from_service
-    project.destroy
+    project.destroy unless project.nil?
   end
 end
@@ -25,14 +25,21 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     @content.save
   end
-  should 'test project state without error' do
+  should 'show an error page if an exception is raised' do
+    Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns(Exception.new(:message => "Error message"))
+    get :project_state, :profile => @profile.identifier, :id => @content.id
+    assert_response 302
+    assert_select('h2', 'An error occured: ')
+  end
+
+  should 'test project state without kalibro_error' do
     Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash})
     get :project_state, :profile => @profile.identifier, :id => @content.id
     assert_response 200
     assert_equal @content, assigns(:content)
   end
-  should 'test project state with error' do
+  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 => ErrorFixtures.error_hash})})
     get :project_state, :profile => @profile.identifier, :id => @content.id
     assert_response 200
 <% @configuration_content = @page
 @configuration = @page.configuration %>
+<% unless @page.errors[:base].nil? %>
+  <% if @page.errors[:base] =~ /There is no project named/ %>
+    <h3>Warning:</h3>
+    <p>This Configuration doesn't exist on the Web Service. Do you want to <a href="/myprofile/<%= @page.profile.name %>/cms/destroy/<%= @page.id%>">delete</a> or <a href="/myprofile/<%= @page.profile.name %>/cms/edit/<%= @page.id%>">save it again</a>?</p>
+  <% else %>
+    <%= @page.errors[:base] %>
+  <% end %>
+<% else %>
-<table id="project_info">
-  <tr>
-    <td><%= _('Name') %></td>
-    <td><%= @configuration.name %></td>
-  </tr>
-  <tr>
-    <td><%= _('Description') %></td>
-    <td><%= @configuration.description %></td>
-  </tr>
-</table>
+  <table id="project_info">
+    <tr>
+      <td><%= _('Name') %></td>
+      <td><%= @configuration.name %></td>
+    </tr>
+    <tr>
+      <td><%= _('Description') %></td>
+      <td><%= @configuration.description %></td>
+    </tr>
+  </table>
-<br/>
+  <br/>
-<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_myprofile",
-:action => "choose_base_tool", :params => { :id => @configuration_content.id } %><br/>
+  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_myprofile",
+  :action => "choose_base_tool", :params => { :id => @configuration_content.id } %><br/>
-<table>
-  <tr class="titles">
-      <td><h5>Metric Name</h5></td>
-      <td><h5>Collector Name</h5></td>
-      <td><h5>Metric Code</h5></td>
-      <td/><td/>
-  </tr>
-  <% @configuration.metric_configurations.each do |metric_configuration| %>
-    <tr class="metric">
-      <td><%= metric_configuration.metric.name %></td>
-      <% if metric_configuration.metric.instance_of? Kalibro::NativeMetric %>
-        <td>
-          <%= metric_configuration.metric.origin %>
-        </td>
-        <td><%= metric_configuration.code %></td>
-        <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params =>
-          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
-      <% else %>
-        <td>
-          Compound Metric
-        </td>
-        <td><%= metric_configuration.code %></td>
-        <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_compound_metric_configuration", :params =>
-          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
-      <% end %>
-      
-      <td><%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params =>
-        {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+  <table>
+    <tr class="titles">
+        <td><h5>Metric Name</h5></td>
+        <td><h5>Collector Name</h5></td>
+        <td><h5>Metric Code</h5></td>
+        <td/><td/>
     </tr>
-  <% end %>
-</table>
+    <% @configuration.metric_configurations.each do |metric_configuration| %>
+      <tr class="metric">
+        <td><%= metric_configuration.metric.name %></td>
+        <% if metric_configuration.metric.instance_of? Kalibro::NativeMetric %>
+          <td>
+            <%= metric_configuration.metric.origin %>
+          </td>
+          <td><%= metric_configuration.code %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params =>
+            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+        <% else %>
+          <td>
+            Compound Metric
+          </td>
+          <td><%= metric_configuration.code %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_compound_metric_configuration", :params =>
+            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+        <% end %>
+        
+        <td><%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params =>
+          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
@@ -2,60 +2,58 @@
 <% @project = @page.project %>
 <% unless @page.errors[:base].nil? %>
-  <%= @page.errors[:base] %>
-<% else %>
-
-  <% if (@project==nil) %>
+  <% if @page.errors[:base] =~ /There is no project named/ %>
     <h3>Warning:</h3>
     <p>This project doesn't exist on the Web Service. Do you want to <a href="/myprofile/<%= @page.profile.name %>/cms/destroy/<%= @page.id%>">delete</a> or <a href="/myprofile/<%= @page.profile.name %>/cms/edit/<%= @page.id%>">save it again</a>?</p>
   <% else %>
+    <%= @page.errors[:base] %>
+  <% end %>
+<% else %>
+  <table>
+    <tr>
+      <td><%= _('Name') %></td>
+      <td><%= @project.name %></td>
+    </tr>
+    <tr>
+      <td><%= _('License') %></td>
+      <td><%= @project.license %></td>
+    </tr>
+    <tr>
+      <td><%= _('Description') %></td>
+      <td><%= @project.description %></td>
+    </tr>
+    <tr>
+      <td><%= _('Repository type') %></td>
+      <td><%= @project.repository.type %></td>
+    </tr>
+    <tr>
+      <td><%= _('Repository address') %></td>
+      <td><%= @project.repository.address %></td>
+    </tr>
+    <tr>
+      <td><%= _('Configuration') %></td>
+      <td><%= @project.configuration_name %></td>
+    </tr>
+    <tr> 
+      <td><%= _('Periodicity') %></td>
+      <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
+    </tr>
+    <tr>
+      <td><%= _('Status')%></td>
+      <td>
+        <div id="project-state"><%= @project.state %></div>
+        <div id="msg-time"></div> 
+      </td>
+    </tr>
+  </table>
-    <table>
-      <tr>
-        <td><%= _('Name') %></td>
-        <td><%= @project.name %></td>
-      </tr>
-      <tr>
-        <td><%= _('License') %></td>
-        <td><%= @project.license %></td>
-      </tr>
-      <tr>
-        <td><%= _('Description') %></td>
-        <td><%= @project.description %></td>
-      </tr>
-      <tr>
-        <td><%= _('Repository type') %></td>
-        <td><%= @project.repository.type %></td>
-      </tr>
-      <tr>
-        <td><%= _('Repository address') %></td>
-        <td><%= @project.repository.address %></td>
-      </tr>
-      <tr>
-        <td><%= _('Configuration') %></td>
-        <td><%= @project.configuration_name %></td>
-      </tr>
-      <tr> 
-        <td><%= _('Periodicity') %></td>
-        <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
-      </tr>
-      <tr>
-        <td><%= _('Status')%></td>
-        <td>
-          <div id="project-state"><%= @project.state %></div>
-          <div id="msg-time"></div> 
-        </td>
-      </tr>
-    </table>
-
-    <br />
+  <br />
-    <div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>"
-         data-project-name="<%= @project.name %>">
-    </div>
-    <div id="project-tree"></div>
-    <div id="module-result">
-    </div>
-  <% end %>
+  <div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>"
+       data-project-name="<%= @project.name %>">
+  </div>
+  <div id="project-tree"></div>
+  <div id="module-result">
+  </div>
 <% end %>
-<h2> <%= "An error occured: " %> </h2>
-<%=h params[:message] %>
+<h2> An error occured: </h2>
+<%= @message %>
 <!-- The <%=h is for escaping the URL properly --!>
@@ -0,0 +1,3 @@
+<h2> An error occured: </h2>
+<%= @message %>
+<!-- The <%=h is for escaping the URL properly --!>
	@@ -8,6 +8,7 @@ class MezuroPluginMyprofileController < ProfileController		@@ -8,6 +8,7 @@ class MezuroPluginMyprofileController < ProfileController
8	end	8	end
9		9
10	def error_page	10	def error_page
		11	+ @message = params[:message]
11	end	12	end
12		13
13	def choose_base_tool	14	def choose_base_tool
1	-<h2> <%= "An error occured: " %> </h2>
2	-<%=h params[:message] %>	1	+<h2> An error occured: </h2>
		2	+<%= @message %>
3	<!-- The <%=h is for escaping the URL properly --!>	3	<!-- The <%=h is for escaping the URL properly --!>
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<h2> An error occured: </h2>
	2	+<%= @message %>
	3	+<!-- The <%=h is for escaping the URL properly --!>