From 7a26a9dfad4d6f71cd81b27181a9bd92062205b0 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Mon, 29 Mar 2010 23:12:43 +0200 Subject: [PATCH] Cache: vars renamed --- lib/logan/cache.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/logan/cache.rb b/lib/logan/cache.rb index de71614..f6ed504 100644 --- a/lib/logan/cache.rb +++ b/lib/logan/cache.rb @@ -10,16 +10,16 @@ class LogAn::Cache end def flush! - @data.each {|k,v| @obj[k] = v } + @data.each {|k,v| @source[k] = v } @data = {} end def dget k - @data[k] ||= @obj[k] + @data[k] ||= @source[k] end def oget k - @data[k] || @obj[k] + @data[k] || @source[k] end def dset k, v @@ -27,7 +27,7 @@ class LogAn::Cache end def oset k, v - @obj[k] = v + @source[k] = v end def type= type @@ -49,7 +49,7 @@ class LogAn::Cache #def each &e #return Enumerator.new self, :each unless e #flush! - #@obj.each &e + #@source.each &e #self #end end @@ -58,18 +58,18 @@ class LogAn::AutoValueConvertHash include Enumerable attr_reader :decode, :encode - def initialize obj, encode = nil, each = nil, &decode - @object, @encoder = obj, decode.nil? ? encode || Marshal.method( :dump) : nil, - @each = each || obj.method( :each) rescue NameError + def initialize source, encode = nil, each = nil, &decode + @source, @encoder = source, decode.nil? ? encode || Marshal.method( :dump) : nil, + @each = each || source.method( :each) rescue NameError @decode = decode || Marshal.method( :restore) end def [] k - @decode.call @object[k] + @decode.call @source[k] end def []= k, v - @object[k] = @encode.call v + @source[k] = @encode.call v end def each *paras