Merge pull request #287 from mezuro/hotspot_listing

Hotspot listing

Merge pull request #287 from mezuro/hotspot_listing
Hotspot listing
Rafael Manzo
2 parents c6921d9e 70a04eb8
Showing 72 changed files with 634 additions and 368 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
app/assets/javascripts/module/tree.js.coffee
app/controllers/compound_metric_configurations_controller.rb
app/controllers/kalibro_configurations_controller.rb
app/controllers/metric_configurations_controller.rb
app/models/module_result.rb
app/views/kalibro_configurations/_metric_configurations.html.erb
app/views/kalibro_configurations/_no_metric_configurations.html.erb
app/views/kalibro_configurations/show.html.erb
app/views/modules/_hotspot_metric_result.html.erb
app/views/modules/_hotspot_metric_results.html.erb
app/views/modules/_metric_result.html.erb
app/views/modules/_metric_results.html.erb
app/views/modules/_module_result.html.erb
app/views/modules/_module_tree.html.erb
app/views/modules/load_module_tree.js.erb
app/views/repositories/_hotspot_metric_results_error.html.erb
app/views/repositories/load_error.js.erb
@@ -5,10 +5,12 @@ addons:
   postgresql: "9.3"
 before_script:
-  - git clone https://github.com/mezuro/kalibro_install.git -b v3.6 kalibro_install
+  - git clone https://github.com/mezuro/kalibro_install.git -b v4.0 kalibro_install
   - pushd kalibro_install
     # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
   - sudo apt-get remove libzmq3
+  - export KALIBRO_PROCESSOR_VERSION=v1.1.2
+  - export KALIBRO_CONFIGURATIONS_VERSION=v1.2.0
   - bash install.sh
   - popd
   - cp config/database.yml.sample config/database.yml
@@ -28,7 +28,7 @@ gem &#39;jbuilder&#39;, &#39;~&gt; 2.0&#39;
 gem 'devise', '~> 3.5.1'
 # Kalibro integration
-gem 'kalibro_client', '~> 1.4'
+gem 'kalibro_client', '~> 2.1.2'
 # PostgreSQL integration
 gem "pg", "~> 0.18.1"
@@ -119,7 +119,7 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
@@ -152,7 +152,7 @@ GEM
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
-    kalibro_client (1.4.1)
+    kalibro_client (2.1.2)
       activesupport (>= 2.2.1)
       faraday_middleware (~> 0.10.0)
     konacha (3.7.0)
@@ -353,7 +353,7 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails (~> 5.0.0)
   js-routes (~> 1.1.0)
-  kalibro_client (~> 1.4)
+  kalibro_client (~> 2.1.2)
   konacha
   less-rails (~> 2.7.0)
   mocha
 class Module.Tree
   @load: (loading_html, module_id) ->
+    # FIXME: The messages we send on loading_html are the same already
+    # shown on the Repository's show page
     $('div#module_tree').html(loading_html)
     $('div#metric_results').html(loading_html)
+    $('div#hotspot_metric_results').html(loading_html)
     $.post Routes.module_tree_path(module_id)
@@ -7,7 +7,7 @@ class CompoundMetricConfigurationsController &lt; BaseMetricConfigurationsControlle
     respond_to do |format|
       create_and_redir(format)
     end
-    Rails.cache.delete("#{params[:kalibro_configuration_id].to_i}_metric_configurations")
+    Rails.cache.delete("#{params[:kalibro_configuration_id].to_i}_tree_metric_configurations")
   end
   def show
@@ -30,7 +30,7 @@ class CompoundMetricConfigurationsController &lt; BaseMetricConfigurationsControlle
       else
         failed_action(format, 'edit')
       end
-      Rails.cache.delete("#{@compound_metric_configuration.kalibro_configuration_id}_metric_configurations")
+      Rails.cache.delete("#{@compound_metric_configuration.kalibro_configuration_id}_tree_metric_configurations")
     end
   end
@@ -28,8 +28,11 @@ class KalibroConfigurationsController &lt; ApplicationController
   # GET /kalibro_configurations/1
   # GET /kalibro_configurations/1.json
   def show
-    Rails.cache.fetch("#{@kalibro_configuration.id}_metric_configurations") do
-       @kalibro_configuration.metric_configurations
+    Rails.cache.fetch("#{@kalibro_configuration.id}_tree_metric_configurations") do
+      @kalibro_configuration.tree_metric_configurations
+    end
+    Rails.cache.fetch("#{@kalibro_configuration.id}_hotspot_metric_configurations") do
+      @kalibro_configuration.hotspot_metric_configurations
     end
   end
@@ -7,7 +7,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
   def new
     super
-    # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
+    # FIXME: find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
     metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(params[:metric_collector_name]).find_metric_by_code params[:metric_code]
     @reading_groups = ReadingGroup.public_or_owned_by_user(current_user).map { |reading_group|
       [reading_group.name, reading_group.id]
@@ -20,11 +20,11 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
     respond_to do |format|
       create_and_redir(format)
     end
-    Rails.cache.delete("#{params[:kalibro_configuration_id]}_metric_configurations")
+    clear_caches
   end
   def edit
-    #FIXME: set the configuration id just once!
+    # FIXME: set the configuration id just once!
     @kalibro_configuration_id = params[:kalibro_configuration_id]
     @metric_configuration.kalibro_configuration_id = @kalibro_configuration_id
     @reading_groups = ReadingGroup.public_or_owned_by_user(current_user).map { |reading_group|
@@ -38,7 +38,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
       if @metric_configuration.update(metric_configuration_params)
         format.html { redirect_to(kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), notice: t('successfully_updated', :record => t(metric_configuration.class))) }
         format.json { head :no_content }
-        Rails.cache.delete("#{@metric_configuration.kalibro_configuration_id}_metric_configurations")
+        clear_caches
       else
         failed_action(format, 'edit')
       end
@@ -51,7 +51,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
       format.html { redirect_to kalibro_configuration_path(params[:kalibro_configuration_id]) }
       format.json { head :no_content }
     end
-    Rails.cache.delete("#{params[:kalibro_configuration_id]}_metric_configurations")
+    clear_caches
   end
   protected
@@ -67,7 +67,12 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
   private
-  # Duplicated code on create and update actions extracted here
+  def clear_caches
+    Rails.cache.delete("#{params[:kalibro_configuration_id]}_tree_metric_configurations")
+    Rails.cache.delete("#{params[:kalibro_configuration_id]}_hotspot_metric_configurations")
+  end
+
+  # FIXME: Duplicated code on create and update actions extracted here
   def failed_action(format, destiny_action)
     @kalibro_configuration_id = params[:kalibro_configuration_id]
@@ -75,7 +80,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
     format.json { render json: @metric_configuration.kalibro_errors, status: :unprocessable_entity }
   end
-  #Code extracted from create action
+  # Code extracted from create action
   def create_and_redir(format)
     if @metric_configuration.save
       format.html { redirect_to kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), notice: t('successfully_created', :record => t(metric_configuration.class)) }
 class ModuleResult < KalibroClient::Entities::Processor::ModuleResult
   def metric_history(name)
-    history = KalibroClient::Entities::Processor::MetricResult.history_of(name, self.id, processing.repository_id)
+    history = KalibroClient::Entities::Processor::TreeMetricResult.history_of(name, self.id, processing.repository_id)
     grade_history = Hash.new
     history.each { |date_metric_result| grade_history[date_metric_result.date] = date_metric_result.metric_result.value }
 <tr>
   <td><%= metric_configuration.metric.name %></td>
   <td><%= metric_configuration.metric.code %></td>
-  <td><%= metric_configuration.weight %></td>
+  <% unless metric_configuration.metric.is_a? KalibroClient::Entities::Miscellaneous::HotspotMetric %>
+    <td><%= metric_configuration.weight %></td>
+  <% end %>
   <td>
     <%= link_to_show_page(metric_configuration, @kalibro_configuration.id) %>
   </td>
 <tr>
   <% col_number = kalibro_configuration_owner?(@kalibro_configuration.id) ? 5 : 3 %>
-  <td colspan="<%= col_number %>"><%= t('no_metric_configurations') %></td>
-</tr>
 \ No newline at end of file
+  <td colspan="<%= col_number %>">
+    <%= t(message) %>
+  </td>
+</tr>
@@ -8,13 +8,13 @@
 </p>
 <hr>
-<div id="metrics">
-<h2><%= t('metric').pluralize %></h2>
 <% if kalibro_configuration_owner? @kalibro_configuration.id %>
   <%= link_to t_action(:add, MetricConfiguration), kalibro_configuration_choose_metric_path(@kalibro_configuration.id), class: 'btn btn-info' %>
 <% end %>
+<div id="tree_metrics">
+<h2><%= t('tree_metric').pluralize %></h2>
-<table class="table table-hover">
+<table class="table table-hover" id="tree_metric_configurations">
   <thead>
     <tr>
       <th><%= t('metric') %></th>
@@ -24,10 +24,10 @@
     </tr>
   </thead>
   <tbody>
