kalibro_client 0.0.1 → 0.0.2

data/lib/kalibro_client/entities/configurations/base.rb

@@ -1,8 +1,11 @@
+require 'kalibro_client/helpers/date_attributes'
+
 module KalibroClient
   module Entities
     module Configurations
       class Base < KalibroClient::Entities::Base
-        attr_accessor :created_at, :updated_at
+        include DateAttributes
+
         def self.address
           :configurations_address
         end

data/lib/kalibro_client/entities/configurations/kalibro_configuration.rb

@@ -5,7 +5,7 @@
 # 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

data/lib/kalibro_client/entities/configurations/kalibro_range.rb

@@ -25,16 +25,12 @@ module KalibroClient
           @id = value.to_i
         end
 
-        def reading_id=(value)
-          @reading_id = value.to_i
+        def metric_configuration_id=(value)
+          @metric_configuration_id = value.to_i
         end
 
-        def beginning=(value)
-          @beginning = value == "-INF" ? value : value.to_f
-        end
-
-        def end=(value)
-          @end = value == "INF" ? value : value.to_f
+        def reading_id=(value)
+          @reading_id = value.to_i
         end
 
         def label
@@ -68,6 +64,10 @@ module KalibroClient
           "metric_configurations/#{metric_configuration_id}"
         end
 
+        def update_prefix
+          "metric_configurations/#{metric_configuration_id}"
+        end
+
         def destroy_prefix
           "metric_configurations/#{metric_configuration_id}"
         end

data/lib/kalibro_client/entities/configurations/metric_configuration.rb

@@ -35,12 +35,10 @@ module KalibroClient
 
         def metric=(value)
           if value.is_a?(Hash)
-            if value['type'] == "NativeMetricSnapshot" || value[:type] == "NativeMetricSnapshot"
+            if value['type'] == "NativeMetricSnapshot"
               @metric = KalibroClient::Entities::Miscellaneous::NativeMetric.to_object(value)
-            elsif value['type'] == "CompoundMetricSnapshot" || value[:type] == "CompoundMetricSnapshot"
-              @metric = KalibroClient::Entities::Miscellaneous::CompoundMetric.to_object(value)
             else
-              @metric = KalibroClient::Entities::Miscellaneous::Metric.to_object(value)
+              @metric = KalibroClient::Entities::Miscellaneous::CompoundMetric.to_object(value)
             end
           elsif value.is_a?(KalibroClient::Entities::Miscellaneous::Metric)
             @metric = value
@@ -70,7 +68,7 @@ module KalibroClient
 
         def self.find(id)
           metric_configuration = request(':id', {id: id}, :get)
-          raise KalibroClient::Errors::RecordNotFound unless metric_configuration['error'].nil?
+          raise KalibroClient::Errors::RecordNotFound unless metric_configuration['errors'].nil?
           return new(metric_configuration['metric_configuration'])
         end
 
@@ -82,6 +80,10 @@ module KalibroClient
           end
         end
 
+        def kalibro_ranges
+          KalibroClient::Entities::Configurations::KalibroRange.create_objects_array_from_hash(self.class.request(':id/kalibro_ranges', {id: id}, :get))
+        end
+
         private
 
         def save_params

data/lib/kalibro_client/entities/configurations/reading.rb

@@ -25,10 +25,6 @@ module KalibroClient
           @id = value.to_i
         end
 
-        def grade=(value)
-          @grade = value.to_f
-        end
-
         def reading_group_id=(value)
           @reading_group_id = value.to_i
         end
@@ -50,6 +46,10 @@ module KalibroClient
         def destroy_prefix
           "reading_groups/#{reading_group_id}"
         end
+
+        def update_prefix
+          "reading_groups/#{reading_group_id}"
+        end
       end
     end
   end

data/lib/kalibro_client/entities/configurations/reading_group.rb

@@ -28,6 +28,10 @@ module KalibroClient
         def self.all
           create_objects_array_from_hash(request('', {}, :get))
         end
