rhodes-framework 1.1.1 → 1.2.0

data/lib/date/format.rb

@@ -3,10 +3,10 @@
 
 if defined? RHO_ME
 	require 'rationalME'
+else	
+    require 'rational'
 end
 
-require 'rational'
-
 class Date
 
   #SECONDS_IN_DAY = 60*60*24
@@ -283,6 +283,7 @@ class Date
       when 'j'; emit_n(yday(), 3, f)
       when 'k'; emit_a(hour(), 2, f)
       when 'L'
+	f[:p] = nil
 	w = f[:w] || 3
 	u = 10**w
 	emit_n((sec_fraction * u).floor, w, f)
@@ -290,6 +291,7 @@ class Date
       when 'M', 'OM'; emit_n(min(), 2, f)
       when 'm', 'Om'; emit_n(mon(), 2, f)
       when 'N'
+	f[:p] = nil
 	w = f[:w] || 9
 	u = 10**w
 	emit_n((sec_fraction * u).floor, w, f)
@@ -695,11 +697,11 @@ class Date
   private_class_method :s3e
 
   def self._parse_day(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/ino, ' ')
+    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
       e.wday = Format::ABBR_DAYS[$1.downcase]
       true
 =begin
-    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
+    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
       e.wday = %w(su mo tu we th fr sa).index($1.downcase)
       true
 =end
@@ -734,7 +736,7 @@ class Date
 		     [[:alpha:]]+(?:\sdst)?\b
 		   )
 		 )?
-		/inx,
+		/ix,
 		' ')
 
       t = $1
@@ -746,7 +748,7 @@ class Date
 		  \s*:?\s*(\d+)(?:[,.](\d+))?s?
 		)?
 	      )?
-	    (?:\s*([ap])(?:m\b|\.m\.))?/inx
+	    (?:\s*([ap])(?:m\b|\.m\.))?/ix
 
       e.hour = $1.to_i
       e.min = $2.to_i if $2
@@ -791,7 +793,7 @@ class Date
 		   \s*
 		   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
 		 )?
-		/inox,
+		/iox,
 		' ') # '
       s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
 	  $3 && $3[0,1].downcase == 'b')
@@ -810,7 +812,7 @@ class Date
 		   \s*
 		   ('?-?\d+)
 		 )?
-		/inox,
+		/iox,
 		' ') # '
       s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
 	  $3 && $3[0,1].downcase == 'b')
@@ -819,43 +821,43 @@ class Date
   end
 
   def self._parse_iso(str, e) # :nodoc:
-    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/n, ' ')
+    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
       s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_iso2(str, e) # :nodoc:
-    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/in, ' ')
+    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/i, ' ')
       e.cwyear = $1.to_i if $1
       e.cweek = $2.to_i
       e.cwday = $3.to_i if $3
       true
-    elsif str.sub!(/-w-(\d)\b/in, ' ')
+    elsif str.sub!(/-w-(\d)\b/i, ' ')
       e.cwday = $1.to_i
       true
-    elsif str.sub!(/--(\d{2})?-(\d{2})\b/n, ' ')
+    elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
       e.mon = $1.to_i if $1
       e.mday = $2.to_i
       true
-    elsif str.sub!(/--(\d{2})(\d{2})?\b/n, ' ')
+    elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
       e.mon = $1.to_i
       e.mday = $2.to_i if $2
       true
-    elsif /[,.](\d{2}|\d{4})-\d{3}\b/n !~ str &&
-	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
+    elsif /[,.](\d{2}|\d{4})-\d{3}\b/ !~ str &&
+	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/, ' ')
       e.year = $1.to_i
       e.yday = $2.to_i
       true
-    elsif /\d-\d{3}\b/n !~ str &&
-	str.sub!(/\b-(\d{3})\b/n, ' ')
+    elsif /\d-\d{3}\b/ !~ str &&
+	str.sub!(/\b-(\d{3})\b/, ' ')
       e.yday = $1.to_i
       true
     end
   end
 
   def self._parse_jis(str, e) # :nodoc:
-    if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/in, ' ')
+    if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
       era = { 'm'=>1867,
 	      't'=>1911,
 	      's'=>1925,
@@ -870,46 +872,46 @@ class Date
 
   def self._parse_vms(str, e) # :nodoc:
     if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-		-('?-?\d+)/inox, ' ')
+		-('?-?\d+)/iox, ' ')
       s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
       true
     elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-		-('?-?\d+)(?:-('?-?\d+))?/inox, ' ')
+		-('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
       s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
       true
     end
   end
 
   def self._parse_sla(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|n, ' ') # '
+    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|, ' ') # '
       s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_dot(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|n, ' ') # '
+    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
       s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_year(str, e) # :nodoc:
-    if str.sub!(/'(\d+)\b/n, ' ')
+    if str.sub!(/'(\d+)\b/, ' ')
       e.year = $1.to_i
       true
     end
   end
 
   def self._parse_mon(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/ino, ' ')
+    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/io, ' ')
       e.mon = Format::ABBR_MONTHS[$1.downcase]
       true
     end
   end
 
   def self._parse_mday(str, e) # :nodoc:
-    if str.sub!(/(\d+)(st|nd|rd|th)\b/in, ' ')
+    if str.sub!(/(\d+)(st|nd|rd|th)\b/i, ' ')
       e.mday = $1.to_i
       true
     end
@@ -934,7 +936,7 @@ class Date
 		      \[[-+]?\d[^\]]*\]
 		    )
 		  )?
-		/inx,
+		/ix,
 		' ')
       case $2.size
       when 2
@@ -1060,7 +1062,7 @@ class Date
 
     e._comp = comp
 
-    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]\x80-\xff]+/n, ' ')
+    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
 
     _parse_time(str, e) # || _parse_beat(str, e)
     _parse_day(str, e)
@@ -1078,13 +1080,13 @@ class Date
     _parse_mday(str, e)   ||
     _parse_ddd(str, e)
 
-    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
+    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
       if e.year
 	e.year = -e.year + 1
       end
     end
 
-    if str.sub!(/\A\s*(\d{1,2})\s*\z/n, ' ')
+    if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
       if e.hour && !e.mday
 	v = $1.to_i
 	if (1..31) === v