-    <% if Rails.cache.read("#{@kalibro_configuration.id}_metric_configurations").empty? %>
-      <%= render partial: 'no_metric_configurations' %>
+    <% if Rails.cache.read("#{@kalibro_configuration.id}_tree_metric_configurations").empty? %>
+      <%= render partial: 'no_metric_configurations', locals: { message: 'no_tree_metric_configurations' } %>
     <% else %>
-      <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@kalibro_configuration.id}_metric_configurations"), as: :metric_configuration %>
+      <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@kalibro_configuration.id}_tree_metric_configurations"), as: :metric_configuration %>
     <% end %>
   </tbody>
 </table>
@@ -35,6 +35,28 @@
 <hr>
+<div id="hotspot_metrics">
+<h2><%= t('hotspot_metric').pluralize %></h2>
+
+<table class="table table-hover" id="hotspot_metric_configurations">
+  <thead>
+    <tr>
+      <th><%= t('metric') %></th>
+      <th><%= t('code') %></th>
+      <th colspan="2"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if Rails.cache.read("#{@kalibro_configuration.id}_hotspot_metric_configurations").empty? %>
+      <%= render partial: 'no_metric_configurations', locals: { message: 'no_hotspot_metric_configurations' } %>
+    <% else %>
+      <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@kalibro_configuration.id}_hotspot_metric_configurations"), as: :metric_configuration %>
+    <% end %>
+  </tbody>
+</table>
+</div>
+
+<hr>
 <p>
  <%= link_to t('back'), kalibro_configurations_path, class: 'btn btn-default' %>
  <% if kalibro_configuration_owner? @kalibro_configuration.id %>
@@ -0,0 +1,5 @@
+<tr>
+  <td><%= hotspot_metric_result.module_result.kalibro_module.short_name %></td>
+  <td><%= hotspot_metric_result.line_number %></td>
+  <td><%= hotspot_metric_result.message %></td>
+</tr>
@@ -0,0 +1,15 @@
+<table class="table table-hover metric_results">
+  <thead>
+    <tr>
+      <th><%= t('activemodel.attributes.hotspot_metric_result.module_result.module.name') %></th>
+      <th><%= t('activemodel.attributes.hotspot_metric_result.line') %></th>
+      <th><%= t('activemodel.attributes.hotspot_metric_result.message') %></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% cache("#{@root_module_result.id}_hotspot_results") do %>
+      <%= render partial: 'hotspot_metric_result', collection: @root_module_result.hotspot_metric_results, locals: {module_result: @root_module_result} %>
+    <% end %>
+  </tbody>
+</table>
 <% metric_configuration = metric_result.metric_configuration %>
-<% unless metric_configuration.kalibro_ranges.nil? %>
+<% unless metric_configuration.metric.type == "HotspotMetricSnapshot" %>
   <% range_snapshot = find_range_snapshot(metric_result)
      metric_name = metric_configuration.metric.name
   %>
@@ -15,7 +15,7 @@
   </tr>
   <tr id="container<%= metric_result.id %>" style="display: none">
     <td colspan="4">
-      <span id="loader_container<%= metric_result.id %>"><%= image_tag 'loader.gif' %> <%= t('loading_data') %></span>
+      <span id="loader_container<%= metric_result.id %>"><%= image_tag 'loader.gif' %> <%= t('repository.show.loading') %></span>
       <canvas id="container<%= metric_result.id %>" class="graphic_container" style="display: none"></canvas>
     </td>
   </tr>
@@ -10,7 +10,7 @@
   <tbody>
     <% cache("#{@root_module_result.id}_results") do %>
-      <%= render partial: 'metric_result', collection: @root_module_result.metric_results, locals: {module_result: @root_module_result} %>
+      <%= render partial: 'metric_result', collection: @root_module_result.tree_metric_results, locals: {module_result: @root_module_result} %>
     <% end %>
   </tbody>
 </table>
@@ -7,6 +7,6 @@
     <% end %>
     <%= link_to format_module_name(module_result.kalibro_module.name), "#module_#{module_result.id}", onClick: "Module.Tree.load('#{escape_javascript(image_tag 'loader.gif')} #{escape_javascript(t('loading_data'))}', #{module_result.id});" %>
   </td>
-	<td><%= module_result.kalibro_module.granularity %></td>
+	<td><%= module_result.kalibro_module.granularity["type"] %></td>
 	<td><%= format_grade(module_result.grade) %></td>
 </tr>
@@ -4,7 +4,7 @@
 </p>
 <p>
   <strong><%= KalibroModule.human_attribute_name('granularity') %>:</strong>
-  <%= @root_module_result.kalibro_module.granularity %>
+  <%= @root_module_result.kalibro_module.granularity["type"] %>
 </p>
 <p>
   <strong><%= KalibroModule.human_attribute_name('grade') %>:</strong>
 $('div#module_tree').html('<%= escape_javascript(render partial: "module_tree") %>');
+$('div#hotspot_metric_results').html('<%= escape_javascript(render partial: "hotspot_metric_results") %>')
 $('div#metric_results').html('<%= escape_javascript(render partial: "metric_results") %>');
@@ -0,0 +1 @@
+<p><%= t('activemodel.errors.repository.no_hotspot_metric_results') %></p>
 $('div#processing_information').html('<%= escape_javascript(render partial: "processing_information") %>');
 $('div#module_tree').html('<%= escape_javascript(render partial: "module_tree_error") %>');
-$('div#metric_results').html('<%= escape_javascript(render partial: "metric_results_error") %>');
 \ No newline at end of file
+$('div#hotspot_metric_results').html('<%= escape_javascript(render partial: "hotspot_metric_results_error") %>');
+$('div#metric_results').html('<%= escape_javascript(render partial: "metric_results_error") %>');
@@ -64,6 +64,11 @@
     <div id="module_tree"><%= image_tag 'loader.gif' %> <%= t('repository.show.loading') %></div>
   </div>
+  <div id="hotspot-metric-accordion">
+    <h3 class="jquery-ui-accordion"><%= t('repository.show.hotspot_metric_results') %></h3>
+    <div id="hotspot_metric_results"><%= image_tag 'loader.gif' %> <%= t('repository.show.loading') %></div>
+  </div>
+
   <div id="metric-accordion">
     <h3 class="jquery-ui-accordion"><%= t('repository.show.metric_results') %></h3>
     <div id="metric_results"><%= image_tag 'loader.gif' %> <%= t('repository.show.loading') %></div>
@@ -81,6 +86,7 @@
       collapsible: true,
     });
     $("#module-accordion").accordion({active: false})
+    $("#hotspot-metric-accordion").accordion({active: false})
     $("#metric-accordion").accordion({active: false})
   });
 </script>
@@ -47,6 +47,10 @@ en:
   no_description: "There is no description available"
   welcome: "Welcome"
   metrics: "Metrics"
+  tree_metrics: "Tree Metrics"
+  tree_metric: "Tree Metric"
+  hotspot_metrics: "Hotspot Metrics"
+  hotspot_metric: "Hotspot Metric"
   value: "Value"
   threshold: "Threshold"
   granularity: "Granularity"
@@ -23,7 +23,8 @@ en:
   metric_configurations_base_tool_name: "Base Tool Name:"
   metric_configurations_aggregation: "Aggregation Form"
   metric_configurations_reading_group: "Reading Group Name"
-  no_metric_configurations: "There are no Metric Configurations yet!"
+  no_tree_metric_configurations: "There are no Tree Metric Configurations yet!"
+  no_hotspot_metric_configurations: "There are no Hotspot Metric Configurations yet!"
   destroy_metric_configuration: "Destroy Metric Configuration"
   want_destroy_metric_configuration: "Are you sure that you want to destroy this Metric Configuration?"
   metric_base_tool_name: "Base Tool Name"
@@ -27,7 +27,8 @@ pt:
   metric_configurations_base_tool_name: "Nome da ferramenta base:"
   metric_configurations_aggregation: "Forma de Agregação"
   metric_configurations_reading_group: "Nome do grupo"
-  no_metric_configurations: "Não há configurações de métricas ainda!"
+  no_tree_metric_configurations: "Não há configurações de métricas escalares ainda!"
+  no_hotspot_metric_configurations: "Não há configurações de métricas de Hotspot ainda!"
   destroy_metric_configuration: "Destruir Configuração de Métrica"
   want_destroy_metric_configuration: "Tem certeza que você quer destruir esta Configuração de Métrica?"
   metric_base_tool_name: "Coletor"
@@ -17,3 +17,6 @@ en:
         name: "Name"
         granularity: "Granularity"
         grade: "Grade"
+      hotspot_metric_result:
+        line: "Line"
+        message: "Message"
@@ -16,4 +16,7 @@ pt:
       kalibro_module:
         name: "Nome"
         granularity: "Granularidade"
-        grade: "Nota"
 \ No newline at end of file
+        grade: "Nota"
+      hotspot_metric_result:
+        line: "Linha"
+        message: "Mensagem"
@@ -50,6 +50,10 @@ pt:
   no_description: "Não há descrição disponível."
   welcome: "Bem-Vindo"
   metrics: "Métricas"
+  tree_metrics: "Métricas escalares"
+  tree_metric: "Métrica escalar"
+  hotspot_metrics: "Métricas de Hotspot"
+  hotspot_metric: "Métrica de Hotspot"
   value: "Valor"
   threshold: "limite"
   granularity: "Granularidade"
@@ -25,14 +25,16 @@ en:
         branch: "The branch to be analyzed."
     errors:
       repository:
-        no_metric_results: "Repository process returned with error. There are no metric results."
-        no_modeule_tree: "Repository process returned with error. There is no module tree."
+        no_metric_results: "Repository process returned with error. There are no tree metric results."
+        no_hotspot_metric_results: "Repository process returned with error. There are no hotspot metric results."
+        no_module_tree: "Repository process returned with error. There is no module tree."
         unstarted_processing: "This Repository has no processings yet. Please, wait an instant as we start it."
   repository:
     show:
       reprocess: "Reprocess"
       processing_information: "Processing Information"
       modules_tree: "Modules Tree"
-      metric_results: "Metric Results"
+      hotspot_metric_results: "Hotspot Metric Results"
+      metric_results: "Tree Metric Results"
       loading: "Loading data. Please, wait."
       date_processing: "Retrieve the closest processing information from"
@@ -26,13 +26,15 @@ pt:
     errors:
       repository:
         no_metric_results: "O processamento do Repósitório retornou um erro. Não há Resultados de Métrica."
-        no_modeule_tree: "Repository process returned with error. Não há uma Árvore de Módulos."
+        no_hotspot_metric_results: "O processamento do Repósitório retornou um erro. Não há Resultados de Métricas de Hotspot."
+        no_module_tree: "Repository process returned with error. Não há uma Árvore de Módulos."
         unstarted_processing: "Este Repositório ainda não tem Processamentos. Por favor, aguarde um instante enquanto o iniciamos."
   repository:
     show:
       reprocess: "Reprocessar"
       processing_information: "Informação do Processamento"
       modules_tree: "Árvore de Módulos"
+      hotspot_metric_results: "Resultados de Métricas de Hotspot"
       metric_results: "Resultados de Métrica"
       loading: "Carregando os dados. Por favor, aguarde."
       date_processing: "Obtenha a informação de processamento mais próxima a"
@@ -9,7 +9,7 @@ Feature: Compound Metric Configuration Creation
     And I am signed in
     And I own a sample configuration
     And I have a reading group named "Scholar"
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I am at the Sample Configuration page
     And I click the Add Metric link
     And I click the Compound Metric link
@@ -9,10 +9,10 @@ Feature: Compound Metric Configuration edition
     And I am signed in
     And I have a sample configuration
     And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample compound metric configuration within the given mezuro configuration
     When I am at the Sample Configuration page
-    Then I should not see Edit within table
+    Then I should not find "Edit" within "table#tree_metric_configurations"
   @kalibro_configuration_restart
   Scenario: editing a compound metric configuration successfully
@@ -20,7 +20,7 @@ Feature: Compound Metric Configuration edition
     And I am signed in
     And I own a sample configuration
     And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample compound metric configuration within the given mezuro configuration
     And I am at the Sample Configuration page
     When I click the edit link of the Coumpound Metric
@@ -30,13 +30,13 @@ Feature: Compound Metric Configuration edition
     Then I should see "Another_code"
     And I should see "Compound Metric Configuration was successfully updated."
-  @kalibro_configuration_restart@javascript
+  @kalibro_configuration_restart @javascript
   Scenario: trying to edit with blank fields
     Given I am a regular user
     And I am signed in
     And I own a sample configuration
     And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample compound metric configuration within the given mezuro configuration
     When I visit the sample compound metric configuration edit page
     And I fill the Name field with " "
@@ -57,7 +57,7 @@ Feature: Compound Metric Configuration edition
     And I am signed in
     And I own a sample configuration
     And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample compound metric configuration within the given mezuro configuration
     And I have another compound metric configuration with code "Another_Code" within the given mezuro configuration
     When I visit the sample compound metric configuration edit page
@@ -0,0 +1,18 @@
+Feature: Hotspot Metric Configuration Creation
+  In order to register my metric configurations
+  As a regular user
+  I should be able to create hotspot metric configurations
+
+  @kalibro_configuration_restart @javascript
+  Scenario: hotspot metric configuration creation
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "MetricFu" h3
+    And I click the Duplicate Code link
+    When I fill the Weight field with "2"
+    And I press the Save button
+    Then I should see "Hotspot Metrics"
+    And I should see "Duplicate Code"
@@ -0,0 +1,23 @@
+Feature: Hotspot Configuration listing
+  In order to interact with hotspot metric configurations
+  As a regular user
+  I should see the hotspot metric configurations of a given kalibro configuration
+
+  @kalibro_configuration_restart
+  Scenario: When there are hotspot metric configurations and no tree metric configurations
+    Given I have a sample configuration
+    And I have a sample hotspot metric configuration within the given mezuro configuration
+    When I am at the Sample Configuration page
+    Then I should see the sample hotspot metric configuration content
+    And I should see "There are no Tree Metric Configurations yet!"
+  
+  
+  @kalibro_configuration_restart
+  Scenario: When there are hotspot metric configurations and tree metric configurations
+    Given I have a sample configuration
+    And I have a sample hotspot metric configuration within the given mezuro configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I am at the Sample Configuration page
+    Then I should see the sample hotspot metric configuration content
+    And I should not see "There are no Tree Metric Configurations yet!"
 Feature: Show Configuration
-  In order to know all the contents of a given configuration 
+  In order to know all the contents of a given configuration
   As a regular user
   I should be able to see each of them
 @kalibro_configuration_restart
 Scenario: Checking configuration contents
   Given I have a sample configuration
+  And I have a hotspot metric configuration
+  And I have a tree metric configuration
   When I am at the Sample Configuration page
   Then the sample configuration should be there
 \ No newline at end of file
@@ -9,7 +9,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the sample metric configuration page
     When I click the Add Range link
@@ -25,7 +25,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I have a reading group named "Scholar"
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I am at the sample metric configuration page
     When I click the Add Range link
     Then I should be at the New Range page
@@ -41,7 +41,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I am at the sample metric configuration page
     When I click the Add Range link
     Then I should be at the New Range page
@@ -61,7 +61,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page
     And I fill the Beginning field with "42"
@@ -77,7 +77,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page
     And I fill the Beginning field with "666"
@@ -95,7 +95,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page
     And I fill the Beginning field with "z"
@@ -113,7 +113,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page
     And I fill the Beginning field with "-1"
@@ -131,9 +131,9 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample range within the sample metric configuration with beginning "2"
+    And I have a sample range within the sample tree metric configuration with beginning "2"
     And I am at the New Range page
     And I fill the Beginning field with "2"
     And I fill the End field with "666"
@@ -151,7 +151,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page
     And I click the -∞ link
@@ -169,7 +169,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page
     And I fill the Beginning field with "2"
@@ -193,7 +193,7 @@ Feature: Create Kalibro Range
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample compound metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
     And I am at the New Range page for the compound metric configuration
@@ -9,9 +9,9 @@ Feature: Kalibro Range Deletion
     And I am signed in
     And I own a sample configuration
     And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample range within the sample metric configuration
+    And I have a sample range within the sample tree metric configuration
     And I am at the sample metric configuration page
     When I click the Destroy link
     Then I should be at metric configuration sample page
@@ -37,8 +37,8 @@ Feature: Kalibro Range Deletion
     And I am signed in
     And I have a sample configuration
     And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample range within the sample metric configuration
+    And I have a sample range within the sample tree metric configuration
     When I am at the sample metric configuration page
     Then I should not see "Destroy"
@@ -9,9 +9,9 @@ Feature: Kalibro Range Edit
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample range within the sample metric configuration with beginning "1.1"
+    And I have a sample range within the sample tree metric configuration with beginning "1.1"
     And I am at the Edit Kalibro Range page
     And the select field "Reading" is set as "My Reading"
     And the field "Beginning" should be filled with "1.1"
@@ -45,9 +45,9 @@ Feature: Kalibro Range Edit
     And I am signed in
     And I own a sample configuration
     And I own a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
+    And I have a sample tree metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample range within the sample metric configuration with beginning "1"
+    And I have a sample range within the sample tree metric configuration with beginning "1"
     And I am at the Edit Kalibro Range page
     When I fill the Beginning field with " "
     And I press the Save button
