erubis 2.0.1 → 2.1.0

data/lib/erubis/engine/ec.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 24 $
-## $Release: 2.0.1 $
+## $Rev: 33 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,22 +11,21 @@ require 'erubis/enhancer'
 module Erubis
 
 
-  ##
-  ## engine for C
-  ##
-  class Ec < Engine
+  module CGenerator
+    include Generator
 
     def self.supported_properties()  # :nodoc:
-      list = super
-      list << [:indent, '',       "indent spaces (ex. '  ')"]
-      list << [:out,    'stdout', "output file pointer name"]
-      return list
+      return [
+              [:indent, '',       "indent spaces (ex. '  ')"],
+              [:out,    'stdout', "output file pointer name"],
+            ]
     end
 
-    def initialize(input, properties={})
+    def init_generator(properties={})
+      super
+      @escapefunc ||= "escape"
       @indent = properties[:indent] || ''
       @out = properties[:out] || 'stdout'
-      super
     end
 
     def add_preamble(src)
@@ -40,13 +39,7 @@ module Erubis
     end
 
     def escaped_expr(code)
-      @escape ||= "escape"
-      code.strip!
-      if code =~ /\A(\".*?\")\s*,\s*(.*)/
-        return "#{$1}, #{@escape}(#{$2})"
-      else
-        return "#{@escape}(#{code})"
-      end
+      return "#{@escapefunc}(#{code.strip}, #{@out})"
     end
 
     def add_text(src, text)
@@ -74,7 +67,7 @@ module Erubis
 
     def add_expr_escaped(src, code)
       src << @indent if src.empty? || src[-1] == ?\n
-      src << " fprintf(#{@out}, " << escaped_expr(code) << ');'
+      src << ' ' << escaped_expr(code) << ';'
     end
 
     def add_expr_debug(src, code)
@@ -94,6 +87,14 @@ module Erubis
   end
 
 
+  ##
+  ## engine for C
+  ##
+  class Ec < Basic::Engine
+    include CGenerator
+  end
+
+
   class EscapedEc < Ec
     include EscapeEnhancer
   end
@@ -103,5 +104,15 @@ module Erubis
   #  include EscapeEnhancer
   #end
 
+  class PI::Ec < PI::Engine
+    include CGenerator
+
+    def init_converter(properties={})
+      @pi = 'c'
+      super(properties)
+    end
+
+  end
+
 
 end

data/lib/erubis/engine/ejava.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 24 $
-## $Release: 2.0.1 $
+## $Rev: 31 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,24 +11,23 @@ require 'erubis/enhancer'
 module Erubis
 
 
-  ##
-  ## engine for Java
-  ##
-  class Ejava < Engine
+  module JavaGenerator
+    include Generator
 
     def self.supported_properties()   # :nodoc:
-      list = super
-      list << [:indent,   '',       "indent spaces (ex. '  ')"]
-      list << [:buf,      '_buf',   "output buffer name"]
-      list << [:bufclass, 'StringBuffer', "output buffer class (ex. 'StringBuilder')"]
-      return list
+      return [
+              [:indent,   '',       "indent spaces (ex. '  ')"],
+              [:buf,      '_buf',   "output buffer name"],
+              [:bufclass, 'StringBuffer', "output buffer class (ex. 'StringBuilder')"],
+            ]
     end
 
-    def initialize(input, properties={})
+    def init_generator(properties={})
+      super
+      @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
       @buf = properties[:buf] || '_buf'
       @bufclass = properties[:bufclass] || 'StringBuffer'
-      super
     end
 
     def add_preamble(src)
@@ -40,11 +39,6 @@ module Erubis
       return text.gsub!(/[\r\n\t"\\]/) { |m| @@table_[m] } || text
     end
 
-    def escaped_expr(code)
-      @escape ||= 'escape'
-      return "#{@escape}(#{code.strip})"
-    end
-
     def add_text(src, text)
       return if text.empty?
       src << (src.empty? || src[-1] == ?\n ? @indent : ' ')
@@ -64,12 +58,12 @@ module Erubis
 
     def add_expr_literal(src, code)
       src << @indent if src.empty? || src[-1] == ?\n
-      src << ' ' << @buf << '.append(' << code.strip << ');'
+      code.strip!
+      src << " #{@buf}.append(#{code});"
     end
 
     def add_expr_escaped(src, code)
-      src << @indent if src.empty? || src[-1] == ?\n
-      src << ' ' << @buf << '.append(' << escaped_expr(code) << ');'
+      add_expr_literal(src, escaped_expr(code))
     end
 
     def add_expr_debug(src, code)
@@ -81,11 +75,20 @@ module Erubis
     def add_postamble(src)
       src << "\n" if src[-1] == ?;
       src << @indent << "return " << @buf << ".toString();\n"
+      #src << @indent << "System.out.print(" << @buf << ".toString());\n"
     end
 
   end
 
 
+  ##
+  ## engine for Java
+  ##
+  class Ejava < Basic::Engine
+    include JavaGenerator
+  end
+
+
   class EscapedEjava < Ejava
     include EscapeEnhancer
   end
@@ -95,5 +98,14 @@ module Erubis
   #  include EscapeEnhancer
   #end
 
+  class PI::Ejava < PI::Engine
+    include JavaGenerator
+
+    def init_converter(properties={})
+      @pi = 'java'
+      super(properties)
+    end
+
+  end
 
 end

data/lib/erubis/engine/ejavascript.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 24 $
-## $Release: 2.0.1 $
+## $Rev: 31 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,23 +11,21 @@ require 'erubis/enhancer'
 module Erubis
 
 
-  ##
-  ## engine for JavaScript
-  ##
-  class Ejavascript < Engine
+  module JavascriptGenerator
+    include Generator
 
     def self.supported_properties()   # :nodoc:
-      list = super
+      list = []
       #list << [:indent,   '',       "indent spaces (ex. '  ')"]
       #list << [:buf,      '_buf',   "output buffer name"]
       return list
     end
 
-    def initialize(input, properties={})
+    def init_generator(properties={})
+      super
+      @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
       @buf = properties[:out] || '_buf'
-      #@bufclass = properties[:outclass] || 'StringBuffer'
-      super
     end
 
     def add_preamble(src)
@@ -39,11 +37,6 @@ module Erubis
       return text.gsub!(/[\r\n\t"\\]/) { |m| @@table_[m] } || text
     end
 
-    def escaped_expr(code)
-      @escape ||= 'escape'
-      return "#{@escape}(#{code.strip})"
-    end
-
     def add_indent(src, indent)
       src << (src.empty? || src[-1] == ?\n ? indent : ' ')
     end
@@ -67,12 +60,12 @@ module Erubis
 
     def add_expr_literal(src, code)
       add_indent(src, @indent)
-      src << @buf << '.push(' << code.strip << ');'
+      code.strip!
+      src << "#{@buf}.push(#{code});"
     end
 
     def add_expr_escaped(src, code)
-      add_indent(src, @indent)
-      src << @buf << '.push(' << escaped_expr(code) << ');'
+      add_expr_literal(src, escaped_expr(code))
     end
 
     def add_expr_debug(src, code)
@@ -89,6 +82,14 @@ module Erubis
   end
 
 
+  ##
+  ## engine for JavaScript
+  ##
+  class Ejavascript < Basic::Engine
+    include JavascriptGenerator
+  end
+
+
   class EscapedEjavascript < Ejavascript
     include EscapeEnhancer
   end
@@ -99,4 +100,15 @@ module Erubis
   #end
 
 
+  class PI::Ejavascript < PI::Engine
+    include JavascriptGenerator
+
+    def init_converter(properties={})
+      @pi = 'js'
+      super(properties)
+    end
+
+  end
+
+
 end

data/lib/erubis/engine/enhanced.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 19 $
-## $Release: 2.0.1 $
+## $Rev: 27 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -67,6 +67,11 @@ module Erubis
   end
 
 
+  class NoCodeEruby < Eruby
+    include NoCodeEnhancer
+  end
+
+
   class SimplifiedEruby < Eruby
     include SimplifyEnhancer
   end

data/lib/erubis/engine/eperl.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 24 $
-## $Release: 2.0.1 $
+## $Rev: 40 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,24 +11,23 @@ require 'erubis/enhancer'
 module Erubis
 
 
-  ##
-  ## engine for Perl
-  ##
-  class Eperl < Engine
+  module PerlGenerator
+    include Generator
 
     def self.supported_properties()  # :nodoc:
-      list = super
-      list << [:func, 'print', "function name"]
-      return list
+      return [
+              [:func, 'print', "function name"],
+              ]
     end
 
-    def initialize(input, properties={})
-      @func = properties[:func] || 'print'
+    def init_generator(properties={})
       super
+      @escapefunc ||= 'encode_entities'
+      @func = properties[:func] || 'print'
     end
 
     def add_preamble(src)
-      # empty
+      src << "use HTML::Entities; ";
     end
 
     def escape_text(text)
@@ -39,17 +38,13 @@ module Erubis
       src << @func << "('" << escape_text(text) << "'); " unless text.empty?
     end
 
-    def escaped_expr(code)
-      @escape ||= 'escape'
-      return "escape(#{code.strip})"
-    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)
@@ -69,6 +64,14 @@ module Erubis
   end
 
 
+  ##
+  ## engine for Perl
+  ##
+  class Eperl < Basic::Engine
+    include PerlGenerator
+  end
+
+
   class EscapedEperl < Eperl
     include EscapeEnhancer
   end
@@ -79,4 +82,15 @@ module Erubis
   #end
 
 
+  class PI::Eperl < PI::Engine
+    include PerlGenerator
+
+    def init_converter(properties={})
+      @pi = 'perl'
+      super(properties)
+    end
+
+  end
+
+
 end

data/lib/erubis/engine/ephp.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 24 $
-## $Release: 2.0.1 $
+## $Rev: 31 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -11,13 +11,16 @@ require 'erubis/enhancer'
 module Erubis
 
 
-  ##
-  ## engine for PHP
-  ##
-  class Ephp < Engine
+  module PhpGenerator
+    include Generator
 
     def self.supported_properties()  # :nodoc:
-      return super
+      return []
+    end
+
+    def init_generator(properties={})
+      super
+      @escapefunc ||= 'htmlspecialchars'
     end
 
     def add_preamble(src)
@@ -32,17 +35,13 @@ module Erubis
       src << escape_text(text)
     end
 
-    def escaped_expr(code)
-      @escape ||= 'htmlspecialchars'
-      return "#{@escape}(#{code.strip})"
-    end
-
     def add_expr_literal(src, code)
-      src << "<?php echo #{code.strip}; ?>"
+      code.strip!
+      src << "<?php echo #{code}; ?>"
     end
 
     def add_expr_escaped(src, code)
-      src << "<?php echo #{escaped_expr(code)}; ?>"
+      add_expr_literal(src, escaped_expr(code))
     end
 
     def add_expr_debug(src, code)
@@ -69,6 +68,14 @@ module Erubis
   end
 
 
+  ##
+  ## engine for PHP
+  ##
+  class Ephp < Basic::Engine
+    include PhpGenerator
+  end
+
+
   class EscapedEphp < Ephp
     include EscapeEnhancer
   end
@@ -79,4 +86,15 @@ module Erubis
   #end
 
 
+  class PI::Ephp < PI::Engine
+    include PhpGenerator
+
+    def init_converter(properties={})
+      @pi = 'php'
+      super(properties)
+    end
+
+  end
+
+
 end