erubis 2.1.0 → 2.2.0

data/lib/erubis/engine.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 32 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Rev: 55 $
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 
@@ -23,11 +23,6 @@ module Erubis
     #include Converter
     #include Generator
 
-    # convert input string and set it to @src
-    def convert!(input)
-      @src = convert(input)
-    end
-
     def initialize(input=nil, properties={})
       #@input = input
       init_generator(properties)
@@ -36,12 +31,34 @@ module Erubis
       @src    = convert(input) if input
     end
 
-    ## load file and create engine object
+
+    ##
+    ## convert input string and set it to @src
+    ##
+    def convert!(input)
+      @src = convert(input)
+    end
+
+
+    ##
+    ## load file, write cache file, and return engine object.
+    ## this method create cache file (filename + '.cache') automatically.
+    ##
     def self.load_file(filename, properties={})
-      input = File.open(filename, 'rb') { |f| f.read }
-      input.untaint   # is it ok?
+      cachename = filename + '.cache'
       properties[:filename] = filename
-      engine = self.new(input, properties)
+      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 }
+        engine = self.new(input, properties)
+        File.open(cachename, 'w') do |f|
+          f.flock(File::LOCK_EX)
+          f.write(engine.src)
+        end
+      end
+      engine.src.untaint   # ok?
       return engine
     end
 

data/lib/erubis/engine/ec.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 33 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/ejava.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 31 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/ejavascript.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 31 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/enhanced.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 27 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/enhancer'

data/lib/erubis/engine/eperl.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 40 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/ephp.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 31 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/eruby.rb

@@ -1,12 +1,11 @@
 ##
-## $Rev: 33 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Rev: 54 $
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'
 require 'erubis/enhancer'
-require 'abstract'
 
 
 module Erubis
@@ -17,8 +16,8 @@ module Erubis
   ##
   module RubyGenerator
     include Generator
-    #include StringBufferEnhancer
-    include ArrayBufferEnhancer
+    #include ArrayBufferEnhancer
+    include StringBufferEnhancer
 
     def init_generator(properties={})
       super

data/lib/erubis/engine/escheme.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 33 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/optimized.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 31 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 

data/lib/erubis/enhancer.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 32 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Rev: 60 $
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 
@@ -214,7 +214,7 @@ module Erubis
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf\n"
+      src << "_buf.to_s\n"
     end
 
   end
@@ -243,6 +243,31 @@ module Erubis
   end
 
 
+  #--
+  ###
+  ### set buffer variable name to '_erbout' as well as '_buf'
+  ###
+  ### this is only for Eruby.
+  ###
+  #module ErboutEnhancer
+  #
+  #  def self.desc   # :nodoc:
+  #    "set buffer name '_erbout' as well as '_buf'"
+  #  end
+  #
+  #  def add_preamble(src)
+  #    src << "_erbout = _buf = '';"
+  #  end
+  #
+  #  def add_postamble(src)
+  #    src << "\n" unless src[-1] == ?\n
+  #    src << "_buf.to_s\n"
+  #  end
+  #
+  #end
+  #++
+
+
   ##
   ## remove text and leave code, especially useful when debugging.
   ##
@@ -323,9 +348,10 @@ module Erubis
       #regexp = pattern_regexp(@pattern)
       pos = 0
       input.scan(SIMPLE_REGEXP) do |indicator, code|
-        index = Regexp.last_match.begin(0)
-        text = input[pos, index - pos]
-        pos = index + $&.length()
+        match = Regexp.last_match
+        index = match.begin(0)
+        text  = input[pos, index - pos]
+        pos   = match.end(0)
         add_text(src, text)
         if !indicator              # <% %>
           add_stmt(src, code)

data/lib/erubis/error.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 32 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 module Erubis

data/lib/erubis/evaluator.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 32 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/error'

data/lib/erubis/generator.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 32 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Rev: 42 $
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require 'abstract'
@@ -9,6 +9,9 @@ require 'abstract'
 module Erubis
 
 
+  ##
+  ## code generator, called by Converter module
+  ##
   module Generator
 
     def self.supported_properties()  # :nodoc:

data/lib/erubis/helper.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 21 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Rev: 64 $
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 
@@ -22,28 +22,11 @@ module Erubis
       "'" => ''',
     }
 
-    def escape_xml(obj)
-      #table = ESCAPE_TABLE
-      #obj.to_s.gsub(/[&<>"]/) { |s| table[s] }    # or /[&<>"']/
-      obj.to_s.gsub(/[&<>"]/) { |s| ESCAPE_TABLE[s] }   # or /[&<>"']/
-      #obj.to_s.gsub(SCAN_REGEXP) { |s| ESCAPE_TABLE[s] }
-      #obj.to_s.gsub(/[&<>"]/) { ESCAPE_TABLE[$&] }
+    def escape_xml(value)
+      value.to_s.gsub(/[&<>"]/) { |s| ESCAPE_TABLE[s] }   # or /[&<>"']/
+      #value.to_s.gsub(/[&<>"]/) { ESCAPE_TABLE[$&] }
     end
 
-    #--
-    #def escape_xml(obj)
-    #  str = obj.to_s.dup
-    #  #str = obj.to_s
-    #  #str = str.dup if obj.__id__ == str.__id__
-    #  str.gsub!(/&/, '&amp;')
-    #  str.gsub!(/</, '&lt;')
-    #  str.gsub!(/>/, '&gt;')
-    #  str.gsub!(/"/, '&quot;')
-    #  str.gsub!(/'/, '&#039;')
-    #  return str
-    #end
-    #++
-
     alias h escape_xml
     alias html_escape escape_xml
 

data/lib/erubis/helpers/rails_helper.rb

@@ -0,0 +1,202 @@
+###
+### $Rev: 64 $
+### $Release: 2.2.0 $
+### copyright(c) 2006-2007 kuwata-lab all rights reserved.
+###
+
+
+require 'erubis'
+
+
+module Erubis
+
+  module Helpers
+
+    ##
+    ## helper module for Ruby on Rails
+    ##
+    ## howto:
+    ##
+    ## 1. add the folliwng code in your 'config/environment.rb'
+    ##
+    ##      require 'erubis/helpers/rails_helper'
+    ##      #Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby
+    ##      #Erubis::Helpers::RailsHelper.init_properties = {}
+    ##      #Erubis::Helpers::RailsHelper.show_src = false
+    ##
+    ## 2. (optional) apply the patch for 'action_view/base.rb'
+    ##
+    ##      $ cd /usr/local/lib/ruby/gems/1.8/gems/actionpack-1.13.1/lib/action_view/
+    ##      $ sudo patch -p1 < /tmp/erubis_2.X.X/contrib/action_view_base_rb.patch
+    ##
+    ## 3. restart web server.
+    ##
+    ## if Erubis::Helper::Rails.show_src is ture, Erubis prints converted Ruby code
+    ## into log file ('log/development.log' or so). This may be useful for debug.
+    ##
+    module RailsHelper
+
+      #cattr_accessor :init_properties
+      @@engine_class = Erubis::Eruby
+
+      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 = false
+
+      def self.show_src
+        @@show_src
+      end
+
+      def self.show_src=(flag)
+        @@show_src = flag
+      end
+
+    end
+
+  end
+
+end
+
+
+method_name = 'convert_template_into_ruby_code'
+unless ActionView::Base.private_instance_methods.include?(method_name) ||
+       ActionView::Base.instance_methods.include?(method_name)
+
+  require 'action_pack/version'
+
+  module ActionView  # :nodoc:
+
+    class Base  # :nodoc:
+
+      private
+
+      # 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 <= 12   ###  Rails 1.1
+
+
+      # Create source code for given template
+      def create_template_source(extension, template, render_symbol, locals)
+        if template_requires_setup?(extension)
+          body = case extension.to_sym
+            when :rxml
+              "xml = Builder::XmlMarkup.new(:indent => 2)\n" +
+              "@controller.headers['Content-Type'] ||= 'application/xml'\n" +
+              template
+            when :rjs
+              "@controller.headers['Content-Type'] ||= 'text/javascript'\n" +
+              "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] ||= {}
+        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
+
+
+else    ###  Rails 1.2 or later
+
+
+      # Create source code for given template
+      def create_template_source(extension, template, render_symbol, locals)
+        if template_requires_setup?(extension)
+          body = case extension.to_sym
+            when :rxml
+              "controller.response.content_type ||= 'application/xml'\n" +
+              "xml = Builder::XmlMarkup.new(:indent => 2)\n" +
+              template
+            when :rjs
+              "controller.response.content_type ||= 'text/javascript'\n" +
+              "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] ||= {}
+        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
+
+  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
+    src = klass.new(template, properties).src
+    src.insert(0, '_erbout = ')
+    logger.debug "** Erubis: src==<<'END'\n#{src}END\n" if show_src
+    src
+  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] }
+  end
+  module_function :h
+end
+
+
+## finish
+ac = ActionController::Base.new
+ac.logger.info "** Erubis #{Erubis::VERSION}"
+#$stdout.puts "** Erubis #{Erubis::VERSION}"