[Mezuro] refactoring Handling Exceptions

João M. M. da Silva + Paulo Meirelles · Paulo Meireles
1 parent e3a97dfd
Showing 7 changed files with 40 additions and 29 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/lib/kalibro/configuration.rb
plugins/mezuro/lib/kalibro/error.rb
plugins/mezuro/lib/kalibro/metric_configuration.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/kalibro/project.rb
plugins/mezuro/test/unit/kalibro/configuration_test.rb
 class MezuroPluginProfileController < ProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  
+
+  rescue_from Exception do |exception|
+    message = URI.escape(CGI.escape(exception.message),'.')
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
+  end
+
+  def error_page
+  end
+
   def project_state
     @content = profile.articles.find(params[:id])
     project = @content.project
@@ -7,11 +7,7 @@ class Kalibro::Configuration &lt; Kalibro::Model
   end
   def metric_configurations
-    if @metric_configuration != nil
-      @metric_configuration
-    else
-      []
-    end
+    @metric_configuration.nil? ? [] : @metric_configuration
   end
   def metric_configurations=(metric_configurations)
@@ -19,19 +15,11 @@ class Kalibro::Configuration &lt; Kalibro::Model
   end
   def self.find_by_name(configuration_name)
-    begin
-      new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
-    rescue Exception
-      nil
-    end
+    new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
   end
   def self.all_names
-    begin
-      request("Configuration", :get_configuration_names)[:configuration_name]
-    rescue Exception
-      []
-    end
+    request("Configuration", :get_configuration_names)[:configuration_name]
   end
   def update_attributes(attributes={})
@@ -2,10 +2,6 @@ class Kalibro::Error &lt; Kalibro::Model
   attr_accessor :error_class, :message, :stack_trace_element, :cause
-  def initialize(exception)
-    @message = exception.message
-  end
-
   def stack_trace_element=(value)
     @stack_trace_element = Kalibro::StackTraceElement.to_objects_array value
   end
@@ -49,10 +49,14 @@ class Kalibro::MetricConfiguration &lt; Kalibro::Model
   end
   def destroy
-    self.class.request("MetricConfiguration", :remove_metric_configuration, {
+    begin
+      self.class.request("MetricConfiguration", :remove_metric_configuration, {
         :configuration_name => configuration_name,
         :metric_name=> metric.name
       })
+    rescue Exception => exception
+      add_error exception
+    end
   end
   def to_hash
@@ -10,6 +10,7 @@ class Kalibro::Model
   def to_hash(options={})
     hash = Hash.new
     excepts = !options[:except].nil? ? options[:except] : []
+    excepts << :errors
     fields.each do |field|
       if(!excepts.include?(field))
         field_value = send(field)
@@ -19,19 +19,31 @@ class Kalibro::Project &lt; Kalibro::Model
   end
   def process_project(days = '0')
-    if days.to_i.zero?
-      self.class.request("Kalibro", :process_project, {:project_name => name})
-  	else
-      self.class.request("Kalibro", :process_periodically, {:project_name => name, :period_in_days => days})
-  	end
+    begin
+      if days.to_i.zero?
+        self.class.request("Kalibro", :process_project, {:project_name => name})
+    	else
+        self.class.request("Kalibro", :process_periodically, {:project_name => name, :period_in_days => days})
+    	end
+    rescue Exception => exception
+      add_error exception
+    end
   end
 	def process_period
-    self.class.request("Kalibro", :get_process_period, {:project_name => name})[:period]
+	  begin
+      self.class.request("Kalibro", :get_process_period, {:project_name => name})[:period]
+    rescue Exception => exception
+      add_error exception
+    end
   end
 	def cancel_periodic_process
-    self.class.request("Kalibro", :cancel_periodic_process, {:project_name => name})
+	  begin
+      self.class.request("Kalibro", :cancel_periodic_process, {:project_name => name})
+    rescue Exception => exception
+      add_error exception
+    end
   end
 end
@@ -44,7 +44,9 @@ class ConfigurationTest &lt; ActiveSupport::TestCase
   should 'return nil when configuration doesnt exist' do
     request_body = {:configuration_name => @configuration.name}
     Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, request_body).raises(Exception.new)
-    assert_nil Kalibro::Configuration.find_by_name(@configuration.name)
+    assert_raise Exception do
+      Kalibro::Configuration.find_by_name(@configuration.name)
+    end
   end
   should 'destroy configuration by name' do
1	class MezuroPluginProfileController < ProfileController	1	class MezuroPluginProfileController < ProfileController
2		2
3	append_view_path File.join(File.dirname(__FILE__) + '/../views')	3	append_view_path File.join(File.dirname(__FILE__) + '/../views')
4	-	4	+
		5	+ rescue_from Exception do \|exception\|
		6	+ message = URI.escape(CGI.escape(exception.message),'.')
		7	+ redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
		8	+ end
		9	+
		10	+ def error_page
		11	+ end
		12	+
5	def project_state	13	def project_state
6	@content = profile.articles.find(params[:id])	14	@content = profile.articles.find(params[:id])
7	project = @content.project	15	project = @content.project