From 64f6a39390d8c2da63431ecf0708abffb4fb68d1 Mon Sep 17 00:00:00 2001
From: Carlos Morais <carlos88morais@gmail.com>
Date: Wed, 29 Feb 2012 15:06:12 -0300
Subject: [PATCH] Fix metric entities and fixtures

---
 plugins/mezuro/lib/kalibro/entities/metric.rb                          |  9 +--------
 plugins/mezuro/lib/kalibro/entities/native_metric.rb                   |  8 ++++++++
 plugins/mezuro/test/fixtures/native_metric_fixtures.rb                 |  8 ++++----
 plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/mezuro/lib/kalibro/entities/metric.rb b/plugins/mezuro/lib/kalibro/entities/metric.rb
index bb789e4..e369fc8 100644
--- a/plugins/mezuro/lib/kalibro/entities/metric.rb
+++ b/plugins/mezuro/lib/kalibro/entities/metric.rb
@@ -1,12 +1,5 @@
 class Kalibro::Entities::Metric < Kalibro::Entities::Entity
   
-  attr_accessor :name, :scope, :description, :id
-
-  def initialize name, scope, description, id
-    @name = name
-    @scope = scope
-    @description = description
-    @id = id
-  end
+  attr_accessor :name, :scope, :description
 
 end
diff --git a/plugins/mezuro/lib/kalibro/entities/native_metric.rb b/plugins/mezuro/lib/kalibro/entities/native_metric.rb
index f7e7822..7bb95a0 100644
--- a/plugins/mezuro/lib/kalibro/entities/native_metric.rb
+++ b/plugins/mezuro/lib/kalibro/entities/native_metric.rb
@@ -2,4 +2,12 @@ class Kalibro::Entities::NativeMetric < Kalibro::Entities::Metric
 
   attr_accessor :origin, :language
 
+  def languages
+    @language
+  end
+
+  def languages=(languages)
+    @language = languages
+  end
+
 end
\ No newline at end of file
diff --git a/plugins/mezuro/test/fixtures/native_metric_fixtures.rb b/plugins/mezuro/test/fixtures/native_metric_fixtures.rb
index f04c1c3..2121c94 100644
--- a/plugins/mezuro/test/fixtures/native_metric_fixtures.rb
+++ b/plugins/mezuro/test/fixtures/native_metric_fixtures.rb
@@ -5,12 +5,12 @@ class NativeMetricFixtures
     total_cof.name = 'Total Coupling Factor'
     total_cof.scope = 'APPLICATION'
     total_cof.origin = 'Analizo'
-    total_cof.language = 'JAVA'
+    total_cof.languages = ['JAVA']
     total_cof
   end
 
   def self.total_cof_hash
-    {:name => 'Total Coupling Factor', :scope => 'APPLICATION', :origin => 'Analizo', :language => 'JAVA'}
+    {:name => 'Total Coupling Factor', :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}
   end
 
   def self.amloc
@@ -18,12 +18,12 @@ class NativeMetricFixtures
     total_cof.name = 'Average Method LOC'
     total_cof.scope = 'CLASS'
     total_cof.origin = 'Analizo'
-    total_cof.language = 'JAVA'
+    total_cof.languages = ['JAVA']
     total_cof
   end
 
   def self.amloc_hash
-    {:name => 'Average Method LOC', :scope => 'CLASS', :origin => 'Analizo', :language => 'JAVA'}
+    {:name => 'Average Method LOC', :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}
   end
 
 end
\ No newline at end of file
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
index 991ab64..f0cad2e 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
@@ -26,7 +26,7 @@
   #FIXME dando erro
   @collector.supported_metrics.each do |metric| %>
     <div class="metric">
-      <%= label_tag "#{metric.origin}" %>
+      <%= label_tag "#{metric.name}" %>
     </div>
   <% end
 end %>
--
libgit2 0.21.2