From 7e0a47fa233ac97ef14c185f5ffd5ac51e59b5d7 Mon Sep 17 00:00:00 2001 From: Diego Araújo + Alessandro Palmeira + João M. M. da Silva Date: Wed, 31 Oct 2012 16:53:10 -0200 Subject: [PATCH] Started refactoring models --- plugins/mezuro/lib/kalibro/base_tool.rb | 4 ++-- plugins/mezuro/lib/kalibro/configuration.rb | 32 +++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/plugins/mezuro/lib/kalibro/base_tool.rb b/plugins/mezuro/lib/kalibro/base_tool.rb index c24a54c..bc10586 100644 --- a/plugins/mezuro/lib/kalibro/base_tool.rb +++ b/plugins/mezuro/lib/kalibro/base_tool.rb @@ -1,9 +1,9 @@ class Kalibro::BaseTool < Kalibro::Model - attr_accessor :name, :description, :supported_metric + attr_accessor :name, :description, :collector_class_name, :supported_metric def self.all_names - request("BaseTool", :get_base_tool_names)[:base_tool_name].to_a + request("BaseTool", :all_base_tool_names)[:base_tool_name].to_a end def self.find_by_name(base_tool_name) diff --git a/plugins/mezuro/lib/kalibro/configuration.rb b/plugins/mezuro/lib/kalibro/configuration.rb index e3deff6..295defa 100644 --- a/plugins/mezuro/lib/kalibro/configuration.rb +++ b/plugins/mezuro/lib/kalibro/configuration.rb @@ -1,7 +1,7 @@ class Kalibro::Configuration < Kalibro::Model - attr_accessor :name, :description, :metric_configuration - + attr_accessor :name, :description, :id +=begin def metric_configuration=(value) @metric_configuration = Kalibro::MetricConfiguration.to_objects_array value end @@ -13,21 +13,35 @@ class Kalibro::Configuration < Kalibro::Model def metric_configurations=(metric_configurations) @metric_configuration = metric_configurations end +=end + + def self.exists?(id) + request("Configuration", :configuration_exists, {:configuration_id => id})[:exists] + end - def self.find_by_name(configuration_name) - new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration] + def self.find(id) + if(exists?(id)) + new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration] + else + nil + end end - def self.all_names - request("Configuration", :get_configuration_names)[:configuration_name] + def self.configuration_of(repository_id) + new request("Configuration", :configuration_of, {:repository_id => repository_id})[:configuration] end + def self.all + request("Configuration", :all_configuration)[:configuration] + end + + def update_attributes(attributes={}) attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) } save end - def metric_configurations_hash - self.to_hash[:metric_configuration] - end +# def metric_configurations_hash +# self.to_hash[:metric_configuration] +# end end -- libgit2 0.21.2