Merged Rails 2.1 compatibility branch.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1623 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged Rails 2.1 compatibility branch.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1623 e93f8b46-1217-0410-a6f0-8f06a7374b81
7cdd88a6 · Jean-Philippe Lang · 22558f77 · 7cdd88a6 · 7cdd88a6 · 7cdd88a6
Commit 7cdd88a6 authored Jul 04, 2008 by Jean-Philippe Lang
32 changed files
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -52,7 +52,7 @@ class ProjectsController < ApplicationController
    respond_to do |format|
      format.html { 
        @project_tree = projects.group_by {|p| p.parent || p}
-        @project_tree.each_key {|p| @project_tree[p] -= [p]} 
+        @project_tree.keys.each {|p| @project_tree[p] -= [p]} 
      }
      format.atom {
        render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), 

--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -22,6 +22,10 @@ module RepositoriesHelper
    txt.to_s[0,8]
  end
+  def to_path_param(path)
+    path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
+  end
  def to_utf8(str)
    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
    @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)

--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -42,8 +42,10 @@ class UserPreference < ActiveRecord::Base
    if attribute_present? attr_name
      super
    else
-      self.others ||= {}
+      h = read_attribute(:others).dup || {}
-      self.others.store attr_name, value
+      h.update(attr_name => value)
+      write_attribute(:others, h)
+      value
    end
  end

--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -4,14 +4,14 @@
 <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="filename">
 <% if entry.is_dir? %>
-<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                  :update => { :success => tr_id },
                  :position => :after,
                  :success => "scmEntryLoaded('#{tr_id}')",
                  :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
 <% end %>
 <%=  link_to h(entry.name),
-          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
+          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
          :class => (entry.is_dir? ? 'icon icon-folder' : 'icon icon-file')%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>

--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -10,10 +10,10 @@ dirs.each do |dir|
    link_path << '/' unless link_path.empty?
    link_path << "#{dir}" 
    %>
-    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
+    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
 <% end %>
 <% if filename %>
-    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
+    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
 <% end %>
 <%= "@ #{revision}" if revision %>

--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
-<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
+<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
 <table class="list changesets">
 <thead><tr>
 <th>#</th>

--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -4,12 +4,12 @@
 <p>
 <% if @repository.supports_cat? %>
-    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
 <% if @repository.supports_annotate? %>
-    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
+    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>

--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -55,7 +55,7 @@
 <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>
-<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision %>
+<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => to_path_param(change.relative_path), :rev => @changeset.revision %>
 <% end %>
 </td>
 </tr>

--- a/config/boot.rb
+++ b/config/boot.rb
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
-unless defined?(RAILS_ROOT)
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
-  unless RUBY_PLATFORM =~ /mswin32/
+module Rails
-    require 'pathname'
+  class << self
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+    def booted?
+      defined? Rails::Initializer
+    end
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
  end
-  RAILS_ROOT = root_path
-end
-if File.directory?("#{RAILS_ROOT}/vendor/rails")
+  class Boot
-  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+    def run
-else
+      load_initializer
-  require 'rubygems'
+      Rails::Initializer.run(:set_load_path)
-  require 'initializer'
+    end
+  end
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+    end
+  end
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      end
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+      def load_rubygems
+        require 'rubygems'
+        unless rubygems_version >= '0.9.4'
+          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+      rescue LoadError
+        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
 end
-Rails::Initializer.run(:set_load_path)
+# All that for this:
+Rails.boot!
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -71,32 +71,3 @@ Rails::Initializer.run do |config|
 	config.action_mailer.delivery_method = :smtp  
 end
