spruz 0.2.0 → 0.2.1

data/Rakefile

@@ -23,12 +23,13 @@ end
 
 desc "Testing library"
 task :test  do
-  ruby '-Ilib tests/test_spruz.rb'
+  ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -Ilib"
+  sh 'testrb tests/test_*.rb'
 end
 
 desc "Testing library with coverage"
 task :coverage  do
-  sh "rcov -Ilib -x 'tests/.*\.rb' tests/test_spruz.rb"
+  sh "rcov -Ilib -x 'tests/.*\.rb' tests/test_*.rb"
 end
 
 if defined? Gem
@@ -48,7 +49,7 @@ if defined? Gem
     s.has_rdoc = true
     s.extra_rdoc_files << 'README'
     s.rdoc_options << '--title' <<  'Spruz' << '--main' << 'README'
-    s.test_files << 'tests/test_spruz.rb'
+    s.test_files.concat Dir['tests/test_*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/spruz/memoize.rb

@@ -22,19 +22,18 @@ module Spruz
       # object the method is called on.
       def memoize_method(*method_ids)
         method_ids.each do |method_id|
+          method_id = method_id.to_s.to_sym
           orig_method = instance_method(method_id)
           __send__(:define_method, method_id) do |*args|
             unless mc = ::Module.__memoize_cache__[__id__]
               mc = ::Module.__memoize_cache__[__id__] ||= {}
               ObjectSpace.define_finalizer(self, ::Module.__memoize_cache_delete__)
             end
-            if mc.key?(args)
-              result = mc[args]
+            if mc.key?(method_id) and result = mc[method_id][args]
+              result
             else
-              result = mc[args] = orig_method.bind(self).call(*args)
-              if $DEBUG
-                warn "#{self.class} cached method #{method_id}(#{args.inspect unless args.empty?}) = #{result.inspect} [#{__id__}]"
-              end
+              (mc[method_id] ||= {})[args] = result = orig_method.bind(self).call(*args)
+              $DEBUG and warn "#{self.class} cached method #{method_id}(#{args.inspect unless args.empty?}) = #{result.inspect} [#{__id__}]"
             end
             result
           end
@@ -52,20 +51,26 @@ module Spruz
       def memoize_function(*function_ids)
         mc = @__memoize_cache__ ||= {}
         function_ids.each do |method_id|
+          method_id = method_id.to_s.to_sym
           orig_method = instance_method(method_id)
           __send__(:define_method, method_id) do |*args|
-            if mc.key?(args)
-              result = mc[args]
+            if mc.key?(method_id) and result = mc[method_id][args]
+              result
             else
-              result = mc[args] = orig_method.bind(self).call(*args)
-              if $DEBUG
-                warn "#{self.class} cached function #{method_id}(#{args.inspect unless args.empty?}) = #{result.inspect}"
-              end
+              (mc[method_id] ||= {})[args] = result = orig_method.bind(self).call(*args)
+              $DEBUG and warn "#{self.class} cached function #{method_id}(#{args.inspect unless args.empty?}) = #{result.inspect}"
             end
             result
           end
         end
       end
+
+      # Clear cached values for all methods and functions.
+      def memoize_cache_clear
+        mc = @__memoize_cache__ and mc.clear
+        mc = ::Module.__memoize_cache__ and mc.clear
+        self
+      end
     end
   end
 end

data/lib/spruz/version.rb

@@ -1,6 +1,6 @@
 module Spruz
   # Spruz version
-  VERSION         = '0.2.0'
+  VERSION         = '0.2.1'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_spruz_memoize.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'spruz/memoize'
+
+module Spruz
+  class TestSpruzMemoize < Test::Unit::TestCase
+    class FooBar
+      def foo(*a)
+        @@foo ||= 0
+        @@foo += 1
+      end
+      memoize_method :foo
+
+      def bar(*a)
+        @@bar ||= 0
+        @@bar += 1
+      end
+      memoize_function :bar
+    end
+
+    def test_foo
+      fb1 = FooBar.new
+      fb2 = FooBar.new
+      assert_equal 1, fb1.foo(1, 2)
+      assert_equal 2, fb2.foo(1, 2)
+      assert_equal 3, fb1.foo(1, 2, 3)
+      assert_equal 4, fb2.foo(1, 2, 3)
+      assert_equal 1, fb1.foo(1, 2)
+      assert_equal 2, fb2.foo(1, 2)
+      FooBar.memoize_cache_clear
+      assert_equal 5, fb1.foo(1, 2)
+      assert_equal 6, fb2.foo(1, 2)
+      assert_equal 5, fb1.foo(1, 2)
+      assert_equal 6, fb2.foo(1, 2)
+    end
+
+    def test_bar
+      fb1 = FooBar.new
+      fb2 = FooBar.new
+      assert_equal 1, fb1.bar(1, 2)
+      assert_equal 1, fb2.bar(1, 2)
+      assert_equal 2, fb1.bar(1, 2, 3)
+      assert_equal 2, fb2.bar(1, 2, 3)
+      assert_equal 1, fb1.bar(1, 2)
+      assert_equal 1, fb2.bar(1, 2)
+      FooBar.memoize_cache_clear
+      assert_equal 3, fb1.bar(1, 2)
+      assert_equal 3, fb2.bar(1, 2)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Florian Frank
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2010-11-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -72,6 +72,7 @@ files:
 - lib/spruz/xt.rb
 - lib/spruz.rb
 - tests/test_spruz.rb
+- tests/test_spruz_memoize.rb
 - install.rb
 - LICENSE
 has_rdoc: true
@@ -109,3 +110,4 @@ specification_version: 3
 summary: Useful stuff.
 test_files: 
 - tests/test_spruz.rb
+- tests/test_spruz_memoize.rb