Download as
Browse Code »

Commit 24336d9e2ece055219764bc03e64cba753320dcd

Authored by Diego Camarinha
Committed by João M. M. da Silva
1 parent 109621c4
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Started refactoring models

Showing 2 changed files with 25 additions and 11 deletions   Show diff stats
plugins/mezuro/lib/kalibro/base_tool.rb
  Diff comments   View file @24336d9
1 1 class Kalibro::BaseTool < Kalibro::Model
2 2  
3   - attr_accessor :name, :description, :supported_metric
  3 + attr_accessor :name, :description, :collector_class_name, :supported_metric
4 4  
5 5 def self.all_names
6   - request("BaseTool", :get_base_tool_names)[:base_tool_name].to_a
  6 + request("BaseTool", :all_base_tool_names)[:base_tool_name].to_a
7 7 end
8 8  
9 9 def self.find_by_name(base_tool_name)
... ...
plugins/mezuro/lib/kalibro/configuration.rb
  Diff comments   View file @24336d9
1 1 class Kalibro::Configuration < Kalibro::Model
2 2  
3   - attr_accessor :name, :description, :metric_configuration
4   -
  3 + attr_accessor :name, :description, :id
  4 +=begin
5 5 def metric_configuration=(value)
6 6 @metric_configuration = Kalibro::MetricConfiguration.to_objects_array value
7 7 end
... ... @@ -13,21 +13,35 @@ class Kalibro::Configuration &lt; Kalibro::Model
13 13 def metric_configurations=(metric_configurations)
14 14 @metric_configuration = metric_configurations
15 15 end
  16 +=end
  17 +
  18 + def self.exists?(id)
  19 + request("Configuration", :configuration_exists, {:configuration_id => id})[:exists]
  20 + end
16 21  
17   - def self.find_by_name(configuration_name)
18   - new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
  22 + def self.find(id)
  23 + if(exists?(id))
  24 + new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
  25 + else
  26 + nil
  27 + end
19 28 end
20 29  
21   - def self.all_names
22   - request("Configuration", :get_configuration_names)[:configuration_name]
  30 + def self.configuration_of(repository_id)
  31 + new request("Configuration", :configuration_of, {:repository_id => repository_id})[:configuration]
23 32 end
24 33  
  34 + def self.all
  35 + request("Configuration", :all_configuration)[:configuration]
  36 + end
  37 +
  38 +
25 39 def update_attributes(attributes={})
26 40 attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
27 41 save
28 42 end
29 43  
30   - def metric_configurations_hash
31   - self.to_hash[:metric_configuration]
32   - end
  44 +# def metric_configurations_hash
  45 +# self.to_hash[:metric_configuration]
  46 +# end
33 47 end
... ...