@@ -1126,20 +1128,20 @@ class Date
 	      -w-\d)
 	(t
 	\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/inx =~ str
+	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
       _parse(str)
     elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
 	      ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
 	      (\d{2}|\d{4})?w\d{2}\d)
 	(t?
 	\d{2}\d{2}(\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/inx =~ str
+	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
       _parse(str)
     elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/inx =~ str
+	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
       _parse(str)
     elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/inx =~ str
+	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
       _parse(str)
     end
   end
@@ -1148,7 +1150,7 @@ class Date
     if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
 	(t|\s)
 	\d{2}:\d{2}:\d{2}(\.\d+)?
-	(z|[-+]\d{2}:\d{2})\s*\z/inx =~ str
+	(z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
       _parse(str)
     end
   end
@@ -1157,7 +1159,7 @@ class Date
     if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
 	(?:t
 	  (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
-	(z|[-+]\d{2}:\d{2})?\s*\z/inx =~ str
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
       e = Format::Bag.new
       e.year = $1.to_i
       e.mon = $2.to_i if $2
@@ -1172,7 +1174,7 @@ class Date
       end
       e.to_hash
     elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
-	(z|[-+]\d{2}:\d{2})?\s*\z/inx =~ str
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
       e = Format::Bag.new
       e.hour = $1.to_i if $1
       e.min = $2.to_i if $2
@@ -1184,7 +1186,7 @@ class Date
       end
       e.to_hash
     elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
-	(z|[-+]\d{2}:\d{2})?\s*\z/inx =~ str
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
       e = Format::Bag.new
       e.mon = $1.to_i if $1
       e.mday = $2.to_i if $2
@@ -1203,7 +1205,7 @@ class Date
 	(?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
 	-?(\d{2,})\s+ # allow minus, anyway
 	\d{2}:\d{2}(:\d{2})?\s*
-	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/inox =~ str
+	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/iox =~ str
       e = _parse(str, false)
       if $1.size < 4
 	if e[:year] < 50
@@ -1224,20 +1226,20 @@ class Date
 	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
 	-?\d{4}\s+ # allow minus, anyway
 	\d{2}:\d{2}:\d{2}\s+
-	gmt\s*\z/inox =~ str
+	gmt\s*\z/iox =~ str
       _rfc2822(str)
     elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
 	\d{2}\s*-\s*
 	(#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
 	\d{2}\s+
 	\d{2}:\d{2}:\d{2}\s+
-	gmt\s*\z/inox =~ str
+	gmt\s*\z/iox =~ str
       _parse(str)
     elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
 	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
 	\d{1,2}\s+
 	\d{2}:\d{2}:\d{2}\s+
-	\d{4}\s*\z/inox =~ str
+	\d{4}\s*\z/iox =~ str
       _parse(str)
     end
   end
@@ -1246,7 +1248,7 @@ class Date
     if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
 	(t
 	(\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/inx =~ str
+	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/ix =~ str
       if /\A\s*\d/ =~ str
 	_parse(str.sub(/\A\s*(\d)/, 'h\1'))
       else

data/lib/dateME.rb

@@ -3,8 +3,9 @@ require 'date/format'
 class Time
 
   def strftime(fmt='%F')
-    DateTimeME.new(self).strftime(fmt);
+    DateTimeME.new(self.localtime).strftime(fmt)
   end
+
 end
 
 class DateTimeME < Date

data/lib/erb.rb

@@ -10,233 +10,251 @@
 #
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-#
-# = ERB -- Ruby Templating
-#
-# == Introduction
-#
-# ERB provides an easy to use but powerful templating system for Ruby.  Using
-# ERB, actual Ruby code can be added to any plain text document for the
-# purposes of generating document information details and/or flow control.
-#
-# A very simple example is this:
-# 
-#   require 'erb'
-#
-#   x = 42
-#   template = ERB.new <<-EOF
-#     The value of x is: <%= x %>
-#   EOF
-#   puts template.result(binding)
-#
-# <em>Prints:</em> The value of x is: 42
-#
-# More complex examples are given below.
-#
-#
-# == Recognized Tags
-#
-# ERB recognizes certain tags in the provided template and converts them based
-# on the rules below:
-#
-#   <% Ruby code -- inline with output %>
-#   <%= Ruby expression -- replace with result %>
-#   <%# comment -- ignored -- useful in testing %>
-#   % a line of Ruby code -- treated as <% line %> (optional -- see ERB.new)
-#   %% replaced with % if first thing on a line and % processing is used
-#   <%% or %%> -- replace with <% or %> respectively
-#
-# All other text is passed through ERB filtering unchanged.
-#
-#
-# == Options
-#
-# There are several settings you can change when you use ERB:
-# * the nature of the tags that are recognized;
-# * the value of <tt>$SAFE</tt> under which the template is run;
-# * the binding used to resolve local variables in the template.
-#
-# See the ERB.new and ERB#result methods for more detail.
-#
-#
-# == Examples
-#
-# === Plain Text
-#
-# ERB is useful for any generic templating situation.  Note that in this example, we use the
-# convenient "% at start of line" tag, and we quote the template literally with
-# <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
-#
-# <i>Generates:</i>
-#
-#   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
-#
-# ERB is often used in <tt>.rhtml</tt> files (HTML with embedded Ruby).  Notice the need in
-# this example to provide a special binding when the template is run, so that the instance
-# variables in the Product object can be resolved.
-#
-#   require "erb"
-#   
-#   # Build template data class.
-#   class Product
-#     def initialize( code, name, desc, cost )
-#       @code = code
-#       @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>
-#           <% else %>
-#              Call for a price, today!
-#           <% end %>
-#         </p>
-#    
-#       </body>
-#     </html>
-#   }.gsub(/^  /, '')
-#   
-#   rhtml = ERB.new(template)
-#   
-#   # Set up template data.
-#   toy = Product.new( "TZ-1002",
-#                      "Rubysapien",
-#                      "Geek's Best Friend!  Responds to Ruby commands...",
-#                      999.95 )
-#   toy.add_feature("Listens for verbal commands in the Ruby language!")
-#   toy.add_feature("Ignores Perl, Java, and all C variants.")
-#   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)
-#
-# <i>Generates (some blank lines removed):</i>
-#
-#    <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>
-#            <li><b>Karate-Chop Action!!!</b></li>
-#            <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:
-# * ERB's big brother, eRuby, works the same but is written in C for speed;
-# * Amrita (smart at producing HTML/XML);
-# * cs/Template (written in C for speed);
-# * RDoc, distributed with Ruby, uses its own template engine, which can be reused elsewhere;
-# * and others; search the RAA.
-#
-# Rails, the web application framework, uses ERB to create views.
-#
+=begin rdoc
+= ERB -- Ruby Templating
+
+== Introduction
+
+ERB provides an easy to use but powerful templating system for Ruby.  Using
+ERB, actual Ruby code can be added to any plain text document for the
+purposes of generating document information details and/or flow control.
+
+A very simple example is this:
+
+  require 'erb'
+
+  x = 42
+  template = ERB.new <<-EOF
+    The value of x is: <%= x %>
+  EOF
+  puts template.result(binding)
+
+<em>Prints:</em> The value of x is: 42
+
+More complex examples are given below.
+
+
+== Recognized Tags
+
+ERB recognizes certain tags in the provided template and converts them based
+on the rules below:
+
+  <% Ruby code -- inline with output %>
+  <%= Ruby expression -- replace with result %>
+  <%# comment -- ignored -- useful in testing %>
+  % a line of Ruby code -- treated as <% line %> (optional -- see ERB.new)
+  %% replaced with % if first thing on a line and % processing is used
+  <%% or %%> -- replace with <% or %> respectively
+
+All other text is passed through ERB filtering unchanged.
+
+
+== Options
+
+There are several settings you can change when you use ERB:
+* the nature of the tags that are recognized;
+* the value of <tt>$SAFE</tt> under which the template is run;
+* the binding used to resolve local variables in the template.
+
+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
+
+=== Plain Text
+
+ERB is useful for any generic templating situation.  Note that in this example, we use the
+convenient "% at start of line" tag, and we quote the template literally with
+<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
+
+<i>Generates:</i>
+
+  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
+
+ERB is often used in <tt>.rhtml</tt> files (HTML with embedded Ruby).  Notice the need in
+this example to provide a special binding when the template is run, so that the instance
+variables in the Product object can be resolved.
+
+  require "erb"
+  
+  # Build template data class.
+  class Product
+    def initialize( code, name, desc, cost )
+      @code = code
+      @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>
+          <% else %>
+             Call for a price, today!
+          <% end %>
+        </p>
+   
+      </body>
+    </html>
+  }.gsub(/^  /, '')
+  
+  rhtml = ERB.new(template)
+  
+  # Set up template data.
+  toy = Product.new( "TZ-1002",
+                     "Rubysapien",
+                     "Geek's Best Friend!  Responds to Ruby commands...",
+                     999.95 )
+  toy.add_feature("Listens for verbal commands in the Ruby language!")
+  toy.add_feature("Ignores Perl, Java, and all C variants.")
+  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)
+
+<i>Generates (some blank lines removed):</i>
+
+   <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>
+           <li><b>Karate-Chop Action!!!</b></li>
+           <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:
+* ERB's big brother, eRuby, works the same but is written in C for speed;
+* Amrita (smart at producing HTML/XML);
+* cs/Template (written in C for speed);
+* RDoc, distributed with Ruby, uses its own template engine, which can be reused elsewhere;
+* and others; search the RAA.
+
+Rails, the web application framework, uses ERB to create views.
+=end
 class ERB
-  Revision = '$Date$' 	#'
+  Revision = '$Date:: 2009-01-17 21:20:08 +0900#$' 	#'
 
   # Returns revision information for the erb.rb module.
   def self.version
@@ -304,7 +322,7 @@ class ERB
       def scan(&block)
 	@stag = nil
 	if @percent
-	  @src.each do |line|
+	  @src.each_line do |line|
 	    percent_line(line, &block)
 	  end
 	else
@@ -487,10 +505,10 @@ class ERB
     end
 
     class Buffer # :nodoc:
-      def initialize(compiler)
+      def initialize(compiler, enc=nil)
 	@compiler = compiler
 	@line = []
-	@script = ""
+        @script = enc ? "#coding:#{enc.to_s}\n" : ""
 	@compiler.pre_cmd.each do |x|
 	  push(x)
 	end
@@ -527,7 +545,11 @@ class ERB
     end
 
     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)
@@ -584,7 +606,7 @@ class ERB
       end
       out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
       out.close
-      out.script
+      return out.script, enc
     end
 
     def prepare_trim_mode(mode)
@@ -624,6 +646,18 @@ class ERB
     end
     attr_reader :percent, :trim_mode
     attr_accessor :put_cmd, :insert_cmd, :pre_cmd, :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
 
@@ -699,7 +733,7 @@ class ERB
     @safe_level = safe_level
     compiler = ERB::Compiler.new(trim_mode)
     set_eoutvar(compiler, eoutvar)
-    @src = compiler.compile(str)
+    @src, @enc = *compiler.compile(str)
     @filename = nil
   end
 
@@ -720,12 +754,12 @@ class ERB
     compiler.insert_cmd = "#{eoutvar}.concat"
 
     cmd = []
-    cmd.push "#{eoutvar} = ''; #{eoutvar}.force_encoding('utf-8')"
+    cmd.push "#{eoutvar} = ''"
     
     compiler.pre_cmd = cmd
 
     cmd = []
-    cmd.push(eoutvar)
+    cmd.push("#{eoutvar}.force_encoding('utf-8')")
 
     compiler.post_cmd = cmd
   end
@@ -747,10 +781,10 @@ class ERB
     if @safe_level
       proc { 
 	$SAFE = @safe_level
-	eval(@src, b, (@filename || '(erb)'), 1)
+	eval(@src, b, (@filename || '(erb)'), 0)
       }.call
     else
-      eval(@src, b, (@filename || '(erb)'), 1)
+      eval(@src, b, (@filename || '(erb)'), 0)
     end
   end
 
@@ -762,7 +796,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.
@@ -839,7 +877,9 @@ class ERB
     # 	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