erubis 2.6.3 → 2.6.4

data/doc/users-guide.html

@@ -17,7 +17,7 @@
       last update: $Date: 2008-06-13 08:04:21 +0900 (Fri, 13 Jun 2008) $<br>
     </div>
 
-<p>release: 2.6.3
+<p>release: 2.6.4
 </p>
 <a name="preface"></a>
 <h2 class="section1">Preface</h2>
@@ -2986,8 +2986,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.6.3/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.3/
+<li>Copy 'erubis-2.6.4/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.4/
 $ sudo copy contrib/erubis-run.rb /usr/local/lib/ruby/1.8/apache/
 </pre>
 </li>
@@ -3063,12 +3063,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.6.3/benchark/' directory.
+<p>A benchmark script is included in Erubis package at 'erubis-2.6.4/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.6.3/benchmark/
+<pre class="terminal">$ cd erubis-2.6.4/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.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -48,7 +48,7 @@
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.3 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.4 $' =~ /([.\d]+)/) && $1
 end
 
 require 'erubis/engine'

data/lib/erubis/context.rb

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

data/lib/erubis/converter.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 104 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ec.rb

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

data/lib/erubis/engine/ejava.rb

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

data/lib/erubis/engine/ejavascript.rb

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

data/lib/erubis/engine/enhanced.rb

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

data/lib/erubis/engine/eperl.rb

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

data/lib/erubis/engine/ephp.rb

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

data/lib/erubis/engine/eruby.rb

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

data/lib/erubis/engine/escheme.rb

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

data/lib/erubis/engine/optimized.rb

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

data/lib/erubis/enhancer.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/error.rb

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

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/generator.rb

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

data/lib/erubis/helper.rb

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

data/lib/erubis/helpers/rails_form_helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 109 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 112 $
-### $Release: 2.6.3 $
+### $Rev: 127 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
@@ -97,12 +97,12 @@ module Erubis
           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
+            _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
+          _logger_info "** Erubis: src==<<'END'\n#{src}END\n" if show_src
           return src
         end
         def _create_preprocessor(template)
@@ -111,6 +111,9 @@ module Erubis
         def _preprocessing_context_object
           return self
         end
+        def _logger_info(message)
+          logger.info message
+        end
       end
 
     end
@@ -134,11 +137,38 @@ end
 
 require 'action_pack/version'
 
+rails22 = false
 
 if ActionPack::VERSION::MAJOR >= 2             ### Rails 2.X
 
 
-  if ActionPack::VERSION::MINOR >=1            ### Rails 2.1 or higher
+  if ActionPack::VERSION::MINOR >=2            ### Rails 2.2, 2.3 or higher
+
+    rails22 = true
+    module ActionView
+      module TemplateHandlers
+        class ErubisHandler < TemplateHandler
+          include Compilable
+          include ::Erubis::Helpers::RailsHelper::TemplateConverter
+          include ::Erubis::PreprocessingHelper
+          def compile(template)
+            #src = ::ERB.new("<% __in_erb_template=true %>#{template.source}", nil, erb_trim_mode, '@output_buffer').src
+            return _convert_template("<% __in_erb_template=true %>#{template.source}")
+          end
+        end
+      end
+      handler_klass = TemplateHandlers::ErubisHandler
+      Template.register_default_template_handler :erb, handler_klass
+      Template.register_template_handler :rhtml, handler_klass
+    end
+    module Erubis::Helpers::RailsHelper::TemplateConverter
+      def _logger_info(message)
+        #logger.info message   # logger.info seems not available in Rails 2.2
+        ActionController::Base.new.logger.info message
+      end
+    end
+
+  elsif ActionPack::VERSION::MINOR >=1            ### Rails 2.1
 
     module ActionView
       module TemplateHandlers # :nodoc:
@@ -320,6 +350,5 @@ end   ###
 
 
 ## finish
-ac = ActionController::Base.new
-ac.logger.info "** Erubis #{::Erubis::VERSION}"
-#$stdout.puts "** Erubis #{::Erubis::VERSION}"
+ActionController::Base.new.logger.info "** Erubis #{::Erubis::VERSION}"
+$stdout.puts "** Erubis #{::Erubis::VERSION}" if rails22

data/lib/erubis/local-setting.rb

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

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 122 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/preprocessing.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 102 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/tiny.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/assert-text-equal.rb

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

data/test/test-engines.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/test-enhancers.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/test-main.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 122 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## $Date: 2009-02-07 18:10:01 +0900 (Sat, 07 Feb 2009) $
 ##
 
@@ -179,7 +179,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.6.3 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.6.4 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end

data/test/test-users-guide.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 115 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/test/test.rb

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

data/test/testutil.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 116 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors: 
 - makoto kuwata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 +09:00
+date: 2009-02-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency