Only include memoized method into classes where it is really used

This way we do not change anything in the global Module and Kernel namespace.

lib/aws/ses.rb

@@ -13,7 +13,8 @@
 end
 
 $:.unshift(File.dirname(__FILE__))
-require 'ses/extensions'
+
+require 'ses/expirable_memoize'
 
 require 'ses/response'
 require 'ses/send_email'

lib/aws/ses/expirable_memoize.rb

@@ -0,0 +1,45 @@
+#:stopdoc:
+module AWS
+  module SES
+    module ExpirableMemoize
+      module InstanceMethods
+        def __method__(depth = 0)
+          caller[depth][/`([^']+)'/, 1]
+        end if RUBY_VERSION <= '1.8.7'
+
+        def __called_from__
+          caller[1][/`([^']+)'/, 1]
+        end if RUBY_VERSION > '1.8.7'
+
+        def expirable_memoize(reload = false, storage = nil)
+          current_method = RUBY_VERSION > '1.8.7' ? __called_from__ : __method__(1)
+          storage = "@#{storage || current_method}"
+          if reload 
+            instance_variable_set(storage, nil)
+          else
+            if cache = instance_variable_get(storage)
+              return cache
+            end
+          end
+          instance_variable_set(storage, yield)
+        end
+      end
+
+      module ClassMethods
+        def memoized(method_name)
+          original_method = "unmemoized_#{method_name}_#{Time.now.to_i}"
+          alias_method original_method, method_name
+          module_eval(<<-EVAL, __FILE__, __LINE__)
+            def #{method_name}(reload = false, *args, &block)
+              expirable_memoize(reload) do
+                send(:#{original_method}, *args, &block)
+              end
+            end
+          EVAL
+        end
+      end
+    end
+  end
+end
+
+#:startdoc:

lib/aws/ses/info.rb

@@ -50,6 +50,9 @@ module SES
     #         "Complaints"=>"0"}]
 
     module Info
+      include AWS::SES::ExpirableMemoize::InstanceMethods
+      extend AWS::SES::ExpirableMemoize::ClassMethods
+
       # Returns quota information provided by SES
       # 
       # The return format inside the response result will look like:

lib/aws/ses/response.rb

@@ -1,6 +1,9 @@
 module AWS
   module SES
     class Response < String  
+      include AWS::SES::ExpirableMemoize::InstanceMethods
+      extend AWS::SES::ExpirableMemoize::ClassMethods
+
       attr_reader :response, :body, :parsed, :action
 
       def initialize(action, response)

test/extensions_test.rb → test/expirable_memoize_test.rb

@@ -2,6 +2,9 @@
 
 class KerneltExtensionsTest < Test::Unit::TestCase
   class Foo
+    include AWS::SES::ExpirableMemoize::InstanceMethods
+    extend AWS::SES::ExpirableMemoize::ClassMethods
+
     def foo
       __method__
     end
@@ -16,6 +19,9 @@ def baz
   end
 
   class Bar
+    include AWS::SES::ExpirableMemoize::InstanceMethods
+    extend AWS::SES::ExpirableMemoize::ClassMethods
+
     def foo
       calling_method
     end
@@ -45,6 +51,9 @@ def test___method___depth
 
 class ModuleExtensionsTest < Test::Unit::TestCase
   class Foo
+    include AWS::SES::ExpirableMemoize::InstanceMethods
+    extend AWS::SES::ExpirableMemoize::ClassMethods
+
     def foo(reload = false)
       expirable_memoize(reload) do
         Time.now