kalibro_client 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e7df405fbb5caaf2ed0998437a1e6a4ef66b74e
-  data.tar.gz: c6123a2a752d3750f33e04f428395b5bf98c1bb6
+  metadata.gz: b40775ac3e5ba10762848b6572733224f37a152a
+  data.tar.gz: 92263bcca84854b2fc945eed763cf8508fc4e5c2
 SHA512:
-  metadata.gz: 44c1230696f6f271e0619473edad2700caf0c3f34f9b8f2ea1ff4df3fc77efb300c91b386c4671e7e909b4ac106ea1b3884246dec111831098ebea5f9044f25c
-  data.tar.gz: 8011b114efdaf7ce12c0e2f234aeaae49d99e80c19c8d0d912b57b027d7da9e519a233105f5a6e11b10eb8d42f27f22250d0274e6de25d63fc0b3055db63126c
+  metadata.gz: 31e14134d85a08877a3839550c8e97c8b8c73b390042b24c6068723bf5304af652d0a046bf3795458c00f15639a1b621bf0e74146b562f0b9944db23186af183
+  data.tar.gz: bb36487be04498b65d0f4bd3007ca6e886e78f41ffb06995377af90f7a795fb174bb0dc86ddd92e400482be7dc1d359eca3a3d48a38e6bd304ad633662c6160a

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/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module KalibroClient
-  VERSION = "0.4.0"
+  VERSION = "0.5.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: 0.4.0
+  version: 0.5.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