[Mezuro] Merge branch 'merging_configuration' into 'mezuro'

Conflicts: plugins/mezuro/lib/kalibro/client/kalibro_client.rb plugins/mezuro/views/content_viewer/_module_result.rhtml

[Mezuro] Merge branch 'merging_configuration' into 'mezuro'
Conflicts: plugins/mezuro/lib/kalibro/client/kalibro_client.rb plugins/mezuro/views/content_viewer/_module_result.rhtml
Paulo Meireles
2 parents 285c0e25 8cf59529
Showing 51 changed files with 874 additions and 95 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/lib/kalibro/client/base_tool_client.rb
plugins/mezuro/lib/kalibro/client/kalibro_client.rb
plugins/mezuro/lib/kalibro/client/metric_configuration_client.rb
plugins/mezuro/lib/kalibro/client/module_result_client.rb
plugins/mezuro/lib/kalibro/client/port.rb
plugins/mezuro/lib/kalibro/entities/configuration.rb
plugins/mezuro/lib/kalibro/entities/entity.rb
plugins/mezuro/lib/kalibro/entities/error.rb
plugins/mezuro/lib/kalibro/entities/metric.rb
plugins/mezuro/lib/kalibro/entities/metric_configuration.rb
plugins/mezuro/lib/kalibro/entities/metric_result.rb
plugins/mezuro/lib/kalibro/entities/module_result.rb
plugins/mezuro/lib/kalibro/entities/native_metric.rb
plugins/mezuro/lib/kalibro/entities/project_result.rb
plugins/mezuro/lib/kalibro/entities/range.rb
plugins/mezuro/lib/kalibro/entities/stack_trace_element.rb
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
plugins/mezuro/lib/mezuro_plugin/metric_configuration_content.rb
plugins/mezuro/public/javascripts/project_content.js
@@ -35,4 +35,93 @@ class MezuroPluginProfileController &lt; ProfileController
     render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
   end
  
+  def choose_base_tool
+    @configuration_name = params[:configuration_name]
+    @tool_names = Kalibro::Client::BaseToolClient.new
+  end
+
+  def choose_metric
+    @configuration_name = params[:configuration_name]
+    @collector_name = params[:collector_name]
+    @collector = Kalibro::Client::BaseToolClient.new.base_tool(@collector_name)
+  end
+
+  def new_metric_configuration
+    metric_name = params[:metric_name]
+    collector_name = params[:collector_name]
+    collector = Kalibro::Client::BaseToolClient.new.base_tool(collector_name)
+    @metric = collector.supported_metrics.find {|metric| metric.name == metric_name}
+    @configuration_name = params[:configuration_name]
+  end
+
+  def edit_metric_configuration
+    metric_name = params[:metric_name]
+    @configuration_name = params[:configuration_name]
+    @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
+    @metric = @metric_configuration.metric
+  end
+
+  def create_metric_configuration
+    @configuration_name = params[:configuration_name]
+    metric_configuration = new_metric_configuration_instance
+    Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
+    redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
+  end
+
+  def update_metric_configuration
+    @configuration_name = params[:configuration_name]
+    metric_configuration = new_metric_configuration_instance
+    Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
+    redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
+  end
+
+  def new_range
+    @metric_name = params[:metric_name]
+    @configuration_name = params[:configuration_name]
+  end
+
+  def create_range
+    @range = new_range_instance
+    configuration_name = params[:configuration_name]
+    metric_name = params[:metric_name]
+    metric_configuration_client = Kalibro::Client::MetricConfigurationClient.new
+    metric_configuration = metric_configuration_client.metric_configuration(configuration_name, metric_name)
+    metric_configuration.add_range(@range)
+    metric_configuration_client.save(metric_configuration, configuration_name)
+  end
+
+  def remove_metric_configuration
+    configuration_name = params[:configuration_name]
+    metric_name = params[:metric_name]
+    Kalibro::Client::MetricConfigurationClient.new.remove(configuration_name, metric_name)
+    redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}"
+  end
+
+  private 
+
+  def new_metric_configuration_instance
+    metric_configuration = Kalibro::Entities::MetricConfiguration.new
+    metric_configuration.metric = Kalibro::Entities::NativeMetric.new
+    metric_configuration.metric.name = params[:metric][:name]
+    metric_configuration.metric.description = params[:description]
+    metric_configuration.metric.origin = params[:metric][:origin]
+    metric_configuration.metric.scope = params[:scope]
+    metric_configuration.metric.language = params[:language]
+    metric_configuration.code = params[:metric_configuration][:code]
+    metric_configuration.weight = params[:metric_configuration][:weight]
+    metric_configuration.aggregation_form = params[:metric_configuration][:aggregation]
+    metric_configuration
+  end
+
+  def new_range_instance
+    range = Kalibro::Entities::Range.new
+    range.beginning = params[:range][:beginning]
+    range.end = params[:range][:end]
+    range.label = params[:range][:label]
+    range.grade = params[:range][:grade]
+    range.color = params[:range][:color]
+    range.comments = params[:range][:comments]
+    range
+  end
 end
+
@@ -13,4 +13,4 @@ class Kalibro::Client::BaseToolClient
     Kalibro::Entities::BaseTool.from_hash(hash)
   end
  
-end
 \ No newline at end of file
+end
 class Kalibro::Client::KalibroClient
+
+  def self.process_project(project_name)
+    new.process_project(project_name)
+  end
  
   def initialize
     @port = Kalibro::Client::Port.new('Kalibro')
@@ -12,16 +16,16 @@ class Kalibro::Client::KalibroClient
     @port.request(:process_project, {:project_name => project_name})
   end
  
-	def process_periodically(project_name, days)
-		@port.request(:process_periodically, {:project_name => project_name, :period_in_days => days})
-	end
+	def process_periodically(project_name, period_in_days)
+    @port.request(:process_periodically, {:project_name => project_name, :period_in_days => period_in_days})
+  end
+
+	def process_period(project_name)
+    @port.request(:get_process_period, {:project_name => project_name})[:period]
+  end
  
-  def self.process_project(project_name, days)
-    if days.to_i.zero?
-    	new.process_project(project_name)
-  	else
-  		new.process_periodically(project_name, days)
-  	end
+	def cancel_periodic_process(project_name)
+    @port.request(:cancel_periodic_process, {:project_name => project_name})
   end
  
 end
@@ -0,0 +1,28 @@
+class Kalibro::Client::MetricConfigurationClient
+
+  def initialize
+    @port = Kalibro::Client::Port.new('MetricConfiguration')
+  end
+
+  def save(metric_configuration, configuration_name)
+    @port.request(:save_metric_configuration, {
+        :metric_configuration => metric_configuration.to_hash,
+        :configuration_name => configuration_name})
+  end
+
+  def metric_configuration(configuration_name, metric_name)
+    hash = @port.request(:get_metric_configuration, {
+        :configuration_name => configuration_name,
+        :metric_name => metric_name
+      })[:metric_configuration]
+    Kalibro::Entities::MetricConfiguration.from_hash(hash)
+  end
+
+  def remove (configuration_name, metric_name)
+    @port.request(:remove_metric_configuration, {
+        :configuration_name => configuration_name,
+        :metric_name=> metric_name
+      })
+  end
+
+end
 \ No newline at end of file
@@ -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::Entities::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
@@ -7,7 +7,8 @@ end
 class Kalibro::Client::Port
  
   def initialize(endpoint)
-    @client = Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
+    @endpoint = endpoint
+    initialize_client
   end
  
   def service_address
@@ -18,9 +19,20 @@ class Kalibro::Client::Port
     @service_address
   end
  
