From 90446ad24db0edb3f618d2d283fd111aeca1da71 Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva Date: Thu, 23 Aug 2012 18:08:15 -0300 Subject: [PATCH] [Mezuro] Refactored node_of and get_node methods. --- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 2 +- plugins/mezuro/lib/kalibro/project_result.rb | 20 ++++++++------------ plugins/mezuro/test/unit/kalibro/project_result_test.rb | 14 ++++---------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb index ab89a4b..9062b24 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb @@ -56,7 +56,7 @@ class MezuroPluginProfileController < ProfileController if project_content_has_errors? redirect_to_error_page(@content.errors[:base]) else - @source_tree = project_result.node_of(params[:module_name]) + @source_tree = project_result.node(params[:module_name]) render :partial =>'content_viewer/source_tree' end end diff --git a/plugins/mezuro/lib/kalibro/project_result.rb b/plugins/mezuro/lib/kalibro/project_result.rb index 841b305..244e947 100644 --- a/plugins/mezuro/lib/kalibro/project_result.rb +++ b/plugins/mezuro/lib/kalibro/project_result.rb @@ -75,21 +75,17 @@ class Kalibro::ProjectResult < Kalibro::Model ('%2d' % amount).sub(/\s/, '0') end - def node_of(module_name) + def node(module_name) if module_name.nil? or module_name == project.name node = source_tree else - node = get_node(module_name) - end - end - - def get_node(module_name) - path = Kalibro::Module.parent_names(module_name) - parent = @source_tree - path.each do |node_name| - parent = get_leaf_from(parent, node_name) - end - return parent + path = Kalibro::Module.parent_names(module_name) + parent = @source_tree + path.each do |node_name| + parent = get_leaf_from(parent, node_name) + end + parent + end end private diff --git a/plugins/mezuro/test/unit/kalibro/project_result_test.rb b/plugins/mezuro/test/unit/kalibro/project_result_test.rb index 2e72842..12dc082 100644 --- a/plugins/mezuro/test/unit/kalibro/project_result_test.rb +++ b/plugins/mezuro/test/unit/kalibro/project_result_test.rb @@ -69,26 +69,20 @@ class ProjectResultTest < ActiveSupport::TestCase assert_equal '00:00:01', @project_result.formatted_analysis_time end - should 'retrieve module node' do - node = @project_result.get_node("main") - assert_equal @hash[:source_tree][:child][2], node.to_hash - end - should 'retrive complex module' do - node = @project_result.get_node("org.Window") - assert_equal @hash[:source_tree][:child][0][:child].first, node.to_hash + assert_equal @hash[:source_tree][:child][0][:child].first, @project_result.node("org.Window").to_hash end should 'return source tree node when nil is given' do - assert_equal @hash[:source_tree], @project_result.node_of(nil).to_hash + assert_equal @hash[:source_tree], @project_result.node(nil).to_hash end should 'return source tree node when project name is given' do - assert_equal @hash[:source_tree], @project_result.node_of(@project_result.project.name).to_hash + assert_equal @hash[:source_tree], @project_result.node(@project_result.project.name).to_hash end should 'return correct node when module name is given' do - assert_equal @hash[:source_tree][:child][2], @project_result.node_of("main").to_hash + assert_equal @hash[:source_tree][:child][2], @project_result.node("main").to_hash end end -- libgit2 0.21.2