- [bugfix] rails_form_helper.rb: change '::::' to '::'

- [bugfix] rails_form_helper.rb: support Rails 2.0.2
- [update] users-guide
- [remove] contrib/action_view_base_rb.patch
- [release] preparation for 2.6.0

5 files changed, 33 insertions, 37 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b13a94a..de555b1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,14 +2,21 @@
 .?lastupdate:	$Date$
 .?version:	$Rev$
 
-: Rev.107 (2008-05-05)
+: Rev.108 (2008-05-05)
+	.- [bugfix] rails_form_helper.rb: change '::::' to '::'
+	.- [bugfix] rails_form_helper.rb: support Rails 2.0.2
 	.- [update] users-guide
+	.- [remove] contrib/action_view_base_rb.patch
+	.- [release] preparation for 2.6.0
 
-: Rev.106 (2008-05-05)
+: Rev.107 (2008-05-05)
 	.- [update] users-guide
 	.- [refactor] rails_helper.rb: remove debug messages
 	.- [change] rails_helper.rb: change 'logger.debug' to 'logger.info'
 
+: Rev.106 (2008-05-04)
+	.- [enhance] rails_helper.rb: improved support of Rails 2.0.2.
+
 : Rev.105 (2008-05-03)
 	.- [enhance] rails_helper.rb: improved Rails 2.0.2 support
 
diff --git a/Rookbook.props b/Rookbook.props
index d862bb6..0de5dcc 100644
--- a/Rookbook.props
+++ b/Rookbook.props
@@ -1,2 +1,2 @@
-release: 2.5.0
+release: 2.6.0
 copyright: copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
diff --git a/contrib/action_view_base_rb.patch b/contrib/action_view_base_rb.patch
deleted file mode 100644
index 446c7b2..0000000
--- a/contrib/action_view_base_rb.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- action_view/base.rb	(original)
-+++ action_view/base.rb	(working copy)
-@@ -445,6 +445,11 @@
-         end
-       end
- 
-+      # convert template into ruby code
-+      def convert_template_into_ruby_code(template)
-+        ERB.new(template, nil, @@erb_trim_mode).src
-+      end
-+
-       # Create source code for given template
-       def create_template_source(extension, template, render_symbol, locals)
-         if template_requires_setup?(extension)
-@@ -458,7 +463,7 @@
-               "update_page do |page|\n#{template}\nend"
-           end
-         else
--          body = ERB.new(template, nil, @@erb_trim_mode).src
-+          body = convert_template_into_ruby_code(template)
-         end
- 
-         @@template_args[render_symbol] ||= {}
diff --git a/lib/erubis/helpers/rails_form_helper.rb b/lib/erubis/helpers/rails_form_helper.rb
index 211f441..9c68e07 100644
--- a/lib/erubis/helpers/rails_form_helper.rb
+++ b/lib/erubis/helpers/rails_form_helper.rb
@@ -15,21 +15,24 @@ 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}.html.erb"
+    return "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.rhtml"
   end
 else                                 ###  Rails 2.X
   def pp_template_filename(basename)
-    return "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.rhtml"
+    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)
-    preprocessor = Erubis::::PreprocessingEruby.new(File.read(filename), :escape=>true)
-    return preprocessor.evaluate(self)
+    preprocessor = _create_preprocessor(File.read(filename))
+    return preprocessor.evaluate(_preprocessing_context_object())
   end
 
   def pp_error_on(object_name, method)
diff --git a/lib/erubis/helpers/rails_helper.rb b/lib/erubis/helpers/rails_helper.rb
index d0155b1..0b02086 100644
--- a/lib/erubis/helpers/rails_helper.rb
+++ b/lib/erubis/helpers/rails_helper.rb
@@ -87,19 +87,16 @@ module Erubis
 
       module TemplateConverter
         ## covert eRuby string into ruby code
-        def _convert_template(template, view_obj=nil)    # :nodoc:
+        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?
-          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_)
+            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
@@ -108,6 +105,12 @@ module Erubis
           logger.info "** Erubis: src==<<'END'\n#{src}END\n" if show_src
           return src
         end
+        def _create_preprocessor(template)
+          return PreprocessingEruby.new(template, :escape=>true)
+        end
+        def _preprocessing_context_object
+          return self
+        end
       end
 
     end
@@ -143,7 +146,13 @@ if ActionPack::VERSION::MAJOR >= 2             ### Rails 2.X
           include ::Erubis::Helpers::RailsHelper::TemplateConverter
           include ::Erubis::PreprocessingHelper
           def compile(template)
-            return _convert_template(template, @view)
+            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