erubis 2.6.1 → 2.6.2

data/lib/erubis/context.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/converter.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 104 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -168,7 +168,8 @@ module Erubis
           end
         end
       end
-      rest = $' || input     # add input when no matched
+      #rest = $' || input                        # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       add_text(src, rest)
     end
 
@@ -264,7 +265,8 @@ module Erubis
           add_pi_expr(codebuf, expr1 || expr2, indicator1 || indicator2)
         end
       end
-      rest = $' || input
+      #rest = $' || input                        # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       add_text(codebuf, rest)
     end
 

data/lib/erubis/engine.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 104 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ec.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ejava.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ejavascript.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 95 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/enhanced.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/eperl.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ephp.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/eruby.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/optimized.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/enhancer.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 103 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -360,7 +360,8 @@ module Erubis
           add_expr(src, code, indicator)
         end
       end
-      rest = $' || input
+      #rest = $' || input                      # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]  # ruby1.9
       add_text(src, rest)
       add_postamble(src)
       return src
@@ -419,11 +420,14 @@ module Erubis
 
     def add_text(src, text)
       return unless text
+      m = nil
       text.scan(@bipattern_regexp) do |txt, indicator, code|
+        m = Regexp.last_match
         super(src, txt)
         add_expr(src, code, '=' + indicator)
       end
-      rest = $' || text
+      #rest = $' || text                    # ruby1.8
+      rest = m ? text[m.end(0)..-1] : text  # ruby1.9
       super(src, rest)
     end
 
@@ -465,7 +469,8 @@ module Erubis
           add_stmt(src, line)
         end
       end
-      rest = pos == 0 ? text : $'  # or $' || text
+      #rest = pos == 0 ? text : $'             # ruby1.8
+      rest = pos == 0 ? text : text[pos..-1]   # ruby1.9
       unless text2.empty?
         text2 << rest if rest
         rest = text2
@@ -535,7 +540,9 @@ module Erubis
     HEADER_FOOTER_PATTERN = /(.*?)(^[ \t]*)?<!--\#(\w+):(.*?)\#-->([ \t]*\r?\n)?/m
 
     def add_text(src, text)
+      m = nil
       text.scan(HEADER_FOOTER_PATTERN) do |txt, lspace, word, content, rspace|
+        m = Regexp.last_match
         flag_trim = @trim && lspace && rspace
         super(src, txt)
         content = "#{lspace}#{content}#{rspace}" if flag_trim
@@ -543,7 +550,8 @@ module Erubis
         instance_variable_set("@#{word}", content)
         super(src, rspace) if !flag_trim && rspace
       end
-      rest = $' || text
+      #rest = $' || text                    # ruby1.8
+      rest = m ? text[m.end(0)..-1] : text  # ruby1.9
       super(src, rest)
     end
 
@@ -636,7 +644,8 @@ module Erubis
           end
         end
       end
-      rest = $' || input     # add input when no matched
+      #rest = $' || input                       # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]  # ruby1.9
       _add_text_to_str(str, rest)
       add_text(src, str)
     end

data/lib/erubis/error.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 94 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -54,20 +54,25 @@ module Erubis
     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}];" }
-        eval _arg.collect{|k,v| "#{k} = _arg[#{k.inspect}]; "}.join
-        _arg = binding()
+        _b = binding()
+        eval _arg.collect{|k,v| "#{k} = _arg[#{k.inspect}]; "}.join, _b
+      elsif _arg.is_a?(Binding)
+        _b = _arg
+      elsif _arg.nil?
+        _b = binding()
+      else
+        raise ArgumentError.new("#{self.class.name}#result(): argument should be Binding or Hash but passed #{_arg.class.name} object.")
       end
-      return eval(@src, _arg, (@filename || '(erubis)'))
+      return eval(@src, _b, (@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)')
-      @_proc ||= eval("proc { #{@src} }", Erubis::EMPTY_BINDING, @filename || '(erubis)')
-      return context.instance_eval(&@_proc)
+    def evaluate(_context=Context.new)
+      _context = Context.new(_context) if _context.is_a?(Hash)
+      #return _context.instance_eval(@src, @filename || '(erubis)')
+      #@_proc ||= eval("proc { #{@src} }", Erubis::EMPTY_BINDING, @filename || '(erubis)')
+      @_proc ||= eval("proc { #{@src} }", binding(), @filename || '(erubis)')
+      return _context.instance_eval(&@_proc)
     end
 
     ## if object is an Class or Module then define instance method to it,

data/lib/erubis/generator.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 89 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helpers/rails_form_helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 109 $
-### $Release: 2.6.1 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 112 $
-### $Release: 2.6.1 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/local-setting.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 91 $
-### $Release: 2.6.1 $
+### $Rev: 116 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -52,34 +52,34 @@ module Erubis
       @single_options = "hvxztTSbeBXNUC"
       @arg_options    = "pcrfKIlaE" #C
       @option_names   = {
-        ?h => :help,
-        ?v => :version,
-        ?x => :source,
-        ?z => :syntax,
-        ?T => :unexpand,
-        ?t => :untabify,      # obsolete
-        ?S => :intern,
-        ?b => :bodyonly,
-        ?B => :binding,
-        ?p => :pattern,
-        ?c => :context,
-        #?C => :class,
-        ?e => :escape,
-        ?r => :requires,
-        ?f => :datafiles,
-        ?K => :kanji,
-        ?I => :includes,
-        ?l => :lang,
-        ?a => :action,
-        ?E => :enhancers,
-        ?X => :notext,
-        ?N => :linenum,
-        ?U => :unique,
-        ?C => :compact,
+        'h' => :help,
+        'v' => :version,
+        'x' => :source,
+        'z' => :syntax,
+        'T' => :unexpand,
+        't' => :untabify,      # obsolete
+        'S' => :intern,
+        'b' => :bodyonly,
+        'B' => :binding,
+        'p' => :pattern,
+        'c' => :context,
+        #'C' => :class,
+        'e' => :escape,
+        'r' => :requires,
+        'f' => :datafiles,
+        'K' => :kanji,
+        'I' => :includes,
+        'l' => :lang,
+        'a' => :action,
+        'E' => :enhancers,
+        'X' => :notext,
+        'N' => :linenum,
+        'U' => :unique,
+        'C' => :compact,
       }
       assert unless @single_options.length + @arg_options.length == @option_names.length
       (@single_options + @arg_options).each_byte do |ch|
-        assert unless @option_names.key?(ch)
+        assert unless @option_names.key?(ch.chr)
       end
     end
 
@@ -88,7 +88,7 @@ module Erubis
       ## parse command-line options
       options, properties = parse_argv(argv, @single_options, @arg_options)
       filenames = argv
-      options[?h] = true if properties[:help]
+      options['h'] = true if properties[:help]
       opts = Object.new
       arr = @option_names.collect { |ch, name| "def #{name}; @#{name}; end\n" }
       opts.instance_eval arr.join
@@ -287,7 +287,7 @@ module Erubis
       s = "enhancers:\n"
       list = []
       ObjectSpace.each_object(Module) do |m| list << m end
-      list.sort_by { |m| m.name }.each do |m|
+      list.sort_by { |m| m.name.to_s }.each do |m|
         next unless m.name =~ /\AErubis::(.*)Enhancer\z/
         name = $1
         desc = m.desc
@@ -319,7 +319,7 @@ module Erubis
           #
         else                  # options
           while optstr && !optstr.empty?
-            optchar = optstr[0]
+            optchar = optstr[0].chr
             optstr[0,1] = ""
             if arg_none.include?(optchar)
               options[optchar] = true
@@ -472,7 +472,8 @@ module Erubis
 
     def check_syntax(filename, src)
       require 'open3'
-      stdin, stdout, stderr = Open3.popen3('ruby -wc')
+      command = (ENV['_'] || 'ruby') + ' -wc'   # ENV['_'] stores command name
+      stdin, stdout, stderr = Open3.popen3(command)
       stdin.write(src)
       stdin.close
       result = stdout.read()

data/lib/erubis/preprocessing.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 102 $
-### $Release: 2.6.1 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/tiny.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -43,7 +43,8 @@ module Erubis
           src << " _buf << (" << code << ").to_s;"
         end
       end
-      rest = $' || input
+      #rest = $' || input                        # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       #src << " _buf << '" << escape_text(rest) << "';"
       rest.gsub!(/['\\]/, '\\\\\&')
       src << " _buf << '" << rest << "';" unless rest.empty?
@@ -113,7 +114,8 @@ module Erubis
           end
         end
       end
-      rest = $' || input
+      #rest = $' || input                        # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       #src << " _buf << '" << escape_text(rest) << "';"
       rest.gsub!(/['\\]/, '\\\\\&')
       src << " _buf << '" << rest << "';" unless rest.empty?

data/test/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 77 $
-### $Release: 2.6.1 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###