benelux 0.5.15 → 0.5.16

data/CHANGES.txt

@@ -1,6 +1,12 @@
 BENELUX, CHANGES
 
 
+#### 0.5.16 (2010-06-08) ##############################
+
+* ADDED: Support for timing class methods.
+* ADDED: New Calculator attribute: time
+
+
 #### 0.5.15 (2010-04-03) ##############################
 
 * FIXED: require 'storable'. Rookie!

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.15"
+  s.version = "0.5.16"
   s.summary = "Benelux: A mad way to time Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

data/lib/benelux.rb

@@ -5,7 +5,7 @@ require 'selectable'
 require 'storable'
 
 module Benelux
-  VERSION = "0.5.15"
+  VERSION = "0.5.16"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end

data/lib/benelux/packer.rb

@@ -41,8 +41,18 @@ module Benelux
       thread_id, call_id = Thread.current.object_id.abs, @klass.object_id.abs
       @methorig = methorig = :"__benelux_#{@meth}_#{thread_id}_#{call_id}"
       Benelux.ld "%20s: %s" % ['Alias', @methorig] 
+      
       @klass.module_eval do
-        alias_method methorig, m  # Can't use the instance variables
+        Benelux.ld [:def, self, m, 
+          MethodPacker.method_defined?(self, m),
+          MethodPacker.class_method_defined?(self, m)].inspect
+        if MethodPacker.method_defined?(self, m)
+          alias_method methorig, m  # Can't use the instance variables
+        elsif MethodPacker.class_method_defined?(self, m)
+          eval "class << self; alias #{methorig} #{m}; end"
+        else
+          raise BeneluxError, "No such method: #{self}.#{m}"
+        end
       end
       install_method  # see generate_packed_method
       self.add_tags :class => @klass.to_s.to_sym, 
@@ -55,6 +65,16 @@ module Benelux
       Benelux.packed_methods[:all] << self
       
     end
+    def self.method_defined?(klass, meth)
+      meth &&= meth.to_s if RUBY_VERSION < "1.9"
+      klass.method_defined?(meth) || 
+      klass.private_method_defined?(meth) ||
+      klass.protected_method_defined?(meth)
+    end
+    def self.class_method_defined?(klass, meth)
+      meth &&= meth.to_s if RUBY_VERSION < "1.9"
+      klass.singleton_methods.member? meth
+    end
     def install_method
       raise "You need to implement this method"
     end

data/lib/benelux/stats.rb

@@ -132,7 +132,8 @@ module Benelux
       field :n => Integer
       field :min => Float
       field :max => Float
-
+      field :time => Float
+      
       def initialize
         reset
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -04:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency