memoize 1.2.0 → 1.2.1

data/CHANGES

@@ -1,3 +1,10 @@
+= 1.2.1 - 2-Feb-2006
+* Cache files are now read in binary mode to eliminate issues with Marshal
+  and MS Windows.  Thanks go to Brian Buckley for the spot.
+* Refactored code base down to about half previous size.  Thanks go to Andrew
+  Johnson.
+* Some documentation corrections.
+
 = 1.2.0 - 31-Dec-2005
 * Added support for memoizing to file rather than memory
 * Corresponding changes in the test suite and example programs

data/README

@@ -44,10 +44,9 @@ Memoize#memoize(method, file=nil)
    you the value from the table instead of letting the method compute the
    value again.
    
-   If +file+ is provided, the results are cached to that file instead of
-   in memory.  Note that this uses Marshal internally, so don't expect your
-   cache to work between different versions of Ruby, should you happen to
-   upgrade.
+   If +file+ is provided, the results are cached to that file.  Note that
+   this uses Marshal internally.  Beware of changes in the Marshal format
+   should you happen to upgrade.
 
    Returns the cache, which you can inspect or manipulate directly if you are
    so inclined.
@@ -55,13 +54,20 @@ Memoize#memoize(method, file=nil)
 = Acknowledgements
    Code borrowed from Nobu Nakada (ruby-talk:155159).
    Code borrowed from Ara Howard (ruby-talk:173428).
+   Code borrowed from Andrew Johnson (http://tinyurl.com/8ymx8)
    Ideas taken from Brian Buckley and Sean O'Halpin.
+   Tiny URL provided for Andrew Johnson because I could not find the ruby-talk
+   reference.  The gateway may have been broken at the time.
+   
+== Known Issues
+   None that I'm aware of.  Please report any problems on the Shards tracker
+   or the forums at http://www.rubyforge.org/projects/shards.
 
 == License
    Ruby's
 
 == Copyright
-   (C) 2005, Daniel J. Berger
+   (C) 2005, 2006 Daniel J. Berger
    All Rights Reserved
 
 = Author

data/lib/memoize.rb

@@ -1,39 +1,18 @@
 module Memoize
-   MEMOIZE_VERSION = "1.2.0"
+   MEMOIZE_VERSION = "1.2.1"
    
    # Memoize the method +name+.  If +file+ is provided, then the method results
-   # are stored on disk rather than in memory.  This consumes virtually no
-   # memory and is persistant.
+   # are stored on disk as well as in memory.
    def memoize(name, file=nil)
-      meth = method(name)
-      
-      if file
-         cache = Hash.new.update(Marshal.load(File.read(file))) rescue {}
-      else
-         cache = {}
-      end
-      
-      if file
-         (class << self; self; end).class_eval do
-            define_method(name) do |*args|
-               unless cache.has_key?(args)
-                  cache[args] = meth.call(*args)
-                  File.open(file, "wb+"){|f| Marshal.dump(cache, f) }
-               end
-               cache[args]
-            end
-         end
-      else
-         (class << self; self; end).class_eval do
-            define_method(name) do |*args|
-               if cache.has_key?(args)
-                  cache[args]
-               else
-                  cache[args] ||= meth.call(*args)
-               end
-            end
-         end
-      end
-      cache
+        cache = File.open(file, "rb"){ |io| Marshal.load(io) } rescue {}
+
+        (class<<self; self; end).send(:define_method, name) do |*args|
+          unless cache[args]
+            cache[args] = super
+            File.open(file, "wb+"){ |f| Marshal.dump(cache, f) } if file
+          end
+          cache[args]
+        end
+        cache
    end
-end
+end

data/test/tc_memoize.rb

@@ -20,7 +20,7 @@ class TC_Memoize < Test::Unit::TestCase
    def setup
       @cache1 = nil
       @cache2 = nil
-      @file   = ENV["HOME"] || ENV["USERPROFILE"] + "/test.cache"
+      @file   = (ENV["HOME"] || ENV["USERPROFILE"]) + "/test.cache"
    end
 
    def fib(n)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: memoize
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2005-12-31
+  version: 1.2.1
+date: 2006-02-02 00:00:00 -07:00
 summary: Speeds up methods at the cost of memory (or disk space)
 require_paths: 
-  - lib
+- lib
 email: djberg96@gmail.com
 homepage: http://www.rubyforge.org/projects/shards
 rubyforge_project: 
@@ -18,27 +18,33 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Daniel J. Berger
+- Daniel J. Berger
 files: 
-  - lib/memoize.rb
-  - README
-  - CHANGES
-  - MANIFEST
-  - test/tc_memoize.rb
+- lib/memoize.rb
+- CHANGES
+- MANIFEST
+- README
+- test/tc_memoize.rb
 test_files: 
-  - test/tc_memoize.rb
+- test/tc_memoize.rb
 rdoc_options: []
+
 extra_rdoc_files: 
-  - README
-  - CHANGES
+- README
+- CHANGES
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+