Merge branch 'refactoring_project_content' into models_with_ids

Conflicts: plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb plugins/mezuro/lib/kalibro/metric_result.rb plugins/mezuro/lib/kalibro/model.rb plugins/mezuro/lib/kalibro/repository.rb plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb

Merge branch 'refactoring_project_content' into models_with_ids
Conflicts: plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb plugins/mezuro/lib/kalibro/metric_result.rb plugins/mezuro/lib/kalibro/model.rb plugins/mezuro/lib/kalibro/repository.rb plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
Diego Camarinha · Alessandro Palmeira
2 parents 66eca73f bc8b3384
Showing 16 changed files with 235 additions and 202 deletions Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_module_controller.rb
plugins/mezuro/controllers/profile/mezuro_plugin_project_controller.rb
plugins/mezuro/lib/kalibro/errors/record_not_found.rb
plugins/mezuro/lib/kalibro/errors/standard.rb
plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
plugins/mezuro/lib/kalibro/metric_result.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/kalibro/repository.rb
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/public/javascripts/project_content.js
plugins/mezuro/test/fixtures/project_content_fixtures.rb
plugins/mezuro/test/fixtures/project_fixtures.rb
plugins/mezuro/test/functional/profile/mezuro_plugin_module_controller_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
plugins/mezuro/views/mezuro_plugin_module/_module_result.rhtml
@@ -3,10 +3,10 @@ class MezuroPluginModuleController &lt; MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def module_result
-    @content = profile.articles.find(params[:id])
-    @module_result = @content.module_result(params)
-    @module = @module_result.module
-    @module_label = "#{@module.name} (#{@module.granularity})"
+    project_content = profile.articles.find(params[:id])
+    repositories = project_content.repositories
+    @module_result = project_content.module_result(repositories.first.id)
+    @metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
@@ -15,9 +15,9 @@ class MezuroPluginModuleController &lt; MezuroPluginProfileController
   end
   def module_metrics_history
-    metric_name = params[:metric_name]
+    module_result_id = params[:module_result_id]
     @content = profile.articles.find(params[:id])
-    module_history = @content.result_history(params[:module_name])
+    module_history = @content.result_history(params[:module_result_id])
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
@@ -28,7 +28,7 @@ class MezuroPluginModuleController &lt; MezuroPluginProfileController
   def module_grade_history
     @content = profile.articles.find(params[:id])
-    modules_results = @content.result_history(params[:module_name])
+    modules_results = @content.result_history(params[:module_result_id])
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
@@ -42,16 +42,12 @@ class MezuroPluginModuleController &lt; MezuroPluginProfileController
   private
   def filtering_metric_history(metric_name, module_history)
-    metrics_history = module_history.map do |module_result|
-      [module_result.metric_results, format_date_to_simple_form(module_result.date)]
-    end
-    metric_history =  metrics_history.map do |metric_results_with_date|
-      [(metric_results_with_date.first.select do |metric_result|
-        metric_result.metric.name.delete("() ") == metric_name
-      end).first, metric_results_with_date.last]
+    metrics_history = module_history.select do |m|
+      m.metric_result.configuration.metric.name.delete("() ") == metric_name
     end
-    metric_history.map do |metric_result_with_date|
-      [metric_result_with_date.first.value, metric_result_with_date.last]
+    
+    metric_history = metrics_history.map do |m|
+      [m.metric_result.value, format_date_to_simple_form(m.date)]
     end
   end
@@ -2,35 +2,34 @@ class MezuroPluginProjectController &lt; MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def project_state
+  def processing_state
     @content = profile.articles.find(params[:id])
-    project = @content.project
+    processing = @content.processing
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
-      state = project.kalibro_error.nil? ? project.state : "ERROR"
-      render :text => state
+      render :text => processing.state
     end
   end
-  def project_error
+  def processing_error
     @content = profile.articles.find(params[:id])
-    @project = @content.project
+    @processing = @content.processing
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
-      render :partial => 'project_error'
+      render :partial => 'processing_error'
     end
   end
-  def project_result
+  def processing
     @content = profile.articles.find(params[:id])
     date = params[:date]
-    @project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
+    @processing = date.nil? ? @content.processing : @content.processing_with_date(date)
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
-      render :partial => 'project_result'
+      render :partial => 'processing'
     end
   end
@@ -0,0 +1,2 @@
+class Kalibro::Errors::RecordNotFound < Kalibro::Errors::Standard
+end
 \ No newline at end of file
