erubis 2.0.0 → 2.0.1

data/lib/erubis.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -61,7 +61,7 @@ module Erubis
 
 
   ##
-  ## [abstract] base engine class
+  ## .[abstract] base engine class
   ##
   class Engine
 
@@ -78,7 +78,7 @@ module Erubis
 
     def initialize(input, properties={})
       #@input    = input
-      @pattern   = properties[:pattern]  || '<% %>'
+      @pattern   = properties[:pattern]
       @filename  = properties[:filename]
       @trim      = properties[:trim] != false
       @preamble  = properties[:preamble]
@@ -98,7 +98,7 @@ module Erubis
       return engine
     end
 
-    ## eval(@src) with binding
+    ## eval(@src) with binding object
     def result(_binding_or_hash=TOPLEVEL_BINDING)
       _arg = _binding_or_hash
       if _arg.is_a?(Hash)
@@ -109,7 +109,7 @@ module Erubis
       return eval(@src, _arg, (@filename || '(erubis)'))
     end
 
-    ## call context.instance_eval(@src)
+    ## 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)'))
@@ -119,7 +119,7 @@ module Erubis
 
     ## return regexp of pattern to parse eRuby script
     def pattern_regexp(pattern=@pattern)
-      if pattern == '<% %>'
+      if pattern.nil? || pattern == '<% %>'
         return DEFAULT_REGEXP
       else
         prefix, postfix = pattern.split()
@@ -152,7 +152,7 @@ module Erubis
           else
             add_text(src, lspace) if lspace
             add_stmt(src, "\n" * n)
-            add_text(src, rspace) if lspace
+            add_text(src, rspace) if rspace
           end
           #flag_trim = @trim && lspace && rspace
           #add_text(src, lspace) if !flag_trim && lspace
@@ -196,20 +196,31 @@ module Erubis
 
     protected
 
-    ## escape text string
+    ## .[abstract] escape text string
+    ##
+    ## ex.
+    ##   def escape_text(text)
+    ##     return text.dump
+    ##     # or return "'" + text.gsub(/['\\]/, '\\\\\&') + "'"
+    ##   end
     def escape_text(text)
-      return text
+      not_implemented
     end
 
-    ## return escaped expression code
+    ## .[abstract] return escaped expression code
+    ##
+    ## ex.
+    ##   def escaped_expr(code)
+    ##     @escape ||= 'escape'
+    ##     return "#{@escape}(#{code.strip})"
+    ##   end
     def escaped_expr(code)
-      @escape ||= 'escape'
-      return "#{@escape}(#{code.strip})"
+      not_implemented
     end
 
-    ## .[empty] add @preamble to src
+    ## .[abstract] add @preamble to src
     def add_preamble(src)
-      # empty
+      not_implemented
     end
 
     ## .[abstract] add text string to src
@@ -244,14 +255,14 @@ module Erubis
       not_implemented
     end
 
-    ## .[empty] add expression code to src for debug. this is called by add_expr().
+    ## .[abstract] add expression code to src for debug. this is called by add_expr().
     def add_expr_debug(src, code)
-      # empty
+      not_implemented
     end
 
-    ## .[empty] add @postamble to src
+    ## .[abstract] add @postamble to src
     def add_postamble(src)
-      # empty
+      not_implemented
     end
 
   end  # end of class Engine

data/lib/erubis/engine/ec.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -88,6 +88,7 @@ module Erubis
     end
 
     def add_postamble(src)
+      # empty
     end
 
   end

data/lib/erubis/engine/ejava.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -40,12 +40,10 @@ 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 escaped_expr(code)
+      @escape ||= 'escape'
+      return "#{@escape}(#{code.strip})"
+    end
 
     def add_text(src, text)
       return if text.empty?

data/lib/erubis/engine/ejavascript.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -39,12 +39,10 @@ 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 escaped_expr(code)
+      @escape ||= 'escape'
+      return "#{@escape}(#{code.strip})"
+    end
 
     def add_indent(src, indent)
       src << (src.empty? || src[-1] == ?\n ? indent : ' ')

data/lib/erubis/engine/enhanced.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 19 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine/eperl.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 19 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -28,6 +28,7 @@ module Erubis
     end
 
     def add_preamble(src)
+      # empty
     end
 
     def escape_text(text)
@@ -38,12 +39,10 @@ module Erubis
       src << @func << "('" << escape_text(text) << "'); " unless text.empty?
     end
 
-    #--
-    #def escaped_expr(code)
-    #  @escape ||= 'escape'
-    #  return "escape(#{code.strip})"
-    #end
-    #++
+    def escaped_expr(code)
+      @escape ||= 'escape'
+      return "escape(#{code.strip})"
+    end
 
     def add_expr_literal(src, code)
       src << @func << "(" << code.strip << "); "

data/lib/erubis/engine/ephp.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 19 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -20,10 +20,9 @@ module Erubis
       return super
     end
 
-    #--
-    #def add_preamble(src)
-    #end
-    #++
+    def add_preamble(src)
+      # empty
+    end
 
     def escape_text(text)
       return text.gsub!(/<\?xml\b/, '<<?php ?>?xml') || text
@@ -63,10 +62,9 @@ module Erubis
       end
     end
 
-    #--
-    #def add_postamble(src)
-    #end
-    #++
+    def add_postamble(src)
+      # empty
+    end
 
   end
 

data/lib/erubis/engine/eruby.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/engine/optimized.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/enhancer.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/local-setting.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 13 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 21 $
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 
@@ -233,7 +233,7 @@ END
     end
 
     def version
-      release = ('$Release: 2.0.0 $' =~ /([.\d]+)/) && $1
+      release = ('$Release: 2.0.1 $' =~ /([.\d]+)/) && $1
       return release
     end
 

data/lib/erubis/tiny.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/test/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 6 $
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 

data/test/test-bin.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## $Date: 2006-05-20 08:57:39 +0900 (Sat, 20 May 2006) $
 ##
 
@@ -115,7 +115,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.0.0 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.0.1 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end

data/test/test-engines.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/test/test.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev$
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/test/testutil.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 103 $
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
-date: 2006-05-20 00:00:00 +09:00
+  version: 2.0.1
+date: 2006-05-21 00:00:00 +09:00
 summary: a fast and extensible eRuby implementation which supports multi-language
 require_paths: 
 - lib