+  def service_address=(address)
+    @service_address = address
+    initialize_client
+  end
+
   def request(action, request_body = nil)
     response = @client.request(:kalibro, action) { soap.body = request_body }
     response.to_hash["#{action}_response".to_sym]
   end
  
+  private
+
+  def initialize_client
+    @client = Savon::Client.new("#{service_address}#{@endpoint}Endpoint/?wsdl")
+  end
+
 end
@@ -7,7 +7,11 @@ class Kalibro::Entities::Configuration &lt; Kalibro::Entities::Entity
   end
  
   def metric_configurations
-    @metric_configuration
+    if @metric_configuration != nil
+      @metric_configuration
+    else
+      []
+    end
   end
  
   def metric_configurations=(metric_configurations)
@@ -2,10 +2,19 @@ class Kalibro::Entities::Entity
  
   def self.from_hash(hash)
     entity = self.new
-    hash.each { |field, value| entity.set(field, value) }
+    hash.each { |field, value| entity.set(field, value) if is_valid?(field) }
     entity
   end
  
+  def self.is_valid?(field)
+    field.to_s[0] != '@' and field != :attributes!
+  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
@@ -24,16 +33,16 @@ class Kalibro::Entities::Entity
     fields.each do |field|
       field_value = self.get(field)
       hash[field] = convert_to_hash(field_value) if ! field_value.nil?
+      if need_xml_type?(field_value)
+        hash = {:attributes! => {}}.merge(hash)
+        hash[:attributes!][field.to_sym] = {
+          'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:type' => 'kalibro:' + xml_class_name(field_value)  }
+      end
     end
     hash
   end
  
-  def convert_to_hash(value)
-    return value.collect { |element| convert_to_hash(element) } if value.kind_of?(Array)
-    return value.to_hash if value.kind_of?(Kalibro::Entities::Entity)
-    value
-  end
-
   def ==(other)
     begin
       fields.each.inject(true) { |equal, field| equal && (self.get(field) == other.get(field)) }
@@ -42,6 +51,8 @@ class Kalibro::Entities::Entity
     end
   end
  
+  protected
+
   def fields
     instance_variable_names.each.collect { |variable| variable.to_s.sub(/@/, '').to_sym }
   end
@@ -50,4 +61,24 @@ class Kalibro::Entities::Entity
     send("#{field}")
   end
  
+  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 self.class.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
+  end
+
+  def need_xml_type?(value)
+    value.is_a?(Kalibro::Entities::Entity) and value.class.superclass != Kalibro::Entities::Entity
+  end
+
+  def xml_class_name(entity)
+    xml_name = entity.class.name
+    xml_name["Kalibro::Entities::"] = ""
+    xml_name[0..0] = xml_name[0..0].downcase
+    xml_name + "Xml"
+  end
+  
 end
 class Kalibro::Entities::Error < Kalibro::Entities::Entity
  
-  attr_accessor :message, :stack_trace_element
+  attr_accessor :error_class, :message, :stack_trace_element
  
   def stack_trace_element=(value)
     @stack_trace_element = to_entity_array(value, Kalibro::Entities::StackTraceElement)
@@ -2,4 +2,4 @@ class Kalibro::Entities::Metric &lt; Kalibro::Entities::Entity
  
   attr_accessor :name, :scope, :description
  
-end
 \ No newline at end of file
+end
@@ -11,10 +11,19 @@ class Kalibro::Entities::MetricConfiguration &lt; Kalibro::Entities::Entity
     end
   end
  
+  def weight=(value)
+    @weight = value.to_f
+  end
+
   def range=(value)
     @range = to_entity_array(value, Kalibro::Entities::Range)
   end
  
+  def add_range(new_range)
+    @range = [] if @range.nil?
+    @range << new_range
+  end
+
   def ranges
     @range
   end
@@ -23,4 +32,4 @@ class Kalibro::Entities::MetricConfiguration &lt; Kalibro::Entities::Entity
     @range = ranges
   end
  
-end
 \ No newline at end of file
+end
@@ -14,12 +14,17 @@ class Kalibro::Entities::MetricResult &lt; Kalibro::Entities::Entity
     end
   end
  
+  def value=(value)
+    @value = value.to_f
+  end
+
   def range=(value)
     @range = to_entity(value, Kalibro::Entities::Range)
   end
  
   def descendent_result=(value)
-    @descendent_result = to_entity_array(value)
+    array = value.kind_of?(Array) ? value : [value]
+    @descendent_result = array.collect {|element| element.to_f}
   end
  
   def descendent_results
@@ -6,6 +6,15 @@ class Kalibro::Entities::ModuleResult &lt; Kalibro::Entities::Entity
     @module = to_entity(value, Kalibro::Entities::Module)
   end
  
+  def date=(value)
+    @date = value
+    @date = DateTime.parse(value) if value.is_a?(String)
+  end
+
+  def grade=(value)
+    @grade = value.to_f
+  end
+
   def metric_result=(value)
     @metric_result = to_entity_array(value, Kalibro::Entities::MetricResult)
   end
@@ -2,4 +2,16 @@ class Kalibro::Entities::NativeMetric &lt; Kalibro::Entities::Metric
  
   attr_accessor :origin, :language
  
+  def languages
+    @language
+  end
+
+  def languages=(languages)
+    @language = languages
+  end
+
+  def language=(value)
+    @language = to_entity_array(value)
+  end
+
 end
@@ -6,6 +6,19 @@ class Kalibro::Entities::ProjectResult &lt; Kalibro::Entities::Entity
     @project = to_entity(value, Kalibro::Entities::Project)
   end
  
+  def date=(value)
+    @date = value
+    @date = DateTime.parse(value) if value.is_a?(String)
+  end
+
+  def load_time=(value)
+    @load_time = value.to_i
+  end
+
+  def analysis_time=(value)
+    @analysis_time = value.to_i
+  end
+
   def source_tree=(value)
     @source_tree = to_entity(value, Kalibro::Entities::ModuleNode)
   end
@@ -2,4 +2,18 @@ class Kalibro::Entities::Range &lt; Kalibro::Entities::Entity
  
   attr_accessor :beginning, :end, :label, :grade, :color, :comments
  
+  def beginning=(value)
+    @beginning = value.to_f
+    @beginning = -1.0/0.0 if value == "-INF"
+  end
+
+  def end=(value)
+    @end = value.to_f
+    @end = 1.0/0.0 if value == "INF"
+  end
+
+  def grade=(value)
+    @grade = value.to_f
+  end
+
 end
 \ No newline at end of file
@@ -2,4 +2,8 @@ class Kalibro::Entities::StackTraceElement &lt; Kalibro::Entities::Entity
  
   attr_accessor :declaring_class, :method_name, :file_name, :line_number
  
+  def line_number=(value)
+    @line_number = value.to_i
+  end
+
 end
 \ No newline at end of file
@@ -8,7 +8,7 @@ class MezuroPlugin::ConfigurationContent &lt; Article
     'Sets of thresholds to interpret metrics'
   end
  
