Changeset 8981

Timestamp:

03/05/08 02:03:24 (6 months ago)

Author:

pratik

Message:

Moved template handlers related code from ActionView::Base to ActionView::Template

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (3 diffs)
• trunk/actionpack/lib/action_view/helpers/cache_helper.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/template_finder.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/template.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/custom_handler_test.rb (modified) (1 diff)
• trunk/actionpack/test/controller/layout_test.rb (modified) (1 diff)
• trunk/actionpack/test/template/compiled_templates_test.rb (modified) (1 diff)
• trunk/actionpack/test/template/template_finder_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik]
-
-* Tests for div_for and content_tag_for helpers. Closes #11223 [thechrisoshow]

trunk/actionpack/lib/action_controller/base.rb

@@ -6 +6 @@
-require 'action_controller/url_rewriter'
-require 'action_controller/status_codes'
-
-
+
-require 'drb'
-require 'set'

trunk/actionpack/lib/action_view/base.rb

@@ -184 +184 @@
-    
-    delegate :request_forgery_protection_token, :to => :controller
-
-    @@template_handlers = HashWithIndifferentAccess.new
- 
-    module CompiledTemplates #:nodoc:
@@ -201 +199 @@
-    cattr_reader :computed_public_paths
-    @@computed_public_paths = {}
-
-    @@template_handlers = {}
-    @@default_template_handlers = nil
-
-    class ObjectWrapper < Struct.new(:value) #:nodoc:
@@ -218 +213 @@
-      end
-    end
-
-    # Register a class that knows how to handle template files with the given
-    # extension. This can be used to implement new template types.
-    # The constructor for the class must take the ActiveView::Base instance
-    # as a parameter, and the class must implement a #render method that
-    # takes the contents of the template to render as well as the Hash of
-    # local assigns available to the template. The #render method ought to
-    # return the rendered template as a string.
-    def self.register_template_handler(extension, klass)
-      @@template_handlers[extension.to_sym] = klass
-      TemplateFinder.update_extension_cache_for(extension.to_s)
-    end
-
-    def self.template_handler_extensions
-      @@template_handlers.keys.map(&:to_s).sort
-    end
-
-    def self.register_default_template_handler(extension, klass)
-      register_template_handler(extension, klass)
-      @@default_template_handlers = klass
-    end
-
-    def self.handler_class_for_extension(extension)
-      (extension && @@template_handlers[extension.to_sym]) || @@default_template_handlers
-    end
-
-    register_default_template_handler :erb, TemplateHandlers::ERB
-    register_template_handler :rjs, TemplateHandlers::RJS
-    register_template_handler :builder, TemplateHandlers::Builder
-
-    # TODO: Depreciate old template extensions
-    register_template_handler :rhtml, TemplateHandlers::ERB
-    register_template_handler :rxml, TemplateHandlers::Builder
-
-    def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil)#:nodoc:

trunk/actionpack/lib/action_view/helpers/cache_helper.rb

@@ -33 +33 @@
-      #    <% end %>
-      def cache(name = {}, options = nil, &block)
-Bas
+Templat
-        handler.new(@controller).cache_fragment(block, name, options)
-      end

trunk/actionpack/lib/action_view/template_finder.rb

@@ -51 +51 @@
-
-      def template_handler_extensions
-Bas
+Templat
-      end
-

trunk/actionpack/lib/action_view/template.rb

@@ -20 +20 @@
-      end
-      @locals = locals || {}
-@view
+self
-    end
-    
@@ -74 +74 @@
-    end
-
+    # Template Handlers
+    
+    @@template_handlers = HashWithIndifferentAccess.new
+    @@default_template_handlers = nil
+    
+    # Register a class that knows how to handle template files with the given
+    # extension. This can be used to implement new template types.
+    # The constructor for the class must take the ActiveView::Base instance
+    # as a parameter, and the class must implement a #render method that
+    # takes the contents of the template to render as well as the Hash of
+    # local assigns available to the template. The #render method ought to
+    # return the rendered template as a string.
+    def self.register_template_handler(extension, klass)
+      @@template_handlers[extension.to_sym] = klass
+      TemplateFinder.update_extension_cache_for(extension.to_s)
+    end
+
+    def self.template_handler_extensions
+      @@template_handlers.keys.map(&:to_s).sort
+    end
+
+    def self.register_default_template_handler(extension, klass)
+      register_template_handler(extension, klass)
+      @@default_template_handlers = klass
+    end
+
+    def self.handler_class_for_extension(extension)
+      (extension && @@template_handlers[extension.to_sym]) || @@default_template_handlers
+    end
+
+    register_default_template_handler :erb, TemplateHandlers::ERB
+    register_template_handler :rjs, TemplateHandlers::RJS
+    register_template_handler :builder, TemplateHandlers::Builder
+
+    # TODO: Depreciate old template extensions
+    register_template_handler :rhtml, TemplateHandlers::ERB
+    register_template_handler :rxml, TemplateHandlers::Builder
+    
-  end
-end

trunk/actionpack/test/controller/custom_handler_test.rb

@@ -15 +15 @@
-class CustomHandlerTest < Test::Unit::TestCase
-  def setup
-Bas
-Bas
+Templat
+Templat
-    @view = ActionView::Base.new
-  end

trunk/actionpack/test/controller/layout_test.rb

@@ -41 +41 @@
-end
-
-Bas
+Templat
-
-class LayoutAutoDiscoveryTest < Test::Unit::TestCase

trunk/actionpack/test/template/compiled_templates_test.rb

@@ -92 +92 @@
-      ts = ActionView::Template.new(v, @s, false, {})
-
-Bas
+Templat
-      @handler       = @handler_class.new(v)
-

trunk/actionpack/test/template/template_finder_test.rb

@@ -7 +7 @@
-  def setup
-    ActionView::TemplateFinder.process_view_paths(LOAD_PATH_ROOT)
-Bas
+Templat
-    @template = ActionView::Base.new
-    @finder = ActionView::TemplateFinder.new(@template, LOAD_PATH_ROOT)
@@ -36 +36 @@
-    def test_should_update_extension_cache_when_template_handler_is_registered
-      ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky")
-Bas
+Templat
-    end
-