erubis 2.5.0 → 2.6.0

data/doc/users-guide.html

@@ -14,10 +14,10 @@
 
     <div align="left"><h1>Erubis Users' Guide</h1></div>
     <div align="left">
-      last update: $Date: 2008-01-30 23:27:58 +0900 (Wed, 30 Jan 2008) $<br>
+      last update: $Date: 2008-05-05 18:47:05 +0900 (Mon, 05 May 2008) $<br>
     </div>
 
-<p>release: 2.5.0
+<p>release: 2.6.0
 </p>
 <a name="preface"></a>
 <h2 class="section1">Preface</h2>
@@ -153,6 +153,10 @@ It has the following features.
   </li>
   <li><a href="#topics">Other Topics</a>
   <ul>
+    <li><a href="#'&lt;%= =%&gt;' and '&lt;%= -%&gt;'">'&lt;%= =%&gt;' and '&lt;%= -%&gt;'</a>
+    </li>
+    <li><a href="#'&lt;%% %&gt;' and '&lt;%%= %&gt;'">'&lt;%% %&gt;' and '&lt;%%= %&gt;'</a>
+    </li>
     <li><a href="#topics-context-vs-binding">evaluate(context) v.s. result(binding)</a>
     </li>
     <li><a href="#topics-fasteruby">Class Erubis::FastEruby</a>
@@ -2606,6 +2610,64 @@ This means that pp_text_field() with preprocessing makes view layer very fast.
 
 <a name="topics"></a>
 <h2 class="section1">Other Topics</h2>