-  settings_items :description
+  settings_items :description, :metrics
  
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
@@ -0,0 +1,37 @@
+class MezuroPlugin::MetricConfigurationContent < Article
+
+  def self.short_description
+    'Kalibro Configurated Metric'
+  end
+
+  def self.description
+    'Sets of thresholds to interpret a metric'
+  end
+
+  settings_items :description, :code, :weight, :scope, :aggregation_form, :range
+
+  include ActionView::Helpers::TagHelper
+  def to_html(options = {})
+    lambda do
+      render :file => 'content_viewer/show_configuration.rhtml'
+    end
+  end
+
+  def metric_configuration
+    Kalibro::Client::MetricConfigurationClient.metric_configuration(name)
+  end
+
+  after_save :send_metric_configuration_to_service
+  after_destroy :remove_metric_configuration_from_service
+
+  private
+
+  def send_metric_configuration_to_service
+    Kalibro::Client::MetricConfigurationClient.save(self)
+  end
+
+  def remove_metric_configuration_from_service
+    Kalibro::Client::MetricConfigurationClient.remove(name)
+  end
+
+end
@@ -80,4 +80,10 @@ function showLoadingProcess(firstLoad){
  
   showProjectTree("<img src='/images/loading-small.gif'/>");
   showModuleResult("<img src='/images/loading-small.gif'/>");
-} 
+}
+
+function sourceNodeToggle(id){
+  var suffixes = ['_hidden', '_plus', '_minus'];
+  for (var i in suffixes)
+    jQuery('#' + id + suffixes[i]).toggle();
+}
+require File.dirname(__FILE__) + '/native_metric_fixtures'
+
 class BaseToolFixtures
  
   def self.analizo
@@ -4,12 +4,12 @@ class CompoundMetricFixtures
     sc = Kalibro::Entities::CompoundMetric.new
     sc.name = 'Structural Complexity'
     sc.scope = 'CLASS'
-    sc.script = 'return cbo * lcom4;'
+    sc.script = 'return 42;'
     sc
   end
  
   def self.sc_hash
-    {:name => 'Structural Complexity', :scope => 'CLASS', :script => 'return cbo * lcom4;'}
+    {:name => 'Structural Complexity', :scope => 'CLASS', :script => 'return 42;'}
   end
  
 end
@@ -10,7 +10,10 @@ class CompoundMetricWithErrorFixtures
   end
  
   def self.create_hash
-    {:metric => CompoundMetricFixtures.sc_hash, :error => ErrorFixtures.create_hash}
+    {:metric => CompoundMetricFixtures.sc_hash, :error => ErrorFixtures.create_hash,
+      :attributes! => {:metric => {
+          'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:type' => 'kalibro:compoundMetricXml'  }}}
   end
  
 end
@@ -4,6 +4,7 @@ class ErrorFixtures
  
   def self.create
     error = Kalibro::Entities::Error.new
+    error.error_class = 'java.lang.Exception'
     error.message = 'Error message from ErrorTest'
     error.stack_trace = [
       StackTraceElementFixtures.create('my method 1', 42),
@@ -12,7 +13,8 @@ class ErrorFixtures
   end
  
   def self.create_hash
-    {:message => 'Error message from ErrorTest', :stack_trace_element => [
+    {:error_class => 'java.lang.Exception', :message => 'Error message from ErrorTest',
+      :stack_trace_element => [
         StackTraceElementFixtures.create_hash('my method 1', 42),
         StackTraceElementFixtures.create_hash('my method 2', 84)]}
   end
@@ -14,6 +14,15 @@ class MetricConfigurationFixtures
     amloc
   end
  
+  def self.metric_configuration_without_ranges
+    amloc = Kalibro::Entities::MetricConfiguration.new
+    amloc.metric = NativeMetricFixtures.amloc
+    amloc.code = 'amloc'
+    amloc.weight = 1.0
+    amloc.aggregation_form = 'AVERAGE'
+    amloc
+  end
+
   def self.sc_configuration
     sc = Kalibro::Entities::MetricConfiguration.new
     sc.metric = CompoundMetricFixtures.sc
@@ -25,12 +34,18 @@ class MetricConfigurationFixtures
  
   def self.amloc_configuration_hash
     {:metric => NativeMetricFixtures.amloc_hash, :code => 'amloc', :weight => 1.0,
-      :aggregation_form => 'AVERAGE', :range =>
-        [RangeFixtures.amloc_excellent_hash, RangeFixtures.amloc_bad_hash]}
+      :aggregation_form => 'AVERAGE',
+      :range => [RangeFixtures.amloc_excellent_hash, RangeFixtures.amloc_bad_hash],
+      :attributes! => {:metric => {
+          'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:type' => 'kalibro:nativeMetricXml'  }}}
   end
  
   def self.sc_configuration_hash
-    {:metric => CompoundMetricFixtures.sc_hash, :code => 'sc', :weight => 1.0, :aggregation_form => 'AVERAGE'}
+    {:metric => CompoundMetricFixtures.sc_hash, :code => 'sc', :weight => 1.0, :aggregation_form => 'AVERAGE',
+      :attributes! => {:metric => {
+          'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:type' => 'kalibro:compoundMetricXml'  }}}
   end
  
 end
@@ -23,11 +23,17 @@ class MetricResultFixtures
  
   def self.amloc_result_hash
     {:metric => NativeMetricFixtures.amloc_hash, :value => 0.0, :descendent_result => [40.0, 42.0],
-      :range => RangeFixtures.amloc_excellent_hash}
+      :range => RangeFixtures.amloc_excellent_hash,
+      :attributes! => {:metric => {
+          'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:type' => 'kalibro:nativeMetricXml'  }}}
   end
  
   def self.sc_result_hash
-    {:metric => CompoundMetricFixtures.sc_hash, :value => 1.0, :descendent_result => [2.0, 42.0]}
+    {:metric => CompoundMetricFixtures.sc_hash, :value => 1.0, :descendent_result => [2.0, 42.0],
+      :attributes! => {:metric => {
+          'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:type' => 'kalibro:compoundMetricXml'  }}}
   end
  
 end
@@ -5,17 +5,17 @@ class ModuleNodeFixtures
     node.module = ModuleFixtures.qt_calculator
     org_node = new_node('org', 'PACKAGE')
     org_node.children = [new_node('org.Window', 'CLASS')]
-    node.children = [new_node('Dialog', 'CLASS'), new_node('main', 'CLASS'), org_node]
+    node.children = [org_node, new_node('Dialog', 'CLASS'), new_node('main', 'CLASS')]
     node
   end
  
   def self.qt_calculator_tree_hash
     {:module => ModuleFixtures.qt_calculator_hash,
       :child => [
-        {:module => {:name => 'Dialog', :granularity => 'CLASS'}},
-        {:module => {:name => 'main', :granularity => 'CLASS'}},
         {:module => {:name => 'org', :granularity => 'PACKAGE'},
-         :child => [{:module => {:name => 'org.Window', :granularity => 'CLASS'}}]}
+         :child => [{:module => {:name => 'org.Window', :granularity => 'CLASS'}}]},
+        {:module => {:name => 'Dialog', :granularity => 'CLASS'}},
+        {:module => {:name => 'main', :granularity => 'CLASS'}}
       ]
     }
   end
@@ -18,7 +18,7 @@ class ModuleResultFixtures
  
   def self.create_hash
     {:module => ModuleFixtures.qt_calculator_hash,
-      :date => DateTime.parse('Thu, 20 Oct 2011 18:26:43.151 +0000'), :grade => 10.0, :metric_result => [
+      :date => '2011-10-20T18:26:43.151+00:00', :grade => 10.0, :metric_result => [
         MetricResultFixtures.amloc_result_hash,
         MetricResultFixtures.sc_result_hash],
       :compound_metric_with_error => [CompoundMetricWithErrorFixtures.create_hash]}
@@ -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
@@ -15,7 +15,7 @@ class ProjectResultFixtures
   end
  
   def self.qt_calculator_hash
-    {:project => ProjectFixtures.qt_calculator_hash, :date => ModuleResultFixtures.create.date,
+    {:project => ProjectFixtures.qt_calculator_hash, :date => ModuleResultFixtures.create_hash[:date],
       :load_time => 14878, :analysis_time => 1022, :source_tree => ModuleNodeFixtures.qt_calculator_tree_hash}
   end
  
@@ -27,7 +27,7 @@ class RangeFixtures
   end
  
   def self.amloc_bad_hash
-    {:beginning => 19.5, :end => Infinity, :label => 'Bad',:grade => 0.0, :color => 'ffff0000'}
+    {:beginning => 19.5, :end => "INF", :label => 'Bad',:grade => 0.0, :color => 'ffff0000'}
   end
  
 end
@@ -0,0 +1,88 @@
+require "test_helper"
+
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/base_tool_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_result_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_result_fixtures"
+
+class EchoPortTest < ActiveSupport::TestCase
+
+  def setup
+    @port = Kalibro::Client::Port.new('Echo')
+    @port.service_address=('http://valinhos.ime.usp.br:50688/KalibroFake/');
+  end
+
+  should 'echo base tool' do
+    test BaseToolFixtures.analizo, 'BaseTool' do |base_tool|
+      base_tool.name = "echo " + base_tool.name
+    end
+  end
+  
+  should 'echo configuration' do
+    test ConfigurationFixtures.kalibro_configuration, 'Configuration' do |configuration|
+      configuration.name = "echo " + configuration.name
+    end
+  end
+
+  should 'echo metric configuration' do
+    test_metric_configuration(MetricConfigurationFixtures.amloc_configuration)
+    test_metric_configuration(MetricConfigurationFixtures.sc_configuration)
+  end
+
+  should 'echo module result' do
+    test ModuleResultFixtures.create, 'ModuleResult' do |module_result|
+      module_result.module.name = "echo." + module_result.module.name
+    end
+  end
+
+  should 'echo project' do
+    test(ProjectFixtures.qt_calculator, 'Project') do |project|
+      project.name = "echo " + project.name
+    end
+  end
+
+  should 'echo project result' do
+    test(ProjectResultFixtures.qt_calculator, 'ProjectResult') do |project_result|
+      project_result.project.name = "echo " + project_result.project.name
+    end
+  end
+
+  should 'echo raw project' do
+    project = ProjectFixtures.qt_calculator
+    echoed = @port.request(:echo_raw_project, {:project => project.to_hash})[:project]
+    project.name = "echo " + project.name
+    project.state = nil
+    project.error = nil
+    assert_equal project, Kalibro::Entities::Project.from_hash(echoed)
+  end
+
+  should 'work with enums' do
+    test_granularity("METHOD", "CLASS")
+    test_granularity("CLASS", "PACKAGE")
+    test_granularity("PACKAGE", "PACKAGE")
+    test_granularity("APPLICATION", "APPLICATION")
+  end
+
+  private
+  
+  def test_metric_configuration(fixture)
+    test fixture, 'MetricConfiguration' do |metric_configuration|
+      metric_configuration.code = "echo_" + metric_configuration.code
+    end
+  end
+
+  def test(fixture, entity_name)
+    entity_symbol = entity_name.underscore.to_sym
+    request_body = {entity_symbol => fixture.to_hash}
+    echoed = @port.request("echo_#{entity_symbol}".to_sym, request_body)[entity_symbol]
+    yield fixture
+    entity_class = "Kalibro::Entities::#{entity_name}".constantize
+    assert_equal fixture, entity_class.from_hash(echoed)
+  end
+
+  def test_granularity(granularity, parent)
+    body = {:granularity => granularity}
+    assert_equal parent, @port.request(:infer_parent_granularity, body)[:parent_granularity]
+  end
+
+end
 \ No newline at end of file
@@ -3,6 +3,9 @@ require &#39;test_helper&#39;
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_result_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_result_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/error_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/base_tool_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/native_metric_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
  
 class MezuroPluginProfileControllerTest < ActionController::TestCase
  
@@ -16,6 +19,12 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     @module_result = ModuleResultFixtures.create
     @project = @project_result.project
     @name = @project.name
+
+    @collector = BaseToolFixtures.analizo
+    @base_tool_client = Kalibro::Client::BaseToolClient.new
+    @metric = NativeMetricFixtures.amloc
+    @metric_configuration_client = Kalibro::Client::MetricConfigurationClient.new
+    @metric_configuration = MetricConfigurationFixtures.amloc_configuration
   end
  
   should 'not find module result for inexistent project content' do
@@ -65,6 +74,91 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)')
   end
  
+  should 'assign configuration name in choose_base_tool' do
+    get :choose_base_tool, :profile => @profile.identifier, :configuration_name => "test name"
+    assert_equal assigns(:configuration_name), "test name"
+  end
+
+  should 'create base tool client' do
+    get :choose_base_tool, :profile => @profile.identifier, :configuration_name => "test name"
+    assert assigns(:tool_names).instance_of?(Kalibro::Client::BaseToolClient)
+  end
+
+  should 'assign configuration and collector name in choose_metric' do
+    Kalibro::Client::BaseToolClient.expects(:new).returns(@base_tool_client)
+    @base_tool_client.expects(:base_tool).with(@collector.name).returns(@collector)
+    get :choose_metric, :profile => @profile.identifier, :configuration_name => "test name", :collector_name => "Analizo"
+    assert_equal assigns(:configuration_name), "test name"
+    assert_equal assigns(:collector_name), "Analizo"
+  end
+
+  should 'get collector by name' do
+    Kalibro::Client::BaseToolClient.expects(:new).returns(@base_tool_client)
+    @base_tool_client.expects(:base_tool).with(@collector.name).returns(@collector)
+    get :choose_metric, :profile => @profile.identifier, :configuration_name => "test name", :collector_name => "Analizo"
+    assert_equal assigns(:collector), @collector
+  end
+
+  should 'get choosed native metric and configuration name' do
+    Kalibro::Client::BaseToolClient.expects(:new).returns(@base_tool_client)
+    @base_tool_client.expects(:base_tool).with(@collector.name).returns(@collector)
+    get :new_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :collector_name => "Analizo", :metric_name => @metric.name
+    assert_equal assigns(:configuration_name), "test name"
+    assert_equal assigns(:metric), @metric
+  end
+
+  should 'assign configuration name and get metric_configuration' do
+    Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
+    @metric_configuration_client.expects(:metric_configuration).with("test name", @metric.name).returns(@metric_configuration)
+    get :edit_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :metric_name => @metric.name
+    assert_equal assigns(:configuration_name), "test name"
+    assert_equal assigns(:metric_configuration), @metric_configuration
+    assert_equal assigns(:metric), @metric_configuration.metric
+  end
+
+  should 'test metric creation' do
+    Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
+    @metric_configuration_client.expects(:save)
+    get :create_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :description => @metric.description,
+    :scope => @metric.scope, :language => @metric.language, :metric => { :name => @metric.name, :origin => @metric.origin},
+    :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form }
+    assert_equal assigns(:configuration_name), "test name"
+    assert_response 302
+  end
+
+  should 'test metric edition' do
+    Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
+    @metric_configuration_client.expects(:save)
+    get :create_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :description => @metric.description,
+    :scope => @metric.scope, :language => @metric.language, :metric => { :name => @metric.name, :origin => @metric.origin},
+    :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form }
+    assert_equal assigns(:configuration_name), "test name"
+    assert_response 302
+  end
+
+  should 'assign configuration name and metric name to new range' do
+    get :new_range, :profile => @profile.identifier, :configuration_name => "test name", :metric_name => @metric.name
+    assert_equal assigns(:configuration_name), "test name"
+    assert_equal assigns(:metric_name), @metric.name
+  end
+
+  should 'create instance range' do
+    Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
+    @metric_configuration_client.expects(:metric_configuration).with("test name", @metric.name).returns(@metric_configuration)    
+    @metric_configuration_client.expects(:save)
+    range = @metric_configuration.ranges[0]
+    get :create_range, :profile => @profile.identifier, :range => { :beginning => range.beginning, :end => range.end, :label => range.label,
+    :grade => range.grade, :color => range.color, :comments => range.comments }, :configuration_name => "test name", :metric_name => @metric.name
+    assert assigns(:range).instance_of?(Kalibro::Entities::Range)
+  end
+
+  should 'redirect from remove metric configuration' do
+    Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
+    @metric_configuration_client.expects(:remove)
+    get :remove_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :metric_name => @metric.name
+    assert_response 302
+  end
+
   private
  
   def create_project_content