@@ -0,0 +1,4 @@
+#Inspired on:
+#https://github.com/rails/rails/blob/master/activerecord/lib/active_record/errors.rb
+class Kalibro::Errors::Standard < StandardError
+end
 \ No newline at end of file
@@ -11,7 +11,11 @@ class Kalibro::MetricConfigurationSnapshot &lt; Kalibro::Model
   end
   def range=(value)
-    @range = Kalibro::Range.to_object value
+    @range = Kalibro::RangeSnapshot.to_object value
+  end
+
+  def range_snapshot
+    range
   end
 end
@@ -10,6 +10,10 @@ class Kalibro::MetricResult &lt; Kalibro::Model
     @configuration = Kalibro::MetricConfigurationSnapshot.to_object value
   end
+  def metric_configuration_snapshot
+    configuration
+  end
+
   def error=(value)
     @error = Kalibro::Throwable.to_object value
   end
@@ -22,8 +26,8 @@ class Kalibro::MetricResult &lt; Kalibro::Model
     request(:metric_results_of, {:module_result_id => module_result_id})[:metric_result].to_a.map {|metric_result| new metric_result}
   end
-  def history_of(module_id)
-    self.class.request(:history_of, {:metric_name => self.configuration.metric.name, :module_result_id => module_id})[:date_metric_result].to_a.map {|date_metric_result| Kalibro::DateMetricResult.new date_metric_result}
+  def history_of(module_result_id)
+    self.class.request(:history_of, {:metric_name => self.configuration.metric.name, :module_result_id => module_result_id})[:date_metric_result].to_a.map {|date_metric_result| Kalibro::DateMetricResult.new date_metric_result}
   end
 end
@@ -40,8 +40,8 @@ class Kalibro::Model
   def self.to_object value
     value.kind_of?(Hash) ? new(value) : value
-  end 
-  
+  end
+
   def self.create(attributes={})
     new_model = new attributes
     new_model.save
@@ -52,7 +52,7 @@ class Kalibro::Model
     if(exists?(id))
       new request(find_action, id_params(id))["#{class_name.underscore}".to_sym]
     else
-      nil
+      raise Errors::RecordNotFound
     end
   end
@@ -77,7 +77,7 @@ class Kalibro::Model
   def self.exists?(id)
     request(exists_action, id_params(id))[:exists]
   end
-  
+
   protected
   def fields
@@ -88,7 +88,7 @@ class Kalibro::Model
     return value if value.nil?
     return value.collect { |element| convert_to_hash(element) } if value.is_a?(Array)
     return value.to_hash if value.is_a?(Kalibro::Model)
-    return self.class.date_with_milliseconds(value) if value.is_a?(DateTime)    
+    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
@@ -109,32 +109,32 @@ class Kalibro::Model
   def self.is_valid?(field)
     field.to_s[0] != '@' and field != :attributes! and (field.to_s =~ /xsi/).nil?
   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 instance_class_name
     self.class.name.gsub(/Kalibro::/,"")
   end
-  
+
   def self.endpoint
     class_name
   end
-  
+
   def save_action
     "save_#{instance_class_name.underscore}".to_sym
   end
-  
+
   def save_params
     {instance_class_name.underscore.to_sym => self.to_hash}
   end
-  
+
   def destroy_action
     "delete_#{instance_class_name.underscore}".to_sym
   end
-  
+
   def destroy_params
     {"#{instance_class_name.underscore}_id".to_sym => self.id}
   end
@@ -142,11 +142,11 @@ class Kalibro::Model
   def self.class_name
     self.name.gsub(/Kalibro::/,"")
   end
-  
+
   def self.exists_action
     "#{class_name.underscore}_exists".to_sym
   end
-  
+
   def self.id_params(id)
     {"#{class_name.underscore}_id".to_sym => id}
   end
@@ -15,11 +15,15 @@ class Kalibro::Repository &lt; Kalibro::Model
   end
   def process_repository
-    self.class.request(:process_repository, {:repository_id => self.id});
+    self.class.request(:process_repository, {:repository_id => self.id})
   end
   def cancel_processing_of_repository
-    self.class.request(:cancel_processing_of_repository, {:repository_id => self.id});
+    self.class.request(:cancel_processing_of_repository, {:repository_id => self.id})
+  end
+
+  def save_params
+    {:repository => self.to_hash, :project_id => Kalibro::Project.project_of(id).id}
   end
 end