+
+        def readings
+          KalibroClient::Entities::Configurations::Reading.create_objects_array_from_hash(self.class.request(':id/readings', {id: @id}, :get))
+        end
       end
     end
   end

data/lib/kalibro_client/entities/processor/base.rb

@@ -1,11 +1,12 @@
 require 'json'
+require 'kalibro_client/helpers/date_attributes'
 
 module KalibroClient
   module Entities
     module Processor
       class Base < KalibroClient::Entities::Base
+        include DateAttributes
 
-        attr_accessor :created_at, :updated_at
         def self.address
           :processor_address
         end

data/lib/kalibro_client/entities/processor/kalibro_module.rb

@@ -20,6 +20,7 @@ module KalibroClient
       class KalibroModule < KalibroClient::Entities::Processor::Base
 
         attr_accessor :name, :granlrty, :id, :long_name, :module_result_id
+        alias_method :granularity, :granlrty
 
       end
     end

data/lib/kalibro_client/entities/processor/metric_collector_details.rb

@@ -23,15 +23,20 @@ module KalibroClient
         def supported_metrics=(value)
           @supported_metrics = {}
           value.each do |code, metric|
-            @supported_metrics[code] = KalibroClient::Entities::Miscellaneous::Metric.new(metric[:type], metric[:name], metric[:code], metric[:scope])
+            @supported_metrics[code] = KalibroClient::Entities::Miscellaneous::NativeMetric.new(metric["name"], metric["code"], metric["scope"], metric["languages"], metric["metric_collector_name"])
           end
         end
 
-        def metric(name)
+        def find_metric_by_name(name)
           metric = self.supported_metrics.find {|code, metric| metric.name == name}
           metric.nil? ? nil : metric.last
         end
 
+        def find_metric_by_code(metric_code)
+          metric = self.supported_metrics.find {|code, metric| metric.code == metric_code}
+          metric.nil? ? nil : metric.last
+        end
+
         def self.find_by_name(metric_collector_name)
           begin
             new request(:find, {name: metric_collector_name})["metric_collector_details"]

data/lib/kalibro_client/entities/processor/metric_result.rb

@@ -20,8 +20,9 @@ module KalibroClient
       class MetricResult < KalibroClient::Entities::Processor::Base
 
         attr_accessor :id, :value, :aggregated_value, :module_result_id, :metric_configuration_id
+        attr_reader :metric_configuration
 
-        def initialize(attributes={})
+        def initialize(attributes={}, persisted=false)
           value = attributes["value"]
           @value = (value == "NaN") ? attributes["aggregated_value"].to_f : value.to_f
           attributes.each do |field, value|
@@ -30,25 +31,22 @@ module KalibroClient
             end
           end
           @kalibro_errors = []
+          @persisted = persisted
         end
 
         def id=(value)
           @id = value.to_i
         end
 
+        def metric_configuration_id=(value)
+          self.metric_configuration = KalibroClient::Entities::Configurations::MetricConfiguration.request(":id", {id: value.to_i}, :get)["metric_configuration"]
+        end
+
         def metric_configuration=(value)
           @metric_configuration = KalibroClient::Entities::Configurations::MetricConfiguration.to_object value
           @metric_configuration_id = @metric_configuration.id
         end
 
-        def metric_configuration
-          unless @metric_configuration.nil?
-            return @metric_configuration
-          end
-          @metric_configuration = KalibroClient::Entities::Configurations::MetricConfiguration.find @metric_configuration_id
-          return @metric_configuration
-        end
-
         def value=(value)
           @value = value.to_f
         end
@@ -63,7 +61,8 @@ module KalibroClient
         end
 
         def self.metric_results_of(module_result_id)
-          create_objects_array_from_hash ModuleResult.request(":id/metric_results", {id: module_result_id}, :get)
+          puts "DEPRECATED: MetricResult.metric_results_of"
+          KalibroClient::Entities::Processor::ModuleResult.find(module_result_id).metric_results
         end
 
         def self.history_of(metric_name, kalibro_module_id, repository_id)

data/lib/kalibro_client/entities/processor/module_result.rb

@@ -51,6 +51,10 @@ module KalibroClient
           @processing_id = value.to_i
         end
 