@@ -0,0 +1,44 @@
+require "test_helper"
+
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
+
+class MetricConfigurationClientTest < ActiveSupport::TestCase
+
+  def setup
+    @port = mock
+    Kalibro::Client::Port.expects(:new).with('MetricConfiguration').returns(@port)
+    @client = Kalibro::Client::MetricConfigurationClient.new
+  end
+
+  should 'save metric configuration' do
+    configuration = MetricConfigurationFixtures.amloc_configuration
+    @port.expects(:request).with(:save_metric_configuration, {
+        :metric_configuration => configuration.to_hash,
+        :configuration_name => 'x'
+      })
+    @client.save(configuration, 'x')
+  end
+
+  should 'get metric configuration by name' do
+    configuration = MetricConfigurationFixtures.amloc_configuration
+    request_body = {
+      :configuration_name => 'configuration.name',
+      :metric_name => configuration.metric.name
+    }
+    response_hash = {:metric_configuration => configuration.to_hash}
+    @port.expects(:request).with(:get_metric_configuration, request_body).returns(response_hash)
+    assert_equal configuration, @client.metric_configuration('configuration.name', configuration.metric.name)
+  end
+
+  should 'remove metric configuration by name' do
+    metric_name = 'MetricConfigurationClientTest'
+    configuration_name = 'xxxx'
+    request_body = {
+      :configuration_name => configuration_name,
+      :metric_name => metric_name
+    }
+    @port.expects(:request).with(:remove_metric_configuration, request_body)
+    @client.remove(configuration_name, metric_name)
+  end
+
+end
 \ No newline at end of file
@@ -13,59 +13,46 @@ class ProjectResultClientTest &lt; ActiveSupport::TestCase
     @project_name = @result.project.name
     @date = @result.date
     @flag = DateTime.now.sec % 2 == 0
+
+    @request = {:project_name => @project_name}
+    @request_with_date = {:project_name => @project_name, :date => @date}
+    @flag_response = {:has_results => @flag}
+    @result_response = {:project_result => @result.to_hash}
   end
  
   should 'retrieve if project has results' do
-    @port.expects(:request).with(:has_results_for, request).returns(flag_response)
+    @port.expects(:request).with(:has_results_for, @request).returns(@flag_response)
     assert_equal @flag, @client.has_results_for(@project_name)
   end
  
   should 'retrieve if project has results before date' do
-    @port.expects(:request).with(:has_results_before, request_with_date).returns(flag_response)
+    @port.expects(:request).with(:has_results_before, @request_with_date).returns(@flag_response)
     assert_equal @flag, @client.has_results_before(@project_name, @date)
   end
  
   should 'retrieve if project has results after date' do
-    @port.expects(:request).with(:has_results_after, request_with_date).returns(flag_response)
+    @port.expects(:request).with(:has_results_after, @request_with_date).returns(@flag_response)
     assert_equal @flag, @client.has_results_after(@project_name, @date)
   end
  
   should 'get first result of project' do
-    @port.expects(:request).with(:get_first_result_of, request).returns(result_response)
+    @port.expects(:request).with(:get_first_result_of, @request).returns(@result_response)
     assert_equal @result, @client.first_result(@project_name)
   end
  
   should 'get last result of project' do
-    @port.expects(:request).with(:get_last_result_of, request).returns(result_response)
+    @port.expects(:request).with(:get_last_result_of, @request).returns(@result_response)
     assert_equal @result, @client.last_result(@project_name)
   end
  
   should 'get first result of project after date' do
-    @port.expects(:request).with(:get_first_result_after, request_with_date).returns(result_response)
+    @port.expects(:request).with(:get_first_result_after, @request_with_date).returns(@result_response)
     assert_equal @result, @client.first_result_after(@project_name, @date)
   end
  
   should 'get last result of project before date' do
-    @port.expects(:request).with(:get_last_result_before, request_with_date).returns(result_response)
+    @port.expects(:request).with(:get_last_result_before, @request_with_date).returns(@result_response)
     assert_equal @result, @client.last_result_before(@project_name, @date)
   end
  
-  private
-
-  def request
-    {:project_name => @project_name}
-  end
-
-  def request_with_date
-    {:project_name => @project_name, :date => @date}
-  end
-
-  def flag_response
-    {:has_results => @flag}
-  end
-
-  def result_response
-    {:project_result => @result.to_hash}
-  end
-
 end
 \ No newline at end of file
@@ -17,4 +17,4 @@ class ConfigurationTest &lt; ActiveSupport::TestCase
     assert_equal @hash, @configuration.to_hash
   end
  
-end
 \ No newline at end of file
+end
 require "test_helper"
  
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/range_fixtures"
  
 class MetricConfigurationTest < ActiveSupport::TestCase
  
   def setup
     @hash = MetricConfigurationFixtures.amloc_configuration_hash
-    @range = MetricConfigurationFixtures.amloc_configuration
+    @metric_configuration = MetricConfigurationFixtures.amloc_configuration
+    @metric_configuration_without_ranges = MetricConfigurationFixtures.metric_configuration_without_ranges
+    @range1 = RangeFixtures.amloc_excellent
+    @range2 = RangeFixtures.amloc_bad
   end
  
   should 'create metric configuration from hash' do
-    assert_equal @range, Kalibro::Entities::MetricConfiguration.from_hash(@hash)
+    assert_equal @metric_configuration, Kalibro::Entities::MetricConfiguration.from_hash(@hash)
   end
  
   should 'convert metric configuration to hash' do
-    assert_equal @hash, @range.to_hash
+    assert_equal @hash, @metric_configuration.to_hash
   end
  
   should 'create appropriate metric type' do
@@ -24,4 +28,16 @@ class MetricConfigurationTest &lt; ActiveSupport::TestCase
     assert sc.metric.instance_of?(Kalibro::Entities::CompoundMetric)
   end
  
+  should 'add a range to an empty range list' do
+    @metric_configuration_without_ranges.add_range @range1
+    assert_equal @metric_configuration_without_ranges.ranges, [@range1]
+  end
+  
+  should 'add a range to an non-empty range list' do
+    @metric_configuration_without_ranges.ranges = [@range1]
+    @metric_configuration_without_ranges.add_range @range2
+    assert_equal @metric_configuration_without_ranges.ranges, [@range1, @range2]
+  end
+
+
 end
@@ -27,12 +27,12 @@ class ProjectResultTest &lt; ActiveSupport::TestCase
  
   should 'retrieve module node' do
     node = @result.get_node("main")
-    assert_equal @hash[:source_tree][:child][1], node.to_hash
+    assert_equal @hash[:source_tree][:child][2], node.to_hash
   end
  
   should 'retrive complex module' do
     node = @result.get_node("org.Window")
-    assert_equal @hash[:source_tree][:child][2][:child].first, node.to_hash
+    assert_equal @hash[:source_tree][:child][0][:child].first, node.to_hash
   end
  
   should 'return source tree node when nil is given' do
@@ -44,6 +44,6 @@ class ProjectResultTest &lt; ActiveSupport::TestCase
   end
  
   should 'return correct node when module name is given' do
-    assert_equal @hash[:source_tree][:child][1], @result.node_of("main").to_hash 
+    assert_equal @hash[:source_tree][:child][2], @result.node_of("main").to_hash
   end
 end
@@ -42,7 +42,7 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
     @content.send :send_configuration_to_service
   end
  
-  should 'remove project from service' do
+  should 'remove configuration from service' do
     Kalibro::Client::ConfigurationClient.expects(:remove).with(@content.name)
     @content.send :remove_configuration_from_service
   end
 <h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>
  
 <%
-  begin
-    @configuration = @article.title.nil? ? nil : Kalibro::Client::ConfigurationClient.new.configuration(@article.title)
-  rescue
-    @configuration = nil
-  end
+begin
+  @configuration = @article.title.nil? ? nil : Kalibro::Client::ConfigurationClient.new.configuration(@article.title)
+rescue
+  @configuration = nil
+end 
 %>
  
 <%= error_messages_for 'kalibro_configuration' %>
@@ -19,7 +19,7 @@
       <% range = metric_result.range %>
       <tr>
         <td><a href="#" data-show=".<%= metric_result.metric.name.delete("() ")%>"><%= metric_result.metric.name %></a></td>
-        <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td> <!--FIXME: Move to helper eventually-->
+        <td><%= "%.02f" % metric_result.value %></td>
         <td><%= metric_result.weight %></td>
         <% if range.nil? %>
           <td></td>
@@ -29,7 +29,7 @@
       </tr>
       <tr class="<%= metric_result.metric.name.delete("() ")%>" style="display: none;">
       	<td colspan="4" align="right">
-      	  <%= range.comments.nil? ? 'comment empty' : range.comments %>
+      	  <%= range.nil? or range.comments.nil? ? 'comment empty' : range.comments %>
       	</td>      
       </tr>
     <% end %>
@@ -39,7 +39,7 @@
       <td colspan = "4" align = "right">
         <strong>
           <%= _('Grade:') %>
-          <%=  MezuroPlugin::Helpers::ContentViewerHelper.format_grade(module_result.grade) %> <!--FIXME: Move to helper eventually -->
+          <%= "%.02f" % module_result.grade %>
         </strong>
       </td>
     </tr>
-<% @configuration = @page.configuration %>
+<% @configuration_content = @page
+@configuration = Kalibro::Client::ConfigurationClient.new.configuration(@configuration_content.name) %>
  
 <table id="project_info">
   <tr>
@@ -10,3 +11,27 @@
     <td><%= @configuration.description %></td>
   </tr>
 </table>
