erubis 2.2.0 → 2.3.0

data/lib/erubis.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 59 $
-## $Release: 2.2.0 $
+## 2.3.0
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
@@ -48,7 +48,7 @@
 
 
 module Erubis
-  VERSION = ('$Release: 2.2.0 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.3.0 $' =~ /([.\d]+)/) && $1
 end
 
 require 'erubis/engine'

data/lib/erubis/context.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 59 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/converter.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 60 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 55 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
@@ -80,7 +80,7 @@ module Erubis
 
 
     ##
-    ## helper method evaluate Proc object iwth contect object.
+    ## helper method evaluate Proc object with contect object.
     ## context may be Binding, Hash, or Object.
     ##
     def process_proc(proc_obj, context=nil, filename=nil)

data/lib/erubis/engine/ec.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 33 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine/ejava.rb

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

data/lib/erubis/engine/ejavascript.rb

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

data/lib/erubis/engine/enhanced.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 27 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
@@ -62,6 +62,11 @@ module Erubis
   end
 
 
+  class ErboutEruby < Eruby
+    include ErboutEnhancer
+  end
+
+
   class NoTextEruby < Eruby
     include NoTextEnhancer
   end
@@ -104,4 +109,14 @@ module Erubis
   end
 
 
+  class DeleteIndentEruby < Eruby
+    include DeleteIndentEnhancer
+  end
+
+
+  class InterpolationEruby < Eruby
+    include InterpolationEnhancer
+  end
+
+
 end

data/lib/erubis/engine/eperl.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 40 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine/ephp.rb

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

data/lib/erubis/engine/eruby.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 54 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
@@ -84,6 +84,14 @@ module Erubis
   end
 
 
+  ##
+  ## fast engine for Ruby
+  ##
+  class FastEruby < Eruby
+    include InterpolationEnhancer
+  end
+
+
   ##
   ## swtich '<%= %>' to escaped and '<%== %>' to not escaped
   ##

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 33 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine/optimized.rb

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

data/lib/erubis/enhancer.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 60 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
@@ -243,29 +243,27 @@ 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
-  #++
+  ##
+  ## set buffer variable name to '_erbout' as well as '_buf'
+  ##
+  ## this is only for Eruby.
+  ##
+  module ErboutEnhancer
+
+    def self.desc   # :nodoc:
+      "set '_erbout = _buf = \"\";' to be compatible with ERB."
+    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
 
 
   ##
@@ -544,4 +542,115 @@ module Erubis
   end
 
 