@@ -45,8 +45,8 @@ class MezuroPlugin::Helpers::ContentViewerHelper
     selected_option.first
   end
-  def self.format_name(metric_result)
-    metric_result.configuration.metric.name.delete("() ")
+  def self.format_name(metric_configuration_snapshot)
+    metric_configuration_snapshot.metric.name.delete("() ")
   end
   def self.get_license_option(selected)
 class MezuroPlugin::ProjectContent < Article
   include ActionView::Helpers::TagHelper
-  settings_items :project_license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days
+  settings_items :project_id
-  validate_on_create :validate_kalibro_project_name 
-  validate_on_create :validate_repository_url
+  validate_on_create :validate_repository_address
   def self.short_description
     'Mezuro project'
@@ -22,90 +21,113 @@ class MezuroPlugin::ProjectContent &lt; Article
   def project
     begin
-      @project ||= Kalibro::Project.find_by_name(name)
+      @project ||= Kalibro::Project.find(project_id)
     rescue Exception => error
       errors.add_to_base(error.message)
     end
     @project
   end
-  def project_result
+  def repositories
     begin
-      @project_result ||= Kalibro::ProjectResult.last_result(name)
+      @repositories ||= Kalibro::Repository.repositories_of(project_id)
     rescue Exception => error
       errors.add_to_base(error.message)
+      @repositories = []
     end
-    @project_result
+    @repositories
   end
-  
-  def project_result_with_date(date)
+
+  def processing(repository_id)
     begin
-      @project_result ||= Kalibro::ProjectResult.has_results_before?(name, date) ? Kalibro::ProjectResult.last_result_before(name, date) : 
-Kalibro::ProjectResult.first_result_after(name, date)
+      if Kalibro::Processing.has_ready_processing(repository_id)
+        @processing ||= Kalibro::Processing.last_ready_processing_of(repository_id)
+      else
+        @processing = Kalibro::Processing.last_processing_of(repository_id)
+      end
     rescue Exception => error
       errors.add_to_base(error.message)
     end
-    @project_result
+    @processing
   end
-  def module_result(attributes)
-    module_name = attributes[:module_name].nil? ? project.name : attributes[:module_name]
-    date = attributes[:date].nil? ? project_result.date : project_result_with_date(attributes[:date]).date
+  def processing_with_date(repository_id, date)
     begin
-      @module_result ||= Kalibro::ModuleResult.find_by_project_name_and_module_name_and_date(name, module_name, date)
+      if Kalibro::Processing.has_processing_after(repository_id, date)
+        @processing ||= Kalibro::Processing.first_processing_after(repository_id, date)
+      elsif Kalibro::Processing.has_processing_before(repository_id, date)
+        @processing ||= Kalibro::Processing.last_processing_before(repository_id, date)
+      end
     rescue Exception => error
       errors.add_to_base(error.message)
     end
-    @module_result
+    @processing
   end
-  def result_history(module_name)
+  def module_result(repository_id, date = nil)
+    @processing ||= date.nil? ? processing(repository_id) : processing_with_date(repository_id, date)
     begin
-      @result_history ||= Kalibro::ModuleResult.all_by_project_name_and_module_name(name, module_name)
+      @module_result ||= Kalibro::ModuleResult.find(@processing.results_root_id)
     rescue Exception => error
       errors.add_to_base(error.message)
     end
+    @module_result
   end
-  after_save :send_project_to_service
-  after_destroy :destroy_project_from_service
-
-  private
-
-  def validate_kalibro_project_name
+  def result_history(module_result_id)
     begin
-      existing = Kalibro::Project.all_names
+      @result_history ||= Kalibro::MetricResult.history_of(module_result_id)
     rescue Exception => error
       errors.add_to_base(error.message)
-      existing = []
-    end
-    
-    if existing.any?{|existing_name| existing_name.casecmp(name)==0} # existing.include?(name) + case insensitive
-      errors.add_to_base("Project name already exists in Kalibro")
     end
   end
+
+  def description=(value)
+    @description=value
+  end
-  def validate_repository_url
-    if(repository_url.nil? || repository_url == "")
-      errors.add_to_base("Repository URL is mandatory")
-    end
+  def description
+    @description
   end