@@ -1,91 +0,0 @@
-Feature: Metric Configuration Creation
-  In order to register my metric configurations
-  As a regular user
-  I should be able to create metric configurations
-
-  @kalibro_configuration_restart
-  Scenario: Should not create metric configurations without login
-    Given I have a sample configuration
-    And I am at the Sample Configuration page
-    Then I should not see "New Metric Configuration"
-
-  @kalibro_configuration_restart @javascript
-  Scenario: metric configuration creation
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a reading group named "Scholar"
-    And I am at the Sample Configuration page
-    And I click the Add Metric link
-    And I click the "Analizo" h3
-    And I click the Total Lines of Code link
-    And I fill the Weight field with "2"
-    And I set the select field "Aggregation Form" as "Average"
-    And I set the select field "Reading Group" as "Scholar"
-    When I press the Save button
-    Then I should see "Total Lines of Code"
-    Then I should see "2"
-
-  @kalibro_configuration_restart @javascript
-  Scenario: ruby metric configuration creation
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a reading group named "Scholar"
-    And I am at the Sample Configuration page
-    And I click the Add Metric link
-    And I click the "MetricFu" h3
-    And I click the Pain link
-    And I fill the Weight field with "2"
-    And I set the select field "Aggregation Form" as "Average"
-    And I set the select field "Reading Group" as "Scholar"
-    When I press the Save button
-    Then I should see "Pain"
-    Then I should see "2"
-
-  @kalibro_configuration_restart @javascript
-  Scenario: metric configuration creation
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a reading group named "Scholar"
-    And I am at the Sample Configuration page
-    And I click the Add Metric link
-    And I click the "Analizo" h3
-    And I click the Total Lines of Code link
-    When I click the Back link
-    Then I should be at the choose metric page
-
-  @kalibro_configuration_restart @javascript
-  Scenario: compound metric configuration creation with same code
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a reading group named "Scholar"
-    And I have a metric configuration with code "total_abstract_classes" within the given mezuro configuration
-    And I am at the Sample Configuration page
-    And I click the Add Metric link
-    And I click the "Analizo" h3
-    And I click the Total Abstract Classes link
-    And I fill the Weight field with "2"
-    And I set the select field "Aggregation Form" as "Average"
-    And I set the select field "Reading Group" as "Scholar"
-    When I press the Save button
-    Then I should see "Code must be unique within a kalibro configuration"
-
-  @kalibro_configuration_restart @javascript
-  Scenario: metric configuration creation with count aggregation form
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a reading group named "Scholar"
-    And I am at the Sample Configuration page
-    And I click the Add Metric link
-    And I click the "Analizo" h3
-    And I click the Lines of Code link
-    And I fill the Weight field with "100"
-    And I set the select field "Aggregation Form" as "Count"
-    And I set the select field "Reading Group" as "Scholar"
-    When I press the Save button
-    Then I should see "Lines of Code"
-    Then I should see "100"
@@ -1,25 +0,0 @@
-Feature: Metric Configuration Deletion
-  In order to be able to remove metric configuration
-  As a regular user
-  The system should have an interface to it
-
-  @kalibro_configuration_restart
-  Scenario: Should delete a metric configuration that I own
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    When I am at the Sample Configuration page
-    And I click destroy Metric Configuration
-    Then I should see "There are no Metric Configurations yet!"
-
-  @kalibro_configuration_restart
-  Scenario: Should not see the destroy metric configuration link in the mezuro configuration that I not own
-    Given I am a regular user
-    And I am signed in
-    And I have a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    When I am at the Sample Configuration page
-    Then I should not see "Destroy"
@@ -1,52 +0,0 @@
-Feature: Metric Configuration edition
-  In order to interact with metric configurations
-  As a regular user
-  I should edit the informations of metric configurations
-
-  @kalibro_configuration_restart
-  Scenario: the configuration is not mine
-    Given I am a regular user
-    And I am signed in
-    And I have a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    When I am at the Sample Configuration page
-    Then I should not see Edit within table
-
-  @kalibro_configuration_restart
-  Scenario: editing a metric configuration successfully
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    And I am at the Sample Configuration page
-    When I click the Edit link
-    And I fill the Weight field with "3.0"
-    And I press the Save button
-    Then I should see "3.0"
-
-  @kalibro_configuration_restart
-  Scenario: trying to edit with blank fields
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    When I visit the sample metric configuration edit page
-    And I fill the Weight field with " "
-    And I press the Save button
-    Then I should see "Weight must be greater than 0"
-
-  @kalibro_configuration_restart
-  Scenario: Should not edit a metric configuration with invalid weight
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    When I visit the sample metric configuration edit page
-    And I fill the Weight field with "0"
-    And I set the select field "Aggregation Form" as "Median"
-    When I press the Save button
-    Then I should see "Weight must be greater than 0"
@@ -1,37 +0,0 @@
-Feature: Configuration listing
-  In order to interact with metric configurations
-  As a regular user
-  I should see the metric configurations of a given configuration
-
-  @kalibro_configuration_restart
-  Scenario: When there are no metric configurations
-    Given I have a sample configuration
-    When I am at the Sample Configuration page
-    Then I should see "Metric"
-    And I should see "Code"
-    And I should see "Weight"
-    And I should see "There are no Metric Configurations yet!"
-
-  @kalibro_configuration_restart
-  Scenario: When there are metric configurations
-    Given I have a sample configuration
-    And I have a sample reading group
-    And I have a sample metric configuration within the given mezuro configuration
-    When I am at the Sample Configuration page
-    Then I should see the sample metric configuration content
-
-  @kalibro_configuration_restart
-  Scenario: I should see the add metric link when I am the owner of the given configuration
-    Given I am a regular user
-    And I am signed in
-    And I own a sample configuration
-    When I am at the Sample Configuration page
-    Then I should see "Add Metric"
-
-  @kalibro_configuration_restart
-  Scenario: I should not see the add metric link when I am at a given configuration page
-    Given I am a regular user
-    And I am signed in
-    And I have a sample configuration
-    When I am at the Sample Configuration page
-    Then I should not see "Add Metric"
@@ -1,28 +0,0 @@
-Feature: Show Metric Configuration
-  In order to know all the metric configurations of the given configuration and its contents
-  As a regular user
-  I should be able to see each of them
-
-  @kalibro_configuration_restart
-  Scenario: Checking metric configuration show link
-    Given I have a sample configuration
-    And I have a sample reading group
-    And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample metric configuration within the given mezuro configuration
-    And I have a sample range within the sample metric configuration
-    When I am at the Sample Configuration page
-    And I click the Show link
-    Then I should be at metric configuration sample page
-    And I should see the sample range
-
-  @kalibro_configuration_restart @javascript
-  Scenario: When there's a range created and I want to see its comments
-    Given I have a sample configuration
-    And I have a sample reading group
-    And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample metric configuration within the given mezuro configuration
-    And I have a sample range within the sample metric configuration
-    And I am at the sample metric configuration page
-    When I click the "comment-icon" icon
-    Then I should see "Comment"
-
@@ -0,0 +1,43 @@
+Feature: Repository hotspot metric results
+  In order to better understand the results of the analysis
+  As a regular user
+  I should see the hotspot metric results list
+
+  @kalibro_configuration_restart @kalibro_processor_restart @javascript
+  Scenario: Should show the message when the graphic of the given metric has only a single point
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "MetricFu" h3
+    And I click the Duplicate Code link
+    When I fill the Weight field with "2"
+    And I press the Save button
+    Given I have a sample project
+    And I have a sample ruby repository within the sample project
+    And I start to process that repository
+    And I wait up for a ready processing
+    And I ask for the last ready processing of the given repository
+    And I ask for the module result of the given processing
+    And I ask for the hotspot metric results of the given module result
+    When I visit the repository show page
+    And I click the "Hotspot Metric Results" h3
+    Then I should have at least one hotspot metric result
+    And I should see the hotspot metric results file names
+    And I should see the hotspot metric results messages
+    When I click the "Tree Metric Results" h3
+    Then I should not see "Duplicate Code"
+
+  @kalibro_configuration_restart @kalibro_processor_restart @javascript
+  Scenario: Should show the error message when the process fails
+    Given I am a regular user
+    And I am signed in
+    And I have a sample project
+    And I have a sample configuration with native metrics
+    And I have a sample of an invalid repository within the sample project
+    And I start to process that repository
+    And I wait up for a error processing
+    When I visit the repository show page
+    And I click the "Hotspot Metric Results" h3
+    Then I should see "Repository process returned with error. There are no hotspot metric results."
@@ -22,7 +22,7 @@ Feature: Date Select
     And I should see "AGGREGATING time"
     And I should see "CALCULATING time"
     And I should see "INTERPRETING time"
-    When I click the "Metric Results" h3
+    When I click the "Tree Metric Results" h3
     And I click the "Modules Tree" h3
     Then I should see "Metric"
     And I should see "Value"
@@ -35,4 +35,4 @@ Feature: Date Select
     Then I should see "PREPARING"
     When I click the Back link
     And I wait for "5" seconds
-    Then I should be at the Repositories index
 \ No newline at end of file
+    Then I should be at the Repositories index
@@ -3,7 +3,7 @@ Feature: Repository metric results
   As a regular user
   I should see the metric results table with its graphics
-  @kalibro_configuration_restart @kalibro_processor_restart @javascript @wip
+  @kalibro_configuration_restart @kalibro_processor_restart @javascript
   Scenario: Should show the message when the graphic of the given metric has only a single point
     Given I am a regular user
     And I am signed in
@@ -16,12 +16,10 @@ Feature: Repository metric results
     And I ask for the module result of the given processing
     And I ask for the metric results of the given module result
     When I visit the repository show page