+        def processing
+          KalibroClient::Entities::Processor::Processing.find(self.processing_id)
+        end
+
         def grade=(value)
           @grade = value.to_f
         end
@@ -67,8 +71,8 @@ module KalibroClient
           !self.folder?
         end
 
-        def self.history_of(module_result_id)
-          response = self.create_array_from_hash(self.request('history_of', {id: module_result_id})['date_module_results'])
+        def self.history_of(module_result, repository_id)
+          response = self.create_array_from_hash(Repository.request(':id/module_result_history_of', {id: repository_id, kalibro_module_id: module_result.kalibro_module.id})['date_module_results'])
           response.map do |date_module_result_pair|
             date_module_result = KalibroClient::Entities::Miscellaneous::DateModuleResult.new
             date_module_result.date = date_module_result_pair.first
@@ -76,6 +80,10 @@ module KalibroClient
             date_module_result
           end
         end
+
+        def metric_results
+          MetricResult.create_objects_array_from_hash self.class.request(":id/metric_results", {id: self.id}, :get)
+        end
       end
     end
   end

data/lib/kalibro_client/entities/processor/processing.rb

@@ -65,43 +65,59 @@ module KalibroClient
         end
 
         def self.has_processing(repository_id)
-          Repository.request("#{repository_id}/has_processing")['has_processing']
+          puts "DEPRECATED: Processing.has_processing"
+          repository(repository_id).has_processing
         end
 
         def self.has_ready_processing(repository_id)
-          Repository.request("#{repository_id}/has_ready_processing", {}, :get)['has_ready_processing']
+          puts "DEPRECATED: Processing.has_ready_processing"
+          repository(repository_id).has_ready_processing
         end
 
         def self.has_processing_after(repository_id, date)
-          Repository.request("#{repository_id}/has_processing/after", {:date => date})['has_processing_in_time']
+          puts "DEPRECATED: Processing.has_processing_after"
+          repository(repository_id).has_processing_after(date)
         end
 
         def self.has_processing_before(repository_id, date)
-          Repository.request("#{repository_id}/has_processing/before", {:date => date})['has_processing_in_time']
+          puts "DEPRECATED: Processing.has_processing_before"
+          repository(repository_id).has_processing_before(date)
         end
 
         def self.last_processing_state_of(repository_id)
-          Repository.request("#{repository_id}/last_processing_state", {}, :get)['processing_state']
+          puts "DEPRECATED: Processing.last_processing_state_of"
+          repository(repository_id).last_processing_state
         end
 
         def self.last_ready_processing_of(repository_id)
-          new(Repository.request(':id/last_ready_processing', {id: repository_id}, :get)['last_ready_processing'])
+          puts "DEPRECATED: Processing.last_ready_processing_of"
+          repository(repository_id).last_ready_processing
         end
 
         def self.first_processing_of(repository_id)
-          new(Repository.request("#{repository_id}/first_processing")['processing'])
+          puts "DEPRECATED: Processing.first_processing_of"
+          repository(repository_id).first_processing
         end
 
         def self.last_processing_of(repository_id)
-          new(Repository.request("#{repository_id}/last_processing")['processing'])
+          puts "DEPRECATED: Processing.last_processing_of"
+          repository(repository_id).last_processing
         end
 
         def self.first_processing_after(repository_id, date)
-          new(Repository.request("#{repository_id}/first_processing/after", {:date => date})["processing"])
+          puts "DEPRECATED: Processing.first_processing_after"
+          repository(repository_id).first_processing_after(date)
         end
 
         def self.last_processing_before(repository_id, date)
-          new(Repository.request("#{repository_id}/last_processing/before", {:date => date})['processing'])
+          puts "DEPRECATED: Processing.last_processing_before"
+          repository(repository_id).last_processing_before(date)
+        end
+
+        private
+
+        def self.repository(id)
+          Repository.find(id)
         end
       end
     end

data/lib/kalibro_client/entities/processor/project.rb

@@ -28,6 +28,10 @@ module KalibroClient
         def self.all
           create_objects_array_from_hash(request('', {}, :get))
         end