+
+  def repositories=(value)
+    @repositories = value.kind_of?(Array) ? value : [value]
+    @repositories = @repositories.map { |element| to_repository(element) }
+  end
+
+  after_save :send_project_to_service
+  after_destroy :destroy_project_from_service
+
+  private
+  def self.to_repository value
+    value.kind_of?(Hash) ? Kalibro::Repository.new(value) : value
+  end
+
+  def validate_repository_address
+    repositories.each do |repository|
+      if (!repository.nil?)
+        address = repository.address
+        if(address.nil? || address == "")
+          errors.add_to_base("Repository Address is mandatory")
+        end
+      else
+        errors.add_to_base("Repository is mandatory")
+      end       
+    end
+  end
+
   def send_project_to_service
     created_project = create_kalibro_project
-    created_project.process_project(periodicity_in_days)
+    repositories = Kalibro::Repository.repositories_of(project_id)
+    repositories.each {|repository| repository.process_repository }
   end
   def create_kalibro_project
    Kalibro::Project.create(
+      :id => project_id,
       :name => name,
-      :license => project_license,
-      :description => description,
-      :repository => {
-        :type => repository_type,
-        :address => repository_url
-      },
-      :configuration_name => configuration_name
+      :description => description
     )
   end
@@ -18,7 +18,7 @@ function display_metric_history() {
   var metric_name = jQuery(this).attr('show-metric-history');
   toggle_mezuro("." + metric_name);
   metricName = metric_name;
-  callAction('module', 'module_metrics_history', {module_name: module_name, metric_name: metric_name}, show_metrics);
+  callAction('module', 'module_metrics_history', {module_id: module_id, module_result_id: module_result_id}, show_metrics);
   return false;
 }
@@ -0,0 +1,16 @@
+class ProjectContentFixtures
+
+  def self.project_content
+    content = MezuroPlugin::ProjectContent.new
+    content.project_id = 42
+    #content.name = 'Qt-Calculator'
+    #content.project_license = 'GPL'
+    #content.description = 'Calculator for Qt'
+    #content.repository_type = [RepositoryFixtures.repository_hash[:type]]
+    #content.repository_url = [RepositoryFixtures.repository_hash[:address]]
+    #content.configuration_name = 'Kalibro for Java'
+    #content.periodicity_in_days = 1
+    content
+  end
+
+end
 \ No newline at end of file
@@ -17,17 +17,4 @@ class ProjectFixtures
       :description => 'Calculator for Qt'
     }
   end
-    
-  def self.project_content
-    content = MezuroPlugin::ProjectContent.new
-    content.name = 'Qt-Calculator'
-    content.project_license = 'GPL'
-    content.description = 'Calculator for Qt'
-    content.repository_type = RepositoryFixtures.repository_hash[:type]
-    content.repository_url = RepositoryFixtures.repository_hash[:address]
-    content.configuration_name = 'Kalibro for Java'
-    content.periodicity_in_days = 1
-    content
-  end
-
 end
 require 'test_helper'
 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/repository_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_fixtures"
 class MezuroPluginModuleControllerTest < ActionController::TestCase
@@ -13,19 +12,23 @@ class MezuroPluginModuleControllerTest &lt; ActionController::TestCase
     @response = ActionController::TestResponse.new
     @profile = fast_create(Community)
-    @project_result = ProjectResultFixtures.project_result
+    #@project_result = ProjectResultFixtures.project_result
     @module_result = ModuleResultFixtures.module_result
     @repository_url = RepositoryFixtures.repository.address
-    @project = @project_result.project
+    @project = ProjectFixtures.project
     @date = "2012-04-13T20:39:41+04:00"
-    Kalibro::Project.expects(:all_names).returns([])
-    @content = MezuroPlugin::ProjectContent.new(:profile => @profile, :name => @project.name, :repository_url => @repository_url)
+    #Kalibro::Project.expects(:all_names).returns([])
+    @content = MezuroPlugin::ProjectContent.new(:profile => @profile, :project_id => @project.id)
     @content.expects(:send_project_to_service).returns(nil)
     @content.save
+
   end
+  should 'get module result' do
+  end
+=begin
   should 'get module result without date' do
     date_with_milliseconds = Kalibro::ProjectResult.date_with_milliseconds(@project_result.date)
     Kalibro::ProjectResult.expects(:request).
@@ -70,5 +73,5 @@ class MezuroPluginModuleControllerTest &lt; ActionController::TestCase
     assert_equal [[@module_result.grade, @module_result.date.to_s[0..9]]], assigns(:score_history)
     assert_response 200
   end
-
+=end
 end
 require "test_helper"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_content_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/processing_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_result_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/date_metric_result_fixtures"
 class ProjectContentTest < ActiveSupport::TestCase
   def setup
+    @project_content = ProjectContentFixtures.project_content
     @project = ProjectFixtures.project
-    @content = ProjectFixtures.project_content
-    @project_result = ProjectResultFixtures.project_result
+    @repository = RepositoryFixtures.repository
+    @processing = ProcessingFixtures.processing
+    @date = @processing.date
     @module = ModuleFixtures.module
     @module_result = ModuleResultFixtures.module_result
+    @date_metric_result = DateMetricResultFixtures.date_metric_result
   end
   should 'provide proper short description' do
@@ -23,98 +29,81 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
   end
   should 'have an html view' do
-    assert_not_nil @content.to_html
+    assert_not_nil @project_content.to_html
   end
   should 'get project from service' do
-    Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash})
-    assert_equal @project.name, @content.project.name
+    Kalibro::Project.expects(:find).with(@project.id).returns(@project)
+    assert_equal @project, @project_content.project
   end
-  should 'get project result from service' do
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :get_last_result_of, {:project_name => @project.name}).returns({:project_result => @project_result.to_hash})
-    assert_equal @project_result.load_time, @content.project_result.load_time
+  should 'add error to base when the project does not exist' do
+    Kalibro::Project.expects(:find).with(@project.id).raises(Kalibro::Errors::RecordNotFound)
+    assert_nil @project_content.errors[:base]
+    @project_content.project
+    assert_not_nil @project_content.errors[:base]
+  end
+
+  should 'get repositories of the project from service' do
+    Kalibro::Repository.expects(:repositories_of).with(@project.id).returns([@repository])
+    assert_equal [@repository], @project_content.repositories
   end
-  should 'get date result from service when has_result_before is true' do
-    request_body = {:project_name => @project.name, :date => @project_result.date}
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :has_results_before, request_body).returns({:has_results => true})
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :get_last_result_before, request_body).returns({:project_result => @project_result.to_hash})
-    assert_equal @project_result.load_time, @content.project_result_with_date(@project_result.date).load_time
+  should 'add error to base when getting the repositories of a project that does not exist' do
+    Kalibro::Repository.expects(:repositories_of).with(@project.id).raises(Kalibro::Errors::RecordNotFound)
+    assert_nil @project_content.errors[:base]
+    @project_content.repositories
+    assert_not_nil @project_content.errors[:base]
   end
-
-  should 'get date result from service when has_result_before is false' do
-    request_body = {:project_name => @project.name, :date => @project_result.date}
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :has_results_before, request_body).returns({:has_results => false})
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :get_first_result_after, request_body).returns({:project_result => @project_result.to_hash})
-    assert_equal @project_result.load_time, @content.project_result_with_date(@project_result.date).load_time
+  
+  should 'get processing of a repository' do
+    Kalibro::Processing.expects(:has_ready_processing).with(@repository.id).returns(true)
+    Kalibro::Processing.expects(:last_ready_processing_of).with(@repository.id).returns(@processing)
+    assert_equal @processing, @project_content.processing(@repository.id)
   end
-
-  should 'get module result from service without date' do
-    date_with_milliseconds = Kalibro::ProjectResult.date_with_milliseconds(@project_result.date)
-    Kalibro::ProjectResult.expects(:request).with('ProjectResult', :get_last_result_of, {:project_name => @project.name}).returns({:project_result => @project_result.to_hash})
-    Kalibro::ModuleResult.expects(:request).with(
-      'ModuleResult',
-      :get_module_result,
-      {
-        :project_name => @project.name, 
-        :module_name => @module.name,
-        :date => date_with_milliseconds
-      }).returns({:module_result => @module_result.to_hash})
-    assert_equal @module_result.grade, @content.module_result({:module_name => @module.name}).grade
+  
+  should 'get not ready processing of a repository' do
+    Kalibro::Processing.expects(:has_ready_processing).with(@repository.id).returns(false)
+    Kalibro::Processing.expects(:last_processing_of).with(@repository.id).returns(@processing)
+    assert_equal @processing, @project_content.processing(@repository.id)
   end
