From 8a9934a9d9fc98b56c4566ae2e3fd4d83e505d3e Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 14 Jul 2008 19:50:32 -0500
Subject: Added Memoizable mixin for caching simple lazy loaded attributes

---
 activesupport/lib/active_support/memoizable.rb | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 activesupport/lib/active_support/memoizable.rb

(limited to 'activesupport/lib/active_support/memoizable.rb')

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
new file mode 100644
index 0000000000..c78fb0a793
--- /dev/null
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -0,0 +1,32 @@
+module ActiveSupport
+  module Memoizable
+    def self.included(base) #:nodoc:
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def memorize(symbol)
+        original_method = "_unmemorized_#{symbol}"
+        alias_method original_method, symbol
+        class_eval <<-EOS, __FILE__, __LINE__
+          def #{symbol}
+            if instance_variable_defined?(:@#{symbol})
+              @#{symbol}
+            else
+              @#{symbol} = #{original_method}
+            end
+          end
+        EOS
+      end
+    end
+
+    def freeze
+      methods.each do |method|
+        if m = method.to_s.match(/^_unmemorized_(.*)/)
+          send(m[1]).freeze
+        end
+      end
+      super
+    end
+  end
+end
-- 
cgit v1.2.3


From 001c8beb4d0999a858a8b52ad511ee1251cc3517 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 14 Jul 2008 20:02:59 -0500
Subject: memorize typo

---
 activesupport/lib/active_support/memoizable.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support/memoizable.rb')

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index c78fb0a793..65feca363a 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -5,8 +5,8 @@ module ActiveSupport
     end
 
     module ClassMethods
-      def memorize(symbol)
-        original_method = "_unmemorized_#{symbol}"
+      def memoize(symbol)
+        original_method = "_unmemoized_#{symbol}"
         alias_method original_method, symbol
         class_eval <<-EOS, __FILE__, __LINE__
           def #{symbol}
@@ -22,7 +22,7 @@ module ActiveSupport
 
     def freeze
       methods.each do |method|
-        if m = method.to_s.match(/^_unmemorized_(.*)/)
+        if m = method.to_s.match(/^_unmemoized_(.*)/)
           send(m[1]).freeze
         end
       end
-- 
cgit v1.2.3


From 911c2c381347ffb04615896ee6afe45277eeb103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Mon, 14 Jul 2008 20:23:23 -0500
Subject: Some performance tweaks to ActiveSupport::Memoizable

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 activesupport/lib/active_support/memoizable.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support/memoizable.rb')

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index 65feca363a..5af50df023 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -7,10 +7,12 @@ module ActiveSupport
     module ClassMethods
       def memoize(symbol)
         original_method = "_unmemoized_#{symbol}"
+        raise "Already memoized #{symbol}" if instance_methods.map(&:to_s).include?(original_method)
+
         alias_method original_method, symbol
         class_eval <<-EOS, __FILE__, __LINE__
           def #{symbol}
-            if instance_variable_defined?(:@#{symbol})
+            if defined? @#{symbol}
               @#{symbol}
             else
               @#{symbol} = #{original_method}
@@ -22,7 +24,7 @@ module ActiveSupport
 
     def freeze
       methods.each do |method|
-        if m = method.to_s.match(/^_unmemoized_(.*)/)
+        if m = method.to_s.match(/\A_unmemoized_(.*)/)
           send(m[1]).freeze
         end
       end
-- 
cgit v1.2.3


From 7f0346237e30e55d6cd16a8b4a9dfe4193f61804 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 14 Jul 2008 20:25:09 -0500
Subject: Append a "_" to memoized instance variables

---
 activesupport/lib/active_support/memoizable.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'activesupport/lib/active_support/memoizable.rb')

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index 5af50df023..d06250171a 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -7,15 +7,16 @@ module ActiveSupport
     module ClassMethods
       def memoize(symbol)
         original_method = "_unmemoized_#{symbol}"
+        memoized_ivar = "@_memoized_#{symbol}"
         raise "Already memoized #{symbol}" if instance_methods.map(&:to_s).include?(original_method)
 
         alias_method original_method, symbol
         class_eval <<-EOS, __FILE__, __LINE__
           def #{symbol}
-            if defined? @#{symbol}
-              @#{symbol}
+            if defined? #{memoized_ivar}
+              #{memoized_ivar}
             else
-              @#{symbol} = #{original_method}
+              #{memoized_ivar} = #{original_method}
             end
           end
         EOS
-- 
cgit v1.2.3