rubysl-erb 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc2021bd6015360e2b32d7145cc13e3b85e8f942
-  data.tar.gz: 3c29e3eb3330205331966c8e1d15f2c531b280c3
+  metadata.gz: d2c7f2c992f92371c1ba30649ffc4093d70f7f2a
+  data.tar.gz: f4fd159ff6e3a39beb2c084ab2240231ce2611b7
 SHA512:
-  metadata.gz: 6060db64dda4dcb7b42709f7d8669c6a6ae75521cf276b1f2d4f449b827713e38663343fe129cf45af0fb0d0011cf7276497950effb13ed0718c7bd3debf0f5b
-  data.tar.gz: 4f2720329d61c51b93f24b9b160980f913bddedc720b8bc75f0f3bcaa15c6cf17b75dda028747bd294306afd5197825858870d6ae66997ad4e59ece464fe66e3
+  metadata.gz: 8b1cd6b883f1df27fc6d651f7b9da5f2c2fff629360dc5d385df0ec626ed009559f31a1ed62b821dc17516aef1310b7fd6a5bf6a73889c201b19ea179ecd591b
+  data.tar.gz: 65e5fab7e463c69942265d9dc6ddccb3d4a4e6c63496c8bc7dd6398ec0a33c66252b6191336559d8b267b9d178cd74598108d3fd4c2cea0da9d390dc6a3cdc80

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/erb/erb.rb

@@ -1,7 +1,8 @@
+# -*- coding: us-ascii -*-
 # = ERB -- Ruby Templating
 #
 # Author:: Masatoshi SEKI
-# Documentation:: James Edward Gray II and Gavin Sinclair
+# Documentation:: James Edward Gray II, Gavin Sinclair, and Simon Chiang
 #
 # See ERB for primary documentation and ERB::Util for a couple of utility
 # routines.
@@ -10,6 +11,8 @@
 #
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
+require "cgi/util"
+
 #
 # = ERB -- Ruby Templating
 #
@@ -20,7 +23,7 @@
 # purposes of generating document information details and/or flow control.
 #
 # A very simple example is this:
-# 
+#
 #   require 'erb'
 #
 #   x = 42
@@ -58,6 +61,24 @@
 #
 # See the ERB.new and ERB#result methods for more detail.
 #
+# == Character encodings
+#
+# ERB (or ruby code generated by ERB) returns a string in the same
+# character encoding as the input string.  When the input string has
+# a magic comment, however, it returns a string in the encoding specified
+# by the magic comment.
+#
+#   # -*- coding: UTF-8 -*-
+#   require 'erb'
+#
+#   template = ERB.new <<EOF
+#   <%#-*- coding: Big5 -*-%>
+#     \_\_ENCODING\_\_ is <%= \_\_ENCODING\_\_ %>.
+#   EOF
+#   puts template.result
+#
+# <em>Prints:</em> \_\_ENCODING\_\_ is Big5.
+#
 #
 # == Examples
 #
@@ -68,39 +89,39 @@
 # <tt>%q{...}</tt> to avoid trouble with the backslash.
 #
 #   require "erb"
-#   
+#
 #   # Create template.
 #   template = %q{
 #     From:  James Edward Gray II <james@grayproductions.net>
 #     To:  <%= to %>
 #     Subject:  Addressing Needs
-#   
+#
 #     <%= to[/\w+/] %>:
-#   
+#
 #     Just wanted to send a quick note assuring that your needs are being
 #     addressed.
-#   
+#
 #     I want you to know that my team will keep working on the issues,
 #     especially:
-#   
+#
 #     <%# ignore numerous minor requests -- focus on priorities %>
 #     % priorities.each do |priority|
 #       * <%= priority %>
 #     % end
-#   
+#
 #     Thanks for your patience.
-#   
+#
 #     James Edward Gray II
 #   }.gsub(/^  /, '')
-#   
+#
 #   message = ERB.new(template, 0, "%<>")
-#   
+#
 #   # Set up template data.
 #   to = "Community Spokesman <spokesman@ruby_community.org>"
 #   priorities = [ "Run Ruby Quiz",
 #                  "Document Modules",
 #                  "Answer Questions on Ruby Talk" ]
-#   
+#
 #   # Produce result.
 #   email = message.result
 #   puts email
@@ -110,19 +131,19 @@
 #   From:  James Edward Gray II <james@grayproductions.net>
 #   To:  Community Spokesman <spokesman@ruby_community.org>
 #   Subject:  Addressing Needs