-
-  should 'get module result from service with date' do
-    date_with_milliseconds = Kalibro::ProjectResult.date_with_milliseconds(@project_result.date)
-    request_body = {:project_name => @project.name, :date => @project_result.date}
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :has_results_before, request_body).returns({:has_results => false})
-    Kalibro::ProjectResult.expects(:request).with("ProjectResult", :get_first_result_after, request_body).returns({:project_result => @project_result.to_hash})
-    Kalibro::ModuleResult.expects(:request).with(
-      'ModuleResult',
-      :get_module_result,
-      {
-        :project_name => @project.name, 
-        :module_name => @module.name,
-        :date => date_with_milliseconds
-      }).returns({:module_result => @module_result.to_hash})
-    assert_equal @module_result.grade, @content.module_result({:module_name => @module.name, :date => @project_result.date}).grade
+  
+  should 'get processing of a repository after date' do
+    Kalibro::Processing.expects(:has_processing_after).with(@repository.id, @date).returns(true)
+    Kalibro::Processing.expects(:first_processing_after).with(@repository.id, @date).returns(@processing)
+    assert_equal @processing, @project_content.processing_with_date(@repository.id, @date)
   end
-
-  should 'get result history' do
-    Kalibro::ModuleResult.expects(:request).with(
-    'ModuleResult',
-    :get_result_history,
-      {
-        :project_name => @project.name, 
-        :module_name => @module.name
-      }).returns({:module_result => @module_result.to_hash})
-  	@content.result_history(@module.name)
+  
+  should 'get processing of a repository before date' do
+    Kalibro::Processing.expects(:has_processing_after).with(@repository.id, @date).returns(false)
+    Kalibro::Processing.expects(:has_processing_before).with(@repository.id, @date).returns(true)
+    Kalibro::Processing.expects(:last_processing_before).with(@repository.id, @date).returns(@processing)
+    assert_equal @processing, @project_content.processing_with_date(@repository.id, @date)
   end
-  should 'send project to service after saving' do
-    @content.expects :send_project_to_service
-    @content.run_callbacks :after_save
+  should 'get module result' do
+    @project_content.expects(:processing).with(@repository.id).returns(@processing)
+    Kalibro::ModuleResult.expects(:find).with(@processing.results_root_id).returns(@module_result)
+    assert_equal @module_result, @project_content.module_result(@repository.id)
+
+  end
+  
+  should 'get module result with date' do
+    @project_content.expects(:processing_with_date).with(@repository.id,@date.to_s).returns(@processing)
+    Kalibro::ModuleResult.expects(:find).with(@processing.results_root_id).returns(@module_result)
+    assert_equal @module_result, @project_content.module_result(@repository.id, @date.to_s)
   end
-  should 'send correct project to service' do
-    hash = ProjectFixtures.project_hash
-    hash.delete(:attributes!)
-    hash.delete(:state)
-    Kalibro::Project.expects(:create).with(hash).returns(@project)
-    @project.expects(:process_project).with(@content.periodicity_in_days)
-    @content.send :send_project_to_service
+  should 'get result history' do
+    Kalibro::MetricResult.expects(:history_of).with(@module_result.id).returns([@date_metric_result])
+    assert_equal [@date_metric_result], @project_content.result_history(@module_result.id)
   end
-  should 'destroy project from service' do
-    Kalibro::Project.expects(:request).with("Project", :get_project, :project_name => @project.name).returns({:project => @project.to_hash})
-    Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})
-    @content.send :destroy_project_from_service
+  should 'add error to base when the module_result does not exist' do
+    Kalibro::MetricResult.expects(:history_of).with(@module_result.id).raises(Kalibro::Errors::RecordNotFound)
+    assert_nil @project_content.errors[:base]
+    @project_content.result_history(@module_result.id)
+    assert_not_nil @project_content.errors[:base]
   end
-  
-  should 'not save a project with an existing project name in kalibro' do
- 		Kalibro::Project.expects(:all_names).returns([@content.name])
-		@content.send :validate_kalibro_project_name
-		assert_equal "Project name already exists in Kalibro", @content.errors.on_base
-	end
-  
+
 end
-<h5><%= _('Metric results for: ') + @module_label %> </h5>
+<% module_name = @module_result.module.name
+<h5><%= _('Metric results for: #{module_name} (#{@module_result.module.granularity}) ') %> </h5>
 <hr/>
 <div class="zoomable-image">
@@ -12,26 +13,28 @@
     </tr>
   </thead>
   <tbody>
-    <% @module_result.metric_results.each do |metric_result|  %>
-      <% range = metric_result.range %>
-      <% if !range.nil? %>
+    <% @metric_results.each do |metric_result|  %>
+      <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
+      <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
+      <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
+      <% if !range_snapshot.nil? %>
         <tr>
