tins 0.5.6 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.0

data/lib/tins/memoize.rb

@@ -1,34 +1,29 @@
 module Tins
   module Memoize
-    class ::Module
-      class << self
-        # Returns the current memoize cache for all the stored objects and
-        # method call results.
-        def __memoize_cache__
-          @__memoize_cache__ ||= {}
-        end
+    module CacheMethods
+      # Return the cache object.
+      def __memoize_cache__
+        @__memoize_cache__ ||= {}
+      end
 
-        # Finalizer to delete the stored result for a garbage collected object.
-        def __memoize_cache_delete__
-          lambda do |id|
-            $DEBUG and warn "Deleted method results for object id='#{id}'"
-            __memoize_cache__.delete(id)
-          end
-        end
+      # Clear cached values for all methods/functions.
+      def memoize_cache_clear
+         __memoize_cache__.clear
+        self
       end
+    end
 
+    class ::Module
       # Automatically memoize calls of the the methods +method_ids+. The
       # memoized results do NOT ONLY depend on the arguments, but ALSO on the
       # object the method is called on.
       def memoize_method(*method_ids)
+        include CacheMethods
         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
+            mc = __memoize_cache__
             if mc.key?(method_id) and result = mc[method_id][args]
               result
             else
@@ -40,16 +35,13 @@ module Tins
         end
       end
 
-      # Returns the current memoize cache for this Module.
-      def __memoize_cache__
-        @__memoize_cache__
-      end
+      include CacheMethods
 
       # Automatically memoize calls of the functions +function_ids+. The
       # memoized result does ONLY depend on the arguments given to the
       # function.
       def memoize_function(*function_ids)
-        mc = @__memoize_cache__ ||= {}
+        mc = __memoize_cache__
         function_ids.each do |method_id|
           method_id = method_id.to_s.to_sym
           orig_method = instance_method(method_id)
@@ -64,13 +56,6 @@ module Tins
           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/tins/version.rb

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

data/tests/memoize_test.rb

@@ -17,24 +17,30 @@ module Tins
       memoize_function :bar
     end
 
-    def test_foo
+    def test_method_cache
       fb1 = FooBar.new
       fb2 = FooBar.new
+      assert_equal true, fb1.__memoize_cache__.empty?
+      assert_equal true, fb2.__memoize_cache__.empty?
       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
+      fb1.memoize_cache_clear
+      fb2.memoize_cache_clear
+      assert_equal true, fb1.__memoize_cache__.empty?
+      assert_equal true, fb2.__memoize_cache__.empty?
       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)
-      assert_equal false, Module.__memoize_cache__.empty?
+      assert_equal false, fb1.__memoize_cache__.empty?
+      assert_equal false, fb2.__memoize_cache__.empty?
     end
 
-    def test_bar
+    def test_function_cache
       fb1 = FooBar.new
       fb2 = FooBar.new
       assert_equal 1, fb1.bar(1, 2)

data/tins.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tins"
-  s.version = "0.5.6"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -296,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 869297561121614640
+      hash: 4391703042856250428
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: