apdex 0.2.0 → 0.3.0

data/CHANGES.markdown

@@ -1,2 +1,6 @@
+- Added Apdex::Calculate
+- Fixed floating point division issue when there is an odd number of tolerations (caused incorrect score) 
+
+0.2.0
 - Initial Release
 - Added Apdex::CalculateFromLog

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
-:minor: 2
+:minor: 3
 :patch: 0
+:major: 0

data/lib/apdex.rb

@@ -2,4 +2,5 @@ module Apdex
 end
 
 dir = File.dirname(__FILE__)
+require "#{dir}/apdex/calculate"
 require "#{dir}/apdex/calculate_from_log"

data/lib/apdex/calculate.rb

@@ -0,0 +1,34 @@
+module Apdex
+  class Calculate
+    def call(threshold, times)
+      output = categorize_times(threshold, times)
+      output[:score] = calculate_apdex(output)
+      output
+    end
+
+    protected
+
+    def categorize_times(threshold, times)
+      output = {}
+      output[:satisfied] = output[:tolerating] = output[:frustrated] = 0
+      times.each do |value|
+        if value <= threshold
+          output[:satisfied] += 1
+        elsif value <= (threshold * 4)
+          output[:tolerating] += 1
+        else
+          output[:frustrated] += 1
+        end
+      end
+      output
+    end
+
+    def calculate_apdex(output)
+      raw_score = (1.0 *
+        (output[:satisfied] + (output[:tolerating]/2.0)) /
+        (output[:satisfied] + output[:tolerating] + output[:frustrated])
+      )
+      ("%0.3f" % raw_score).to_f
+    end
+  end
+end

data/lib/apdex/calculate_from_log.rb

@@ -19,9 +19,7 @@ module Apdex
 
     def call(threshold, input)
       values = value_from_input(input)
-      output = categorize_values(values, threshold)
-      output[:score] = calculate_apdex(output)
-      output
+      Calculate.new.call(threshold, values)
     end
     
     protected
@@ -37,28 +35,5 @@ module Apdex
         end
       end
     end
-
-    def categorize_values(values, threshold)
-      output = {}
-      output[:satisfied] = output[:tolerating] = output[:frustrated] = 0
-      values.each do |value|
-        if value <= threshold
-          output[:satisfied] += 1
-        elsif value <= (threshold * 4)
-          output[:tolerating] += 1
-        else
-          output[:frustrated] += 1
-        end
-      end
-      output
-    end
-
-    def calculate_apdex(output)
-      raw_score = (1.0 *
-        (output[:satisfied] + (output[:tolerating]/2)) /
-        (output[:satisfied] + output[:tolerating] + output[:frustrated])
-      )
-      ("%0.3f" % raw_score).to_f
-    end
   end
 end

data/spec/apdex/calculate_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+
+module Apdex
+  describe Calculate do
+    describe "#call" do
+      context "when the sum of the tolerating counts is odd" do
+        it "calculates the correct score" do
+          Calculate.new.call(1, [2, 0.5]).should == {
+            :satisfied => 1,
+            :tolerating => 1,
+            :frustrated => 0,
+            :score => 0.75
+          }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: apdex
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chad Woolley
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-06-09 00:00:00 -07:00
 default_executable: apdex_from_log
 dependencies: []
 
@@ -30,8 +30,9 @@ files:
 - VERSION.yml
 - bin/apdex_from_log
 - lib/apdex.rb
+- lib/apdex/calculate.rb
 - lib/apdex/calculate_from_log.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/pivotal/apdex
 licenses: []
 
@@ -57,9 +58,10 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Calculate apdex scores from an Apache or Nginx log
 test_files: 
 - spec/apdex/calculate_from_log_spec.rb
-- spec/spec_suite.rb
+- spec/apdex/calculate_spec.rb
 - spec/spec_helper.rb
+- spec/spec_suite.rb