-    And I click the "Metric Results" h3
+    And I click the "Tree Metric Results" h3
     And I see a sample metric's name
     And I click on the sample metric's name
     Then I should see "Loading data. Please, wait."
-    When I wait up for the ajax request
-    Then I should see "There is only one point and it will not be printed into a chart."
   @kalibro_configuration_restart @kalibro_processor_restart @javascript
   Scenario: Should show no range message after a process without range
@@ -36,7 +34,7 @@ Feature: Repository metric results
     And I ask for the module result of the given processing
     And I ask for the metric results of the given module result
     When I visit the repository show page
-    And I click the "Metric Results" h3
+    And I click the "Tree Metric Results" h3
     And I see a sample metric's name
     Then I should see "Missing range"
@@ -50,8 +48,8 @@ Feature: Repository metric results
     And I start to process that repository
     And I wait up for a error processing
     When I visit the repository show page
-    And I click the "Metric Results" h3
-    Then I should see "Repository process returned with error. There are no metric results."
+    And I click the "Tree Metric Results" h3
+    Then I should see "Repository process returned with error. There are no tree metric results."
   # TODO: Scenario: Should show the graphic of a given metric
   #         It was getting really difficult to test this because of Poltergeist's timeouts
@@ -36,14 +36,12 @@ Feature: Repository modules tree
     And I should see "Granularity"
     And I should see "Grade"
-    # This test is broken under analizo 1.17.0: https://www.pivotaltracker.com/story/show/80377258
-  @wip @kalibro_configuration_restart @kalibro_processor_restart @javascript
+  @kalibro_configuration_restart @kalibro_processor_restart @javascript
   Scenario: Module navigation
     Given I am a regular user
     And I am signed in
-    And I have a sample project
-    And I have a sample configuration with native metrics
-    And I have a sample repository within the sample project
+    And I have a sample configuration with ruby native metrics
+    And I have a sample repository
     And I start to process that repository
     And I wait up for a ready processing
     And I ask for the last ready processing of the given repository
@@ -66,4 +64,5 @@ Feature: Repository modules tree
     And I ask for the module result of the given processing
     When I visit the repository show page
     And I click the "Modules Tree" h3
+    And I take a picture of the page
     Then I should see the given module result
@@ -40,7 +40,7 @@ Feature: Show Repository
     And I should see "AGGREGATING time"
     And I should see "CALCULATING time"
     And I should see "INTERPRETING time"
-    When I click the "Metric Results" h3
+    When I click the "Tree Metric Results" h3
     And I click the "Modules Tree" h3
     Then I should see "Metric"
     And I should see "Value"
@@ -67,7 +67,7 @@ Feature: Show Repository
     And I should see "Configuration"
     And I should see "State"
     And I should see "Creation Date"
-    When I click the "Metric Results" h3
+    When I click the "Tree Metric Results" h3
     Then I should see "Loading data. Please, wait."
     When I click the "Modules Tree" h3
     Then I should see "Loading data. Please, wait."
@@ -13,7 +13,14 @@ end
 Given(/^I have a sample configuration$/) do
   @kalibro_configuration = FactoryGirl.create(:kalibro_configuration)
   FactoryGirl.create(:kalibro_configuration_attributes, user_id: FactoryGirl.create(:another_user).id, kalibro_configuration_id: @kalibro_configuration.id)
+end
+Given(/^I have a sample configuration with hotspot metrics$/) do
+  @kalibro_configuration = FactoryGirl.create(:kalibro_configuration, name: 'Sample Ruby Configuration')
+  FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: @user.id, kalibro_configuration_id: @kalibro_configuration.id})
+
+  metric_configuration = FactoryGirl.create(:hotspot_metric_configuration,
+                                            { kalibro_configuration_id: @kalibro_configuration.id} )
 end
 Given(/^I own a sample configuration$/) do
@@ -94,4 +101,3 @@ Then(/^the private configuration should not be there$/) do
   expect(page).to have_no_content(@private_kc.name)
   expect(page).to have_no_content(@private_kc.description)
 end
-
-Given(/^I have a sample range within the sample metric configuration with beginning "(.*?)"$/) do |beginning|
+Given(/^I have a sample range within the sample tree metric configuration with beginning "(.*?)"$/) do |beginning|
   @kalibro_range = FactoryGirl.create(:kalibro_range, {beginning: beginning, metric_configuration_id: @metric_configuration.id,
                                      reading_id: @reading.id})
 end
@@ -20,7 +20,7 @@ Given(/^the select field &quot;(.*?)&quot; is set as &quot;(.*?)&quot;$/) do |field, text|
   select text, from: field
 end
-Given(/^I have a sample range within the sample metric configuration$/) do
+Given(/^I have a sample range within the sample tree metric configuration$/) do
   @kalibro_range = FactoryGirl.create(:kalibro_range, {metric_configuration_id: @metric_configuration.id,
                                      reading_id: @reading.id})
 end
-Given(/^I have a sample metric configuration within the given mezuro configuration$/) do
+Given(/^I have a sample tree metric configuration within the given mezuro configuration$/) do
   @metric_configuration = FactoryGirl.create(:metric_configuration_with_id,
     {kalibro_configuration_id: @kalibro_configuration.id, reading_group_id: @reading_group.id} )
 end
+Given(/^I have a sample hotspot metric configuration within the given mezuro configuration$/) do
+  @metric_configuration = FactoryGirl.create(:hotspot_metric_configuration,
+                                             kalibro_configuration_id: @kalibro_configuration.id)
+end
+
+
 Given(/^I have a metric configuration with code "(.*?)" within the given mezuro configuration$/) do |code|
   @metric_configuration = FactoryGirl.create(:metric_configuration_with_id,
     {kalibro_configuration_id: @kalibro_configuration.id, reading_group_id: @reading_group.id, metric: FactoryGirl.build(:metric, code: code)})
@@ -23,6 +29,16 @@ Given(/^I have a sample configuration with MetricFu metrics$/) do
                                              kalibro_configuration_id: @kalibro_configuration.id})
 end
+Given(/^I have a tree metric configuration$/) do
+  @tree_metric_configuration = FactoryGirl.create(:metric_configuration_with_id,
+    {kalibro_configuration_id: @kalibro_configuration.id, metric: FactoryGirl.build(:hotspot_metric)})
+end
+
+Given(/^I have a hotspot metric configuration$/) do
+  @hotspot_metric_configuration = FactoryGirl.create(:metric_configuration_with_id,
+    {kalibro_configuration_id: @kalibro_configuration.id, metric: FactoryGirl.build(:pain)})
+end
+
 When(/^I visit the sample metric configuration edit page$/) do
   visit edit_kalibro_configuration_metric_configuration_path(kalibro_configuration_id: @metric_configuration.kalibro_configuration_id, id: @metric_configuration.id)
 end
@@ -41,12 +57,17 @@ Then(/^I am at the sample metric configuration page$/) do
   expect(page).to have_content("Ranges")
 end
-Then(/^I should see the sample metric configuration content$/) do
+Then(/^I should see the sample tree metric configuration content$/) do
   expect(page).to have_content(@metric_configuration.metric.name)
   expect(page).to have_content(@metric_configuration.metric.code)
   expect(page).to have_content(@metric_configuration.weight)
 end
+Then(/^I should see the sample hotspot metric configuration content$/) do
+  expect(page).to have_content(@metric_configuration.metric.name)
+  expect(page).to have_content(@metric_configuration.metric.code)
+end
+
 Then(/^I should be at metric configuration sample page$/) do
   expect(page).to have_content(@metric_configuration.metric.name)
   expect(page).to have_content("Ranges")
@@ -56,6 +77,16 @@ Then(/^I should be at the choose metric page$/) do
   expect(page).to have_content("Choose a metric from a Base Tool:")
 end
+Then(/^the tree configuration should be there$/) do
+  expect(page).to have_content(@tree_metric_configuration.metric.name)
+  expect(page).to have_content(@tree_metric_configuration.metric.code)
+end
+
+Then(/^the hotspot configuration should be there$/) do
+  expect(page).to have_content(@hotspot_metric_configuration.metric.name)
+  expect(page).to have_content(@hotspot_metric_configuration.metric.code)
+end
+
 When(/^I click destroy Metric Configuration$/) do
-  find('#metrics').first(:link, "Destroy").click
+  find('#tree_metrics').first(:link, "Destroy").click
 end
@@ -50,6 +50,10 @@ Then(/^I should not see (.+) within (.+)$/) do |text, selector|
   expect(page.find(selector)).to_not have_content(text)
 end
+Then(/^I should not find "(.+)" within "(.+)"$/) do |text, selector|
+  step "I should not see #{text} within #{selector}"
+end
+
 Then(/^the sample project should be there$/) do
   expect(page).to have_content(@project.name)
   expect(page).to have_content(@project.description)
@@ -96,7 +96,11 @@ Given(/^I ask for the module result of the given processing$/) do
 end
 Given(/^I ask for the metric results of the given module result$/) do