+
+<br/>
+
+<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_profile", 
+:action => "choose_base_tool", :params => {:configuration_name => @configuration.name} %><br/>
+
+<table>
+  <tr class="titles">
+      <td><h5>Metric Name</h5></td>
+      <td><h5>Collector Name</h5></td>
+      <td><h5>Metric Code</h5></td>
+  </tr>
+  <% @configuration.metric_configurations.each do |metric_configuration| %>
+    <tr class="metric">
+      <td><%= metric_configuration.metric.name %></td>
+      <td><%= metric_configuration.metric.origin %></td>
+      <td><%= metric_configuration.code %></td>
+      <td><%= link_to "Edit", :controller => "mezuro_plugin_profile", :action => "edit_metric_configuration", :params =>
+        {:configuration_name => @configuration.name, :metric_name => metric_configuration.metric.name} %></td>
+      <td><%= link_to "Remove", :controller => "mezuro_plugin_profile", :action => "remove_metric_configuration", :params =>
+        {:configuration_name => @configuration.name, :metric_name => metric_configuration.metric.name} %></td>
+    </tr>
+<% end %>
+</table>
@@ -0,0 +1,55 @@
+<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %>
+  <%= hidden_field_tag :configuration_name, configuration_name %>
+  <%= hidden_field_tag :metric_name, metric_name %>
+  <table>
+    <tr>
+      <td>
+        <%= f.label :label, "Label:" %>
+      </td>
+      <td>
+        <%= f.text_field :label %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <%= f.label :beginning, "Beginning:" %>
+      </td>
+      <td>
+        <%= f.text_field :beginning %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <%= f.label :end, "End:" %>
+      </td>
+      <td>
+        <%= f.text_field :end %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <%= f.label :grade, "Grade:" %>
+      </td>
+      <td>
+        <%= f.text_field :grade %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <%= f.label :color, "Color:" %>
+      </td>
+      <td>
+        <%= f.text_field :color %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <%= f.label :comments, "Comments:" %>
+      </td>
+      <td>
+        <%= f.text_field :comments %>
+      </td>
+    </tr>
+  </table>
+  <%= f.submit "Save Range" %>
+<% end %>
@@ -0,0 +1,15 @@
+<tr>
+  <td>
+    <%=range.label%>
+  </td>
+  <td>
+    <%=range.beginning%>
+  </td>
+  <td>
+    <%=range.end%>
+  </td>
+  <td>
+    <%=range.grade%>
+  </td>
+  <td bgcolor="#<%= range.color[2..-1] %>"></td>
+</tr>
@@ -0,0 +1,13 @@
+<h2><%= @configuration_name%> Configuration</h2>
+
+<h5>Base Tools:</h5>
+<table id="project_info">
+  <% @tool_names.base_tool_names.each do |collector_name| %>
+    <tr>
+      <td>
+        <%= link_to collector_name, :controller => "mezuro_plugin_profile", :action => "choose_metric", :params =>
+        {:configuration_name => @configuration_name, :collector_name => collector_name} %>
+      </td>
+    </tr>
+  <% end %>
+</table>
@@ -0,0 +1,18 @@
+<h2><%= @configuration_name %> Configuration</h2>
+
+<table id="project_info">
+  <tr>
+    <h5>Metric Collector: <%= @collector_name %></h5>
+  </tr>
+  <tr>
+    <h5>Choose a metric to add:</h5>
+  </tr>
+  <% @collector.supported_metrics.each do |metric| %>
+    <tr class="metric" title="<%= metric.name %>">
+      <td>
+        <%= link_to metric.name, :controller => "mezuro_plugin_profile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
+        :collector_name => @collector_name, :configuration_name => @configuration_name} %>
+      </td>
+    </tr>
+  <% end %>
+</table>
@@ -0,0 +1,2 @@
+page.visual_effect :toggle_slide, "new_range"
+page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range}
@@ -0,0 +1,77 @@
+<h2><%= @configuration_name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %>
+  <%= hidden_field_tag :configuration_name, @configuration_name %>
+  <%= hidden_field_tag :scope, @metric.scope %>
+  
+  <% @metric.language.each do |language| %>
+    <%= hidden_field_tag "language[]", language %>
+  <% end %>
+
+  <p>
+    <%= f.label :origin, "Collector Name:" %>
+    <%= @metric.origin %>
+    <%= hidden_field_tag "metric[origin]", @metric.origin %>
+  </p>
+  <p>
+    <%= f.label :metric_name, "Metric Name:" %>
+    <%= @metric.name %>
+    <%= hidden_field_tag "metric[name]", @metric.name %>
+  </p>
+  <p>
+    <%= f.label :description, "Description:" %>
+    <%= @metric.description %>
+    <%= text_field_tag "metric[description]", @metric.description %>
+  </p>
+  <p>
+    <%= f.label :code, "Code:" %>
+    <%= @metric_configuration.code %>
+    <%= f.hidden_field :code, :value => @metric_configuration.code %>
+  </p>
+  <p>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <%= f.label :weight, "Weight:" %>
+    <%= f.text_field :weight %>
+  </p>
+
+  <p>
+    <%= f.submit "Save" %>
+  </p>
+<% end %>
+
+
+<h5> Ranges </h5><br/>
+
+<table id="ranges">
+  <tr>
+    <td>
+      Label
+    </td>
+    <td>
+      Beginning
+    </td>
+    <td>
+      End
+    </td>
+    <td>
+      Grade
+    </td>
+    <td>
+      Color
+    </td>       
+  </tr>
+  <% if (@metric_configuration.ranges!=nil) 
+    @metric_configuration.ranges.each do |range| %>
+      <%= render :partial => "range", :locals => {:range => range} %>
+    <% end
+  end %>
+</table>
+
+<br/>
+<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_profile", :configuration_name => @configuration_name, :metric_name => @metric.name} %>
+<div id="new_range" style="display:none"></div>
+
@@ -0,0 +1,44 @@
+<h2><%= @configuration_name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %>
+  <%= hidden_field_tag :configuration_name, @configuration_name %>
+  <%= hidden_field_tag :scope, @metric.scope %>
+  
+  <% @metric.language.each do |language| %>
+    <%= hidden_field_tag "language[]", language %>
+  <% end %>
+
+  <p>
+    <%= f.label :origin, "Collector Name:" %>
+    <%= @metric.origin %>
+    <%= hidden_field_tag "metric[origin]", @metric.origin %>
+  </p>
+  <p>
+    <%= f.label :metric_name, "Metric Name:" %>
+    <%= @metric.name %>
+    <%= hidden_field_tag "metric[name]", @metric.name %>
+  </p>
+  <p>
+    <%= f.label :description, "Description:" %>
+    <%= @metric.description %>
+    <%= text_field_tag :description %>
+  </p>
+  <p>
+    <%= f.label :code, "Code:" %>
+    <%= f.text_field :code %>
+  </p>
+  <p>
+    <%= f.label :aggregation, "Aggregation:" %>
+    <%= f.select :aggregation, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <%= f.label :weight, "Weight:" %>
+    <%= f.text_field :weight %>
+  </p>
+
+  <p>
+    <%= f.submit "Add" %>
+  </p>
+
+<% end %>
@@ -0,0 +1,2 @@
+page.replace_html 'new_range', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name}
+page.visual_effect :toggle_slide, "new_range"
@@ -0,0 +1 @@
+<h3><%= @configuration_name %></h3>
...	...	@@ -35,4 +35,93 @@ class MezuroPluginProfileController < ProfileController
35	35	render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
36	36	end
37	37
	38	+ def choose_base_tool
	39	+ @configuration_name = params[:configuration_name]
	40	+ @tool_names = Kalibro::Client::BaseToolClient.new
	41	+ end
	42	+
	43	+ def choose_metric
	44	+ @configuration_name = params[:configuration_name]
	45	+ @collector_name = params[:collector_name]
	46	+ @collector = Kalibro::Client::BaseToolClient.new.base_tool(@collector_name)
	47	+ end
	48	+
	49	+ def new_metric_configuration
	50	+ metric_name = params[:metric_name]
	51	+ collector_name = params[:collector_name]
	52	+ collector = Kalibro::Client::BaseToolClient.new.base_tool(collector_name)
	53	+ @metric = collector.supported_metrics.find {\|metric\| metric.name == metric_name}
	54	+ @configuration_name = params[:configuration_name]
	55	+ end
	56	+
	57	+ def edit_metric_configuration
	58	+ metric_name = params[:metric_name]
	59	+ @configuration_name = params[:configuration_name]
	60	+ @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
	61	+ @metric = @metric_configuration.metric
	62	+ end
	63	+
	64	+ def create_metric_configuration
	65	+ @configuration_name = params[:configuration_name]
	66	+ metric_configuration = new_metric_configuration_instance
	67	+ Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
	68	+ redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
	69	+ end
	70	+
	71	+ def update_metric_configuration
	72	+ @configuration_name = params[:configuration_name]
	73	+ metric_configuration = new_metric_configuration_instance
	74	+ Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
	75	+ redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
	76	+ end
	77	+
	78	+ def new_range
	79	+ @metric_name = params[:metric_name]
	80	+ @configuration_name = params[:configuration_name]
	81	+ end
	82	+
	83	+ def create_range
	84	+ @range = new_range_instance
	85	+ configuration_name = params[:configuration_name]
	86	+ metric_name = params[:metric_name]
	87	+ metric_configuration_client = Kalibro::Client::MetricConfigurationClient.new
	88	+ metric_configuration = metric_configuration_client.metric_configuration(configuration_name, metric_name)
	89	+ metric_configuration.add_range(@range)
	90	+ metric_configuration_client.save(metric_configuration, configuration_name)
	91	+ end
	92	+
	93	+ def remove_metric_configuration
	94	+ configuration_name = params[:configuration_name]
	95	+ metric_name = params[:metric_name]
	96	+ Kalibro::Client::MetricConfigurationClient.new.remove(configuration_name, metric_name)
	97	+ redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}"
	98	+ end
	99	+
	100	+ private
	101	+
	102	+ def new_metric_configuration_instance
	103	+ metric_configuration = Kalibro::Entities::MetricConfiguration.new
	104	+ metric_configuration.metric = Kalibro::Entities::NativeMetric.new
	105	+ metric_configuration.metric.name = params[:metric][:name]
	106	+ metric_configuration.metric.description = params[:description]
	107	+ metric_configuration.metric.origin = params[:metric][:origin]
	108	+ metric_configuration.metric.scope = params[:scope]
	109	+ metric_configuration.metric.language = params[:language]
	110	+ metric_configuration.code = params[:metric_configuration][:code]
	111	+ metric_configuration.weight = params[:metric_configuration][:weight]
	112	+ metric_configuration.aggregation_form = params[:metric_configuration][:aggregation]
	113	+ metric_configuration
	114	+ end
	115	+
	116	+ def new_range_instance
	117	+ range = Kalibro::Entities::Range.new
	118	+ range.beginning = params[:range][:beginning]
	119	+ range.end = params[:range][:end]
	120	+ range.label = params[:range][:label]
	121	+ range.grade = params[:range][:grade]
	122	+ range.color = params[:range][:color]
	123	+ range.comments = params[:range][:comments]
	124	+ range
	125	+ end
38	126	end
	127	+
...	...
...	...	@@ -13,4 +13,4 @@ class Kalibro::Client::BaseToolClient
13	13	Kalibro::Entities::BaseTool.from_hash(hash)
14	14	end
15	15
16		-end
17	16	\ No newline at end of file
	17	+end
...	...
1	1	class Kalibro::Client::KalibroClient
	2	+
	3	+ def self.process_project(project_name)
	4	+ new.process_project(project_name)
	5	+ end
2	6
3	7	def initialize
4	8	@port = Kalibro::Client::Port.new('Kalibro')
...	...	@@ -12,16 +16,16 @@ class Kalibro::Client::KalibroClient
12	16	@port.request(:process_project, {:project_name => project_name})
13	17	end
14	18
15		- def process_periodically(project_name, days)
16		- @port.request(:process_periodically, {:project_name => project_name, :period_in_days => days})
17		- end
	19	+ def process_periodically(project_name, period_in_days)
	20	+ @port.request(:process_periodically, {:project_name => project_name, :period_in_days => period_in_days})
	21	+ end
	22	+
	23	+ def process_period(project_name)
	24	+ @port.request(:get_process_period, {:project_name => project_name})[:period]
	25	+ end