+
+        def repositories
+          Repository.create_objects_array_from_hash(self.class.request(':id/repositories', {id: id}, :get))
+        end
       end
     end
   end

data/lib/kalibro_client/entities/processor/repository.rb

@@ -19,7 +19,7 @@ module KalibroClient
     module Processor
       class Repository < KalibroClient::Entities::Processor::Base
 
-        attr_accessor :id, :name, :description, :license, :period, :scm_type, :address, :configuration_id, :project_id, :send_email, :code_directory
+        attr_accessor :id, :name, :description, :license, :period, :scm_type, :address, :kalibro_configuration_id, :project_id, :send_email, :code_directory
 
         def self.repository_types
           request('types', {}, :get)['types'].to_a
@@ -37,8 +37,8 @@ module KalibroClient
           @period = value.to_i
         end
 
-        def configuration_id=(value)
-          @configuration_id = value.to_i
+        def kalibro_configuration_id=(value)
+          @kalibro_configuration_id = value.to_i
         end
 
         def project_id=(value)
@@ -50,7 +50,66 @@ module KalibroClient
         end
 
         def cancel_processing_of_repository
-          self.class.request('cancel_process', {id: self.id})
+          self.class.request(':id/cancel_process', {id: self.id}, :get)
+        end
+
+        def processing
+          if has_ready_processing
+            last_ready_processing
+          else
+            last_processing
+          end
+        end
+
+        def processing_with_date(date)
+          date = date.is_a?(String) ? DateTime.parse(date) : date
+          if has_processing_after(date)
+            first_processing_after(date)
+          elsif has_processing_before(date)
+            last_processing_before(date)
+          else
+            nil
+          end
+        end
+
+        def has_processing
+          self.class.request("#{self.id}/has_processing", {}, :get)['has_processing']
+        end
+
+        def has_ready_processing
+          self.class.request("#{self.id}/has_ready_processing", {}, :get)['has_ready_processing']
+        end
+
+        def has_processing_after(date)
+          self.class.request("#{self.id}/has_processing/after", {:date => date})['has_processing_in_time']
+        end
+
+        def has_processing_before(date)
+          self.class.request("#{self.id}/has_processing/before", {:date => date})['has_processing_in_time']
+        end
+
+        def last_processing_state
+          self.class.request("#{self.id}/last_processing_state", {}, :get)['processing_state']
+        end
+
+        def last_ready_processing
+          Processing.new(self.class.request(':id/last_ready_processing', {id: self.id}, :get)['last_ready_processing'])
+        end
+
+        def first_processing
+          Processing.new(self.class.request("#{self.id}/first_processing")['processing'])
+        end
+
+        def last_processing
+          Processing.new(self.class.request("#{self.id}/last_processing")['processing'])
+        end
+
+        def first_processing_after(date)
+          Processing.new(self.class.request("#{self.id}/first_processing/after", {:date => date})["processing"])
+        end
+
+        def last_processing_before(date)
+          Processing.new(self.class.request("#{self.id}/last_processing/before", {:date => date})['processing'])
         end
 
         def self.all

data/lib/kalibro_client/helpers/date_attributes.rb

@@ -0,0 +1,11 @@
+module DateAttributes
+  attr_reader :created_at, :updated_at
+
+  def created_at=(value)
+    @created_at = DateTime.parse(value)
+  end
+
+  def updated_at=(value)
+    @updated_at = DateTime.parse(value)
+  end
+end

data/lib/kalibro_client/helpers/request_methods.rb

@@ -30,6 +30,7 @@ module RequestMethods
   def destroy_action
     ":id"
   end
+  alias_method :update_action, :destroy_action
 
   def destroy_params
     {id: self.id}
@@ -39,6 +40,14 @@ module RequestMethods
     ""
   end
 
+  def update_params
+    {instance_class_name.underscore.to_sym => self.to_hash, :id => self.id}
+  end
+
+  def update_prefix
+    ""
+  end
+
   module ClassMethods
     def exists_action
       ":id/exists"