-  @metric_results = @module_result.metric_results
+  @metric_results = @module_result.tree_metric_results
+end
+
+Given(/^I ask for the hotspot metric results of the given module result$/) do
+  @metric_results = @module_result.hotspot_metric_results
 end
 Given(/^I see a sample metric's name$/) do
@@ -220,4 +224,18 @@ Then(/^I should be at the Repositories index$/) do
   expect(page.current_path).to end_with(repositories_path) # We use end_with in order to avoid the language route
 end
+Then(/^I should have at least one hotspot metric result$/) do
+  expect(@metric_results.count).to be > 0
+end
+
+Then(/^I should see the hotspot metric results messages$/) do
+  @metric_results.each do |metric_result|
+    expect(page).to have_content(metric_result.message)
+  end
+end
+Then(/^I should see the hotspot metric results file names$/) do
+  @metric_results.each do |metric_result|
+    expect(page).to have_content(metric_result.module_result.kalibro_module.short_name)
+  end
+end
@@ -15,3 +15,8 @@ Before do |scenario|
   I18n.locale = I18n.default_locale
 end
+
+AfterConfiguration do |config|
+  KalibroClient::KalibroCucumberHelpers.clean_configurations
+  KalibroClient::KalibroCucumberHelpers.clean_processor
+end
@@ -0,0 +1,91 @@
+Feature: Tree Metric Configuration Creation
+  In order to register my metric configurations
+  As a regular user
+  I should be able to create metric configurations
+
+  @kalibro_configuration_restart
+  Scenario: Should not create metric configurations without login
+    Given I have a sample configuration
+    And I am at the Sample Configuration page
+    Then I should not see "New Metric Configuration"
+
+  @kalibro_configuration_restart @javascript
+  Scenario: metric configuration creation
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a reading group named "Scholar"
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "Analizo" h3
+    And I click the Total Lines of Code link
+    And I fill the Weight field with "2"
+    And I set the select field "Aggregation Form" as "Average"
+    And I set the select field "Reading Group" as "Scholar"
+    When I press the Save button
+    Then I should see "Total Lines of Code"
+    Then I should see "2"
+
+  @kalibro_configuration_restart @javascript
+  Scenario: ruby metric configuration creation
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a reading group named "Scholar"
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "MetricFu" h3
+    And I click the Pain link
+    And I fill the Weight field with "2"
+    And I set the select field "Aggregation Form" as "Average"
+    And I set the select field "Reading Group" as "Scholar"
+    When I press the Save button
+    Then I should see "Pain"
+    Then I should see "2"
+
+  @kalibro_configuration_restart @javascript
+  Scenario: metric configuration creation
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a reading group named "Scholar"
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "Analizo" h3
+    And I click the Total Lines of Code link
+    When I click the Back link
+    Then I should be at the choose metric page
+
+  @kalibro_configuration_restart @javascript
+  Scenario: compound metric configuration creation with same code
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a reading group named "Scholar"
+    And I have a metric configuration with code "total_abstract_classes" within the given mezuro configuration
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "Analizo" h3
+    And I click the Total Abstract Classes link
+    And I fill the Weight field with "2"
+    And I set the select field "Aggregation Form" as "Average"
+    And I set the select field "Reading Group" as "Scholar"
+    When I press the Save button
+    Then I should see "Code must be unique within a kalibro configuration"
+
+  @kalibro_configuration_restart @javascript
+  Scenario: metric configuration creation with count aggregation form
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a reading group named "Scholar"
+    And I am at the Sample Configuration page
+    And I click the Add Metric link
+    And I click the "Analizo" h3
+    And I click the Lines of Code link
+    And I fill the Weight field with "100"
+    And I set the select field "Aggregation Form" as "Count"
+    And I set the select field "Reading Group" as "Scholar"
+    When I press the Save button
+    Then I should see "Lines of Code"
+    Then I should see "100"
@@ -0,0 +1,25 @@
+Feature: Metric Configuration Deletion
+  In order to be able to remove metric configuration
+  As a regular user
+  The system should have an interface to it
+
+  @kalibro_configuration_restart
+  Scenario: Should delete a metric configuration that I own
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I am at the Sample Configuration page
+    And I click destroy Metric Configuration
+    Then I should see "There are no Tree Metric Configurations yet!"
+
+  @kalibro_configuration_restart
+  Scenario: Should not see the destroy metric configuration link in the mezuro configuration that I not own
+    Given I am a regular user
+    And I am signed in
+    And I have a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I am at the Sample Configuration page
+    Then I should not see "Destroy"
@@ -0,0 +1,52 @@
+Feature: Metric Configuration edition
+  In order to interact with metric configurations
+  As a regular user
+  I should edit the informations of metric configurations
+
+  @kalibro_configuration_restart
+  Scenario: the configuration is not mine
+    Given I am a regular user
+    And I am signed in
+    And I have a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I am at the Sample Configuration page
+    Then I should not see Edit within table#tree_metric_configurations
+
+  @kalibro_configuration_restart
+  Scenario: editing a metric configuration successfully
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    And I am at the Sample Configuration page
+    When I click the Edit link
+    And I fill the Weight field with "3.0"
+    And I press the Save button
+    Then I should see "3.0"
+
+  @kalibro_configuration_restart
+  Scenario: trying to edit with blank fields
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I visit the sample metric configuration edit page
+    And I fill the Weight field with " "
+    And I press the Save button
+    Then I should see "Weight must be greater than 0"
+
+  @kalibro_configuration_restart
+  Scenario: Should not edit a metric configuration with invalid weight
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I visit the sample metric configuration edit page
+    And I fill the Weight field with "0"
+    And I set the select field "Aggregation Form" as "Median"
+    When I press the Save button
+    Then I should see "Weight must be greater than 0"
@@ -0,0 +1,38 @@
+Feature: Metric Configuration listing
+  In order to interact with metric configurations
+  As a regular user
+  I should see the metric configurations of a given configuration
+
+  @kalibro_configuration_restart
+  Scenario: When there are no tree metric configurations
+    Given I have a sample configuration
+    When I am at the Sample Configuration page
+    Then I should see "Metric"
+    And I should see "Code"
+    And I should see "Weight"
+    And I should see "There are no Tree Metric Configurations yet!"
+
+  @kalibro_configuration_restart
+  Scenario: When there are tree metric configurations and no hotspot metric configurations
+    Given I have a sample configuration
+    And I have a sample reading group
+    And I have a sample tree metric configuration within the given mezuro configuration
+    When I am at the Sample Configuration page
+    Then I should see the sample tree metric configuration content
+    And I should see "There are no Hotspot Metric Configurations yet!"
+
+  @kalibro_configuration_restart
+  Scenario: I should see the add metric link when I am the owner of the given configuration
+    Given I am a regular user
+    And I am signed in
+    And I own a sample configuration
+    When I am at the Sample Configuration page
+    Then I should see "Add Metric"
+
+  @kalibro_configuration_restart
+  Scenario: I should not see the add metric link when I am at a given configuration page
+    Given I am a regular user
+    And I am signed in
+    And I have a sample configuration
+    When I am at the Sample Configuration page
+    Then I should not see "Add Metric"
@@ -0,0 +1,28 @@
+Feature: Show Metric Configuration
+  In order to know all the metric configurations of the given configuration and its contents
+  As a regular user
+  I should be able to see each of them
+
+  @kalibro_configuration_restart
+  Scenario: Checking metric configuration show link
+    Given I have a sample configuration
+    And I have a sample reading group
+    And I have a sample reading within the sample reading group labeled "My Reading"
+    And I have a sample tree metric configuration within the given mezuro configuration
+    And I have a sample range within the sample tree metric configuration
+    When I am at the Sample Configuration page
+    And I click the Show link
+    Then I should be at metric configuration sample page
+    And I should see the sample range
+
+  @kalibro_configuration_restart @javascript
+  Scenario: When there's a range created and I want to see its comments
+    Given I have a sample configuration
+    And I have a sample reading group
+    And I have a sample reading within the sample reading group labeled "My Reading"
+    And I have a sample tree metric configuration within the given mezuro configuration
+    And I have a sample range within the sample tree metric configuration
+    And I am at the sample metric configuration page
+    When I click the "comment-icon" icon
+    Then I should see "Comment"
+
@@ -43,6 +43,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
     context 'when the current user owns the reading group' do
       before :each do
         subject.expects(:kalibro_configuration_owner?).returns true
+        Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_tree_metric_configurations")
       end
       context 'with valid fields' do
@@ -134,6 +135,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
       context 'when user owns the metric configuration' do
         before :each do
           subject.expects(:metric_configuration_owner?).returns true
+          Rails.cache.expects(:delete).with("#{kalibro_configuration.id}_tree_metric_configurations")
         end
         context 'with valid fields' do
@@ -170,5 +172,4 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
       end
     end
   end
-
 end
@@ -73,7 +73,8 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
     before :each do
-      kalibro_configuration.expects(:metric_configurations).returns(metric_configuration)
+      kalibro_configuration.expects(:tree_metric_configurations).returns([metric_configuration])
+      kalibro_configuration.expects(:hotspot_metric_configurations).returns([])
       KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
       get :show, :id => kalibro_configuration.id
@@ -16,7 +16,7 @@ describe ModulesController, :type =&gt; :controller do
     let (:module_id){ 1 }
     let (:metric_name ){ FactoryGirl.build(:loc).name }
     let (:date ){ DateTime.parse("2011-10-20T18:26:43.151+00:00") }
-    let (:metric_result){ FactoryGirl.build(:metric_result) }
+    let (:tree_metric_result){ FactoryGirl.build(:tree_metric_result) }
     let! (:module_result){ FactoryGirl.build(:module_result) }
     before :each do
@@ -29,4 +29,4 @@ describe ModulesController, :type =&gt; :controller do
     it { is_expected.to respond_with(:success) }
     it { is_expected.to render_template(:metric_history) }
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :date_metric_result, class: KalibroClient::Entities::Miscellaneous::DateMetricResult do
+    date '2011-10-20T18:26:43.151+00:00'
+
+    # FIXME: A DateMetricResult should be able to create either a TreeMetricResult or a HotspotMetricResult based on
+    # the arguments passed to it
+    metric_result_attributes { FactoryGirl.attributes_for(:tree_metric_result).except(:aggregated_value) }
+
+    initialize_with { new('date' => date, 'metric_result' => metric_result_attributes) }
+  end
+end
 FactoryGirl.define do
   factory :kalibro_module, class: KalibroClient::Entities::Processor::KalibroModule do
     name 'Qt-Calculator'
-    granlrty 'SOFTWARE'
+    granularity 'SOFTWARE'
     trait :package do
-      granlrty 'PACKAGE'
+      granularity 'PACKAGE'
     end
     trait :class do
-      granlrty 'CLASS'
+      granularity 'CLASS'
     end
     trait :function do
-      granlrty 'FUNCTION'
+      granularity 'FUNCTION'
     end
     trait :method do
-      granlrty 'METHOD'
+      granularity 'METHOD'
     end
     factory :kalibro_module_package, traits: [:package]
@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :metric_configuration, class: MetricConfiguration do
     metric {FactoryGirl.build(:metric, code: 'total_abstract_classes')}
     weight 1
-    aggregation_form "AVERAGE"
+    aggregation_form "MEAN"
     reading_group_id 1
     kalibro_configuration_id 1
@@ -35,4 +35,8 @@ FactoryGirl.define do
     kalibro_configuration_id 1
   end
+  factory :hotspot_metric_configuration, class: MetricConfiguration do
+    metric { FactoryGirl.build(:hotspot_metric) }
+    kalibro_configuration_id 1
+  end
 end
@@ -1,24 +0,0 @@
-# This file is part of KalibroEntities
-# Copyright (C) 2013  it's respectives authors (please see the AUTHORS file)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-FactoryGirl.define do
-  factory :metric_result, class: KalibroClient::Entities::Processor::MetricResult do
-    id  "42"
-    metric_configuration { FactoryGirl.build(:metric_configuration_with_id) }
-    value "10.0"
-    aggregated_value "21"
-  end
-end
@@ -52,4 +52,14 @@ FactoryGirl.define do
     initialize_with { new(name, code, scope, script) }
   end
+
+  factory :hotspot_metric, class: KalibroClient::Entities::Miscellaneous::HotspotMetric do
+    name "Flay"
+    code "flay"
+    description ""
+    metric_collector_name "MetricFu"
+    languages nil
+
+    initialize_with { new(name, code, languages, metric_collector_name) }
+  end
 end
@@ -0,0 +1,24 @@
+# This file is part of KalibroEntities
+# Copyright (C) 2013  it's respectives authors (please see the AUTHORS file)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+FactoryGirl.define do
+  factory :tree_metric_result, class: KalibroClient::Entities::Processor::TreeMetricResult do
+    id  "42"
+    metric_configuration { FactoryGirl.build(:metric_configuration_with_id) }
+    value "10.0"
+    aggregated_value "21"
+  end
+end
@@ -19,10 +19,10 @@ describe ProcessingsHelper, :type =&gt; :helper do
   describe 'find_range_snapshot' do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id)}
