flog 4.0.0 → 4.1.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 4.1.0 / 2013-05-10
+
+* 3 minor enhancements:
+
+  * Cleaned up tests by adding assert_hash_in_epsilon. yay!
+  * Fixed method_location is now cleared on #reset. (makaroni4)
+  * to_proc_normal is now penalized based on RUBY_VERSION. Scores were benchmarked.
+
+* 1 bug fix:
+
+  * Fixed code/home urls in readme/gem.
+
 === 4.0.0 / 2013-04-18
 
 * 1 major enhancement:

data/README.txt

@@ -1,7 +1,7 @@
 = flog
 
 home :: http://ruby.sadi.st/
-repo :: https://github.com/seattlerb/flog
+code :: https://github.com/seattlerb/flog
 rdoc :: http://seattlerb.rubyforge.org/flog
 
 == DESCRIPTION:

data/lib/flog.rb

@@ -11,7 +11,7 @@ class File
 end
 
 class Flog < SexpProcessor
-  VERSION = "4.0.0" # :nodoc:
+  VERSION = "4.1.0" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -42,7 +42,16 @@ class Flog < SexpProcessor
     :super          => 1,
     :to_proc_icky!  => 10,
     :to_proc_lasgn  => 15,
-    :to_proc_normal => 5,
+    :to_proc_normal => case RUBY_VERSION
+                       when /^1\.8\.7/ then
+                         2
+                       when /^1\.9/ then
+                         1.5
+                       when /^2\.[01]/ then
+                         1
+                       else
+                         5
+                       end,
     :yield          => 1,
   }
 
@@ -330,11 +339,12 @@ class Flog < SexpProcessor
   # Reset score data
 
   def reset
-    @totals        = @total_score = nil
-    @multiplier    = 1.0
-    @calls         = Hash.new { |h,k| h[k] = Hash.new 0 }
-    @method_scores = Hash.new { |h,k| h[k] = [] }
-    @scores        = Hash.new 0
+    @totals           = @total_score = nil
+    @multiplier       = 1.0
+    @calls            = Hash.new { |h,k| h[k] = Hash.new 0 }
+    @method_scores    = Hash.new { |h,k| h[k] = [] }
+    @scores           = Hash.new 0
+    @method_locations = {}
   end
 
   ##

data/test/test_flog.rb

@@ -190,11 +190,19 @@ class TestFlog < FlogTest
              s(:block_pass,
                s(:call, nil, :b)))
 
-    util_process(sexp, 9.4,
+    bonus = case RUBY_VERSION
+            when /^1\.8\.7/ then 0.4
+            when /^1\.9/    then 0.3
+            when /^2\.[01]/ then 0.2
+            end
+
+    bonus += Flog::OTHER_SCORES[:to_proc_normal]
+
+    util_process(sexp, 3.4 + bonus,
                  :a              => 1.0,
                  :block_pass     => 1.2,
                  :b              => 1.2,
-                 :to_proc_normal => 6.0)
+                 :to_proc_normal => 0.0 + bonus)
   end
 
   def test_process_block_pass_colon2
@@ -559,6 +567,14 @@ class TestFlog < FlogTest
     assert_equal 16.0, @flog.max_score
   end
 
+  def assert_hash_in_epsilon exp, act
+    assert_equal exp.keys.sort_by(&:to_s), act.keys.sort_by(&:to_s)
+
+    exp.keys.each do |k|
+      assert_in_epsilon exp[k], act[k], 0.001, k
+    end
+  end
+
   def util_process sexp, score = -1, hash = {}
     setup
     @flog.process sexp
@@ -567,13 +583,16 @@ class TestFlog < FlogTest
     @meth  ||= "#none"
 
     unless score != -1 && hash.empty? then
-      exp = {"#{@klass}#{@meth}" => hash}
-      assert_equal exp, @flog.calls
+      key = "#{@klass}#{@meth}"
+      act = @flog.calls
+
+      assert_equal [key], act.keys.sort
+      assert_hash_in_epsilon hash, act[key]
     end
 
     @flog.calculate_total_scores
 
-    assert_in_delta score, @flog.total_score
+    assert_in_epsilon score, @flog.total_score
   end
 
   def test_threshold
@@ -596,6 +615,50 @@ class TestFlog < FlogTest
     assert_equal({ 'MyKlass' => [["MyKlass::Base#mymethod", 42.0]] }, @flog.method_scores)
   end
 
+  def test_reset
+    user_class = %(
+        class User
+          def blah n
+            puts "blah" * n
+          end
+        end
+      )
+    user_file = "user.rb"
+
+    @flog.flog_ruby user_class, user_file
+    @flog.calculate_total_scores
+    @flog.calculate
+
+    assert_equal({ 'User#blah' => 'user.rb:3' }, @flog.method_locations)
+    assert_equal({ "User#blah" => 2.2 }, @flog.totals)
+    assert_equal(2.2, @flog.total_score)
+    assert_equal(1.0, @flog.multiplier)
+    assert_equal({ "User#blah" => { :* => 1.2, :puts => 1.0 } }, @flog.calls)
+    assert_equal({ "User" => 2.2 }, @flog.scores)
+
+    @flog.reset
+
+    coder_class = %(
+        class Coder
+          def happy?
+            [true, false].sample
+          end
+        end
+      )
+    coder_file = "coder.rb"
+
+    @flog.flog_ruby coder_class, coder_file
+    @flog.calculate_total_scores
+    @flog.calculate
+
+    assert_equal({ 'Coder#happy?' => 'coder.rb:3' }, @flog.method_locations)
+    assert_equal({ "Coder#happy?" => 1.0 }, @flog.totals)
+    assert_equal(1.0, @flog.total_score)
+    assert_equal(1.0, @flog.multiplier)
+    assert_equal({ "Coder#happy?" => { :sample => 1.0 } }, @flog.calls)
+    assert_equal({ "Coder" => 1.0 }, @flog.scores)
+  end
+
   def setup_my_klass
     @flog.class_stack  << "Base" << "MyKlass"
     @flog.method_stack << "mymethod"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 4
+  - 1
   - 0
-  - 0
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-04-18 00:00:00 Z
+date: 2013-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -84,11 +84,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
-        - 4
-        - 7
-        version: "4.7"
+        - 5
+        - 0
+        version: "5.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency