From a2ba74c154a4a05ddb005dfd0c6bfe0fa3a6d89c Mon Sep 17 00:00:00 2001 From: Carlos Morais + Eduardo Morais Date: Mon, 2 Apr 2012 16:16:48 -0300 Subject: [PATCH] [mezuro] Fix date with milliseconds problem --- plugins/mezuro/lib/kalibro/client/module_result_client.rb | 9 +-------- plugins/mezuro/lib/kalibro/entities/entity.rb | 6 ++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/mezuro/lib/kalibro/client/module_result_client.rb b/plugins/mezuro/lib/kalibro/client/module_result_client.rb index 1113bde..a67419f 100644 --- a/plugins/mezuro/lib/kalibro/client/module_result_client.rb +++ b/plugins/mezuro/lib/kalibro/client/module_result_client.rb @@ -13,7 +13,7 @@ class Kalibro::Client::ModuleResultClient def module_result(project_name, module_name, date) hash = @port.request(:get_module_result, {:project_name => project_name, :module_name => module_name, - :date => date_with_milliseconds(date)})[:module_result] + :date => Kalibro::Entitites::Entity.date_with_milliseconds(date)})[:module_result] Kalibro::Entities::ModuleResult.from_hash(hash) end @@ -23,11 +23,4 @@ class Kalibro::Client::ModuleResultClient Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult) end - private - - def date_with_milliseconds(date) - milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s - date.to_s[0..18] + milliseconds + date.to_s[19..-1] - end - end \ No newline at end of file diff --git a/plugins/mezuro/lib/kalibro/entities/entity.rb b/plugins/mezuro/lib/kalibro/entities/entity.rb index 0e6adbb..1e0e03d 100644 --- a/plugins/mezuro/lib/kalibro/entities/entity.rb +++ b/plugins/mezuro/lib/kalibro/entities/entity.rb @@ -6,6 +6,11 @@ class Kalibro::Entities::Entity entity end + def self.date_with_milliseconds(date) + milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s + date.to_s[0..18] + milliseconds + date.to_s[19..-1] + end + def set(field, value) send("#{field}=", value) if not field.to_s.start_with? '@' end @@ -55,6 +60,7 @@ class Kalibro::Entities::Entity def convert_to_hash(value) return value.collect { |element| convert_to_hash(element) } if value.is_a?(Array) return value.to_hash if value.is_a?(Kalibro::Entities::Entity) + return date_with_milliseconds(value) if value.is_a?(DateTime) return 'INF' if value.is_a?(Float) and value.infinite? == 1 return '-INF' if value.is_a?(Float) and value.infinite? == -1 value -- libgit2 0.21.2