From 78623c06f702c5c49513b1c49cedf9622d56e37a Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles Date: Wed, 9 Jan 2013 17:08:08 -0200 Subject: [PATCH] [Mezuro] Prepared metric_result for agreggated_value --- plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb | 1 - plugins/mezuro/lib/kalibro/metric_result.rb | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb b/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb index 406f6c2..99c3628 100644 --- a/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb +++ b/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb @@ -26,7 +26,6 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model def to_hash hash = super - puts hash hash[:attributes!][:range] = {'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:type' => 'kalibro:rangeSnapshotXml' } hash diff --git a/plugins/mezuro/lib/kalibro/metric_result.rb b/plugins/mezuro/lib/kalibro/metric_result.rb index 364e6f0..bbaa418 100644 --- a/plugins/mezuro/lib/kalibro/metric_result.rb +++ b/plugins/mezuro/lib/kalibro/metric_result.rb @@ -2,8 +2,15 @@ class Kalibro::MetricResult < Kalibro::Model attr_accessor :id, :configuration, :value, :error - def value=(value) - @value = value.to_f + def initialize(attributes={}) + value = attributes[:value] + value == "NaN" ? @value = attributes[:agreggated_value] : @value = value.to_f + attributes.each do |field, value| + if field!="value" and field!="agreggated_value" and self.class.is_valid?(field) + send("#{field}=", value) + end + end + @errors = [] end def configuration=(value) -- libgit2 0.21.2