18	26
19		- def self.process_project(project_name, days)
20		- if days.to_i.zero?
21		- new.process_project(project_name)
22		- else
23		- new.process_periodically(project_name, days)
24		- end
	27	+ def cancel_periodic_process(project_name)
	28	+ @port.request(:cancel_periodic_process, {:project_name => project_name})
25	29	end
26	30
27	31	end
...	...
...	...	@@ -0,0 +1,28 @@
	1	+class Kalibro::Client::MetricConfigurationClient
	2	+
	3	+ def initialize
	4	+ @port = Kalibro::Client::Port.new('MetricConfiguration')
	5	+ end
	6	+
	7	+ def save(metric_configuration, configuration_name)
	8	+ @port.request(:save_metric_configuration, {
	9	+ :metric_configuration => metric_configuration.to_hash,
	10	+ :configuration_name => configuration_name})
	11	+ end
	12	+
	13	+ def metric_configuration(configuration_name, metric_name)
	14	+ hash = @port.request(:get_metric_configuration, {
	15	+ :configuration_name => configuration_name,
	16	+ :metric_name => metric_name
	17	+ })[:metric_configuration]
	18	+ Kalibro::Entities::MetricConfiguration.from_hash(hash)
	19	+ end
	20	+
	21	+ def remove (configuration_name, metric_name)
	22	+ @port.request(:remove_metric_configuration, {
	23	+ :configuration_name => configuration_name,
	24	+ :metric_name=> metric_name
	25	+ })
	26	+ end
	27	+
	28	+end
0	29	\ No newline at end of file
...	...
...	...	@@ -13,7 +13,7 @@ class Kalibro::Client::ModuleResultClient
13	13	def module_result(project_name, module_name, date)
14	14	hash = @port.request(:get_module_result,
15	15	{:project_name => project_name, :module_name => module_name,
16		- :date => date_with_milliseconds(date)})[:module_result]
	16	+ :date => Kalibro::Entities::Entity.date_with_milliseconds(date)})[:module_result]
17	17	Kalibro::Entities::ModuleResult.from_hash(hash)
18	18	end
19	19
...	...	@@ -23,11 +23,4 @@ class Kalibro::Client::ModuleResultClient
23	23	Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult)
24	24	end
25	25
26		- private
27		-
28		- def date_with_milliseconds(date)
29		- milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
30		- date.to_s[0..18] + milliseconds + date.to_s[19..-1]
31		- end
32		-
33	26	end
34	27	\ No newline at end of file
...	...
...	...	@@ -7,7 +7,8 @@ end
7	7	class Kalibro::Client::Port
8	8
9	9	def initialize(endpoint)
10		- @client = Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
	10	+ @endpoint = endpoint
	11	+ initialize_client
11	12	end
12	13
13	14	def service_address
...	...	@@ -18,9 +19,20 @@ class Kalibro::Client::Port
18	19	@service_address
19	20	end
20	21
	22	+ def service_address=(address)
	23	+ @service_address = address
	24	+ initialize_client
	25	+ end
	26	+
21	27	def request(action, request_body = nil)
22	28	response = @client.request(:kalibro, action) { soap.body = request_body }
23	29	response.to_hash["#{action}_response".to_sym]
24	30	end
25	31
	32	+ private
	33	+
	34	+ def initialize_client
	35	+ @client = Savon::Client.new("#{service_address}#{@endpoint}Endpoint/?wsdl")
	36	+ end
	37	+
26	38	end
...	...
...	...	@@ -7,7 +7,11 @@ class Kalibro::Entities::Configuration < Kalibro::Entities::Entity
7	7	end
8	8
9	9	def metric_configurations
10		- @metric_configuration
	10	+ if @metric_configuration != nil
	11	+ @metric_configuration
	12	+ else
	13	+ []
	14	+ end
11	15	end
12	16
13	17	def metric_configurations=(metric_configurations)
...	...
...	...	@@ -2,10 +2,19 @@ class Kalibro::Entities::Entity
2	2
3	3	def self.from_hash(hash)
4	4	entity = self.new
5		- hash.each { \|field, value\| entity.set(field, value) }
	5	+ hash.each { \|field, value\| entity.set(field, value) if is_valid?(field) }
6	6	entity
7	7	end
8	8
	9	+ def self.is_valid?(field)
	10	+ field.to_s[0] != '@' and field != :attributes!
	11	+ end
	12	+
	13	+ def self.date_with_milliseconds(date)
	14	+ milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
	15	+ date.to_s[0..18] + milliseconds + date.to_s[19..-1]
	16	+ end
	17	+
9	18	def set(field, value)
10	19	send("#{field}=", value) if not field.to_s.start_with? '@'
11	20	end
...	...	@@ -24,16 +33,16 @@ class Kalibro::Entities::Entity
24	33	fields.each do \|field\|
25	34	field_value = self.get(field)
26	35	hash[field] = convert_to_hash(field_value) if ! field_value.nil?
	36	+ if need_xml_type?(field_value)
	37	+ hash = {:attributes! => {}}.merge(hash)
	38	+ hash[:attributes!][field.to_sym] = {
	39	+ 'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
	40	+ 'xsi:type' => 'kalibro:' + xml_class_name(field_value) }
	41	+ end
27	42	end
28	43	hash
29	44	end
30	45
31		- def convert_to_hash(value)
32		- return value.collect { \|element\| convert_to_hash(element) } if value.kind_of?(Array)
33		- return value.to_hash if value.kind_of?(Kalibro::Entities::Entity)
34		- value
35		- end
36		-
37	46	def ==(other)
38	47	begin
39	48	fields.each.inject(true) { \|equal, field\| equal && (self.get(field) == other.get(field)) }
...	...	@@ -42,6 +51,8 @@ class Kalibro::Entities::Entity
42	51	end
43	52	end
44	53
	54	+ protected
	55	+
45	56	def fields
46	57	instance_variable_names.each.collect { \|variable\| variable.to_s.sub(/@/, '').to_sym }
47	58	end
...	...	@@ -50,4 +61,24 @@ class Kalibro::Entities::Entity
50	61	send("#{field}")
51	62	end
52	63
	64	+ def convert_to_hash(value)
	65	+ return value.collect { \|element\| convert_to_hash(element) } if value.is_a?(Array)
	66	+ return value.to_hash if value.is_a?(Kalibro::Entities::Entity)
	67	+ return self.class.date_with_milliseconds(value) if value.is_a?(DateTime)
	68	+ return 'INF' if value.is_a?(Float) and value.infinite? == 1
	69	+ return '-INF' if value.is_a?(Float) and value.infinite? == -1
	70	+ value
	71	+ end
	72	+
	73	+ def need_xml_type?(value)
	74	+ value.is_a?(Kalibro::Entities::Entity) and value.class.superclass != Kalibro::Entities::Entity
	75	+ end
	76	+
	77	+ def xml_class_name(entity)
	78	+ xml_name = entity.class.name
	79	+ xml_name["Kalibro::Entities::"] = ""
	80	+ xml_name[0..0] = xml_name[0..0].downcase
	81	+ xml_name + "Xml"
	82	+ end
	83	+
53	84	end
...	...
1	1	class Kalibro::Entities::Error < Kalibro::Entities::Entity
2	2
3		- attr_accessor :message, :stack_trace_element
	3	+ attr_accessor :error_class, :message, :stack_trace_element
4	4
5	5	def stack_trace_element=(value)
6	6	@stack_trace_element = to_entity_array(value, Kalibro::Entities::StackTraceElement)
...	...
...	...	@@ -2,4 +2,4 @@ class Kalibro::Entities::Metric < Kalibro::Entities::Entity
2	2
3	3	attr_accessor :name, :scope, :description
4	4
5		-end
6	5	\ No newline at end of file
	6	+end
...	...