erubis 2.3.1 → 2.7.0

data/lib/erubis/enhancer.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -68,7 +67,7 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = $stdout;"
+      src << "#{@bufvar} = $stdout;"
     end
 
     def add_postamble(src)
@@ -93,15 +92,15 @@ module Erubis
     end
 
     def add_text(src, text)
-      src << " print '" << escape_text(text) << "';" unless text.empty?
+      src << " print '#{escape_text(text)}';" unless text.empty?
     end
 
     def add_expr_literal(src, code)
-      src << ' print((' << code << ').to_s);'
+      src << " print((#{code}).to_s);"
     end
 
     def add_expr_escaped(src, code)
-      src << ' print ' << escaped_expr(code) << ';'
+      src << " print #{escaped_expr(code)};"
     end
 
     def add_postamble(src)
@@ -163,12 +162,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = [];"
+      src << "#{@bufvar} = [];"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf\n"
+      src << "#{@bufvar}\n"
     end
 
   end
@@ -209,12 +208,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = '';"
+      src << "#{@bufvar} = '';"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.to_s\n"
+      src << "#{@bufvar}.to_s\n"
     end
 
   end
@@ -232,12 +231,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = StringIO.new;"
+      src << "#{@bufvar} = StringIO.new;"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.string\n"
+      src << "#{@bufvar}.string\n"
     end
 
   end
@@ -255,12 +254,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_erbout = _buf = '';"
+      src << "_erbout = #{@bufvar} = '';"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.to_s\n"
+      src << "#{@bufvar}.to_s\n"
     end
 
   end
@@ -360,7 +359,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 +419,72 @@ 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
+
+  end
+
+
+  ##
+  ## regards lines starting with '^[ \t]*%' as program code
+  ##
+  ## in addition you can specify prefix character (default '%')
+  ##
+  ## this is language-independent.
+  ##
+  module PrefixedLineEnhancer
+
+    def self.desc   # :nodoc:
+      "regard lines matched to '^[ \t]*%' as program code"
+    end
+
+    def init_generator(properties={})
+      super
+      @prefixchar = properties[:prefixchar]
+    end
+
+    def add_text(src, text)
+      unless @prefixrexp
+        @prefixchar ||= '%'
+        @prefixrexp = Regexp.compile("^([ \\t]*)\\#{@prefixchar}(.*?\\r?\\n)")
+      end
+      pos = 0
+      text2 = ''
+      text.scan(@prefixrexp) do
+        space = $1
+        line  = $2
+        space, line = '', $1 unless $2
+        match = Regexp.last_match
+        len   = match.begin(0) - pos
+        str   = text[pos, len]
+        pos   = match.end(0)
+        if text2.empty?
+          text2 = str
+        else
+          text2 << str
+        end
+        if line[0, 1] == @prefixchar
+          text2 << space << line
+        else
+          super(src, text2)
+          text2 = ''
+          add_stmt(src, space + line)
+        end
+      end
+      #rest = pos == 0 ? text : $'             # ruby1.8
+      rest = pos == 0 ? text : text[pos..-1]   # ruby1.9
+      unless text2.empty?
+        text2 << rest if rest
+        rest = text2
+      end
       super(src, rest)
     end
 
@@ -438,24 +499,26 @@ module Erubis
   ## this is language-independent.
   ##
   module PercentLineEnhancer
+    include PrefixedLineEnhancer
 
     def self.desc   # :nodoc:
       "regard lines starting with '%' as program code"
     end
 
-    PERCENT_LINE_PATTERN = /(.*?)^\%(.*?\r?\n)/m
+    #--
+    #def init_generator(properties={})
+    #  super
+    #  @prefixchar = '%'
+    #  @prefixrexp = /^\%(.*?\r?\n)/
+    #end
+    #++
 
     def add_text(src, text)
-      text.scan(PERCENT_LINE_PATTERN) do |txt, line|
-        super(src, txt)
-        if line[0] == ?%
-          super(src, line)
-        else
-          add_stmt(src, line)
-        end
+      unless @prefixrexp
+        @prefixchar = '%'
+        @prefixrexp = /^\%(.*?\r?\n)/
       end
-      rest = $' || text
-      super(src, rest)
+      super(src, text)
     end
 
   end
@@ -520,7 +583,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
@@ -528,7 +593,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
 
@@ -578,7 +644,7 @@ module Erubis
       pos = 0
       is_bol = true     # is beginning of line
       str = ''
-      input.scan(regexp) do |indicator, code, rspace|
+      input.scan(regexp) do |indicator, code, tailch, rspace|
         match = Regexp.last_match()
         len  = match.begin(0) - pos
         text = input[pos, len]
@@ -590,6 +656,7 @@ module Erubis
         ## * when '<%= %>', do nothing
         ## * when '<% %>' or '<%# %>', delete spaces iff only spaces are around '<% %>'
         if ch == ?=              # <%= %>
+          rspace = nil if tailch && !tailch.empty?
           str << lspace if lspace
           add_expr(str, code, indicator)
           str << rspace if rspace
@@ -620,7 +687,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
@@ -630,16 +698,15 @@ module Erubis
       #src << " _buf << %Q`" << text << "`;"
       if text[-1] == ?\n
         text[-1] = "\\n"
-        src << " _buf << %Q`" << text << "`\n"
+        src << " #{@bufvar} << %Q`#{text}`\n"
       else
-        src << " _buf << %Q`" << text << "`;"
+        src << " #{@bufvar} << %Q`#{text}`;"
       end
     end
 
     def _add_text_to_str(str, text)
       return if !text || text.empty?
-      text.gsub!(/['\#\\]/, '\\\\\&')
-      str << text
+      str << text.gsub(/[`\#\\]/, '\\\\\&')
     end
 
     def add_expr_escaped(str, code)

data/lib/erubis/error.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis

data/lib/erubis/evaluator.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/error'
@@ -10,6 +9,8 @@ require 'erubis/context'
 
 module Erubis
 
+  EMPTY_BINDING = binding()
+
 
   ##
   ## evaluate code
@@ -52,19 +53,35 @@ 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}];" }
-        _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)'))
+    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,
+    ## else define singleton method to it.
+    def def_method(object, method_name, filename=nil)
+      m = object.is_a?(Module) ? :module_eval : :instance_eval
+      object.__send__(m, "def #{method_name}; #{@src}; end", filename || @filename || '(erubis)')
     end
 
+
   end
 
 

data/lib/erubis/generator.rb

@@ -1,10 +1,9 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
-require 'abstract'
+require 'erubis/util'
 
 module Erubis
 

data/lib/erubis/helper.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -27,9 +26,21 @@ module Erubis
       #value.to_s.gsub(/[&<>"]/) { ESCAPE_TABLE[$&] }
     end
 
+    def escape_xml2(value)
+      return value.to_s.gsub(/\&/,'&amp;').gsub(/</,'&lt;').gsub(/>/,'&gt;').gsub(/"/,'&quot;')
+    end
+
     alias h escape_xml
     alias html_escape escape_xml
 
+    def url_encode(str)
+      return str.gsub(/[^-_.a-zA-Z0-9]+/) { |s|
+        s.unpack('C*').collect { |i| "%%%02X" % i }.join
+      }
+    end
+
+    alias u url_encode
+
   end
 
 

data/lib/erubis/helpers/rails_form_helper.rb

@@ -0,0 +1,197 @@
+###
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
+###
+
+
+module Erubis
+  module Helpers
+    module RailsFormHelper
+    end
+  end
+end
+
+
+module Erubis::Helpers::RailsFormHelper
+
+
+if ActionPack::VERSION::MAJOR == 1   ###  Rails 1.X
+  def pp_template_filename(basename)
+    return "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.rhtml"
+  end
+else                                 ###  Rails 2.X
+  def pp_template_filename(basename)
+    fname = "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.html.erb"
+    return fname if test(?f, fname)
+    return  "#{RAILS_ROOT}/app/views/#{controller.controller_name}/#{basename}.rhtml"
+  end
+end
+
+  def pp_render_partial(basename)
+    basename = "_#{basename}" unless basename[0] == ?_
+    filename = pp_template_filename(basename)
+    preprocessor = _create_preprocessor(File.read(filename))
+    return preprocessor.evaluate(_preprocessing_context_object())
+  end
+
+  def pp_error_on(object_name, method)
+    s = ''
+    s << "<% _stag, _etag = _pp_error_tags(@#{object_name}.errors.on('#{method}')) %>"
+    s << "<%= _stag %>"
+    s << yield(object_name, method)
+    s << "<%= _etag %>"
+    return s
+  end
+
+  def _pp_error_tags(value)
+    return value ? ['<div class="fieldWithErrors">', '</div>'] : ['', '']
+  end
+
+  def _pp_remove_error_div(s)
+    s.sub!(/\A<div class="fieldWithErrors">(.*)<\/div>\z/, '\1')
+    return s
+  end
+
+  def pp_tag_helper(helper, object_name, method, options={})
+    if object_name.is_a?(ActionView::Helpers::FormHelper)
+      object_name = object_name.object_name
+    end
+    unless options.key?(:value) || options.key?('value')
+      options['value'] = _?("h @#{object_name}.#{method}")
+    end
+    #$stderr.puts "*** debug: pp_tag_helper(): options=#{options.inspect}"
+    return pp_error_on(object_name, method) {
+      s = __send__(helper, object_name, method, options)
+      _pp_remove_error_div(s)
+    }
+  end
+
+  def pp_form_tag(url_for_options={}, options={}, *parameters_for_url, &block)
+    return form_tag(url_for_options, options, *parameters_for_url, &block)
+  end
+
+  #--
+  #def pp_form_for(object_name, *args, &block)
+  #  return form_for(object_name, *args, &block)
+  #end
+  #++
+
+  def pp_text_field(object_name, method, options={})
+    return pp_tag_helper(:text_field, object_name, method, options)
+  end
+
+  def pp_password_field(object_name, method, options={})
+    return pp_tag_helper(:password_field, object_name, method, options)
+  end
+
+  def pp_hidden_field(object_name, method, options={})
+    return pp_tag_helper(:hidden_field, object_name, method, options)
+  end
+
+  def pp_file_field(object_name, method, options={})
+    return pp_tag_helper(:file_field, object_name, method, options)
+  end
+
+  def pp_text_area(object_name, method, options={})
+    return pp_tag_helper(:text_area, object_name, method, options)
+  end
+
+  def pp_check_box(object_name, method, options={}, checked_value="1", unchecked_value="0")
+    s = check_box(object_name, method, options, checked_value, unchecked_value)
+    s.sub!(/\schecked=\"checked\"/, '')
+    s.sub!(/type="checkbox"/, "\\&<%= _pp_check_box_checked?(@#{object_name}.#{method}, #{checked_value.inspect}) ? ' checked=\"checked\"' : '' %>")
+    return pp_error_on(object_name, method) { _pp_remove_error_div(s) }
+  end
+
+  def _pp_check_box_checked?(value, checked_value)
+    return ActionView::Helpers::InstanceTag::check_box_checked?(value, checked_value)
+  end
+
+  def pp_radio_button(object_name, method, tag_value, options={})
+    s = radio_button(object_name, method, tag_value, options)
+    s.sub!(/\schecked=\"checked\"/, '')
+    s.sub!(/type="radio"/, "\\&<%= _pp_radio_button_checked?(@#{object_name}.#{method}, #{tag_value.inspect}) ? ' checked=\"checked\"' : '' %>")
+    return pp_error_on(object_name, method) { _pp_remove_error_div(s) }
+  end
+
+  def _pp_radio_button_checked?(value, tag_value)
+    return ActionView::Helpers::InstanceTag::radio_button_checked?(value, tag_value)
+  end
+
+  def _pp_select(object, method, collection, priority_collection, options={}, html_options={})
+    return pp_error_on(object, method) do
+      s = ""
+      ## start tag
+      s << "<select id=\"#{object}_#{method}\" name=\"#{object}[#{method}]\""
+      for key, val in html_options:
+          s << " #{key}=\"#{val}\""
+      end
+      s << ">\n"
+      ## selected table
+      key = options.key?(:value) ? :value : (options.key?('value') ? 'value' : nil)
+      if    key.nil?                ;  selected = "@#{object}.#{method}"
+      elsif (val=options[key]).nil? ;  selected = nil
+      elsif val =~ /\A<%=(.*)%>\z/  ;  selected = $1
+      else                          ;  selected = val.inspect
+      end
+      s << "<% _table = {#{selected}=>' selected=\"selected\"'} %>\n" if selected
+      ## <option> tags
+      if options[:include_blank] || options['include_blank']
+        s << "<option value=\"\"></option>\n"
+      end
+      unless priority_collection.blank?
+        _pp_select_options(s, priority_collection, selected, 'delete')
+        s << "<option value=\"\">-------------</option>\n"
+      end
+      _pp_select_options(s, collection, selected, '[]')
+      ## end tag
+      s << "</select>"
+      s
+    end
+  end
+
+  def _pp_select_options(s, collection, selected, operator)
+    for item in collection
+      value, text = item.is_a?(Array) ? item : [item, item]
+      if !selected
+        t = ''
+      elsif operator == 'delete'
+        t = "<%= _table.delete(#{value.inspect}) %>"
+      else
+        t = "<%= _table[#{value.inspect}] %>"
+      end
+      s << "<option value=\"#{h value}\"#{t}>#{h text}</option>\n"
+    end
+  end
+
+  def pp_select(object, method, collection, options={}, html_options={})
+    return _pp_select(object, method, collection, nil, options, html_options)
+  end
+
+  def pp_collection_select(object, method, collection, value_method, text_method, options={}, html_options={})
+    collection2 = collection.collect { |e|
+      [e.__send__(value_method), e.__send__(text_method)]
+    }
+    return _pp_select(object, method, collection2, nil, options, html_options)
+  end
+
+  def pp_country_select(object, method, priority_countries=nil, options={}, html_options={})
+    collection = ActionView::Helpers::FormOptionsHelper::COUNTRIES
+    return _pp_select(object, method, collection, priority_countries, options, html_options)
+  end
+
+  def pp_time_zone_select(object, method, priority_zones=nil, options={}, html_options={})
+    model = options[:model] || options['model'] || TimeZone
+    collection = model.all.collect { |e| [e.name, e.to_s] }
+    return _pp_select(object, method, collection, priority_zones, options, html_options)
+  end
+
+  def pp_submit_tag(value="Save changes", options={})
+    return submit_tag(value, options)
+  end
+
+  def pp_image_submit_tag(source, options={})
+    return image_submit_tag(source, options)
+  end
+
+end