From 01ab6f961bff150d50c99f03fa3946f48ac29b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 14 Oct 2010 09:47:49 +0200
Subject: Remove :cache => true on lookup templates initialization.

---
 actionpack/lib/action_view/lookup_context.rb         |  2 +-
 .../lib/action_view/renderer/template_renderer.rb    |  2 +-
 actionpack/lib/action_view/template.rb               |  9 ---------
 actionpack/lib/action_view/template/inline.rb        | 20 --------------------
 4 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 actionpack/lib/action_view/template/inline.rb

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 80451798b1..27f94a73a6 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -61,7 +61,7 @@ module ActionView
     def initialize(view_paths, details = {})
       @details, @details_key = { :handlers => default_handlers }, nil
       @frozen_formats, @skip_default_locale = false, false
-      @cache = details.key?(:cache) ? details.delete(:cache) : true
+      @cache = true
 
       self.view_paths = view_paths
       self.registered_detail_setters.each do |key, setter|
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 34b2f26199..36beb5c8d0 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -46,7 +46,7 @@ module ActionView
         with_fallbacks { find_template(options[:file], options[:prefix], false, keys) }
       elsif options.key?(:inline)
         handler = Template.handler_class_for_extension(options[:type] || "erb")
-        Template::Inline.new(options[:inline], handler, :locals => keys)
+        Template.new(options[:inline], "inline template", handler, :locals => keys)
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
           options[:template] : find_template(options[:template], options[:prefix], false, keys)
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 3ba18cbfae..7dd8acf37b 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -93,7 +93,6 @@ module ActionView
       autoload :Error
       autoload :Handler
       autoload :Handlers
-      autoload :Inline
       autoload :Text
     end
 
@@ -185,14 +184,6 @@ module ActionView
       end
     end
 
-    def hash
-      identifier.hash
-    end
-
-    def eql?(other)
-      other.is_a?(Template) && other.identifier == identifier
-    end
-
     def inspect
       @inspect ||=
         if defined?(Rails.root)
diff --git a/actionpack/lib/action_view/template/inline.rb b/actionpack/lib/action_view/template/inline.rb
deleted file mode 100644
index be08065b6b..0000000000
--- a/actionpack/lib/action_view/template/inline.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'digest/md5'
-
-module ActionView
-  class Template
-    class Inline < ::ActionView::Template
-      def initialize(source, handler, options={})
-        super(source, "inline template", handler, options)
-      end
-
-      def md5_source
-        @md5_source ||= Digest::MD5.hexdigest(source)
-      end
-
-      def eql?(other)
-        other.is_a?(Inline) && other.md5_source == md5_source
-      end
-    end
-  end
-end
-    
\ No newline at end of file
-- 
cgit v1.2.3