-ActiveRecord::Errors.default_error_messages = {
-  :inclusion => "activerecord_error_inclusion",
-  :exclusion => "activerecord_error_exclusion",
-  :invalid => "activerecord_error_invalid",
-  :confirmation => "activerecord_error_confirmation",
-  :accepted  => "activerecord_error_accepted",
-  :empty => "activerecord_error_empty",
-  :blank => "activerecord_error_blank",
-  :too_long => "activerecord_error_too_long",
-  :too_short => "activerecord_error_too_short",
-  :wrong_length => "activerecord_error_wrong_length",
-  :taken => "activerecord_error_taken",
-  :not_a_number => "activerecord_error_not_a_number"
-}
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
-Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
-Mime::Type.register 'application/pdf', :pdf
-GLoc.set_config :default_language => :en
-GLoc.clear_strings
-GLoc.set_kcode
-GLoc.load_localized_strings
-GLoc.set_config(:raise_string_not_found_errors => false)
-require 'redmine'
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
+ActiveRecord::Errors.default_error_messages = {
+  :inclusion => "activerecord_error_inclusion",
+  :exclusion => "activerecord_error_exclusion",
+  :invalid => "activerecord_error_invalid",
+  :confirmation => "activerecord_error_confirmation",
+  :accepted  => "activerecord_error_accepted",
+  :empty => "activerecord_error_empty",
+  :blank => "activerecord_error_blank",
+  :too_long => "activerecord_error_too_long",
+  :too_short => "activerecord_error_too_short",
+  :wrong_length => "activerecord_error_wrong_length",
+  :taken => "activerecord_error_taken",
+  :not_a_number => "activerecord_error_not_a_number"
+}
+ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
--- a/config/initializers/20-mime_types.rb
+++ b/config/initializers/20-mime_types.rb
+# Add new mime types for use in respond_to blocks:
+Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
+Mime::Type.register 'application/pdf', :pdf
--- a/config/initializers/30-redmine.rb
+++ b/config/initializers/30-redmine.rb
+GLoc.set_config :default_language => :en
+GLoc.clear_strings
+GLoc.set_kcode
+GLoc.load_localized_strings
+GLoc.set_config(:raise_string_not_found_errors => false)
+require 'redmine'
--- a/db/migrate/072_add_enumerations_position.rb
+++ b/db/migrate/072_add_enumerations_position.rb
 class AddEnumerationsPosition < ActiveRecord::Migration
  def self.up
    add_column(:enumerations, :position, :integer, :default => 1) unless Enumeration.column_names.include?('position')
-    Enumeration.find(:all).group_by(&:opt).each_value  do |enums|
+    Enumeration.find(:all).group_by(&:opt).each do |opt, enums|
      enums.each_with_index do |enum, i|
        # do not call model callbacks
        Enumeration.update_all "position = #{i+1}", {:id => enum.id}

--- a/db/migrate/078_add_custom_fields_position.rb
+++ b/db/migrate/078_add_custom_fields_position.rb
 class AddCustomFieldsPosition < ActiveRecord::Migration
  def self.up
    add_column(:custom_fields, :position, :integer, :default => 1)
-    CustomField.find(:all).group_by(&:type).each_value  do |fields|
+    CustomField.find(:all).group_by(&:type).each  do |t, fields|
      fields.each_with_index do |field, i|
        # do not call model callbacks
        CustomField.update_all "position = #{i+1}", {:id => field.id}

--- a/lib/tabular_form_builder.rb
+++ b/lib/tabular_form_builder.rb
@@ -22,7 +22,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
  def initialize(object_name, object, template, options, proc)
    set_language_if_valid options.delete(:lang)