-    let(:metric_result) { FactoryGirl.build(:metric_result, {value: 6.0, metric_configuration: metric_configuration})}
+    let(:tree_metric_result) { FactoryGirl.build(:tree_metric_result, {value: 6.0, metric_configuration: metric_configuration})}
     before :each do
-      metric_result.expects(:metric_configuration).returns(metric_configuration)
+      tree_metric_result.expects(:metric_configuration).returns(metric_configuration)
       metric_configuration.expects(:kalibro_ranges).returns(range_snapshots)
     end
@@ -30,7 +30,7 @@ describe ProcessingsHelper, :type =&gt; :helper do
       let!(:range_snapshots) { [make_range(1.0, 5.0), make_range(5.1, 10.0), make_range(10.1, 15.0)] }
       it 'should return the range snapshot which contains the value' do
-        expect(helper.find_range_snapshot(metric_result)).to eq(range_snapshots[1])
+        expect(helper.find_range_snapshot(tree_metric_result)).to eq(range_snapshots[1])
       end
     end
@@ -38,7 +38,7 @@ describe ProcessingsHelper, :type =&gt; :helper do
       let!(:range_snapshots) { [make_range('-INF', 0.0), make_range(0, 'INF')] }
       it 'should return the range snapshot which contains the value' do
-        expect(helper.find_range_snapshot(metric_result)).to eq(range_snapshots[1])
+        expect(helper.find_range_snapshot(tree_metric_result)).to eq(range_snapshots[1])
       end
     end
@@ -46,7 +46,7 @@ describe ProcessingsHelper, :type =&gt; :helper do
       let!(:range_snapshots) { [make_range('-INF', 'INF')] }
       it 'should return the range snapshot which contains the value' do
-        expect(helper.find_range_snapshot(metric_result)).to eq(range_snapshots[0])
+        expect(helper.find_range_snapshot(tree_metric_result)).to eq(range_snapshots[0])
       end
     end
@@ -54,7 +54,7 @@ describe ProcessingsHelper, :type =&gt; :helper do
       let!(:range_snapshots) { [make_range('-INF', 6.0), make_range(6.1, 'INF')] }
       it 'should return nil' do
-        expect(helper.find_range_snapshot(metric_result)).to be_nil
+        expect(helper.find_range_snapshot(tree_metric_result)).to be_nil
       end
     end
@@ -87,6 +87,7 @@ describe KalibroConfiguration, :type =&gt; :model do
         it 'is expected to clean the attributes memoization' do
           # Call attributes once so it memoizes
           KalibroConfigurationAttributes.expects(:find_by).with(kalibro_configuration_id: kalibro_configuration.id).returns(kalibro_configuration_attributes)
+          KalibroClient::Entities::Configurations::KalibroConfiguration.any_instance.expects(:destroy).returns(kalibro_configuration)
           expect(kalibro_configuration.attributes).to eq(kalibro_configuration_attributes)
           # Destroying
@@ -5,19 +5,19 @@ describe ModuleResult, :type =&gt; :model do
     subject { FactoryGirl.build(:module_result) }
     describe 'metric_history' do
-      let(:date_module_result) {FactoryGirl.build(:date_module_result)}
+      let(:date_metric_result) {FactoryGirl.build(:date_metric_result)}
       let(:metric_configuration) { FactoryGirl.build(:another_metric_configuration_with_id) }
-      let!(:metric_result) { FactoryGirl.build(:metric_result, metric_configuration: metric_configuration) }
+      let!(:tree_metric_result) { FactoryGirl.build(:tree_metric_result, metric_configuration: metric_configuration) }
       let(:processing) {FactoryGirl.build(:processing)}
       before :each do
         subject.expects(:processing).returns(processing)
-        date_module_result.expects(:metric_result).returns(metric_result)
-        KalibroClient::Entities::Processor::MetricResult.expects(:history_of).with(metric_configuration.metric.name, subject.id, processing.repository_id).returns([date_module_result])
+        date_metric_result.expects(:metric_result).returns(tree_metric_result)
+        KalibroClient::Entities::Processor::TreeMetricResult.expects(:history_of).with(metric_configuration.metric.name, subject.id, processing.repository_id).returns([date_metric_result])
       end
       it 'should return the history for the given metric name' do
-        expect(subject.metric_history(metric_configuration.metric.name)).to eq({date_module_result.date => metric_result.value})
+        expect(subject.metric_history(metric_configuration.metric.name)).to eq({date_metric_result.date => tree_metric_result.value})
       end
     end
   end
@@ -54,6 +54,7 @@ describe Project, :type =&gt; :model do
         it 'is expected to clean the attributes memoization' do
           # Call attributes once so it memoizes
           ProjectAttributes.expects(:find_by).with(project_id: project.id).returns(project_attributes)
+          KalibroClient::Entities::Processor::Project.any_instance.expects(:destroy).returns(project)
           expect(project.attributes).to eq(project_attributes)
           # Destroying
@@ -61,6 +61,7 @@ describe ReadingGroup, :type =&gt; :model do
         it 'is expected to clean the attributes memoization' do
           # Call attributes once so it memoizes
           ReadingGroupAttributes.expects(:find_by).with(reading_group_id: reading_group.id).returns(reading_group_attributes)
