- [enhance] rails_helper.rb: improved support of Rails 2.0.2.

1 files changed, 69 insertions, 26 deletions

diff --git a/lib/erubis/helpers/rails_helper.rb b/lib/erubis/helpers/rails_helper.rb
index 9c81437..a4445eb 100644
--- a/lib/erubis/helpers/rails_helper.rb
+++ b/lib/erubis/helpers/rails_helper.rb
@@ -79,25 +79,60 @@ module Erubis
         @@preprocessing = flag
       end
 
-      ## covert eRuby string into ruby code
-      def self._convert_template(template)    # :nodoc:
-        #src = ::Erubis::Eruby.new(template).src
-        klass      = ::Erubis::Helpers::RailsHelper.engine_class
-        properties = ::Erubis::Helpers::RailsHelper.init_properties
-        show_src   = ::Erubis::Helpers::RailsHelper.show_src
-        show_src = ENV['RAILS_ENV'] == 'development' if show_src.nil?
-        ## preprocessing
-        if ::Erubis::Helpers::RailsHelper.preprocessing
-          preprocessor = ::Erubis::PreprocessingEruby.new(template, :escape=>true)
-          #template = self.instance_eval(preprocessor.src)
-          template = preprocessor.evaluate(self)
-          logger.debug "** Erubis: preprocessed==<<'END'\n#{template}END\n" if show_src
+
+      ## define class for backward-compatibility
+      class PreprocessingEruby < Erubis::PreprocessingEruby
+      end
+
+
+      module TemplateConverter
+        ## covert eRuby string into ruby code
+        def _convert_template(template, view_obj=nil)    # :nodoc:
+          #$stderr.puts "*** debug: self.class.name=#{self.class.name}"
+          #                      #=> ActionView::TemplateHandlers::Erubis
+          #$stderr.puts "*** debug: self.instance_variables=#{self.instance_variables.sort.inspect}"
+          #                      #=> ["@view"]
+          #$stderr.puts "*** debug: @view.class.name=#{@view.class.name}"
+          #                      #=> ActionView::Base
+          #$stderr.puts "*** debug: @view.instance_variables=#{@view.instance_variables.sort.inspect}"
+          #                      #=> ["@assigns", "@assigns_added", "@controller", "@first_render", "@logger", "@template_format", "@view_paths"]
+          #                      #=> =["@_cookies", "@_flash", "@_headers", "@_params", "@_request", "@_response", "@_session", "@action_name", "@assigns", "@assigns_added", "@before_filter_chain_aborted", "@content_for_layout", "@controller", "@first_render", "@ignore_missing_templates", "@logger", "@request_origin", "@stocks", "@template", "@template_class", "@template_format", "@url", "@variables_added", "@view_paths"]
+          #$stderr.puts "*** debug: self.methods=#{(self.methods.sort - Object.new.methods).inspect}"
+          #                      #=> ["_convert_template", "compile", "render"]
+          ##$stderr.puts "*** debug: self.methods=#{(self.methods.sort).inspect}"
+          #$stderr.puts "*** debug: @views.methods=#{(@views.methods.sort - Object.new.methods).inspect}"
+          ##$stderr.puts "*** debug: @views.methods=#{(@views.methods.sort).inspect}"
+          #                      #=> ["&", "^", "to_f", "to_i", "|"]
+          #$stderr.puts "*** debug: @first_render.class.name=#{@first_render.class.name.inspect}"
+          #$stderr.puts "*** debug: @view.controller.instance_variables=#{@view.controller.instance_variables.inspect}"
+          #                      #=> ["@stocks", "@_headers", "@template", "@_params", "@performed_redirect", "@before_filter_chain_aborted", "@_flash", "@assigns", "@_session", "@request_origin", "@_request", "@variables_added", "@_response", "@performed_render", "@url", "@action_name", "@_cookies"]
+          #                      #=> ["@stocks", "@_headers", "@template", "@_params", "@performed_redirect", "@before_filter_chain_aborted", "@_flash", "@assigns", "@_session", "@request_origin", "@_request", "@variables_added", "@_response", "@performed_render", "@url", "@action_name", "@_cookies"]
+          #$stderr.puts "*** debug: @view.controller.methods=#{@view.controller.methods.sort.inspect}"
+          #$stderr.puts "*** debug: self.object_id=#{self.object_id}"
+          #$stderr.puts "*** debug: @view.controller.instance_variable_get('@template').object_id=#{@view.controller.instance_variable_get('@template').object_id}"
+          #$stderr.puts "*** debug: @view.controller.instance_variable_get('@template').class=#{@view.controller.instance_variable_get('@template').class}"
+
+
+          #src = ::Erubis::Eruby.new(template).src
+          klass      = ::Erubis::Helpers::RailsHelper.engine_class
+          properties = ::Erubis::Helpers::RailsHelper.init_properties
+          show_src   = ::Erubis::Helpers::RailsHelper.show_src
+          show_src = ENV['RAILS_ENV'] == 'development' if show_src.nil?
+          logger = view_obj ? view_obj.controller.logger : self.logger if show_src
+          ## preprocessing
+          if ::Erubis::Helpers::RailsHelper.preprocessing
+            preprocessor = PreprocessingEruby.new(template, :escape=>true)
+            #template = self.instance_eval(preprocessor.src)
+            self_ = view_obj ? view_obj.controller.instance_variable_get('@template') : self
+            template = preprocessor.evaluate(self_)
+            logger.debug "** Erubis: preprocessed==<<'END'\n#{template}END\n" if show_src
+          end
+          ## convert into ruby code
+          src = klass.new(template, properties).src
+          #src.insert(0, '_erbout = ')
+          logger.debug "** Erubis: src==<<'END'\n#{src}END\n" if show_src
+          return src
         end
-        ## convert into ruby code
-        src = klass.new(template, properties).src
-        #src.insert(0, '_erbout = ')
-        logger.debug "** Erubis: src==<<'END'\n#{src}END\n" if show_src
-        src
       end
 
     end
@@ -108,11 +143,13 @@ end
 
 
 class ActionView::Base   # :nodoc:
+  include ::Erubis::Helpers::RailsHelper::TemplateConverter
+  include ::Erubis::PreprocessingHelper
   private
   # convert template into ruby code
   def convert_template_into_ruby_code(template)
     #ERB.new(template, nil, @@erb_trim_mode).src
-    return ::Erubis::Helpers::RailsHelper._convert_template(template)
+    return _convert_template(template)
   end
 end
 
@@ -125,14 +162,20 @@ if ActionPack::VERSION::MAJOR >= 2             ### Rails 2.X
 
   if ActionPack::VERSION::MINOR > 0 || ActionPack::VERSION::TINY >= 2   ### Rails 2.0.2 or higher
 
-    class ActionView::TemplateHandlers::Erubis
-      def compile(template)
-        return ::Erubis::Helpers::RailsHelper._convert_template(template)
+    module ActionView
+      module TemplateHandlers # :nodoc:
+        class Erubis < TemplateHandler
+          include ::Erubis::Helpers::RailsHelper::TemplateConverter
+          include ::Erubis::PreprocessingHelper
+          def compile(template)
+            return _convert_template(template, @view)
+          end
+        end
+      end
+      Base.class_eval do
+        register_default_template_handler :erb, TemplateHandlers::Erubis
+        register_template_handler :rhtml, TemplateHandlers::Erubis
       end
-    end
-    class ActionView::Base   # :nodoc:
-      register_default_template_handler :erb, TemplateHandlers::Erubis
-      register_template_handler :rhtml, TemplateHandlers::Erubis
     end
 
   else                                         ### Rails 2.0.0 or 2.0.1