lib/memoist.rb in memoist-0.2.0 vs lib/memoist.rb in memoist-0.9.0

- old
+ new

@@ -1,114 +1,197 @@ -# require 'active_support/core_ext/kernel/singleton_class' require 'memoist/core_ext/singleton_class' module Memoist - def self.memoized_ivar_for(symbol) - "@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}".to_sym + def self.memoized_ivar_for(method_name, identifier=nil) + ["@#{memoized_prefix(identifier)}", escape_punctuation(method_name.to_s)].join("_") end - module InstanceMethods - def self.included(base) - base.class_eval do - unless base.method_defined?(:freeze_without_memoizable) - alias_method :freeze_without_memoizable, :freeze - alias_method :freeze, :freeze_with_memoizable - end - end + def self.unmemoized_method_for(method_name, identifier=nil) + [unmemoized_prefix(identifier), method_name].join("_").to_sym + end + + def self.memoized_prefix(identifier=nil) + ["_memoized", identifier].compact.join("_") + end + + def self.unmemoized_prefix(identifier=nil) + ["_unmemoized", identifier].compact.join("_") + end + + def self.escape_punctuation(string) + string.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang') + end + + def self.memoist_eval(klass, *args, &block) + if klass.respond_to?(:class_eval) + klass.class_eval(*args, &block) + else + klass.singleton_class.class_eval(*args, &block) end + end - def freeze_with_memoizable - memoize_all unless frozen? - freeze_without_memoizable + def self.extract_reload!(method, args) + if args.length == method.arity + 1 && (args.last == true || args.last == :reload) + reload = args.pop end + reload + end + module InstanceMethods def memoize_all prime_cache end def unmemoize_all flush_cache end - def prime_cache(*syms) - if syms.empty? - syms = methods.collect do |m| - m[12..-1] if m.to_s.start_with?("_unmemoized_") + def prime_cache(*method_names) + if method_names.empty? + prefix = Memoist.unmemoized_prefix+"_" + method_names = methods.collect do |method_name| + if method_name.to_s.start_with?(prefix) + method_name[prefix.length..-1] + end end.compact end - syms.each do |sym| - m = method(:"_unmemoized_#{sym}") rescue next - if m.arity == 0 - __send__(sym) + method_names.each do |method_name| + if method(Memoist.unmemoized_method_for(method_name)).arity == 0 + __send__(method_name) else - ivar = Memoist.memoized_ivar_for(sym) + ivar = Memoist.memoized_ivar_for(method_name) instance_variable_set(ivar, {}) end end end - def flush_cache(*syms) - if syms.empty? - syms = (methods + private_methods + protected_methods).collect do |m| - m[12..-1] if m.to_s.start_with?("_unmemoized_") + def flush_cache(*method_names) + if method_names.empty? + prefix = Memoist.unmemoized_prefix+"_" + method_names = (methods + private_methods + protected_methods).collect do |method_name| + if method_name.to_s.start_with?(prefix) + method_name[prefix.length..-1] + end end.compact end - syms.each do |sym| - ivar = Memoist.memoized_ivar_for(sym) + method_names.each do |method_name| + ivar = Memoist.memoized_ivar_for(method_name) instance_variable_get(ivar).clear if instance_variable_defined?(ivar) end end end - def memoize(*symbols) - symbols.each do |symbol| - original_method = :"_unmemoized_#{symbol}" - memoized_ivar = Memoist.memoized_ivar_for(symbol) + def memoize(*method_names) + if method_names.last.is_a?(Hash) + identifier = method_names.pop[:identifier] + end - class_eval <<-EOS, __FILE__, __LINE__ + 1 - include InstanceMethods # include InstanceMethods - # - if method_defined?(:#{original_method}) # if method_defined?(:_unmemoized_mime_type) - raise "Already memoized #{symbol}" # raise "Already memoized mime_type" - end # end - alias #{original_method} #{symbol} # alias _unmemoized_mime_type mime_type - # - if instance_method(:#{symbol}).arity == 0 # if instance_method(:mime_type).arity == 0 - def #{symbol}(reload = false) # def mime_type(reload = false) - if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty? # if reload || !defined?(@_memoized_mime_type) || @_memoized_mime_type.empty? - #{memoized_ivar} = [#{original_method}] # @_memoized_mime_type = [_unmemoized_mime_type] - end # end - #{memoized_ivar}[0] # @_memoized_mime_type[0] - end # end - else # else - def #{symbol}(*args) # def mime_type(*args) - #{memoized_ivar} ||= {} unless frozen? # @_memoized_mime_type ||= {} unless frozen? - args_length = method(:#{original_method}).arity # args_length = method(:_unmemoized_mime_type).arity - if args.length == args_length + 1 && # if args.length == args_length + 1 && - (args.last == true || args.last == :reload) # (args.last == true || args.last == :reload) - reload = args.pop # reload = args.pop - end # end - # - if defined?(#{memoized_ivar}) && #{memoized_ivar} # if defined?(@_memoized_mime_type) && @_memoized_mime_type - if !reload && #{memoized_ivar}.has_key?(args) # if !reload && @_memoized_mime_type.has_key?(args) - #{memoized_ivar}[args] # @_memoized_mime_type[args] - elsif #{memoized_ivar} # elsif @_memoized_mime_type - #{memoized_ivar}[args] = #{original_method}(*args) # @_memoized_mime_type[args] = _unmemoized_mime_type(*args) - end # end - else # else - #{original_method}(*args) # _unmemoized_mime_type(*args) - end # end - end # end - end # end - # - if private_method_defined?(#{original_method.inspect}) # if private_method_defined?(:_unmemoized_mime_type) - private #{symbol.inspect} # private :mime_type - elsif protected_method_defined?(#{original_method.inspect}) # elsif protected_method_defined?(:_unmemoized_mime_type) - protected #{symbol.inspect} # protected :mime_type - end # end - EOS + method_names.each do |method_name| + unmemoized_method = Memoist.unmemoized_method_for(method_name, identifier) + memoized_ivar = Memoist.memoized_ivar_for(method_name, identifier) + + Memoist.memoist_eval(self) do + include InstanceMethods + + if method_defined?(unmemoized_method) + raise "Already memoized #{method_name}" + end + alias_method unmemoized_method, method_name + + if instance_method(method_name).arity == 0 + + # define a method like this; + + # def mime_type(reload=true) + # skip_cache = reload || !memoized?(:abc) + # set_cache = skip_cache && !frozen? + # + # if skip_cache + # value = _unmemoized_mime_type + # else + # value = @_memoized_mime_type[0] + # end + # + # if set_cache + # @_memoized_mime_type = [value] + # end + # + # value + # end + + module_eval <<-EOS, __FILE__, __LINE__ + 1 + def #{method_name}(reload = false) + skip_cache = reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty? + set_cache = skip_cache && !frozen? + + if skip_cache + value = #{unmemoized_method} + else + value = #{memoized_ivar}[0] + end + + if set_cache + #{memoized_ivar} = [value] + end + + value + end + EOS + else + + # define a method like this; + + # def mime_type(*args) + # reload = Memoist.extract_reload!(method(:_unmemoized_mime_type), args) + # + # skip_cache = reload || !memoized_with_args?(:mime_type, args) + # set_cache = skip_cache && !frozen + # + # if skip_cache + # value = _unmemoized_mime_type(*args) + # else + # value = @_memoized_mime_type[args] + # end + # + # if set_cache + # @_memoized_mime_type ||= {} + # @_memoized_mime_type[args] = value + # end + # + # value + # end + + module_eval <<-EOS, __FILE__, __LINE__ + 1 + def #{method_name}(*args) + reload = Memoist.extract_reload!(method(#{unmemoized_method.inspect}), args) + + skip_cache = reload || !(defined?(#{memoized_ivar}) && #{memoized_ivar} && #{memoized_ivar}.has_key?(args)) + set_cache = skip_cache && !frozen? + + if skip_cache + value = #{unmemoized_method}(*args) + else + value = #{memoized_ivar}[args] + end + + if set_cache + #{memoized_ivar} ||= {} + #{memoized_ivar}[args] = value + end + + value + end + EOS + end + + if private_method_defined?(unmemoized_method) + private method_name + elsif protected_method_defined?(unmemoized_method) + protected method_name + end + end end end end