erubis 2.0.1 → 2.1.0

data/lib/erubis/engine/eruby.rb

@@ -1,25 +1,32 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 33 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
 require 'erubis/engine'
 require 'erubis/enhancer'
+require 'abstract'
 
 
 module Erubis
 
 
   ##
-  ## engine for Ruby
+  ## code generator for Ruby
   ##
-  class Eruby < Engine
+  module RubyGenerator
+    include Generator
     #include StringBufferEnhancer
     include ArrayBufferEnhancer
 
+    def init_generator(properties={})
+      super
+      @escapefunc ||= "Erubis::XmlHelper.escape_xml"
+    end
+
     def self.supported_properties()  # :nodoc:
-      return super
+      return []
     end
 
     def escape_text(text)
@@ -27,8 +34,7 @@ module Erubis
     end
 
     def escaped_expr(code)
-      @escape ||= "Erubis::XmlHelper.escape_xml"
-      return "#{@escape}(#{code})"
+      return "#{@escapefunc}(#{code})"
     end
 
     #--
@@ -70,6 +76,15 @@ module Erubis
   end
 
 
+  ##
+  ## engine for Ruby
+  ##
+  class Eruby < Basic::Engine
+    include RubyEvaluator
+    include RubyGenerator
+  end
+
+
   ##
   ## swtich '<%= %>' to escaped and '<%== %>' to not escaped
   ##
@@ -88,4 +103,16 @@ module Erubis
   end
 
 
+  class PI::Eruby < PI::Engine
+    include RubyEvaluator
+    include RubyGenerator
+
+    def init_converter(properties={})
+      @pi = 'rb'
+      super(properties)
+    end
+
+  end
+
+
 end

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 33 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,20 +11,19 @@ require 'erubis/enhancer'
 module Erubis
 
 
-  ##
-  ## engine for Scheme
-  ##
-  class Escheme < Engine
+  module SchemeGenerator
+    include Generator
 
     def self.supported_properties()  # :nodoc:
-      list = super
-      list << [:func,  '_add',   "function name (ex. 'display')"]
-      return list
+      return [
+              [:func,  '_add',   "function name (ex. 'display')"],
+              ]
     end
 
-    def initialize(input, properties={})
-      @func = properties[:func] || '_add'   # or 'display'
+    def init_generator(properties={})
       super
+      @escapefunc ||= 'escape'
+      @func = properties[:func] || '_add'   # or 'display'
     end
 
     def add_preamble(src)
@@ -42,8 +41,8 @@ module Erubis
     end
 
     def escaped_expr(code)
-      @escape ||= 'escape'
-      return "(#{@escape} #{code.strip})"
+      code.strip!
+      return "(#{@escapefunc} #{code})"
     end
 
     def add_text(src, text)
@@ -62,11 +61,12 @@ module Erubis
     end
 
     def add_expr_literal(src, code)
-      src << "(#{@func} " << code.strip << ')'
+      code.strip!
+      src << "(#{@func} #{code})"
     end
 
     def add_expr_escaped(src, code)
-      src << "(#{@func} " << escaped_expr(code) << ')'
+      add_expr_literal(src, escaped_expr(code))
     end
 
     def add_expr_debug(src, code)
@@ -83,6 +83,14 @@ module Erubis
   end
 
 
+  ##
+  ## engine for Scheme
+  ##
+  class Escheme < Basic::Engine
+    include SchemeGenerator
+  end
+
+
   class EscapedEscheme < Escheme
     include EscapeEnhancer
   end
@@ -93,4 +101,15 @@ module Erubis
   #end
 
 
+  class PI::Escheme < PI::Engine
+    include SchemeGenerator
+
+    def init_converter(properties={})
+      @pi = 'scheme'
+      super(properties)
+    end
+
+  end
+
+
 end

data/lib/erubis/engine/optimized.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 31 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,19 +11,18 @@ require 'erubis/engine/eruby'
 module Erubis
 
 
-  ##
-  ## Eruby class which generates optimized ruby code
-  ##
-  class OptimizedEruby < Engine    # Eruby
+  module OptimizedGenerator
+    include Generator
 
     def self.supported_properties()  # :nodoc:
-      return super
+      return []
     end
 
-    def initialize(input, properties={})
+    def init_generator(properties={})
+      super
+      @escapefunc ||= "Erubis::XmlHelper.escape_xml"
       @initialized = false
       @prev_is_expr = false
-      super
     end
 
     protected
@@ -33,8 +32,8 @@ module Erubis
     end
 
     def escaped_expr(code)
-      @escape ||= 'Erubis::XmlHelper.escape_xml'
-      return "#{@escape}(#{code})"
+      @escapefunc ||= 'Erubis::XmlHelper.escape_xml'
+      return "#{@escapefunc}(#{code})"
     end
 
     def switch_to_expr(src)
@@ -98,6 +97,21 @@ module Erubis
   end  # end of class OptimizedEruby
 
 
+  ##
+  ## Eruby class which generates optimized ruby code
+  ##
+  class OptimizedEruby < Basic::Engine    # Eruby
+    include RubyEvaluator
+    include OptimizedGenerator
+
+    def init_converter(properties={})
+      @pi = 'rb'
+      super(properties)
+    end
+
+  end
+
+
   ##
   ## XmlEruby class which generates optimized ruby code
   ##

data/lib/erubis/enhancer.rb

@@ -1,13 +1,10 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 32 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
 
-require 'erubis/engine'
-
-
 module Erubis
 
 
@@ -41,11 +38,9 @@ module Erubis
     def add_expr(src, code, indicator)
       case indicator
       when '='
-        add_expr_escaped(src, code)
-        #add_expr_literal(src, code)
+        @escape ? add_expr_literal(src, code) : add_expr_escaped(src, code)
       when '=='
-        add_expr_literal(src, code)
-        #add_expr_escaped(src, code)
+        @escape ? add_expr_escaped(src, code) : add_expr_literal(src, code)
       when '==='
         add_expr_debug(src, code)
       end
@@ -141,11 +136,11 @@ module Erubis
       end
     end
 
-    def evaluate(context=Context.new)
+    def evaluate(context=nil)
       _src = @src
       if context.is_a?(Hash)
         context.each do |key, val| instance_variable_set("@#{key}", val) end
-      else
+      elsif context
         context.instance_variables.each do |name|
           instance_variable_set(name, context.instance_variable_get(name))
         end
@@ -252,7 +247,7 @@ module Erubis
   ## remove text and leave code, especially useful when debugging.
   ##
   ## ex.
-  ##   $ erubis -s -e NoText file.eruby | more
+  ##   $ erubis -s -E NoText file.eruby | more
   ##
   ## this is language independent.
   ##
@@ -274,24 +269,63 @@ module Erubis
 
 
   ##
-  ## get compile faster, but spaces around '<%...%>' are not trimmed.
+  ## remove code and leave text, especially useful when validating HTML tags.
+  ##
+  ## ex.
+  ##   $ erubis -s -E NoCode file.eruby | tidy -errors
+  ##
+  ## this is language independent.
+  ##
+  module NoCodeEnhancer
+
+    def self.desc   # :nodoc:
+      "remove code and leave text (useful when validating HTML)"
+    end
+
+    def add_preamble(src)
+    end
+
+    def add_postamble(src)
+    end
+
+    def add_text(src, text)
+      src << text
+    end
+
+    def add_expr(src, code, indicator)
+      src << "\n" * code.count("\n")
+    end
+
+    def add_stmt(src, code)
+      src << "\n" * code.count("\n")
+    end
+
+  end
+
+
+  ##
+  ## get convert faster, but spaces around '<%...%>' are not trimmed.
   ##
   ## this is language-independent.
   ##
   module SimplifyEnhancer
 
     def self.desc   # :nodoc:
-      "get compile faster but leave spaces around '<% %>'"
+      "get convert faster but leave spaces around '<% %>'"
     end
 
-    #DEFAULT_REGEXP = /(.*?)(^[ \t]*)?<%(=+|\#)?(.*?)-?%>([ \t]*\r?\n)?/m
-    SIMPLE_REGEXP = /(.*?)<%(=+|\#)?(.*?)-?%>/m
+    #DEFAULT_REGEXP = /(^[ \t]*)?<%(=+|\#)?(.*?)-?%>([ \t]*\r?\n)?/m
+    SIMPLE_REGEXP = /<%(=+|\#)?(.*?)-?%>/m
 
-    def compile(input)
+    def convert(input)
       src = ""
       add_preamble(src)
       #regexp = pattern_regexp(@pattern)
-      input.scan(SIMPLE_REGEXP) do |text, indicator, code|
+      pos = 0
+      input.scan(SIMPLE_REGEXP) do |indicator, code|
+        index = Regexp.last_match.begin(0)
+        text = input[pos, index - pos]
+        pos = index + $&.length()
         add_text(src, text)
         if !indicator              # <% %>
           add_stmt(src, code)
@@ -476,7 +510,7 @@ module Erubis
 
     attr_accessor :header, :footer
 
-    def compile(input)
+    def convert(input)
       source = super
       return @src = "#{@header}#{source}#{@footer}"
     end

data/lib/erubis/error.rb

@@ -0,0 +1,24 @@
+##
+## $Rev: 32 $
+## $Release: 2.1.0 $
+## copyright(c) 2006 kuwata-lab all rights reserved.
+##
+
+module Erubis
+
+
+  ##
+  ## base error class
+  ##
+  class ErubisError < StandardError
+  end
+
+
+  ##
+  ## raised when method or function is not supported
+  ##
+  class NotSupportedError < ErubisError
+  end
+
+
+end

data/lib/erubis/evaluator.rb

@@ -0,0 +1,71 @@
+##
+## $Rev: 32 $
+## $Release: 2.1.0 $
+## copyright(c) 2006 kuwata-lab all rights reserved.
+##
+
+require 'erubis/error'
+require 'erubis/context'
+
+
+module Erubis
+
+
+  ##
+  ## evaluate code
+  ##
+  module Evaluator
+
+    def self.supported_properties    # :nodoc:
+      return []
+    end
+
+    attr_accessor :src, :filename
+
+    def init_evaluator(properties)
+      @filename = properties[:filename]
+    end
+
+    def result(*args)
+      raise NotSupportedError.new("evaluation of code except Ruby is not supported.")
+    end
+
+    def evaluate(*args)
+      raise NotSupportedError.new("evaluation of code except Ruby is not supported.")
+    end
+
+  end
+
+
+  ##
+  ## evaluator for Ruby
+  ##
+  module RubyEvaluator
+    include Evaluator
+
+    def self.supported_properties    # :nodoc:
+      list = Evaluator.supported_properties
+      return list
+    end
+
+    ## eval(@src) with binding object
+    def result(_binding_or_hash=TOPLEVEL_BINDING)
+      _arg = _binding_or_hash
+      if _arg.is_a?(Hash)
+        ## load _context data as local variables by eval
+        eval _arg.keys.inject("") { |s, k| s << "#{k.to_s} = _arg[#{k.inspect}];" }
+        _arg = binding()
+      end
+      return eval(@src, _arg, (@filename || '(erubis)'))
+    end
+
+    ## invoke context.instance_eval(@src)
+    def evaluate(context=Context.new)
+      context = Context.new(context) if context.is_a?(Hash)
+      return context.instance_eval(@src, (@filename || '(erubis)'))
+    end
+
+  end
+
+
+end