From 243513f4d17e62186ef0499edece1588c79220b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 7 Oct 2010 13:26:58 +0200
Subject: Get rid of ruby warnings in Resolvers. Move a few methods up to the
 abstract class.

---
 actionpack/lib/action_view/template/resolver.rb | 45 +++++++++++++------------
 actionpack/lib/action_view/testing/resolvers.rb |  4 +--
 2 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index a261e08dbc..a031d0dc33 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -6,7 +6,6 @@ module ActionView
   # = Action View Resolver
   class Resolver
     def initialize
-      @path = nil
       @cached = Hash.new { |h1,k1| h1[k1] =
         Hash.new { |h2,k2| h2[k2] = Hash.new { |h3, k3| h3[k3] = {} } } }
     end
@@ -35,6 +34,23 @@ module ActionView
       raise NotImplementedError
     end
 
+    # Helpers that builds a path. Useful for building virtual paths.
+    def build_path(name, prefix, partial, details)
+      path = ""
+      path << "#{prefix}/" unless prefix.empty?
+      path << (partial ? "_#{name}" : name)
+      path
+    end
+
+    # Get the handler and format from the given parameters.
+    def retrieve_handler_and_format(handler, format, default_formats=nil)
+      handler  = Template.handler_class_for_extension(handler)
+      format   = format && Mime[format]
+      format ||= handler.default_format if handler.respond_to?(:default_format)
+      format ||= default_formats
+      [handler, format]
+    end
+
     def cached(key, prefix, name, partial)
       return yield unless key && caching?
       @cached[key][prefix][name][partial] ||= yield
@@ -44,25 +60,13 @@ module ActionView
   class PathResolver < Resolver
     EXTENSION_ORDER = [:locale, :formats, :handlers]
 
-    def to_s
-      @path.to_s
-    end
-    alias :to_path :to_s
-
-  private
+    private
 
     def find_templates(name, prefix, partial, details)
       path = build_path(name, prefix, partial, details)
       query(path, EXTENSION_ORDER.map { |ext| details[ext] }, details[:formats])
     end
 
-    def build_path(name, prefix, partial, details)
-      path = ""
-      path << "#{prefix}/" unless prefix.empty?
-      path << (partial ? "_#{name}" : name)
-      path
-    end
-
     def query(path, exts, formats)
       query = File.join(@path, path)
 
@@ -86,13 +90,7 @@ module ActionView
     def extract_handler_and_format(path, default_formats)
       pieces = File.basename(path).split(".")
       pieces.shift
-
-      handler  = Template.handler_class_for_extension(pieces.pop)
-      format   = pieces.last && Mime[pieces.last] && pieces.pop.to_sym
-      format ||= handler.default_format if handler.respond_to?(:default_format)
-      format ||= default_formats
-
-      [handler, format]
+      retrieve_handler_and_format(pieces.pop, pieces.pop, default_formats)
     end
   end
 
@@ -103,6 +101,11 @@ module ActionView
       @path = File.expand_path(path)
     end
 
+    def to_s
+      @path.to_s
+    end
+    alias :to_path :to_s
+
     def eql?(resolver)
       self.class.equal?(resolver.class) && to_path == resolver.to_path
     end
diff --git a/actionpack/lib/action_view/testing/resolvers.rb b/actionpack/lib/action_view/testing/resolvers.rb
index b2b62528a9..6d82fa0971 100644
--- a/actionpack/lib/action_view/testing/resolvers.rb
+++ b/actionpack/lib/action_view/testing/resolvers.rb
@@ -13,7 +13,7 @@ module ActionView #:nodoc:
       @hash = hash
     end
 
-  private
+    private
 
     def query(path, exts, formats)
       query = Regexp.escape(path)
@@ -32,7 +32,7 @@ module ActionView #:nodoc:
     end
   end
 
-  class NullResolver < ActionView::PathResolver
+  class NullResolver < PathResolver
     def query(path, exts, formats)
       handler, format = extract_handler_and_format(path, formats)
       [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format)]
-- 
cgit v1.2.3