From f2c0fb32c0dce7f8da0ce446e2d2f0cba5fd44b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 16 Jun 2011 08:01:35 -0300
Subject: Remove usage of memoizable from ActionPack.

---
 actionpack/lib/action_dispatch/http/headers.rb    |  6 +++---
 actionpack/lib/action_view/helpers/date_helper.rb | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 1e43104f0a..505d5560b1 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -3,9 +3,10 @@ require 'active_support/memoizable'
 module ActionDispatch
   module Http
     class Headers < ::Hash
-      extend ActiveSupport::Memoizable
+      @@env_cache = Hash.new { |h,k| h[k] = "HTTP_#{k.upcase.gsub(/-/, '_')}" }
 
       def initialize(*args)
+
         if args.size == 1 && args[0].is_a?(Hash)
           super()
           update(args[0])
@@ -25,9 +26,8 @@ module ActionDispatch
       private
         # Converts a HTTP header name to an environment variable name.
         def env_name(header_name)
-          "HTTP_#{header_name.upcase.gsub(/-/, '_')}"
+          @@env_cache[header_name]
         end
-        memoize :env_name
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 56e3af683b..6a724749f4 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -621,7 +621,6 @@ module ActionView
     end
 
     class DateTimeSelector #:nodoc:
-      extend ActiveSupport::Memoizable
       include ActionView::Helpers::TagHelper
 
       DEFAULT_PREFIX = 'date'.freeze
@@ -786,11 +785,12 @@ module ActionView
         # Returns translated month names, but also ensures that a custom month
         # name array has a leading nil element.
         def month_names
-          month_names = @options[:use_month_names] || translated_month_names
-          month_names.unshift(nil) if month_names.size < 13
-          month_names
+          @month_names ||= begin
+            month_names = @options[:use_month_names] || translated_month_names
+            month_names.unshift(nil) if month_names.size < 13
+            month_names
+          end
         end
-        memoize :month_names
 
         # Returns translated month names.
         #  => [nil, "January", "February", "March",
@@ -825,9 +825,8 @@ module ActionView
         end
 
         def date_order
-          @options[:order] || translated_date_order
+          @date_order ||= @options[:order] || translated_date_order
         end
-        memoize :date_order
 
         def translated_date_order
           I18n.translate(:'date.order', :locale => @options[:locale]) || []
-- 
cgit v1.2.3