-#   
+#
 #   Community:
-#   
+#
 #   Just wanted to send a quick note assuring that your needs are being addressed.
-#   
+#
 #   I want you to know that my team will keep working on the issues, especially:
-#   
+#
 #       * Run Ruby Quiz
 #       * Document Modules
 #       * Answer Questions on Ruby Talk
-#   
+#
 #   Thanks for your patience.
-#   
+#
 #   James Edward Gray II
 #
 # === Ruby in HTML
@@ -132,7 +153,7 @@
 # variables in the Product object can be resolved.
 #
 #   require "erb"
-#   
+#
 #   # Build template data class.
 #   class Product
 #     def initialize( code, name, desc, cost )
@@ -140,37 +161,37 @@
 #       @name = name
 #       @desc = desc
 #       @cost = cost
-#        	
+#
 #       @features = [ ]
 #     end
-#   
+#
 #     def add_feature( feature )
 #       @features << feature
 #     end
-#   
+#
 #     # Support templating of member data.
 #     def get_binding
 #       binding
 #     end
-#   
+#
 #     # ...
 #   end
-#   
+#
 #   # Create template.
 #   template = %{
 #     <html>
 #       <head><title>Ruby Toys -- <%= @name %></title></head>
 #       <body>
-#   
+#
 #         <h1><%= @name %> (<%= @code %>)</h1>
 #         <p><%= @desc %></p>
-#   
+#
 #         <ul>
 #           <% @features.each do |f| %>
 #             <li><b><%= f %></b></li>
 #           <% end %>
 #         </ul>
-#   
+#
 #         <p>
 #           <% if @cost < 10 %>
 #             <b>Only <%= @cost %>!!!</b>
@@ -178,13 +199,13 @@
 #              Call for a price, today!
 #           <% end %>
 #         </p>
-#    
+#
 #       </body>
 #     </html>
 #   }.gsub(/^  /, '')
-#   
+#
 #   rhtml = ERB.new(template)
-#   
+#
 #   # Set up template data.
 #   toy = Product.new( "TZ-1002",
 #                      "Rubysapien",
@@ -195,7 +216,7 @@
 #   toy.add_feature("Karate-Chop Action!!!")
 #   toy.add_feature("Matz signature on left leg.")
 #   toy.add_feature("Gem studded eyes... Rubies, of course!")
-#   
+#
 #   # Produce result.
 #   rhtml.run(toy.get_binding)
 #
@@ -204,10 +225,10 @@
 #    <html>
 #      <head><title>Ruby Toys -- Rubysapien</title></head>
 #      <body>
-#    
+#
 #        <h1>Rubysapien (TZ-1002)</h1>
 #        <p>Geek's Best Friend!  Responds to Ruby commands...</p>
-#    
+#
 #        <ul>
 #            <li><b>Listens for verbal commands in the Ruby language!</b></li>
 #            <li><b>Ignores Perl, Java, and all C variants.</b></li>
@@ -215,15 +236,15 @@
 #            <li><b>Matz signature on left leg.</b></li>
 #            <li><b>Gem studded eyes... Rubies, of course!</b></li>
 #        </ul>
-#    
+#
 #        <p>
 #             Call for a price, today!
 #        </p>
-#    
+#
 #      </body>
 #    </html>
 #
-# 
+#
 # == Notes
 #
 # There are a variety of templating solutions available in various Ruby projects:
@@ -236,7 +257,7 @@
 # Rails, the web application framework, uses ERB to create views.
 #
 class ERB
-  Revision = '$Date: 2009-02-23 09:44:50 -0800 (Mon, 23 Feb 2009) $' 	#'
+  Revision = '$Date::                           $' # :nodoc: #'
 
   # Returns revision information for the erb.rb module.
   def self.version
@@ -247,6 +268,76 @@ end
 #--
 # ERB::Compiler
 class ERB
+  # = ERB::Compiler
+  #
+  # Compiles ERB templates into Ruby code; the compiled code produces the
+  # template result when evaluated. ERB::Compiler provides hooks to define how
+  # generated output is handled.
+  #
+  # Internally ERB does something like this to generate the code returned by
+  # ERB#src:
+  #
+  #   compiler = ERB::Compiler.new('<>')
+  #   compiler.pre_cmd    = ["_erbout=''"]
+  #   compiler.put_cmd    = "_erbout.concat"
+  #   compiler.insert_cmd = "_erbout.concat"
+  #   compiler.post_cmd   = ["_erbout"]
+  #
+  #   code, enc = compiler.compile("Got <%= obj %>!\n")
+  #   puts code
+  #
+  # <i>Generates</i>:
+  #
+  #   #coding:UTF-8
+  #   _erbout=''; _erbout.concat "Got "; _erbout.concat(( obj ).to_s); _erbout.concat "!\n"; _erbout
+  #
+  # By default the output is sent to the print method.  For example:
+  #
+  #   compiler = ERB::Compiler.new('<>')
+  #   code, enc = compiler.compile("Got <%= obj %>!\n")
+  #   puts code
+  #
+  # <i>Generates</i>:
+  #
+  #   #coding:UTF-8
+  #   print "Got "; print(( obj ).to_s); print "!\n"
+  #
+  # == Evaluation
+  #
+  # The compiled code can be used in any context where the names in the code
+  # correctly resolve. Using the last example, each of these print 'Got It!'
+  #
+  # Evaluate using a variable:
+  #
+  #   obj = 'It'
+  #   eval code
+  #
+  # Evaluate using an input:
+  #
+  #   mod = Module.new
+  #   mod.module_eval %{
+  #     def get(obj)
+  #       #{code}
+  #     end
+  #   }
+  #   extend mod
+  #   get('It')
+  #
+  # Evaluate using an accessor:
+  #
+  #   klass = Class.new Object
+  #   klass.class_eval %{
+  #     attr_accessor :obj
+  #     def initialize(obj)
+  #       @obj = obj
+  #     end
+  #     def get_it
+  #       #{code}
+  #     end
+  #   }
+  #   klass.new('It').get_it
+  #
+  # Good! See also ERB#def_method, ERB#def_module, and ERB#def_class.
   class Compiler # :nodoc:
     class PercentLine # :nodoc:
       def initialize(str)
@@ -263,21 +354,21 @@ class ERB
     class Scanner # :nodoc:
       @scanner_map = {}
       def self.regist_scanner(klass, trim_mode, percent)
-	@scanner_map[[trim_mode, percent]] = klass
+        @scanner_map[[trim_mode, percent]] = klass
       end
 
       def self.default_scanner=(klass)
-	@default_scanner = klass
+        @default_scanner = klass
       end
 
       def self.make_scanner(src, trim_mode, percent)
-	klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
-	klass.new(src, trim_mode, percent)
+        klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
+        klass.new(src, trim_mode, percent)
       end
 
       def initialize(src, trim_mode, percent)
-	@src = src
-	@stag = nil
+        @src = src
+        @stag = nil
       end
       attr_accessor :stag
 
@@ -286,44 +377,44 @@ class ERB
 
     class TrimScanner < Scanner # :nodoc:
       def initialize(src, trim_mode, percent)
-	super
-	@trim_mode = trim_mode
-	@percent = percent
-	if @trim_mode == '>'
-	  @scan_line = self.method(:trim_line1)
-	elsif @trim_mode == '<>'
-	  @scan_line = self.method(:trim_line2)
-	elsif @trim_mode == '-'
-	  @scan_line = self.method(:explicit_trim_line)
-	else
-	  @scan_line = self.method(:scan_line)
-	end
+        super
+        @trim_mode = trim_mode
+        @percent = percent
+        if @trim_mode == '>'
+          @scan_line = self.method(:trim_line1)
+        elsif @trim_mode == '<>'
+          @scan_line = self.method(:trim_line2)
+        elsif @trim_mode == '-'
+          @scan_line = self.method(:explicit_trim_line)
+        else
+          @scan_line = self.method(:scan_line)
+        end
       end
       attr_accessor :stag
-      
+
       def scan(&block)
-	@stag = nil
-	if @percent
-	  @src.each do |line|
-	    percent_line(line, &block)
-	  end
-	else
+        @stag = nil
+        if @percent
+          @src.each_line do |line|
+            percent_line(line, &block)
+          end
+        else
           @scan_line.call(@src, &block)
-	end
-	nil
+        end
+        nil
       end
 
       def percent_line(line, &block)
-	if @stag || line[0] != ?%
-	  return @scan_line.call(line, &block)
-	end
-
-	line[0] = ''
-	if line[0] == ?%
-	  @scan_line.call(line, &block)
-	else
+        if @stag || line[0] != ?%
+          return @scan_line.call(line, &block)
+        end
+
+        line[0] = ''
+        if line[0] == ?%
+          @scan_line.call(line, &block)
+        else
           yield(PercentLine.new(line.chomp))
-	end
+        end
       end
 
       def scan_line(line)
@@ -332,7 +423,7 @@ class ERB
             next if token.empty?
             yield(token)
           end
-	end
+        end
       end
 
       def trim_line1(line)
@@ -346,11 +437,11 @@ class ERB
               yield(token)
             end
           end
-	end
+        end
       end
 
       def trim_line2(line)
-	head = nil
+        head = nil
         line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
           tokens.each do |token|
             next if token.empty?
@@ -368,7 +459,7 @@ class ERB
               head = nil if token == "\n"
             end
           end
-	end
+        end
       end
 
       def explicit_trim_line(line)
@@ -391,7 +482,7 @@ class ERB
 
       ERB_STAG = %w(<%= <%# <%)
       def is_erb_stag?(s)
-	ERB_STAG.member?(s)
+        ERB_STAG.member?(s)
       end
     end
 
@@ -404,10 +495,10 @@ class ERB
             next if token.empty?
             yield(token)
           end
-	end
+        end
       end
     end
-    
+
     Scanner.regist_scanner(SimpleScanner, nil, false)
 
     begin
@@ -427,23 +518,23 @@ class ERB
       Scanner.regist_scanner(SimpleScanner2, nil, false)
 
       class ExplicitScanner < Scanner # :nodoc:
-	def scan
+        def scan
           stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
           etag_reg = /(.*?)(%%>|-%>|%>|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
-	    scanner.scan(@stag ? etag_reg : stag_reg)
+            scanner.scan(@stag ? etag_reg : stag_reg)
             yield(scanner[1])
 
             elem = scanner[2]
             if /[ \t]*<%-/ =~ elem
               yield('<%')
             elsif elem == '-%>'
-	      yield('%>')
-	      yield(:cr) if scanner.scan(/(\n|\z)/)
-	    else
-	      yield(elem)
-	    end
+              yield('%>')
+              yield(:cr) if scanner.scan(/(\n|\z)/)
+            else
+              yield(elem)
+            end
           end
         end
       end
@@ -453,37 +544,37 @@ class ERB
     end
 
     class Buffer # :nodoc:
-      def initialize(compiler)
-	@compiler = compiler
-	@line = []
-	@script = ""
-	@compiler.pre_cmd.each do |x|
-	  push(x)
-	end
+      def initialize(compiler, enc=nil)
+        @compiler = compiler
+        @line = []
+        @script = enc ? "#coding:#{enc.to_s}\n" : ""
+        @compiler.pre_cmd.each do |x|
+          push(x)
+        end
       end
       attr_reader :script
 
       def push(cmd)
-	@line << cmd
+        @line << cmd
       end
-      
+
       def cr
-	@script << (@line.join('; '))
-	@line = []
-	@script << "\n"
+        @script << (@line.join('; '))
+        @line = []
+        @script << "\n"
       end
-      
+
       def close
-	return unless @line
-	@compiler.post_cmd.each do |x|
-	  push(x)
-	end
-	@script << (@line.join('; '))
-	@line = nil
+        return unless @line
+        @compiler.post_cmd.each do |x|
+          push(x)
+        end
+        @script << (@line.join('; '))
+        @line = nil
       end
     end
 
-    def content_dump(s)
+    def content_dump(s) # :nodoc:
       n = s.count("\n")
       if n > 0
         s.dump + "\n" * n
@@ -492,95 +583,111 @@ class ERB
       end
     end
 
+    def add_put_cmd(out, content)
+      out.push("#{@put_cmd} #{content_dump(content)}")
+    end
+
+    def add_insert_cmd(out, content)
+      out.push("#{@insert_cmd}((#{content}).to_s)")
+    end
+
+    # Compiles an ERB template into Ruby code.  Returns an array of the code
+    # and encoding like ["code", Encoding].
     def compile(s)
-      out = Buffer.new(self)
+      enc = s.encoding
+      raise ArgumentError, "#{enc} is not ASCII compatible" if enc.dummy?
+      s = s.dup.force_encoding("ASCII-8BIT") # don't use constant Enoding::ASCII_8BIT for miniruby
+      enc = detect_magic_comment(s) || enc
+      out = Buffer.new(self, enc)
 
       content = ''
       scanner = make_scanner(s)
       scanner.scan do |token|
-        next if token.nil? 
+        next if token.nil?
         next if token == ''
-	if scanner.stag.nil?
-	  case token
+        if scanner.stag.nil?
+          case token
           when PercentLine
-	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
-	    content = ''
+            add_put_cmd(out, content) if content.size > 0
+            content = ''
             out.push(token.to_s)
             out.cr
-	  when :cr
-	    out.cr
-	  when '<%', '<%=', '<%#'
-	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
-	    content = ''
-	  when "\n"
-	    content << "\n"
-	    out.push("#{@put_cmd} #{content_dump(content)}")
-	    content = ''
-	  when '<%%'
-	    content << '<%'
-	  else
-	    content << token
-	  end
-	else
-	  case token
-	  when '%>'
-	    case scanner.stag
-	    when '<%'
-	      if content[-1] == ?\n
-		content.chop!
-		out.push(content)
-		out.cr
-	      else
-		out.push(content)
-	      end
-	    when '<%='
-	      out.push("#{@insert_cmd}((#{content}).to_s)")
-	    when '<%#'
-	      # out.push("# #{content_dump(content)}")
-	    end
-	    scanner.stag = nil
-	    content = ''
-	  when '%%>'
-	    content << '%>'
-	  else
-	    content << token
-	  end
-	end
+          when :cr
+            out.cr
+          when '<%', '<%=', '<%#'
+            scanner.stag = token
+            add_put_cmd(out, content) if content.size > 0
+            content = ''
+          when "\n"
+            content << "\n"
+            add_put_cmd(out, content)
+            content = ''
+          when '<%%'
+            content << '<%'
+          else
+            content << token
+          end
+        else
+          case token
+          when '%>'
+            case scanner.stag
+            when '<%'
+              if content[-1] == ?\n
+                content.chop!
+                out.push(content)
+                out.cr
+              else
+                out.push(content)
+              end
+            when '<%='
+              add_insert_cmd(out, content)
+            when '<%#'
+              # out.push("# #{content_dump(content)}")
+            end
+            scanner.stag = nil
+            content = ''
+          when '%%>'
+            content << '%>'
+          else
+            content << token
+          end
+        end
       end
-      out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
+      add_put_cmd(out, content) if content.size > 0
       out.close
-      out.script
+      return out.script, enc
     end
 
-    def prepare_trim_mode(mode)
+    def prepare_trim_mode(mode) # :nodoc:
       case mode
       when 1
-	return [false, '>']
+        return [false, '>']
       when 2
-	return [false, '<>']
+        return [false, '<>']
       when 0
-	return [false, nil]
+        return [false, nil]
       when String
-	perc = mode.include?('%')
-	if mode.include?('-')
-	  return [perc, '-']
-	elsif mode.include?('<>')
-	  return [perc, '<>']
-	elsif mode.include?('>')
-	  return [perc, '>']
-	else
-	  [perc, nil]
-	end
+        perc = mode.include?('%')
+        if mode.include?('-')
+          return [perc, '-']
+        elsif mode.include?('<>')
+          return [perc, '<>']
+        elsif mode.include?('>')
+          return [perc, '>']
+        else
+          [perc, nil]
+        end
       else
-	return [false, nil]
+        return [false, nil]
       end
     end
 
-    def make_scanner(src)
+    def make_scanner(src) # :nodoc:
       Scanner.make_scanner(src, @trim_mode, @percent)
     end
 
+    # Construct a new compiler using the trim_mode. See ERB::new for available
+    # trim modes.
     def initialize(trim_mode)
       @percent, @trim_mode = prepare_trim_mode(trim_mode)
       @put_cmd = 'print'
@@ -589,7 +696,30 @@ class ERB
       @post_cmd = []
     end
     attr_reader :percent, :trim_mode
-    attr_accessor :put_cmd, :insert_cmd, :pre_cmd, :post_cmd
+
+    # The command to handle text that ends with a newline
+    attr_accessor :put_cmd
+
+    # The command to handle text that is inserted prior to a newline
+    attr_accessor :insert_cmd
+
+    # An array of commands prepended to compiled code
+    attr_accessor :pre_cmd
+
+    # An array of commands appended to compiled code
+    attr_accessor :post_cmd
+
+    private
+    def detect_magic_comment(s)
+      if /\A<%#(.*)%>/ =~ s or (@percent and /\A%#(.*)/ =~ s)
+        comment = $1
+        comment = $1 if comment[/-\*-\s*(.*?)\s*-*-$/]
+        if %r"coding\s*[=:]\s*([[:alnum:]\-_]+)" =~ comment
+          enc = $1.sub(/-(?:mac|dos|unix)/i, '')
+          enc = Encoding.find(enc)
+        end
+      end
+    end
   end
 end
 
@@ -598,19 +728,20 @@ end
 class ERB
   #
   # Constructs a new ERB object with the template specified in _str_.
-  # 
+  #
   # An ERB object works by building a chunk of Ruby code that will output
   # the completed template when run. If _safe_level_ is set to a non-nil value,
   # ERB code will be run in a separate thread with <b>$SAFE</b> set to the
   # provided level.
-  # 
+  #
   # If _trim_mode_ is passed a String containing one or more of the following
   # modifiers, ERB will adjust its code generation as listed:
-  # 
-  # 	%  enables Ruby code processing for lines beginning with %
-  # 	<> omit newline for lines starting with <% and ending in %>
-  # 	>  omit newline for lines ending in %>
-  # 
+  #
+  #     %  enables Ruby code processing for lines beginning with %
+  #     <> omit newline for lines starting with <% and ending in %>
+  #     >  omit newline for lines ending in %>
+  #     -  omit blank lines ending in -%>
+  #
   # _eoutvar_ can be used to set the name of the variable ERB will build up
   # its output in.  This is useful when you need to run multiple ERB
   # templates through the same binding and/or when you want to control where
@@ -619,20 +750,20 @@ class ERB
   # === Example
   #
   #  require "erb"
-  #  
+  #
   #  # build data class
   #  class Listings
   #    PRODUCT = { :name => "Chicken Fried Steak",
   #                :desc => "A well messages pattie, breaded and fried.",
   #                :cost => 9.95 }
-  #  
+  #
   #    attr_reader :product, :price
-  #    
+  #
   #    def initialize( product = "", price = "" )
   #      @product = product
   #      @price = price
   #    end
-  #    
+  #
   #    def build
   #      b = binding
   #      # create and run templates, filling member data variables
@@ -646,29 +777,36 @@ class ERB
   #      END_PRICE
   #    end
   #  end
-  #  
+  #
   #  # setup template data
   #  listings = Listings.new
   #  listings.build
-  #  
+  #
   #  puts listings.product + "\n" + listings.price
   #
   # _Generates_
   #
   #  Chicken Fried Steak
   #  A well messages pattie, breaded and fried.
-  #  
+  #
   #  Chicken Fried Steak -- 9.95
   #  A well messages pattie, breaded and fried.
-  #  
+  #
   def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
     @safe_level = safe_level
-    compiler = ERB::Compiler.new(trim_mode)
+    compiler = make_compiler(trim_mode)
     set_eoutvar(compiler, eoutvar)
-    @src = compiler.compile(str)
+    @src, @enc = *compiler.compile(str)
     @filename = nil
   end
 
+  ##
+  # Creates a new compiler for ERB.  See ERB::Compiler.new for details
+
+  def make_compiler(trim_mode)
+    ERB::Compiler.new(trim_mode)
+  end
+
   # The Ruby code generated by ERB
   attr_reader :src
 
@@ -677,23 +815,15 @@ class ERB
   attr_accessor :filename
 
   #
-  # Can be used to set _eoutvar_ as described in ERB#new.  It's probably easier
-  # to just use the constructor though, since calling this method requires the
-  # setup of an ERB _compiler_ object.
+  # Can be used to set _eoutvar_ as described in ERB::new.  It's probably
+  # easier to just use the constructor though, since calling this method
+  # requires the setup of an ERB _compiler_ object.
   #
   def set_eoutvar(compiler, eoutvar = '_erbout')
     compiler.put_cmd = "#{eoutvar}.concat"
     compiler.insert_cmd = "#{eoutvar}.concat"
-
-    cmd = []
-    cmd.push "#{eoutvar} = ''"
-    
-    compiler.pre_cmd = cmd
-
-    cmd = []
-    cmd.push(eoutvar)
-
-    compiler.post_cmd = cmd
+    compiler.pre_cmd = ["#{eoutvar} = ''"]
+    compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
   end
 
   # Generate results and print them. (see ERB#result)
@@ -703,25 +833,28 @@ class ERB
 
   #
   # Executes the generated ERB code to produce a completed template, returning
-  # the results of that code.  (See ERB#new for details on how this process can
-  # be affected by _safe_level_.)
-  # 
+  # the results of that code.  (See ERB::new for details on how this process
+  # can be affected by _safe_level_.)
+  #
   # _b_ accepts a Binding or Proc object which is used to set the context of
   # code evaluation.
   #
   def result(b=new_toplevel)
     if @safe_level
-      proc { 
-	$SAFE = @safe_level
-	eval(@src, b, (@filename || '(erb)'), 1)
+      proc {
+        $SAFE = @safe_level
+        eval(@src, b, (@filename || '(erb)'), 0)
       }.call
     else
-      eval(@src, b, (@filename || '(erb)'), 1)
+      eval(@src, b, (@filename || '(erb)'), 0)
     end
   end
 
+  ##
+  # Returns a new binding each time *near* TOPLEVEL_BINDING for runs that do
+  # not specify a binding.
+
   def new_toplevel
-    # New binding each time *near* toplevel for unspecified runs
     TOPLEVEL_BINDING.dup
   end
   private :new_toplevel
@@ -734,7 +867,11 @@ class ERB
   #   erb.def_method(MyClass, 'render(arg1, arg2)', filename)
   #   print MyClass.new.render('foo', 123)
   def def_method(mod, methodname, fname='(ERB)')
-    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
+    src = self.src
+    magic_comment = "#coding:#{@enc}\n"
+    mod.module_eval do
+      eval(magic_comment + "def #{methodname}\n" + src + "\nend\n", binding, fname, -2)
+    end
   end
 
   # Create unnamed module, define _methodname_ as instance method of it, and return it.
@@ -781,37 +918,39 @@ class ERB
     public
     #
     # A utility method for escaping HTML tag characters in _s_.
-    # 
-    # 	require "erb"
-    # 	include ERB::Util
-    # 	
-    # 	puts html_escape("is a > 0 & a < 10?")
-    # 
+    #
+    #   require "erb"
+    #   include ERB::Util
+    #
+    #   puts html_escape("is a > 0 & a < 10?")
+    #
     # _Generates_
-    # 
-    # 	is a &gt; 0 &amp; a &lt; 10?
+    #
+    #   is a &gt; 0 &amp; a &lt; 10?
     #
     def html_escape(s)
-      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+      CGI.escapeHTML(s.to_s)
     end
     alias h html_escape
     module_function :h
     module_function :html_escape
-    
+
     #
     # A utility method for encoding the String _s_ as a URL.
-    # 
-    # 	require "erb"
-    # 	include ERB::Util
-    # 	
-    # 	puts url_encode("Programming Ruby:  The Pragmatic Programmer's Guide")
-    # 
+    #
+    #   require "erb"
+    #   include ERB::Util
+    #
+    #   puts url_encode("Programming Ruby:  The Pragmatic Programmer's Guide")
+    #
     # _Generates_
-    # 
-    # 	Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
+    #
+    #   Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
     #
     def url_encode(s)
-      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+      s.to_s.dup.force_encoding("ASCII-8BIT").gsub(/[^a-zA-Z0-9_\-.]/n) {
+        sprintf("%%%02X", $&.unpack("C")[0])
+      }
     end
     alias u url_encode
     module_function :u
@@ -852,7 +991,8 @@ class ERB
   #
   module DefMethod
     public
-  # define _methodname_ as instance method of current module, using ERB object or eRuby file
+    # define _methodname_ as instance method of current module, using ERB
+    # object or eRuby file
     def def_erb_method(methodname, erb_or_fname)
       if erb_or_fname.kind_of? String
         fname = erb_or_fname

data/lib/rubysl/erb/version.rb

@@ -1,5 +1,5 @@
 module RubySL
-  module ERB
-    VERSION = "1.0.1"
+  module Erb
+    VERSION = "2.0.0"
   end
 end

data/rubysl-erb.gemspec

@@ -3,7 +3,7 @@ require './lib/rubysl/erb/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rubysl-erb"
-  spec.version       = RubySL::ERB::VERSION
+  spec.version       = RubySL::Erb::VERSION
   spec.authors       = ["Brian Shirai"]
   spec.email         = ["brixen@gmail.com"]
   spec.description   = %q{Ruby standard library erb.}
@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-erb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library erb.
 email:
 - brixen@gmail.com