+  ##
+  ## delete indentation of HTML.
+  ##
+  ## this is language-independent.
+  ##
+  module DeleteIndentEnhancer
+
+    def self.desc   # :nodoc:
+      "delete indentation of HTML."
+    end
+
+    def convert_input(src, input)
+      input = input.gsub(/^[ \t]+</, '<')
+      super(src, input)
+    end
+
+  end
+
+
+  ##
+  ## convert "<h1><%=title%></h1>" into "_buf << %Q`<h1>#{title}</h1>`"
+  ##
+  ## this is only for Eruby.
+  ##
+  module InterpolationEnhancer
+
+    def self.desc   # :nodoc:
+      "convert '<p><%=text%></p>' into '_buf << %Q`<p>\#{text}</p>`'"
+    end
+
+    def convert_input(src, input)
+      pat = @pattern
+      regexp = pat.nil? || pat == '<% %>' ? Basic::Converter::DEFAULT_REGEXP : pattern_regexp(pat)
+      pos = 0
+      is_bol = true     # is beginning of line
+      str = ''
+      input.scan(regexp) do |indicator, code, rspace|
+        match = Regexp.last_match()
+        len  = match.begin(0) - pos
+        text = input[pos, len]
+        pos  = match.end(0)
+        ch   = indicator ? indicator[0] : nil
+        lspace = ch == ?= ? nil : detect_spaces_at_bol(text, is_bol)
+        is_bol = rspace ? true : false
+        _add_text_to_str(str, text)
+        ## * when '<%= %>', do nothing
+        ## * when '<% %>' or '<%# %>', delete spaces iff only spaces are around '<% %>'
+        if ch == ?=              # <%= %>
+          str << lspace if lspace
+          add_expr(str, code, indicator)
+          str << rspace if rspace
+        elsif ch == ?\#          # <%# %>
+          n = code.count("\n") + (rspace ? 1 : 0)
+          if @trim && lspace && rspace
+            add_text(src, str)
+            str = ''
+            add_stmt(src, "\n" * n)
+          else
+            str << lspace if lspace
+            add_text(src, str)
+            str = ''
+            add_stmt(src, "\n" * n)
+            str << rspace if rspace
+          end
+        else                     # <% %>
+          if @trim && lspace && rspace
+            add_text(src, str)
+            str = ''
+            add_stmt(src, "#{lspace}#{code}#{rspace}")
+          else
+            str << lspace if lspace
+            add_text(src, str)
+            str = ''
+            add_stmt(src, code)
+            str << rspace if rspace
+          end
+        end
+      end
+      rest = $' || input     # add input when no matched
+      _add_text_to_str(str, rest)
+      add_text(src, str)
+    end
+
+    def add_text(src, text)
+      return if !text || text.empty?
+      #src << " _buf << %Q`" << text << "`;"
+      if text[-1] == ?\n
+        text[-1] = "\\n"
+        src << " _buf << %Q`" << text << "`\n"
+      else
+        src << " _buf << %Q`" << text << "`;"
+      end
+    end
+
+    def _add_text_to_str(str, text)
+      return if !text || text.empty?
+      text.gsub!(/['\#\\]/, '\\\\\&')
+      str << text
+    end
+
+    def add_expr_escaped(str, code)
+      str << "\#{#{escaped_expr(code)}}"
+    end
+
+    def add_expr_literal(str, code)
+      str << "\#{#{code}}"
+    end
+
+  end
+
+
 end

data/lib/erubis/error.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 32 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 32 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/generator.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 42 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 64 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 64 $
-### $Release: 2.2.0 $
+### $Rev: 78 $
+### $Release: 2.3.0 $
 ### copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ###
 
@@ -10,6 +10,14 @@ require 'erubis'
 
 module Erubis
 
+  class Eruby
+    include ErboutEnhancer      # will generate '_erbout = _buf = ""; '
+  end
+
+  class FastEruby
+    include ErboutEnhancer      # will generate '_erbout = _buf = ""; '
+  end
+
   module Helpers
 
     ##
@@ -20,13 +28,13 @@ module Erubis
     ## 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.engine_class = Erubis::Eruby # or Erubis::FastEruby
     ##      #Erubis::Helpers::RailsHelper.init_properties = {}
-    ##      #Erubis::Helpers::RailsHelper.show_src = false
+    ##      #Erubis::Helpers::RailsHelper.show_src = false             # set true for debugging
     ##
     ## 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/
+    ##      $ cd /usr/local/lib/ruby/gems/1.8/gems/actionpack-1.13.3/lib/action_view/
     ##      $ sudo patch -p1 < /tmp/erubis_2.X.X/contrib/action_view_base_rb.patch
     ##
     ## 3. restart web server.
@@ -38,6 +46,7 @@ module Erubis
 
       #cattr_accessor :init_properties
       @@engine_class = Erubis::Eruby
+      #@@engine_class = Erubis::FastEruby
 
       def self.engine_class
         @@engine_class
@@ -104,82 +113,17 @@ if ActionPack::VERSION::MINOR <= 12   ###  Rails 1.1
             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
+    rails_helper = Erubis::Helpers::RailsHelper
+    klass      = rails_helper.engine_class
+    properties = rails_helper.init_properties
+    show_src   = rails_helper.show_src
     src = klass.new(template, properties).src
-    src.insert(0, '_erbout = ')
+    #src.insert(0, '_erbout = ')
     logger.debug "** Erubis: src==<<'END'\n#{src}END\n" if show_src
     src
   end