From f4aecdffad6d0850164e1dcf71a56e9abb802c36 Mon Sep 17 00:00:00 2001 From: Diego Martinez Date: Thu, 15 Mar 2012 21:37:40 +0300 Subject: [PATCH] [Mezuro] Refactored module_result from project_content --- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 6 +----- plugins/mezuro/lib/kalibro/entities/entity.rb | 4 ++-- plugins/mezuro/lib/kalibro/entities/native_metric.rb | 2 +- plugins/mezuro/lib/mezuro_plugin/project_content.rb | 1 + plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb | 14 ++++++++++++++ 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb index 390a78a..3a5b2eb 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb @@ -24,11 +24,7 @@ class MezuroPluginProfileController < ProfileController def module_result content = profile.articles.find(params[:id]) - if params[:module_name].nil? or params[:module_name] == content.project.name - module_result = content.module_result(content.project.name) - else - module_result = content.module_result(params[:module_name]) - end + module_result = content.module_result(params[:module_name]) render :partial => 'content_viewer/module_result', :locals => { :module_result => module_result} end diff --git a/plugins/mezuro/lib/kalibro/entities/entity.rb b/plugins/mezuro/lib/kalibro/entities/entity.rb index 9763f91..f6a08ae 100644 --- a/plugins/mezuro/lib/kalibro/entities/entity.rb +++ b/plugins/mezuro/lib/kalibro/entities/entity.rb @@ -7,7 +7,7 @@ class Kalibro::Entities::Entity end def set(field, value) - send("#{field}=", value) + send("#{field}=", value) if not field.to_s.start_with? '@' end def to_entity_array(value, entity_class = nil) @@ -50,4 +50,4 @@ class Kalibro::Entities::Entity send("#{field}") end -end \ No newline at end of file +end diff --git a/plugins/mezuro/lib/kalibro/entities/native_metric.rb b/plugins/mezuro/lib/kalibro/entities/native_metric.rb index f7e7822..479ae0b 100644 --- a/plugins/mezuro/lib/kalibro/entities/native_metric.rb +++ b/plugins/mezuro/lib/kalibro/entities/native_metric.rb @@ -2,4 +2,4 @@ class Kalibro::Entities::NativeMetric < Kalibro::Entities::Metric attr_accessor :origin, :language -end \ No newline at end of file +end diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb index eb365db..1e39cce 100644 --- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb +++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb @@ -26,6 +26,7 @@ class MezuroPlugin::ProjectContent < Article end def module_result(module_name) + module_name = project.name if module_name.nil? @module_client ||= Kalibro::Client::ModuleResultClient.module_result(self, module_name) end diff --git a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb index bc2dd11..b38388f 100644 --- a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb +++ b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb @@ -50,6 +50,20 @@ class ProjectContentTest < ActiveSupport::TestCase assert_equal module_result, @content.module_result(module_name) end + should 'get module result root when nil is given' do + module_result = mock + Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name). + returns(module_result) + assert_equal module_result, @content.module_result(nil) + end + + should 'get module result root when project name is give' do + module_result = mock + Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name). + returns(module_result) + assert_equal module_result, @content.module_result(@project.name) + end + should 'send project to service after saving' do @content.expects :send_project_to_service @content.run_callbacks :after_save -- libgit2 0.21.2