benelux 0.5.13 → 0.5.14

data/CHANGES.txt

@@ -1,6 +1,13 @@
 BENELUX, CHANGES
 
-#### 0.5.13 (2010-03-??) ##############################
+
+#### 0.5.14 (2010-03-23) ##############################
+
+New dependency: storable >= 0.6.5
+
+* CHANGE: Stats::Calculator now uses Storable 
+
+#### 0.5.13 (2010-03-20) ##############################
 
 * FIXED: Benelux::Stats::Calculator#merge! checks @n instead of @sum
 * CHANGE: Don't merge when the other Calculator has 0 samples. 

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.13"
+  s.version = "0.5.14"
   s.summary = "Benelux: A mad way to time Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -13,6 +13,8 @@
   s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
   s.require_paths = %w[lib]
   
+  s.add_dependency("storable", [">= 0.6.5"])
+  
   # = MANIFEST =
   # git ls-files
   s.files = %w(

data/lib/benelux.rb

@@ -4,7 +4,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.13"
+  VERSION = "0.5.14"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end

data/lib/benelux/stats.rb

@@ -122,10 +122,16 @@ module Benelux
     end
     
     # Based on Mongrel::Stats, Copyright (c) 2005 Zed A. Shaw
-    class Calculator
+    class Calculator < Storable
       include Selectable::Object
       
-      attr_reader :sum, :sumsq, :n, :min, :max
+      field :mean => Float
+      field :sd => Float
+      field :sum => Float
+      field :sumsq => Float
+      field :n => Integer
+      field :min => Float
+      field :max => Float
 
       def initialize
         reset
@@ -221,24 +227,6 @@ module Benelux
         end
       end
       
-      def to_hash
-        { :min => min, :mean => mean, :max => max, :sd => sd, :n => n, :sum => @sum, :sumsq => @sumsq }
-      end
-      
-      def self.from_hash(hash={})
-        me = new
-        me.instance_variable_set '@min', hash[:min] || hash['min']
-        me.instance_variable_set '@max', hash[:max] || hash['max']
-        me.instance_variable_set '@n', hash[:n] || hash['n']
-        me.instance_variable_set '@sum', hash[:sum] || hash['sum']
-        me.instance_variable_set '@sumsq', hash[:sumsq] || hash['sumsq']
-        me
-      end
-      
-      def to_json
-        to_hash.to_json
-      end
-      
       def ==(other)
         return false unless self.class == other.class
         a=([@sum, @min, @max, @n, @sumsq] - 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: storable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.5
+    version: 
 description: "Benelux: A mad way to time Ruby codes"
 email: delano@solutious.com
 executables: []