metric_adapter 0.0.2 → 0.0.3

data/lib/adapters/flay_adapter.rb

@@ -12,25 +12,12 @@ module MetricAdapter
           create_metric(hash_key, node_a, node_b)
         end
       end
-      
+
       metrics.flatten
     end
   
     private
-  
-    def metrics_for_hash(hash_key, score)
-      nodes = flay.hashes[hash_key]
-      is_identical = 
       
-      location = method_location(signature)
-      message  = "Flog: #{score.round(2)}"
-    
-      metric = Metric.new(location, signature, message)
-      metric.score = score
-    
-      metric
-    end
-    
     def create_metric(hash_key, node_a, node_b)
       is_identical = flay.identical[hash_key]
       similarity   = is_identical ? "identical" : "similar"
@@ -41,6 +28,8 @@ module MetricAdapter
       signature = ""
       
       metric = Metric.new(node_location(node_a), signature, message)
+      metric.score = score
+      metric
     end
     
     def node_location(node)

data/test/flay_adapter_test.rb

@@ -13,13 +13,14 @@ class FlayAdapterTest < MiniTest::Unit::TestCase
     assert_equal [], adapter.metrics
   end
   
-  def test_flay_adapts_locations
+  def test_flay_generates_metrics_per_line
     adapter  = flay_self
     flay = adapter.flay
-    # For each set of similar nodes, it should generate all the permutations (nodes choose 2)
-    expected_count = flay.hashes.map{|h, nodes| nodes ** 2}.inject{|n,m| n+m }
     
-    assert_equal expected_count, adapter.metrics.length, "Each set of similar nodes should generate n^2 metrics"
+    # For each set of similar nodes, it should generate all the permutations
+    expected_count = flay.hashes.map{|h, nodes| nodes.permutation(2).count }.inject{|n,m| n+m }
+    count          = adapter.metrics.length
+    assert_equal expected_count, count, "Each set of similar nodes should generate n! metrics"
   end
   
   def test_flay_adapts_locations
@@ -30,12 +31,19 @@ class FlayAdapterTest < MiniTest::Unit::TestCase
     assert metric.line != 0, "Line numbers should be captured (line:0 should not show up in flog)"
   end
   
+  def test_flay_adapts_scores
+    adapter = flay_self
+    scores  = adapter.metrics.map(&:score)
+    
+    assert scores.all?{|s| s > 0 }, "Expected all the scores to be populated. #{scores.inspect}"
+  end
+  
   def test_flay_messages
     adapter  = flay_self
     metric   = adapter.metrics.first
     message  = metric.message
     
-    assert message =~ /flay/i,   "Should reference flay: #{message.inspect}"
+    assert message =~ /flay/i, "Should reference flay: #{message.inspect}"
     assert message =~ /#{Regexp.escape __FILE__}:\d+/, "Should reference the a path: #{message.inspect}"
   end
   
@@ -47,6 +55,5 @@ class FlayAdapterTest < MiniTest::Unit::TestCase
     flay.analyze
     
     FlayAdapter.new(flay)
-  end
-  
+  end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adam Sanderson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-26 00:00:00 -07:00
+date: 2013-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: []