+<a name="'&lt;%= =%&gt;' and '&lt;%= -%&gt;'"></a>
+<h3 class="section2">'&lt;%= =%&gt;' and '&lt;%= -%&gt;'</h3>
+<p>Since 2.6.0, '&lt;%= -%&gt;' remove tail spaces and newline.
+This is for compatibiliy with ERB when trim mode is '-'.
+'&lt;%= =%&gt;' also removes tail spaces and newlines, and this is
+Erubis-original enhancement (cooler than '&lt;%= -%&gt;', isn't it?).
+</p>
+<a name="tailnewline.rhtml.comment_filter"></a>
+<div class="program_caption">
+tailnewline.rhtml</div>
+<pre class="program">&lt;div&gt;
+&lt;%= @var -%&gt;          # or &lt;%= @var =%&gt;
+&lt;/div&gt;
+</pre>
+<div class="terminal_caption">
+result (version 2.5.0):</div>
+<pre class="terminal">$ erubis -c '{var: "AAA\n"}' tailnewline.rhtml
+&lt;div&gt;
+AAA
+
+&lt;/div&gt;
+</pre>
+<a name="tail_260.result"></a>
+<div class="terminal_caption">
+result (version 2.6.0):</div>
+<pre class="terminal">$ erubis -c '{var: "AAA\n"}' tailnewline.rhtml
+&lt;div&gt;
+AAA
+&lt;/div&gt;
+</pre>
+<br>
+
+
+<a name="'&lt;%% %&gt;' and '&lt;%%= %&gt;'"></a>
+<h3 class="section2">'&lt;%% %&gt;' and '&lt;%%= %&gt;'</h3>
+<p>Since 2.6.0, '&lt;%% %&gt;' and '&lt;%%= %&gt;' are converted into '&lt;% %&gt;' and '&lt;%= %&gt;' respectively.
+This is for compatibility with ERB.
+</p>
+<div class="program_caption">
+doublepercent.rhtml:</div>
+<pre class="program">&lt;ul&gt;
+&lt;%% for item in @list %&gt;
+  &lt;li&gt;&lt;%%= item %&gt;&lt;/li&gt;
+&lt;%% end %&gt;
+&lt;/ul&gt;
+</pre>
+<div class="terminal_caption">
+result:</div>
+<pre class="terminal">$ erubis doublepercent.rhtml
+&lt;ul&gt;
+&lt;% for item in @list %&gt;
+  &lt;li&gt;&lt;%= item %&gt;&lt;/li&gt;
+&lt;% end %&gt;
+&lt;/ul&gt;
+</pre>
+<br>
+
+
 <a name="topics-context-vs-binding"></a>
 <h3 class="section2">evaluate(context) v.s. result(binding)</h3>
 <p>It is recommended to use 'Erubis::Eruby#evaluate(context)' instead of 'Erubis::Eruby#result(binding)' because Ruby's Binding object has some problems.
@@ -2808,6 +2870,13 @@ if test(?f, cachename)
   puts "*** cache file '#{cachename}' created."
 end
 </pre>
+<p>Since 2.6.0, it is able to specify cache filename.
+</p>
+<div class="program_caption">
+specify cache filename.</div>
+<pre class="program">filename = 'example.rhtml'
+eruby = Erubis::Eruby.load_file(filename, :cachename=&gt;filename+'.cache')
+</pre>
 <p>Caching makes Erubis about 40-50 percent faster than no-caching.
 See <a href="#topics-benchmark">benchmark</a> for details.
 </p>
@@ -2915,8 +2984,8 @@ example of using NoCodeEnhancer with PHP file</div>
 <p>Thanks Andrew R Jackson, he developed 'erubis-run.rb' which enables you to use Erubis with mod_ruby.
 </p>
 <ol type="1">
-<li>Copy 'erubis-2.5.0/contrib/erubis-run.rb' to the 'RUBYLIBDIR/apache' directory (for example '/usr/local/lib/ruby/1.8/apache') which contains 'ruby-run.rb', 'eruby-run.rb', and so on.
-<pre class="terminal">$ cd erubis-2.5.0/
+<li>Copy 'erubis-2.6.0/contrib/erubis-run.rb' to the 'RUBYLIBDIR/apache' directory (for example '/usr/local/lib/ruby/1.8/apache') which contains 'ruby-run.rb', 'eruby-run.rb', and so on.
+<pre class="terminal">$ cd erubis-2.6.0/
 $ sudo copy contrib/erubis-run.rb /usr/local/lib/ruby/1.8/apache/
 </pre>
 </li>
@@ -2992,12 +3061,12 @@ p obj.render('world')          #=&gt; "hello world"
 
 <a name="topics-benchmark"></a>
 <h3 class="section2">Benchmark</h3>
-<p>A benchmark script is included in Erubis package at 'erubis-2.5.0/benchark/' directory.
+<p>A benchmark script is included in Erubis package at 'erubis-2.6.0/benchark/' directory.
 Here is an example result of benchmark.
 </p>
 <div class="terminal_caption">
 MacOS X 10.4 Tiger, Intel CoreDuo 1.83GHz, Ruby1.8.6, eruby1.0.5, gcc4.0.1</div>
-<pre class="terminal">$ cd erubis-2.5.0/benchmark/
+<pre class="terminal">$ cd erubis-2.6.0/benchmark/
 $ ruby bench.rb -n 10000 -m execute
 *** ntimes=10000, testmode=execute
                                     user     system      total        real

data/lib/erubis.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 99 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -48,7 +48,7 @@
 
 
 module Erubis
-  VERSION = ('$Release: 2.5.0 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.0 $' =~ /([.\d]+)/) && $1
 end
 
 require 'erubis/engine'

data/lib/erubis/context.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/converter.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 89 $
-## $Release: 2.5.0 $
+## $Rev: 104 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -111,10 +111,10 @@ module Erubis
 
     ## return regexp of pattern to parse eRuby script
     def pattern_regexp(pattern)
-      prefix, postfix = pattern.split()   # '<% %>' => '<%', '%>'
-      #return /(.*?)(^[ \t]*)?#{prefix}(=+|\#)?(.*?)-?#{postfix}([ \t]*\r?\n)?/m
-      #return /(^[ \t]*)?#{prefix}(=+|\#)?(.*?)-?#{postfix}([ \t]*\r?\n)?/m
-      return /#{prefix}(=+|-|\#)?(.*?)-?#{postfix}([ \t]*\r?\n)?/m
+      @prefix, @postfix = pattern.split()   # '<% %>' => '<%', '%>'
+      #return /(.*?)(^[ \t]*)?#{@prefix}(=+|\#)?(.*?)-?#{@postfix}([ \t]*\r?\n)?/m
+      #return /(^[ \t]*)?#{@prefix}(=+|\#)?(.*?)-?#{@postfix}([ \t]*\r?\n)?/m
+      return /#{@prefix}(=+|-|\#|%)?(.*?)([-=])?#{@postfix}([ \t]*\r?\n)?/m
     end
     module_function :pattern_regexp
 
@@ -130,7 +130,7 @@ module Erubis
       regexp = pat.nil? || pat == '<% %>' ? DEFAULT_REGEXP : pattern_regexp(pat)
       pos = 0
       is_bol = true     # is beginning of line
-      input.scan(regexp) do |indicator, code, rspace|
+      input.scan(regexp) do |indicator, code, tailch, rspace|
         match = Regexp.last_match()
         len  = match.begin(0) - pos
         text = input[pos, len]
@@ -142,6 +142,7 @@ module Erubis
         ## * when '<%= %>', do nothing
         ## * when '<% %>' or '<%# %>', delete spaces iff only spaces are around '<% %>'
         if ch == ?=              # <%= %>
+          rspace = nil if tailch && !tailch.empty?
           add_text(src, lspace) if lspace
           add_expr(src, code, indicator)
           add_text(src, rspace) if rspace
@@ -154,6 +155,9 @@ module Erubis
             add_stmt(src, "\n" * n)
             add_text(src, rspace) if rspace
           end
+        elsif ch == ?%           # <%% %>
+          s = "#{lspace}#{@prefix||='<%'}#{code}#{tailch}#{@postfix||='%>'}#{rspace}"
+          add_text(src, s)
         else                     # <% %>
           if @trim && lspace && rspace
             add_stmt(src, "#{lspace}#{code}#{rspace}")

data/lib/erubis/engine.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Rev: 104 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -42,20 +42,23 @@ module Erubis
 
     ##
     ## load file, write cache file, and return engine object.
-    ## this method create cache file (filename + '.cache') automatically.
+    ## this method create code cache file automatically.
+    ## cachefile name can be specified with properties[:cachename],
+    ## or filname + 'cache' is used as default.
     ##
     def self.load_file(filename, properties={})
-      cachename = filename + '.cache'
+      cachename = properties[:cachename] || (filename + '.cache')
       properties[:filename] = filename
       if test(?f, cachename) && File.mtime(filename) <= File.mtime(cachename)
         engine = self.new(nil, properties)
         engine.src = File.read(cachename)
       else
-        input = File.open(filename, 'rb') { |f| f.read }
+        input = File.open(filename, 'rb') {|f| f.read }
         engine = self.new(input, properties)
-        File.open(cachename, 'w') do |f|
+        File.open(cachename, 'wb') do |f|
           f.flock(File::LOCK_EX)
           f.write(engine.src)
+          f.flush()
         end
       end
       engine.src.untaint   # ok?

data/lib/erubis/engine/ec.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ejava.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ejavascript.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 95 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/enhanced.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/eperl.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ephp.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/eruby.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/optimized.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/enhancer.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 93 $
-## $Release: 2.5.0 $
+## $Rev: 103 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -593,7 +593,7 @@ module Erubis
       pos = 0
       is_bol = true     # is beginning of line
       str = ''
-      input.scan(regexp) do |indicator, code, rspace|
+      input.scan(regexp) do |indicator, code, tailch, rspace|
         match = Regexp.last_match()
         len  = match.begin(0) - pos
         text = input[pos, len]
@@ -605,6 +605,7 @@ module Erubis
         ## * when '<%= %>', do nothing
         ## * when '<% %>' or '<%# %>', delete spaces iff only spaces are around '<% %>'
         if ch == ?=              # <%= %>
+          rspace = nil if tailch && !tailch.empty?
           str << lspace if lspace
           add_expr(str, code, indicator)
           str << rspace if rspace

data/lib/erubis/error.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 94 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/generator.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 89 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helpers/rails_form_helper.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 98 $
-### $Release: 2.5.0 $
+### $Rev: 109 $
+### $Release: 2.6.0 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -15,24 +15,32 @@ end
 
 module Erubis::Helpers::RailsFormHelper
 
+
+if ActionPack::VERSION::MAJOR == 1   ###  Rails 1.X
   def pp_template_filename(basename)
     return "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.rhtml"
   end
+else                                 ###  Rails 2.X
+  def pp_template_filename(basename)
+    fname = "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.html.erb"
+    return fname if test(?f, fname)
+    return  "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.rhtml"
+  end
+end
 
   def pp_render_partial(basename)
     basename = "_#{basename}" unless basename[0] == ?_
     filename = pp_template_filename(basename)
-    klass = Erubis::Helpers::RailsHelper::PreprocessingEruby
-    eruby = klass.new(File.read(filename))
-    return eruby.evaluate(self)
+    preprocessor = _create_preprocessor(File.read(filename))
+    return preprocessor.evaluate(_preprocessing_context_object())
   end
 
-  def pp_error_on(object_name, method, &block)
+  def pp_error_on(object_name, method)
     s = ''
-    s << "<% _stag, _etag = _pp_error_tags(@#{object_name}.errors.on('#{method}'))%>"
-    s << "<%=_stag%>"
+    s << "<% _stag, _etag = _pp_error_tags(@#{object_name}.errors.on('#{method}')) %>"
+    s << "<%= _stag %>"
     s << yield(object_name, method)
-    s << "<%=_etag%>"
+    s << "<%= _etag %>"
     return s
   end
 
@@ -52,7 +60,7 @@ module Erubis::Helpers::RailsFormHelper
     unless options.key?(:value) || options.key?('value')
       options['value'] = _?("h @#{object_name}.#{method}")
     end
-    $stderr.puts "*** debug: pp_tag_helper(): options=#{options.inspect}"
+    #$stderr.puts "*** debug: pp_tag_helper(): options=#{options.inspect}"
     return pp_error_on(object_name, method) {
       s = __send__(helper, object_name, method, options)
       _pp_remove_error_div(s)

data/lib/erubis/helpers/rails_helper.rb

@@ -1,12 +1,12 @@
 ###
-### $Rev: 99 $
-### $Release: 2.5.0 $
+### $Rev: 109 $
+### $Release: 2.6.0 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 
 
 require 'erubis'
-require 'cgi'
+require 'erubis/preprocessing'
 
 
 module Erubis
@@ -43,40 +43,34 @@ module Erubis
     module RailsHelper
 
       #cattr_accessor :init_properties
-      @@engine_class = Erubis::Eruby
-      #@@engine_class = Erubis::FastEruby
-
+      @@engine_class = ::Erubis::Eruby
+      #@@engine_class = ::Erubis::FastEruby
       def self.engine_class
         @@engine_class
       end
-
       def self.engine_class=(klass)
         @@engine_class = klass
       end
 
       #cattr_accessor :init_properties
       @@init_properties = {}
-
       def self.init_properties
         @@init_properties
       end
-
       def self.init_properties=(hash)
         @@init_properties = hash
       end
 
       #cattr_accessor :show_src
       @@show_src = nil
-
       def self.show_src
         @@show_src
       end
-
       def self.show_src=(flag)
         @@show_src = flag
       end
 
-      ##----- preprocessing --------------------
+      #cattr_accessor :preprocessing
       @@preprocessing = false
       def self.preprocessing
         @@preprocessing
@@ -84,18 +78,40 @@ module Erubis
       def self.preprocessing=(flag)
         @@preprocessing = flag
       end
-      class PreprocessingEruby < Erubis::Eruby
-        def initialize(input, params={})
-          params = params.dup
-          params[:pattern] = '\[% %\]'    # use '[%= %]' instead of '<%= %>'
-          params[:escape] = true          # transport '[%= %]' and '[%== %]'
-          super
+
+
+      ## define class for backward-compatibility
+      class PreprocessingEruby < Erubis::PreprocessingEruby   # :nodoc:
+      end
+
+
+      module TemplateConverter
+        ## covert eRuby string into ruby code
+        def _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 = _create_preprocessor(template)
+            template = preprocessor.evaluate(_preprocessing_context_object())
+            logger.info "** 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.info "** Erubis: src==<<'END'\n#{src}END\n" if show_src
+          return src
         end
-        def add_expr_escaped(src, code)
-          add_expr_literal(src, "_decode((#{code}))")
+        def _create_preprocessor(template)
+          return PreprocessingEruby.new(template, :escape=>true)
+        end
+        def _preprocessing_context_object
+          return self
         end
       end
-      ##----------------------------------------
 
     end
 
@@ -104,27 +120,52 @@ module Erubis
 end
 
 
-method_name = 'convert_template_into_ruby_code'
-unless ActionView::Base.private_instance_methods.include?(method_name) ||
-       ActionView::Base.instance_methods.include?(method_name)
+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 _convert_template(template)
+  end
+end
 
-  require 'action_pack/version'
 
-  module ActionView  # :nodoc:
+require 'action_pack/version'
 
-    class Base  # :nodoc:
 
-      private
+if ActionPack::VERSION::MAJOR >= 2             ### Rails 2.X
 
-      # convert template into ruby code
-      def convert_template_into_ruby_code(template)
-        ERB.new(template, nil, @@erb_trim_mode).src
-      end
 
+  if ActionPack::VERSION::MINOR > 0 || ActionPack::VERSION::TINY >= 2   ### Rails 2.0.2 or higher
 
-if ActionPack::VERSION::MAJOR >= 2   ###  Rails 2.X
+    module ActionView
+      module TemplateHandlers # :nodoc:
+        class Erubis < TemplateHandler
+          include ::Erubis::Helpers::RailsHelper::TemplateConverter
+          include ::Erubis::PreprocessingHelper
+          def compile(template)
+            return _convert_template(template)
+          end
+          def logger
+            return @view.controller.logger
+          end
+          def _preprocessing_context_object
+            return @view.controller.instance_variable_get('@template')
+          end
+        end
+      end
+      Base.class_eval do
+        register_default_template_handler :erb, TemplateHandlers::Erubis
+        register_template_handler :rhtml, TemplateHandlers::Erubis
+      end
+    end
 
+  else                                         ### Rails 2.0.0 or 2.0.1
 
+    class ActionView::Base   # :nodoc:
+      private
       # Method to create the source code for a given template.
       def create_template_source(extension, template, render_symbol, locals)
         if template_requires_setup?(extension)
@@ -143,23 +184,30 @@ if ActionPack::VERSION::MAJOR >= 2   ###  Rails 2.X
           #body = ERB.new(template, nil, @@erb_trim_mode).src
           body = convert_template_into_ruby_code(template)
         end
-
+        #
         @@template_args[render_symbol] ||= {}
         locals_keys = @@template_args[render_symbol].keys | locals
         @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
-
+        #
         locals_code = ""
         locals_keys.each do |key|
           locals_code << "#{key} = local_assigns[:#{key}]\n"
         end
-
+        #
         "def #{render_symbol}(local_assigns)\n#{locals_code}#{body}\nend"
       end
+    end
+
+  end #if
 
 
-elsif ActionPack::VERSION::MINOR > 12    ###  Rails 1.2
+else                                           ###  Rails 1.X
 
 
+  if ActionPack::VERSION::MINOR > 12           ###  Rails 1.2
+
+    class ActionView::Base   # :nodoc:
+      private
       # Create source code for given template
       def create_template_source(extension, template, render_symbol, locals)
         if template_requires_setup?(extension)
@@ -176,23 +224,24 @@ elsif ActionPack::VERSION::MINOR > 12    ###  Rails 1.2
           #body = ERB.new(template, nil, @@erb_trim_mode).src
           body = convert_template_into_ruby_code(template)
         end
-
+        #
         @@template_args[render_symbol] ||= {}
         locals_keys = @@template_args[render_symbol].keys | locals
         @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
-
+        #
         locals_code = ""
         locals_keys.each do |key|
           locals_code << "#{key} = local_assigns[:#{key}]\n"
         end
-
+        #
         "def #{render_symbol}(local_assigns)\n#{locals_code}#{body}\nend"
       end
+    end
 
+  else                                         ###  Rails 1.1
 
-elsif ActionPack::VERSION::MINOR <= 12   ###  Rails 1.1
-
-
+    class ActionView::Base   # :nodoc:
+      private
       # Create source code for given template
       def create_template_source(extension, template, render_symbol, locals)
         if template_requires_setup?(extension)
@@ -209,77 +258,30 @@ elsif ActionPack::VERSION::MINOR <= 12   ###  Rails 1.1
           #body = ERB.new(template, nil, @@erb_trim_mode).src
           body = convert_template_into_ruby_code(template)
         end
-
+        #
         @@template_args[render_symbol] ||= {}
         locals_keys = @@template_args[render_symbol].keys | locals
         @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
-
+        #
         locals_code = ""
         locals_keys.each do |key|
           locals_code << "#{key} = local_assigns[:#{key}] if local_assigns.has_key?(:#{key})\n"
         end
-
+        #
         "def #{render_symbol}(local_assigns)\n#{locals_code}#{body}\nend"
       end
-
-
-end   ###
-
-
-    end
-
-  end
-
-end
-
-
-## set Erubis as eRuby compiler in Ruby on Rails instead of ERB
-class ActionView::Base  # :nodoc:
-  private
-  def convert_template_into_ruby_code(template)
-    #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::Helpers::RailsHelper::PreprocessingEruby.new(template)
-      #template = self.instance_eval(preprocessor.src)
-      template = preprocessor.evaluate(self)
-      logger.debug "** Erubis: preprocessed==<<'END'\n#{template}END\n" if show_src
     end
-    ##----------------------------------------
-    src = klass.new(template, properties).src
-    #src.insert(0, '_erbout = ')
-    logger.debug "** Erubis: src==<<'END'\n#{src}END\n" if show_src
-    src
-  end
 
-  ##----- preprocessing -------------------
-  def _p(arg)
-    return "<%=#{arg}%>"
-  end
-  def _P(arg)
-    return "<%=h(#{arg})%>"
-  end
-  alias _? _p
-  def _decode(arg)
-    arg = arg.to_s
-    arg.gsub!(/%3C%25(?:=|%3D)(.*?)%25%3E/) { "<%=#{CGI.unescape($1)}%>" }
-    arg.gsub!(/&lt;%=(.*?)%&gt;/) { "<%=#{CGI.unescapeHTML($1)}%>" }
-    return arg
-  end
-  ##----------------------------------------
+  end #if
 
-end
+end   ###
 
 
 ## make h() method faster
 module ERB::Util  # :nodoc:
   ESCAPE_TABLE = { '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;', "'"=>'&#039;', }
   def h(value)
-    value.to_s.gsub(/[&<>"]/) { |s| ESCAPE_TABLE[s] }
+    value.to_s.gsub(/[&<>"]/) {|s| ESCAPE_TABLE[s] }
   end
   module_function :h
 end
@@ -287,5 +289,5 @@ end
 
 ## finish
 ac = ActionController::Base.new
-ac.logger.info "** Erubis #{Erubis::VERSION}"
-#$stdout.puts "** Erubis #{Erubis::VERSION}"
+ac.logger.info "** Erubis #{::Erubis::VERSION}"
+#$stdout.puts "** Erubis #{::Erubis::VERSION}"