erubis 2.6.0 → 2.6.1

data/doc/users-guide.html

@@ -17,7 +17,7 @@
       last update: $Date: 2008-05-05 18:47:05 +0900 (Mon, 05 May 2008) $<br>
     </div>
 
-<p>release: 2.6.0
+<p>release: 2.6.1
 </p>
 <a name="preface"></a>
 <h2 class="section1">Preface</h2>
@@ -2984,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.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/
+<li>Copy 'erubis-2.6.1/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.1/
 $ sudo copy contrib/erubis-run.rb /usr/local/lib/ruby/1.8/apache/
 </pre>
 </li>
@@ -3061,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.6.0/benchark/' directory.
+<p>A benchmark script is included in Erubis package at 'erubis-2.6.1/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.0/benchmark/
+<pre class="terminal">$ cd erubis-2.6.1/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.0 $
+## $Release: 2.6.1 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -48,7 +48,7 @@
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.0 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.1 $' =~ /([.\d]+)/) && $1
 end
 
 require 'erubis/engine'

data/lib/erubis/context.rb

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

data/lib/erubis/converter.rb

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

data/lib/erubis/engine.rb

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

data/lib/erubis/engine/ec.rb

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

data/lib/erubis/engine/ejava.rb

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

data/lib/erubis/engine/ejavascript.rb

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

data/lib/erubis/engine/enhanced.rb

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

data/lib/erubis/engine/eperl.rb

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

data/lib/erubis/engine/ephp.rb

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

data/lib/erubis/engine/eruby.rb

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

data/lib/erubis/engine/escheme.rb

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

data/lib/erubis/engine/optimized.rb

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

data/lib/erubis/enhancer.rb

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

data/lib/erubis/error.rb

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

data/lib/erubis/evaluator.rb

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

data/lib/erubis/generator.rb

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

data/lib/erubis/helper.rb

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

data/lib/erubis/helpers/rails_form_helper.rb

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

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 109 $
-### $Release: 2.6.0 $
+### $Rev: 112 $
+### $Release: 2.6.1 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -138,27 +138,60 @@ require 'action_pack/version'
 if ActionPack::VERSION::MAJOR >= 2             ### Rails 2.X
 
 
-  if ActionPack::VERSION::MINOR > 0 || ActionPack::VERSION::TINY >= 2   ### Rails 2.0.2 or higher
+  if ActionPack::VERSION::MINOR >=1            ### Rails 2.1 or higher
 
     module ActionView
       module TemplateHandlers # :nodoc:
-        class Erubis < TemplateHandler
-          include ::Erubis::Helpers::RailsHelper::TemplateConverter
-          include ::Erubis::PreprocessingHelper
+        class ErubisHandler < TemplateHandler
+          include Compilable
+          include Erubis::Helpers::RailsHelper::TemplateConverter
+          include Erubis::PreprocessingHelper
+          #
           def compile(template)
-            return _convert_template(template)
+            return _convert_template(template.source)   # template.is_a?(ActionView::Template)
           end
-          def logger
+          def logger  #:nodoc:
             return @view.controller.logger
           end
-          def _preprocessing_context_object
+          def _preprocessing_context_object  #:nodoc:
+            return @view.controller.instance_variable_get('@template')
+          end
+          #
+          def cache_fragment(block, name = {}, options = nil) #:nodoc:
+            @view.fragment_for(block, name, options) do
+              #eval(ActionView::Base.erb_variable, block.binding)
+              eval('_buf', block.binding)
+            end
+          end
+        end
+      end
+      handler_klass = TemplateHandlers::ErubisHandler
+      Template.register_default_template_handler :erb, handler_klass
+      Template.register_template_handler :rhtml, handler_klass
+    end
+
+  elsif ActionPack::VERSION::TINY >= 2         ### Rails 2.0.X (X >= 2)
+
+    module ActionView
+      module TemplateHandlers # :nodoc:
+        class ErubisHandler < TemplateHandler
+          include Erubis::Helpers::RailsHelper::TemplateConverter
+          include Erubis::PreprocessingHelper
+          def compile(template)
+            return _convert_template(template)     # template.is_a?(String)
+          end
+          def logger  #:nodoc:
+            return @view.controller.logger
+          end
+          def _preprocessing_context_object  #:nodoc:
             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
+        handler_klass = TemplateHandlers::ErubisHandler
+        register_default_template_handler :erb, handler_klass
+        register_template_handler :rhtml, handler_klass
       end
     end
 
@@ -274,17 +307,16 @@ else                                           ###  Rails 1.X
 
   end #if
 
-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] }
+  ## make h() method faster (only for Rails 1.X)
+  module ERB::Util  # :nodoc:
+    ESCAPE_TABLE = { '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;', "'"=>'&#039;', }
+    def h(value)
+      value.to_s.gsub(/[&<>"]/) {|s| ESCAPE_TABLE[s] }
+    end
+    module_function :h
   end
-  module_function :h
-end
+
+end   ###
 
 
 ## finish

data/lib/erubis/local-setting.rb

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

data/lib/erubis/main.rb

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

data/lib/erubis/preprocessing.rb

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

data/lib/erubis/tiny.rb

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

data/test/assert-text-equal.rb

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

data/test/test-engines.rb

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

data/test/test-enhancers.rb

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

data/test/test-erubis.rb

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

data/test/test-main.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 87 $
-## $Release: 2.6.0 $
+## $Release: 2.6.1 $
 ## $Date: 2007-07-12 05:01:24 +0900 (Thu, 12 Jul 2007) $
 ##
 
@@ -178,7 +178,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.6.0 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.6.1 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end

data/test/test-users-guide.rb

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

data/test/test.rb

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

data/test/testutil.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 77 $
-### $Release: 2.6.0 $
+### $Release: 2.6.1 $
 ### copyright(c) 2006-2008 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.0
+  version: 2.6.1
 platform: ruby
 authors: 
 - makoto kuwata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-05 00:00:00 +09:00
+date: 2008-06-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,7 @@ files:
 - lib/erubis
 - lib/erubis/context.rb
 - lib/erubis/converter.rb
+- "lib/erubis/converter.rb:"
 - lib/erubis/engine
 - lib/erubis/engine/ec.rb
 - lib/erubis/engine/ejava.rb
@@ -211,7 +212,7 @@ files:
 - doc-api/classes
 - doc-api/classes/ActionView
 - doc-api/classes/ActionView/TemplateHandlers
-- doc-api/classes/ActionView/TemplateHandlers/Erubis.html
+- doc-api/classes/ActionView/TemplateHandlers/ErubisHandler.html
 - doc-api/classes/ActionView.html
 - doc-api/classes/ERB.html
 - doc-api/classes/Erubis