-    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
+    super
  end      
  (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|

--- a/script/dbconsole
+++ b/script/dbconsole
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'
--- a/script/performance/request
+++ b/script/performance/request
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'
--- a/script/process/inspector
+++ b/script/process/inspector
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -38,7 +38,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
    assert_template 'index'
    assert_not_nil assigns(:project_tree)
    # Root project as hash key
-    assert assigns(:project_tree).has_key?(Project.find(1))
+    assert assigns(:project_tree).keys.include?(Project.find(1))
    # Subproject in corresponding value
    assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
  end

--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -20,8 +20,11 @@ require "#{File.dirname(__FILE__)}/../test_helper"
 class IssuesTest < ActionController::IntegrationTest
  fixtures :projects, 
           :users,
+           :roles,
+           :members,
           :trackers,
           :projects_trackers,
+           :enabled_modules,
           :issue_statuses,
           :issues,
           :enumerations,

--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -65,20 +65,3 @@ class Test::Unit::TestCase
    Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
  end
 end
-# ActionController::TestUploadedFile bug
-# see http://dev.rubyonrails.org/ticket/4635
-class String
-  def original_filename
-    "testfile.txt"
-  end
-  def content_type
-    "text/plain"
-  end
-  def read
-    self.to_s
-  end
-end
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -26,7 +26,7 @@ class RoleTest < Test::Unit::TestCase
    target = Role.new(:name => 'Target')
    assert target.save
-    assert target.workflows.copy(source)
+    target.workflows.copy(source)
    target.reload
    assert_equal 90, target.workflows.size
  end

--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_test.rb
@@ -26,7 +26,7 @@ class TrackerTest < Test::Unit::TestCase
    target = Tracker.new(:name => 'Target')
    assert target.save
-    assert target.workflows.copy(source)
+    target.workflows.copy(source)
    target.reload
    assert_equal 89, target.workflows.size
  end

--- a/vendor/plugins/acts_as_versioned/Rakefile
+++ b/vendor/plugins/acts_as_versioned/Rakefile
--- a/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
+++ b/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
--- a/vendor/plugins/acts_as_versioned/test/abstract_unit.rb
+++ b/vendor/plugins/acts_as_versioned/test/abstract_unit.rb
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activerecord/lib')
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
+begin
-require 'active_record/fixtures'
+  require 'active_support'
+  require 'active_record'
+  require 'active_record/fixtures'
+rescue LoadError
+  require 'rubygems'
+  retry
+end
+require 'acts_as_versioned'
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+ActiveRecord::Base.configurations = {'test' => config[ENV['DB'] || 'sqlite3']}
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
 load(File.dirname(__FILE__) + "/schema.rb")
@@ -19,17 +28,9 @@ if ENV['DB'] == 'postgresql'
 end
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+$:.unshift(Test::Unit::TestCase.fixture_path)
 class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
  self.use_transactional_fixtures = true

--- a/vendor/plugins/acts_as_versioned/test/fixtures/widget.rb
+++ b/vendor/plugins/acts_as_versioned/test/fixtures/widget.rb
 class Widget < ActiveRecord::Base
  acts_as_versioned :sequence_name => 'widgets_seq', :association_options => {
-    :dependent => nil, :order => 'version desc'
+    :dependent => :nullify, :order => 'version desc'
  }
  non_versioned_columns << 'foo'
 end
\ No newline at end of file
--- a/vendor/plugins/acts_as_versioned/test/migration_test.rb
+++ b/vendor/plugins/acts_as_versioned/test/migration_test.rb
@@ -9,9 +9,14 @@ if ActiveRecord::Base.connection.supports_migrations?
  class MigrationTest < Test::Unit::TestCase
    self.use_transactional_fixtures = false
    def teardown
-      ActiveRecord::Base.connection.initialize_schema_information
+      if ActiveRecord::Base.connection.respond_to?(:initialize_schema_information)
-      ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+        ActiveRecord::Base.connection.initialize_schema_information
+        ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+      else
+        ActiveRecord::Base.connection.initialize_schema_migrations_table
+        ActiveRecord::Base.connection.assume_migrated_upto_version(0)
+      end
      Thing.connection.drop_table "things" rescue nil
      Thing.connection.drop_table "thing_versions" rescue nil
      Thing.reset_column_information
@@ -21,8 +26,17 @@ if ActiveRecord::Base.connection.supports_migrations?
      assert_raises(ActiveRecord::StatementInvalid) { Thing.create :title => 'blah blah' }
      # take 'er up
      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-      t = Thing.create :title => 'blah blah'
+      t = Thing.create :title => 'blah blah', :price => 123.45, :type => 'Thing'
      assert_equal 1, t.versions.size
+      # check that the price column has remembered its value correctly
+      assert_equal t.price,  t.versions.first.price
+      assert_equal t.title,  t.versions.first.title
+      assert_equal t[:type], t.versions.first[:type]
+      # make sure that the precision of the price column has been preserved
+      assert_equal 7, Thing::Version.columns.find{|c| c.name == "price"}.precision
+      assert_equal 2, Thing::Version.columns.find{|c| c.name == "price"}.scale
      # now lets take 'er back down
      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')

--- a/vendor/plugins/acts_as_versioned/test/versioned_test.rb
+++ b/vendor/plugins/acts_as_versioned/test/versioned_test.rb
--- a/vendor/plugins/rfpdf/init.rb
+++ b/vendor/plugins/rfpdf/init.rb
 require 'rfpdf'
-ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
+begin
\ No newline at end of file
+  ActionView::Template::register_template_handler 'rfpdf', RFPDF::View
+rescue NameError
+  # Rails < 2.1
+  RFPDF::View.backward_compatibility_mode = true
+  ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
+end
--- a/vendor/plugins/rfpdf/lib/rfpdf/view.rb
+++ b/vendor/plugins/rfpdf/lib/rfpdf/view.rb
@@ -30,6 +30,8 @@
 module RFPDF
  class View
+    @@backward_compatibility_mode = false
+    cattr_accessor :backward_compatibility_mode
    def initialize(action_view)
      @action_view = action_view
@@ -45,6 +47,14 @@ module RFPDF
        :temp_dir => "#{File.expand_path(RAILS_ROOT)}/tmp"
      }.merge(@action_view.controller.instance_eval{ @options_for_rfpdf } || {}).with_indifferent_access
    end
+    def self.compilable?
+      false
+    end
+    def compilable?
+      self.class.compilable?
+    end
    def render(template, local_assigns = {})
 			@pdf_name = "Default.pdf" if @pdf_name.nil?
@@ -66,7 +76,7 @@ module RFPDF
 			  local_assigns.each do |key,val|
 		  		class << self; self; end.send(:define_method,key){ val }
 				end
-        ERB.new(template).result(binding)
+        ERB.new(@@backward_compatibility_mode == true ? template : template.source).result(binding) 
      end
    end