kalibro_client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 898bf1fce5f6d3c85b0c2e11e9e8f378f1bfc2e4
-  data.tar.gz: a25aaa22d3f6b64a04ff42a174e730cf230a7c35
+  metadata.gz: 15bcca85f96a24bd55b802949805c93d4db2e5ad
+  data.tar.gz: 83b823a0de3a999ff5465073b0df0bc40eb9faed
 SHA512:
-  metadata.gz: f6a8c927614532f3eb376b14c074bcc60277ee1460acc729838c04b8144c49094fc9da631140544071b00913ad9ac56b6a9004f3f66a192ac3bcc62fd1b7dd53
-  data.tar.gz: 7ec5f6c9d83e108e80f9013022929e0d8a013dbe4ab208ebcfa5a40dac3a001b08513a75d56d653543c27e1c99db211eed6ce8516bffc227b078c05fca06994b
+  metadata.gz: ab72cff243dc5c1303e799cf051938935aea76fec5886a089a99d9ad753ae571492fb56603cca72ea68b31da9558e604ae24a42f8bb44d38bd04ddbcebc44176
+  data.tar.gz: 2b28c6858132fd53576bfa144ad4ed57b1b947673ad4c779045d4fd25538a7b260a3ec3b95a33b4d5f7a088eb587f07b1300b61c7c252ac432db80ede00c18cf

data/lib/kalibro_client/entities/miscellaneous/granularity.rb

@@ -2,12 +2,21 @@ module KalibroClient
   module Entities
     module Miscellaneous
       class Granularity
-        GRANULARITIES = [:METHOD, :CLASS, :PACKAGE, :SOFTWARE]
+        include Comparable
 
-        METHOD = GRANULARITIES[0]
-        CLASS = GRANULARITIES[1]
-        PACKAGE = GRANULARITIES[2]
-        SOFTWARE = GRANULARITIES[3]
+        GRANULARITIES = [:METHOD, :CLASS, :PACKAGE, :SOFTWARE, :FUNCTION]
+
+        GRANULARITIES.each do |name|
+          self.const_set(name, name)
+        end
+
+        PARENTS = {
+            METHOD: CLASS,
+            CLASS: PACKAGE,
+            PACKAGE: SOFTWARE,
+            SOFTWARE: SOFTWARE,
+            FUNCTION: PACKAGE
+        }
 
         attr_reader :type
 
@@ -20,45 +29,41 @@ module KalibroClient
         end
 
         def parent
-          return self if self.type == SOFTWARE
-          return Granularity.new(GRANULARITIES[GRANULARITIES.find_index(self.type) + 1])
+          parent_type = PARENTS[self.type]
+          raise ArgumentError.new("Not supported granularity type #{type}") if parent_type.nil?
+
+          return self if self.type == parent_type
+          Granularity.new(parent_type)
         end
 
         def to_s
           self.type.to_s
         end
 
-        def <(other_granularity)
-          GRANULARITIES.find_index(self.type) < GRANULARITIES.find_index(other_granularity.type)
-        end
+        # FYI: this is a spaceship operator
+        def <=>(other)
+          return nil if [[:FUNCTION, :METHOD], [:METHOD, :FUNCTION]].include?([self.type, other.type])
 
-        def ==(other_granularity)
-          self.type == other_granularity.type
-        end
-
-        def <=(other_granularity)
-          (self < other_granularity) || (self == other_granularity)
-        end
-
-        def >=(other_granularity)
-          (self > other_granularity) || (self == other_granularity)
+          if self.type == other.type
+            return 0
+          elsif self.is_lower_than?(other.type)
+            return -1
+          else
+            return 1
+          end
         end
 
-        def >(other_granularity)
-          !(self <= other_granularity)
-        end
+        def is_lower_than?(other_type)
+          current_type = self.type
 
-        def <=>(other_granularity)
-          if self < other_granularity
-            return -1
-          elsif self > other_granularity
-            return 1
-          else
-            return 0
+          while current_type != PARENTS[current_type]
+            return true if PARENTS[current_type] == other_type
+            current_type = PARENTS[current_type]
           end
+
+          return false
         end
       end
-
     end
   end
 end

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

@@ -18,7 +18,7 @@ module KalibroClient
   module Entities
     module Processor
       class MetricCollectorDetails < KalibroClient::Entities::Processor::Base
-        attr_accessor :name, :description, :supported_metrics, :wanted_metrics, :processing
+        attr_accessor :name, :description, :supported_metrics
 
         def supported_metrics=(value)
           @supported_metrics = {}

data/lib/kalibro_client/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module KalibroClient
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/entities/miscellaneous/granularity_spec.rb

@@ -32,6 +32,14 @@ describe KalibroClient::Entities::Miscellaneous::Granularity do
           expect(subject.parent.type).to eq(KalibroClient::Entities::Miscellaneous::Granularity::CLASS)
         end
       end
+
+      context 'with a FUNCTION granularity' do
+        subject { FactoryGirl.build(:granularity, type: KalibroClient::Entities::Miscellaneous::Granularity::FUNCTION) }
+
+        it 'should return PACKAGE' do
+          expect(subject.parent.type).to eq(KalibroClient::Entities::Miscellaneous::Granularity::PACKAGE)
+        end
+      end
     end
 
     describe 'Comparison Operators' do
@@ -92,6 +100,18 @@ describe KalibroClient::Entities::Miscellaneous::Granularity do
           expect(subject <=> other_granularity).to eq(1)
         end
       end
+
+      context 'comparing unrelated ones' do
+        let(:function_granularity) { FactoryGirl.build(:granularity, type: KalibroClient::Entities::Miscellaneous::Granularity::FUNCTION) }
+        let(:method_granularity) { FactoryGirl.build(:granularity, type: KalibroClient::Entities::Miscellaneous::Granularity::METHOD) }
+
+        it 'should raise an ArgumentError' do
+          expect { function_granularity < method_granularity }.to raise_error(ArgumentError)
+          expect { function_granularity <= method_granularity }.to raise_error(ArgumentError)
+          expect { function_granularity >= method_granularity }.to raise_error(ArgumentError)
+          expect { function_granularity > method_granularity }.to raise_error(ArgumentError)
+        end
+      end
     end
 
     describe 'to_s' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalibro_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Quadros Miranda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -379,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: KalibroClient is a communication interface with the KalibroProcessor and