Download as
Browse Code »

Commit 5b1b4afc9b66f0d66e4d4440da52c6f938d26232

Authored by João M. M. da Silva + Alessandro Palmeira + João Machini
Committed by João M. M. da Silva
1 parent c07f1fb0
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Loading metrics from client(needs refactoring) 

(tests not running in the enviroment)
Showing 8 changed files with 39 additions and 6 deletions   Show diff stats
plugins/mezuro/lib/kalibro/client/configuration_client.rb
  Diff comments   View file @5b1b4af
@@ -4,6 +4,7 @@ class Kalibro::Client::ConfigurationClient @@ -4,6 +4,7 @@ class Kalibro::Client::ConfigurationClient
4 configuration = Kalibro::Entities::Configuration.new 4 configuration = Kalibro::Entities::Configuration.new
5 configuration.name = configuration_content.name 5 configuration.name = configuration_content.name
6 configuration.description = configuration_content.description 6 configuration.description = configuration_content.description
  7 + configuration.metric_ids = configuration_content.metric_ids
7 new.save(configuration) 8 new.save(configuration)
8 end 9 end
9 10
plugins/mezuro/lib/kalibro/client/metrics_client.rb 0 → 100644
  Diff comments   View file @5b1b4af
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +class Kalibro::Client::MetricsClient
  2 +
  3 + def self.all_metrics
  4 + [Kalibro::Entities::Metric.new("LOC", "class", "Lines of code", 1),
  5 + Kalibro::Entities::Metric.new("LCOM", "class", "Lack of cohesion", 2)]
  6 + end
  7 +
  8 +end
plugins/mezuro/lib/kalibro/entities/configuration.rb
  Diff comments   View file @5b1b4af
1 class Kalibro::Entities::Configuration < Kalibro::Entities::Entity 1 class Kalibro::Entities::Configuration < Kalibro::Entities::Entity
2 2
3 - attr_accessor :name, :description, :metric_configuration 3 + attr_accessor :name, :description, :metric_configuration, :metric_ids
4 4
5 def metric_configuration=(value) 5 def metric_configuration=(value)
6 @metric_configuration = to_entity_array(value, Kalibro::Entities::MetricConfiguration) 6 @metric_configuration = to_entity_array(value, Kalibro::Entities::MetricConfiguration)
plugins/mezuro/lib/kalibro/entities/metric.rb
  Diff comments   View file @5b1b4af
1 class Kalibro::Entities::Metric < Kalibro::Entities::Entity 1 class Kalibro::Entities::Metric < Kalibro::Entities::Entity
2 2
3 - attr_accessor :name, :scope, :description 3 + attr_accessor :name, :scope, :description, :id
4 4
5 -end  
6 \ No newline at end of file 5 \ No newline at end of file
  6 + def initialize name, scope, description, id
  7 + @name = name
  8 + @scope = scope
  9 + @description = description
  10 + @id = id
  11 + end
  12 +
  13 +end
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
  Diff comments   View file @5b1b4af
1 class MezuroPlugin::ConfigurationContent < Article 1 class MezuroPlugin::ConfigurationContent < Article
2 2
  3 + attr_accessor :metric_ids
  4 +
3 def self.short_description 5 def self.short_description
4 'Kalibro configuration' 6 'Kalibro configuration'
5 end 7 end
plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
  Diff comments   View file @5b1b4af
@@ -23,6 +23,11 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase @@ -23,6 +23,11 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
23 assert_equal 'Sets of thresholds to interpret metrics', MezuroPlugin::ConfigurationContent.description 23 assert_equal 'Sets of thresholds to interpret metrics', MezuroPlugin::ConfigurationContent.description
24 end 24 end
25 25
  26 + should 'accept metric_ids' do
  27 + @content.metric_ids = [1,5]
  28 + assert_equal @content.metric_ids, [1,5]
  29 + end
  30 +
26 should 'have an html view' do 31 should 'have an html view' do
27 assert_not_nil @content.to_html 32 assert_not_nil @content.to_html
28 end 33 end
plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
  Diff comments   View file @5b1b4af
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 rescue 6 rescue
7 @configuration = nil 7 @configuration = nil
8 end 8 end
  9 + @metrics = Kalibro::Client::MetricsClient.all_metrics
9 %> 10 %>
10 11
11 <%= error_messages_for 'kalibro_configuration' %> 12 <%= error_messages_for 'kalibro_configuration' %>
@@ -18,3 +19,12 @@ @@ -18,3 +19,12 @@
18 <%= required f.text_field(:name) %> 19 <%= required f.text_field(:name) %>
19 20
20 <%= f.text_field :description %><br/> 21 <%= f.text_field :description %><br/>
  22 +
  23 +<h3> Metrics </h3>
  24 +<% @metrics.each do |metric| %>
  25 + <div class="metric">
  26 + <%= check_box_tag "article[metric_ids][]", metric.id, true, :id => "article_metric_ids_#{metric.id}" %>
  27 + <%= label_tag "article_metric_ids_#{metric.id}", metric.name %>
  28 + <%= metric.description %>
  29 + </div>
  30 +<% end %>
plugins/mezuro/views/content_viewer/show_configuration.rhtml
  Diff comments   View file @5b1b4af
1 -<% @configuration = @page.configuration %> 1 +<% @configuration_content = @page %>
2 2
3 <table id="project_info"> 3 <table id="project_info">
4 <tr> 4 <tr>
5 <td><%= _('Name') %></td> 5 <td><%= _('Name') %></td>
6 - <td><%= @configuration.name %></td> 6 + <td><%= @configuration_content.name %></td>
7 </tr> 7 </tr>
8 <tr> 8 <tr>
9 <td><%= _('Description') %></td> 9 <td><%= _('Description') %></td>
10 - <td><%= @configuration.description %></td> 10 + <td><%= @configuration_content.description %></td>
11 </tr> 11 </tr>
12 </table> 12 </table>