-          <td style="width: 74%"><a href="#" show-metric-history="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" data-module-name="<%= @module.name %>"><%= metric_result.metric.name %></a></td>
+          <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-name="<%= module_name %>"><%= metric_configuration_snapshot.metric.name %></a></td>
           <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
-          <td><%= metric_result.weight %></td>
-          <td style="background-color: #<%= range.color[2..-1] %>">
-            <span title="<%= range.comments %>" >
-              <%= range.label %>
+          <td><%= metric_configuration_snapshot.weight %></td>
+          <td style="background-color: #<%= range_snapshot.color %>">
+            <span title="<%= range_snapshot.comments %>" >
+              <%= range_snapshot.label %>
             </span>
           </td>
         </tr>	  
-        <tr class="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" style="display: none;">
+        <tr class="<%= formatted_name %>" style="display: none;">
           <td colspan="3">
-            <div id='historical-<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>'>
+            <div id='historical-<%= formatted_name %>'>
             </div>
           </td>
           <td align="right">
-            <%= range.comments.nil? ? '' : range.comments %>
+            <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
           </td> 
         </tr>
       <% end %>
@@ -43,7 +46,7 @@
         <div id='historical-grade' style="display: none;"></div>
       </td>
       <td align = "right">
-        <a href="#" show-grade-history="<%= @module_result.module.name %>" data-module-name="<%= @module.name%>" >
+        <a href="#" show-grade-history="<%= module_name %>" data-module-name="<%= module_name%>" >
           <strong>
             <%= _('Grade:') %>
             <%= "%.02f" % @module_result.grade %>
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+class Kalibro::Errors::RecordNotFound < Kalibro::Errors::Standard
		2	+end
0	\ No newline at end of file	3	\ No newline at end of file
	@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
		1	+#Inspired on:
		2	+#https://github.com/rails/rails/blob/master/activerecord/lib/active_record/errors.rb
		3	+class Kalibro::Errors::Standard < StandardError
		4	+end
0	\ No newline at end of file	5	\ No newline at end of file
	@@ -18,7 +18,7 @@ function display_metric_history() {		@@ -18,7 +18,7 @@ function display_metric_history() {
18	var metric_name = jQuery(this).attr('show-metric-history');	18	var metric_name = jQuery(this).attr('show-metric-history');
19	toggle_mezuro("." + metric_name);	19	toggle_mezuro("." + metric_name);
20	metricName = metric_name;	20	metricName = metric_name;
21	- callAction('module', 'module_metrics_history', {module_name: module_name, metric_name: metric_name}, show_metrics);	21	+ callAction('module', 'module_metrics_history', {module_id: module_id, module_result_id: module_result_id}, show_metrics);
22	return false;	22	return false;
23	}	23	}
24		24
	@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
		1	+class ProjectContentFixtures
		2	+
		3	+ def self.project_content
		4	+ content = MezuroPlugin::ProjectContent.new
		5	+ content.project_id = 42
		6	+ #content.name = 'Qt-Calculator'
		7	+ #content.project_license = 'GPL'
		8	+ #content.description = 'Calculator for Qt'
		9	+ #content.repository_type = [RepositoryFixtures.repository_hash[:type]]
		10	+ #content.repository_url = [RepositoryFixtures.repository_hash[:address]]
		11	+ #content.configuration_name = 'Kalibro for Java'
		12	+ #content.periodicity_in_days = 1
		13	+ content
		14	+ end
		15	+
		16	+end
0	\ No newline at end of file	17	\ No newline at end of file
	@@ -17,17 +17,4 @@ class ProjectFixtures		@@ -17,17 +17,4 @@ class ProjectFixtures
17	:description => 'Calculator for Qt'	17	:description => 'Calculator for Qt'
18	}	18	}
19	end	19	end
20	-
21	- def self.project_content
22	- content = MezuroPlugin::ProjectContent.new
23	- content.name = 'Qt-Calculator'
24	- content.project_license = 'GPL'
25	- content.description = 'Calculator for Qt'
26	- content.repository_type = RepositoryFixtures.repository_hash[:type]
27	- content.repository_url = RepositoryFixtures.repository_hash[:address]
28	- content.configuration_name = 'Kalibro for Java'
29	- content.periodicity_in_days = 1
30	- content
31	- end
32	-
33	end	20	end