+          KalibroClient::Entities::Configurations::ReadingGroup.any_instance.expects(:destroy).returns(reading_group)
           expect(reading_group.attributes).to eq(reading_group_attributes)
           # Destroying
	@@ -28,7 +28,7 @@ gem 'jbuilder', '~> 2.0'		@@ -28,7 +28,7 @@ gem 'jbuilder', '~> 2.0'
28	gem 'devise', '~> 3.5.1'	28	gem 'devise', '~> 3.5.1'
29		29
30	# Kalibro integration	30	# Kalibro integration
31	-gem 'kalibro_client', '~> 1.4'	31	+gem 'kalibro_client', '~> 2.1.2'
32		32
33	# PostgreSQL integration	33	# PostgreSQL integration
34	gem "pg", "~> 0.18.1"	34	gem "pg", "~> 0.18.1"
	@@ -119,7 +119,7 @@ GEM		@@ -119,7 +119,7 @@ GEM
119	factory_girl_rails (4.5.0)	119	factory_girl_rails (4.5.0)
120	factory_girl (~> 4.5.0)	120	factory_girl (~> 4.5.0)
121	railties (>= 3.0.0)	121	railties (>= 3.0.0)
122	- faraday (0.9.1)	122	+ faraday (0.9.2)
123	multipart-post (>= 1.2, < 3)	123	multipart-post (>= 1.2, < 3)
124	faraday_middleware (0.10.0)	124	faraday_middleware (0.10.0)
125	faraday (>= 0.7.4, < 0.10)	125	faraday (>= 0.7.4, < 0.10)
	@@ -152,7 +152,7 @@ GEM		@@ -152,7 +152,7 @@ GEM
152	railties (>= 3.2)	152	railties (>= 3.2)
153	sprockets-rails	153	sprockets-rails
154	json (1.8.3)	154	json (1.8.3)
155	- kalibro_client (1.4.1)	155	+ kalibro_client (2.1.2)
156	activesupport (>= 2.2.1)	156	activesupport (>= 2.2.1)
157	faraday_middleware (~> 0.10.0)	157	faraday_middleware (~> 0.10.0)
158	konacha (3.7.0)	158	konacha (3.7.0)
	@@ -353,7 +353,7 @@ DEPENDENCIES		@@ -353,7 +353,7 @@ DEPENDENCIES
353	jquery-rails	353	jquery-rails
354	jquery-ui-rails (~> 5.0.0)	354	jquery-ui-rails (~> 5.0.0)
355	js-routes (~> 1.1.0)	355	js-routes (~> 1.1.0)
356	- kalibro_client (~> 1.4)	356	+ kalibro_client (~> 2.1.2)
357	konacha	357	konacha
358	less-rails (~> 2.7.0)	358	less-rails (~> 2.7.0)
359	mocha	359	mocha
	@@ -7,7 +7,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle		@@ -7,7 +7,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle
7	respond_to do \|format\|	7	respond_to do \|format\|
8	create_and_redir(format)	8	create_and_redir(format)
9	end	9	end
10	- Rails.cache.delete("#{params[:kalibro_configuration_id].to_i}_metric_configurations")	10	+ Rails.cache.delete("#{params[:kalibro_configuration_id].to_i}_tree_metric_configurations")
11	end	11	end
12		12
13	def show	13	def show
	@@ -30,7 +30,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle		@@ -30,7 +30,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle
30	else	30	else
31	failed_action(format, 'edit')	31	failed_action(format, 'edit')
32	end	32	end
33	- Rails.cache.delete("#{@compound_metric_configuration.kalibro_configuration_id}_metric_configurations")	33	+ Rails.cache.delete("#{@compound_metric_configuration.kalibro_configuration_id}_tree_metric_configurations")
34	end	34	end
35	end	35	end
36		36
1	class ModuleResult < KalibroClient::Entities::Processor::ModuleResult	1	class ModuleResult < KalibroClient::Entities::Processor::ModuleResult
2	def metric_history(name)	2	def metric_history(name)
3	- history = KalibroClient::Entities::Processor::MetricResult.history_of(name, self.id, processing.repository_id)	3	+ history = KalibroClient::Entities::Processor::TreeMetricResult.history_of(name, self.id, processing.repository_id)
4	grade_history = Hash.new	4	grade_history = Hash.new
5		5
6	history.each { \|date_metric_result\| grade_history[date_metric_result.date] = date_metric_result.metric_result.value }	6	history.each { \|date_metric_result\| grade_history[date_metric_result.date] = date_metric_result.metric_result.value }
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<tr>
	2	+ <td><%= hotspot_metric_result.module_result.kalibro_module.short_name %></td>
	3	+ <td><%= hotspot_metric_result.line_number %></td>
	4	+ <td><%= hotspot_metric_result.message %></td>
	5	+</tr>
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+<table class="table table-hover metric_results">
	2	+ <thead>
	3	+ <tr>
	4	+ <th><%= t('activemodel.attributes.hotspot_metric_result.module_result.module.name') %></th>
	5	+ <th><%= t('activemodel.attributes.hotspot_metric_result.line') %></th>
	6	+ <th><%= t('activemodel.attributes.hotspot_metric_result.message') %></th>
	7	+ </tr>
	8	+ </thead>
	9	+
	10	+ <tbody>
	11	+ <% cache("#{@root_module_result.id}_hotspot_results") do %>
	12	+ <%= render partial: 'hotspot_metric_result', collection: @root_module_result.hotspot_metric_results, locals: {module_result: @root_module_result} %>
	13	+ <% end %>
	14	+ </tbody>
	15	+</table>
1	<% metric_configuration = metric_result.metric_configuration %>	1	<% metric_configuration = metric_result.metric_configuration %>
2	-<% unless metric_configuration.kalibro_ranges.nil? %>	2	+<% unless metric_configuration.metric.type == "HotspotMetricSnapshot" %>
3	<% range_snapshot = find_range_snapshot(metric_result)	3	<% range_snapshot = find_range_snapshot(metric_result)
4	metric_name = metric_configuration.metric.name	4	metric_name = metric_configuration.metric.name
5	%>	5	%>
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	</tr>	15	</tr>
16	<tr id="container<%= metric_result.id %>" style="display: none">	16	<tr id="container<%= metric_result.id %>" style="display: none">
17	<td colspan="4">	17	<td colspan="4">
18	- <span id="loader_container<%= metric_result.id %>"><%= image_tag 'loader.gif' %> <%= t('loading_data') %></span>	18	+ <span id="loader_container<%= metric_result.id %>"><%= image_tag 'loader.gif' %> <%= t('repository.show.loading') %></span>
19	<canvas id="container<%= metric_result.id %>" class="graphic_container" style="display: none"></canvas>	19	<canvas id="container<%= metric_result.id %>" class="graphic_container" style="display: none"></canvas>
20	</td>	20	</td>
21	</tr>	21	</tr>
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10		10
11	<tbody>	11	<tbody>
12	<% cache("#{@root_module_result.id}_results") do %>	12	<% cache("#{@root_module_result.id}_results") do %>
13	- <%= render partial: 'metric_result', collection: @root_module_result.metric_results, locals: {module_result: @root_module_result} %>	13	+ <%= render partial: 'metric_result', collection: @root_module_result.tree_metric_results, locals: {module_result: @root_module_result} %>
14	<% end %>	14	<% end %>
15	</tbody>	15	</tbody>
16	</table>	16	</table>
	@@ -7,6 +7,6 @@		@@ -7,6 +7,6 @@
7	<% end %>	7	<% end %>
8	<%= link_to format_module_name(module_result.kalibro_module.name), "#module_#{module_result.id}", onClick: "Module.Tree.load('#{escape_javascript(image_tag 'loader.gif')} #{escape_javascript(t('loading_data'))}', #{module_result.id});" %>	8	<%= link_to format_module_name(module_result.kalibro_module.name), "#module_#{module_result.id}", onClick: "Module.Tree.load('#{escape_javascript(image_tag 'loader.gif')} #{escape_javascript(t('loading_data'))}', #{module_result.id});" %>
9	</td>	9	</td>
10	- <td><%= module_result.kalibro_module.granularity %></td>	10	+ <td><%= module_result.kalibro_module.granularity["type"] %></td>
11	<td><%= format_grade(module_result.grade) %></td>	11	<td><%= format_grade(module_result.grade) %></td>
12	</tr>	12	</tr>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	</p>	4	</p>
5	<p>	5	<p>
6	<strong><%= KalibroModule.human_attribute_name('granularity') %>:</strong>	6	<strong><%= KalibroModule.human_attribute_name('granularity') %>:</strong>
7	- <%= @root_module_result.kalibro_module.granularity %>	7	+ <%= @root_module_result.kalibro_module.granularity["type"] %>
8	</p>	8	</p>
9	<p>	9	<p>
10	<strong><%= KalibroModule.human_attribute_name('grade') %>:</strong>	10	<strong><%= KalibroModule.human_attribute_name('grade') %>:</strong>