friendly_format 0.5.1 → 0.6.1

data/CHANGES

@@ -1,4 +1,17 @@
-= pagify changes history
+= friendly_format changes history
+
+== friendly_format 0.6.1 / 2009-04-05
+
+* added nokogiri and libxml-ruby support.
+* drop support for hpricot < 0.7
+* you can explicitly choose adapter, or auto-choose:
+  1. hpricot or falls back to:
+  2. nokogiri or falls back to:
+  3. libxml-ruby
+* now internally, we store string instead of symbol
+  for accepted tags to prevent from symbol explosion.
+* ruby 1.9 compliant
+* escape gt(>) in pre tag and forbidden tag as well.
 
 == friendly_format 0.5.1 / 2008-12-11
 

data/README

@@ -1,4 +1,4 @@
-= friendly_format 0.5
+= friendly_format 0.6
 by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
@@ -18,9 +18,15 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
  FriendlyFormat.format_article(text, FriendlyFormat::SetStrict.new)
  FriendlyFormat.format_article(text, FriendlyFormat::SetCommon.new)
 
+ FriendlyFormat.adapter = FriendlyFormat::NokogiriAdapter
+ FriendlyFormat.adapter = FriendlyFormat::LibxmlAdapter
+ FriendlyFormat.adapter = FriendlyFormat::HpricotAdapter # default
+
 == REQUIREMENTS:
 
- * hpricot 0.6 and later
+ * hpricot     >=0.6 or
+ * nokogiri    >=1.1 or
+ * libxml-ruby >=0.9
 
 == INSTALL:
 

data/Rakefile

@@ -1,44 +1,26 @@
 # encoding: utf-8
 
-begin
-  require 'bones'
-  Bones.setup
-rescue LoadError
-  load 'tasks/setup.rb'   # this line should already be there
-end
+require 'bones'
+Bones.setup
 
 PROJ.name = 'friendly_format'
-# supress warnings, there's too many warnings in dm-core
-# PROJ.ruby_opts.delete '-w'
-
-PROJ.gem.dependencies << ['hpricot', '>=0.6.0']
-PROJ.gem.development_dependencies << ['minitest', '>=1.3.0']
-# PROJ.gem.executables = ["bin/#{PROJ.name}"]
-
-task :default do
-  Rake.application.options.show_task_pattern = /./
-  Rake.application.display_tasks_and_comments
-end
-
-namespace :gem do
-  desc "create #{PROJ.name}.gemspec"
-  task 'gemspec' do
-    puts "rake gem:debug > #{PROJ.name}.gemspec"
-    File.open("#{PROJ.name}.gemspec", 'w'){|spec| spec << `rake gem:debug`.sub(/.*/, '')}
-  end
-end
-
 PROJ.authors = 'Lin Jen-Shin (a.k.a. godfat 真常)'
 PROJ.email = 'godfat (XD) godfat.org'
 PROJ.url = "http://github.com/godfat/#{PROJ.name}"
+PROJ.rubyforge.name = 'ludy'
+
+PROJ.gem.development_dependencies << ['hpricot',     '>=0.6'] <<
+                                     ['nokogiri',    '>=1.1'] <<
+                                     ['libxml-ruby', '>=0.9']
+
+# PROJ.ruby_opts.delete '-w'
+
 PROJ.description = PROJ.summary = paragraphs_of('README', 'description').join("\n\n")
 PROJ.changes = paragraphs_of('CHANGES', 0..1).join("\n\n")
-PROJ.rubyforge.name = 'ludy'
 PROJ.version = File.read("lib/#{PROJ.name}/version.rb").gsub(/.*VERSION = '(.*)'.*/m, '\1')
 
-PROJ.manifest_file = 'Manifest'
-PROJ.exclude += ['^Manifest$', '^tmp', 'tmp$', '^pkg',
-                 '^\.gitignore$', '^ann-', '\.sqlite3$', '\.db$']
+PROJ.exclude += ['^tmp', 'tmp$', '^pkg', '^\.gitignore$',
+                 '^ann-', '\.sqlite3$', '\.db$']
 
 PROJ.rdoc.remote_dir = PROJ.name
 
@@ -46,8 +28,8 @@ PROJ.readme_file = 'README'
 PROJ.rdoc.main = 'README'
 PROJ.rdoc.exclude += ['Rakefile', '^tasks', '^test']
 PROJ.rdoc.include << '\w+'
-PROJ.rdoc.opts << '--diagram' if !WIN32 and `which dot` =~ %r/\/dot/
-PROJ.rdoc.opts += ['--charset=utf-8', '--inline-source', 
+# PROJ.rdoc.opts << '--diagram' if !Rake::Win32 and `which dot` =~ %r/\/dot/
+PROJ.rdoc.opts += ['--charset=utf-8', '--inline-source',
                    '--line-numbers', '--promiscuous']
 
 PROJ.spec.opts << '--color'
@@ -56,3 +38,8 @@ PROJ.ann.file = "ann-#{PROJ.name}-#{PROJ.version}"
 PROJ.ann.paragraphs.concat %w[LINKS SYNOPSIS REQUIREMENTS INSTALL LICENSE]
 
 CLEAN.include Dir['**/*.rbc']
+
+task :default do
+  Rake.application.options.show_task_pattern = /./
+  Rake.application.display_tasks_and_comments
+end

data/TODO

@@ -1,4 +1,5 @@
 = friendly_article todo list
+
 * make format_article take an optional size argument that indicates
   how long should the result be. it should take < as 1 character and
   <a href="/">嗯</a> as 1 character too. never cut out tag and unicode.

data/friendly_format.gemspec

@@ -1,24 +1,23 @@
-
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_format}
-  s.version = "0.5.1"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (a.k.a. godfat \347\234\237\345\270\270)"]
-  s.date = %q{2008-12-11}
-  s.description = %q{}
+  s.date = %q{2009-04-05}
+  s.description = %q{make user input be valid xhtml and format it with gsub("\n", "<br/>") etc. you can partially allow some tags and don't escape them.}
   s.email = %q{godfat (XD) godfat.org}
   s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "TODO", "friendly_format.gemspec"]
-  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "friendly_format.gemspec", "lib/friendly_format.rb", "lib/friendly_format/set_common.rb", "lib/friendly_format/set_strict.rb", "lib/friendly_format/version.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/sample/complex_article.txt", "test/sample/complex_article_result.txt", "test/test_friendly_format.rb"]
+  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "friendly_format.gemspec", "lib/friendly_format.rb", "lib/friendly_format/adapter/abstract.rb", "lib/friendly_format/adapter/hpricot_adapter.rb", "lib/friendly_format/adapter/libxml_adapter.rb", "lib/friendly_format/adapter/nokogiri_adapter.rb", "lib/friendly_format/set_common.rb", "lib/friendly_format/set_strict.rb", "lib/friendly_format/version.rb", "test/sample/complex_article.txt", "test/sample/complex_article_result.txt", "test/test_friendly_format.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/godfat/friendly_format}
-  s.rdoc_options = ["--diagram", "--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
+  s.rdoc_options = ["--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ludy}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{}
+  s.summary = %q{make user input be valid xhtml and format it with gsub("\n", "<br/>") etc. you can partially allow some tags and don't escape them.}
   s.test_files = ["test/test_friendly_format.rb"]
 
   if s.respond_to? :specification_version then
@@ -26,17 +25,20 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.6.0"])
-      s.add_development_dependency(%q<bones>, [">= 2.1.0"])
-      s.add_development_dependency(%q<minitest>, [">= 1.3.0"])
+      s.add_development_dependency(%q<bones>, [">= 2.4.2"])
+      s.add_development_dependency(%q<hpricot>, [">= 0.6"])
+      s.add_development_dependency(%q<nokogiri>, [">= 1.1"])
+      s.add_development_dependency(%q<libxml-ruby>, [">= 0.9"])
     else
-      s.add_dependency(%q<hpricot>, [">= 0.6.0"])
-      s.add_dependency(%q<bones>, [">= 2.1.0"])
-      s.add_dependency(%q<minitest>, [">= 1.3.0"])
+      s.add_dependency(%q<bones>, [">= 2.4.2"])
+      s.add_dependency(%q<hpricot>, [">= 0.6"])
+      s.add_dependency(%q<nokogiri>, [">= 1.1"])
+      s.add_dependency(%q<libxml-ruby>, [">= 0.9"])
     end
   else
-    s.add_dependency(%q<hpricot>, [">= 0.6.0"])
-    s.add_dependency(%q<bones>, [">= 2.1.0"])
-    s.add_dependency(%q<minitest>, [">= 1.3.0"])
+    s.add_dependency(%q<bones>, [">= 2.4.2"])
+    s.add_dependency(%q<hpricot>, [">= 0.6"])
+    s.add_dependency(%q<nokogiri>, [">= 1.1"])
+    s.add_dependency(%q<libxml-ruby>, [">= 0.9"])
   end
 end

data/lib/friendly_format/adapter/abstract.rb

@@ -0,0 +1,31 @@
+
+module FriendlyFormat
+  module Abstract
+
+    def method_name node
+      # discard body
+      node.children.to_s
+    end
+
+    def to_xhtml node
+      node.to_xhtml
+    end
+
+    def content node
+      node.to_s
+    end
+
+    def element? node
+      node.element?
+    end
+
+    def text? node
+      node.text?
+    end
+
+    def empty? node
+      node.children.empty?
+    end
+
+  end # of Abstract
+end # of FriendlyFormat

data/lib/friendly_format/adapter/hpricot_adapter.rb

@@ -0,0 +1,34 @@
+
+require 'hpricot'
+
+module FriendlyFormat
+  class HpricotAdapter
+    class << self
+
+      def parse html
+        Hpricot.parse(html)
+      end
+
+      def to_xhtml node
+        node.to_html
+      end
+
+      def content node
+        node.content
+      end
+
+      def element? node
+        node.kind_of?(Hpricot::Elem)
+      end
+
+      def text? node
+        node.kind_of?(Hpricot::Text)
+      end
+
+      def empty? node
+        node.empty?
+      end
+
+    end # of class method for HpricotAdapter
+  end # of HpricotAdapter
+end # of FriendlyFormat

data/lib/friendly_format/adapter/libxml_adapter.rb

@@ -0,0 +1,25 @@
+
+require 'friendly_format/adapter/abstract'
+require 'libxml'
+
+module FriendlyFormat
+  class LibxmlAdapter
+    extend Abstract
+
+    def self.parse html
+      parser = LibXML::XML::HTMLParser.string(
+        "<zzz>#{html}</zzz>",
+        :options => LibXML::XML::HTMLParser::Options::RECOVER)
+
+      # root is html, children is [body], first is body
+      # same as nokogiri
+      # drop zzz with .children.first since it would wrap a tag p for the article
+      parser.parse.root.children.first.children.first
+    end
+
+    def self.to_xhtml node
+      node.to_s
+    end
+
+  end # of LibxmlAdapter
+end # of FriendlyFormat

data/lib/friendly_format/adapter/nokogiri_adapter.rb

@@ -0,0 +1,21 @@
+
+require 'friendly_format/adapter/abstract'
+require 'nokogiri'
+
+module FriendlyFormat
+  class NokogiriAdapter
+    extend Abstract
+
+    def self.parse html
+      # root is html, children is [body], first is body
+      # same as libxml
+      # drop zzz with .children.first since it would wrap a tag p for the article
+      Nokogiri::HTML.parse(
+        "<zzz>#{html}</zzz>",
+        nil, # url?
+        html.respond_to?(:encoding) ? html.encoding.name : 'utf-8'
+        ).root.children.first.children.first
+    end
+
+  end # of NokogiriAdapter
+end # of FriendlyFormat

data/lib/friendly_format/set_common.rb

@@ -6,11 +6,11 @@ module FriendlyFormat
   # a few people have permission to post or edit.
   class SetCommon < Set
     def initialize
-      super([ :a, :area, :b, :big, :blockquote, :br,
-              :center, :cite, :code, :del, :div, :em,
-              :font, :h1, :h2, :h3, :h4, :h5, :h6, :hr,
-              :i, :img, :li, :map, :object, :ol, :p,
-              :pre, :small, :span, :strong, :u, :ul     ])
+      super(%w[ a area b big blockquote br
+                center cite code del div em
+                font h1 h2 h3 h4 h5 h6 hr
+                i img li map object ol p
+                pre small span strong u ul  ])
     end
   end
 end

data/lib/friendly_format/set_strict.rb

@@ -5,8 +5,8 @@ module FriendlyFormat
   # to post or edit articles.
   class SetStrict < Set
     def initialize
-      super([ :a, :b, :code, :del, :em, :font,
-              :i, :img, :li, :ol, :strong, :u, :ul ])
+      super(%w[ a b code del em font
+                i img li ol strong u ul ])
     end
   end
 end

data/lib/friendly_format/version.rb

@@ -1,3 +1,3 @@
 module FriendlyFormat
-  VERSION = '0.5.1'
+  VERSION = '0.6.1'
 end

data/lib/friendly_format.rb

@@ -5,21 +5,45 @@ require 'friendly_format/set_strict'
 
 # 2008-05-09 godfat
 module FriendlyFormat
+  autoload(:LibxmlAdapter,   'friendly_format/adapter/libxml_adapter')
+  autoload(:HpricotAdapter,  'friendly_format/adapter/hpricot_adapter')
+  autoload(:NokogiriAdapter, 'friendly_format/adapter/nokogiri_adapter')
+
+  class << self
+    attr_writer(:adapter)
+    def adapter
+      @adapter ||= begin
+                     HpricotAdapter
+                   rescue LoadError
+                     begin
+                       NokogiriAdapter
+                     rescue LoadError
+                       LibxmlAdapter
+                     end
+                   end
+    end
+  end
+
   module_function
   # format entire article for you, passing allowed tags to it.
   # you can use Set or Symbol to specify which tags would be allowed.
   # default was no tags at all, all tags would be escaped.
   # it uses Hpricot to parse input.
   def format_article html, *args
-    FriendlyFormat.format_article_entrance(html,
-      args.inject(Set.new){ |allowed_tags, arg|
-        case arg
-          when Symbol; allowed_tags << arg
-          when Set;    allowed_tags += arg
-          else; raise(TypeError.new("expected Symbol or Set, got #{arg.class}"))
-        end
-        allowed_tags
-      })
+    return html if html.strip == ''
+
+    FriendlyFormat.force_encoding(
+      FriendlyFormat.format_article_entrance(html,
+        args.inject(Set.new){ |allowed_tags, arg|
+          case arg
+            when String; allowed_tags << arg
+            when Symbol; allowed_tags << arg.to_s
+            when Set;    allowed_tags += Set.new(arg.map{|a|a.to_s})
+            else; raise(TypeError.new("expected String|Symbol|Set, got #{arg.class}"))
+          end
+          allowed_tags
+        }),
+      html)
   end
 
   # automaticly add "a href" tag on text starts from
@@ -27,14 +51,12 @@ module FriendlyFormat
   # regexp translated from drupal to find where's the target.
   # it uses simplified regexp to do the task. see format_url.
   def format_autolink html, attrs = {}
-    require 'hpricot'
-
-    doc = Hpricot.parse html
-    doc.each_child{ |c|
-      next unless c.kind_of?(Hpricot::Text)
-      c.content = format_url c.content, attrs
-    }
-    doc.to_html
+    return html if html.strip == ''
+
+    FriendlyFormat.force_encoding(
+      FriendlyFormat.format_autolink_rec(
+        FriendlyFormat.adapter.parse(html), attrs),
+      html)
   end
 
   # translated from drupal-6.2/modules/filter/filter.module
@@ -65,27 +87,6 @@ module FriendlyFormat
     }[1..-1]
   end
 
-  # same as format_autolink_regexp, but it's simplified and
-  # cannot process text composed with html and plain text.
-  # used in format_autolink.
-  def format_url text, attrs = {}
-    # translated from drupal-6.2/modules/filter/filter.module
-    # Match absolute URLs.
-    text.gsub(
-%r{((http://|https://|ftp://|mailto:|smb://|afp://|file://|gopher://|news://|ssl://|sslv2://|sslv3://|tls://|tcp://|udp://|www\.)([a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+*~#&=/;-]))([.,?!]*?)}i){ |match|
-      url = $1 # is there any other way to get this variable?
-
-      caption = FriendlyFormat.trim url
-      attrs = attrs.map{ |k,v| " #{k}=\"#{v}\""}.join
-
-      # Match www domains/addresses.
-      url = "http://#{url}" unless url =~ %r{^http://}
-      "<a href=\"#{url}\" title=\"#{url}\"#{attrs}>#{caption}</a>"
-    # Match e-mail addresses.
-    }.gsub( %r{([A-Za-z0-9._-]+@[A-Za-z0-9._+-]+\.[A-Za-z]{2,4})([.,?!]*?)}i,
-            '<a href="mailto:\1">\1</a>')
-  end
-
   # convert newline character(s) to <br />
   def format_newline text
     # windows: \r\n
@@ -93,79 +94,141 @@ module FriendlyFormat
     text.gsub("\r\n", "\n").tr("\r", "\n").gsub("\n", '<br />')
   end
 
-  private
-  # extract it to public?
-  def self.trim text, length = 75
-    # Use +3 for '...' string length.
-    if text.size <= 3
-      '...'
-    elsif text.size > length
-      "#{text[0...length-3]}..."
-    else
-      text
+
+  # private below
+
+  class << self
+    # extract it to public?
+    # @api private
+    def trim text, length = 75
+      # Use +3 for '...' string length.
+      if text.size <= 3
+        '...'
+      elsif text.size > length
+        "#{text[0...length-3]}..."
+      else
+        text
+      end
     end
-  end
 
-  # perhaps we should escape all inside code instead of pre?
-  def self.escape_all_inside_pre html, allowed_tags
-    return html unless allowed_tags.member? :pre
-    # don't bother nested pre, because we escape all tags in pre
-    html = html + '</pre>' unless html =~ %r{</pre>}i
-    html.gsub(%r{<pre>(.*)</pre>}mi){
-      # stop escaping for '>' because drupal's url filter would make &gt; into url...
-      # is there any other way to get matched group?
-      "<pre>#{FriendlyFormat.escape_lt(FriendlyFormat.escape_amp($1))}</pre>"
-    }
-  end
+    # same as format_autolink_regexp, but it's simplified and
+    # cannot process text composed with html and plain text.
+    # used in format_autolink.
+    # @api private
+    def format_url text, attrs = {}
+      # translated from drupal-6.2/modules/filter/filter.module
+      # Match absolute URLs.
+      text.gsub(
+  %r{((http://|https://|ftp://|mailto:|smb://|afp://|file://|gopher://|news://|ssl://|sslv2://|sslv3://|tls://|tcp://|udp://|www\.)([a-zA-Z0-9@:%_+*~#?&=.,/;-]*[a-zA-Z0-9@:%_+*~#&=/;-]))([.,?!]*?)}i){ |match|
+        url = $1 # is there any other way to get this variable?
+        caption = trim(url)
+        html_attrs = attrs.map{ |k,v| " #{k}=\"#{v}\""}.join
+
+        # Match www domains/addresses.
+        url = "http://#{url}" unless url =~ %r{^http://}
+        "<a href=\"#{url}\" title=\"#{url}\"#{html_attrs}>#{caption}</a>"
+      # Match e-mail addresses.
+      }.gsub( %r{([A-Za-z0-9._-]+@[A-Za-z0-9._+-]+\.[A-Za-z]{2,4})([.,?!]*?)}i,
+              '<a href="mailto:\1">\1</a>')
+    end
 
-  # recursion entrance
-  def self.format_article_entrance html, allowed_tags = Set.new
-    require 'hpricot'
-    FriendlyFormat.format_article_elems(Hpricot.parse(
-      FriendlyFormat.escape_all_inside_pre(html, allowed_tags)), allowed_tags)
-  end
+    # perhaps we should escape all inside code instead of pre?
+    # @api private
+    def escape_ltgt_inside_pre html, allowed_tags
+      return html unless allowed_tags.member?('pre')
+      # don't bother nested pre, because we escape all tags in pre
+      html = html + '</pre>' unless html =~ %r{</pre>}i
+      html.gsub(%r{<pre>(.*)</pre>}mi){
+        # stop escaping for '>' because drupal's url filter would make &gt; into url...
+        # is there any other way to get matched group?
+        "<pre>#{escape_ltgt($1)}</pre>"
+      }
+    end
+
+    # @api private
+    def format_autolink_rec elem, attrs = {}
+      elem.children.map{ |e|
+        if adapter.text?(e)
+          format_url(e.content, attrs)
+
+        elsif adapter.element?(e)
+          if adapter.empty?(e)
+            adapter.to_xhtml(e)
+          else
+            "<#{e.name}>" +
+            format_autolink_rec(e, attrs) +
+            "</#{e.name}>"
+          end
 
-  # recursion
-  def self.format_article_elems elems, allowed_tags = Set.new, no_format_newline = false
-    elems.children.map{ |e|
-      if e.kind_of?(Hpricot::Text)
-        if no_format_newline
-          format_url(e.content)
         else
-          format_newline format_url(e.content)
+          e
+
         end
-      elsif e.kind_of?(Hpricot::Elem)
-        if allowed_tags.member? e.name.to_sym
-          if e.empty? || e.name == 'a'
-            e.to_html
+
+      }.join
+    end
+
+    # recursion entrance
+    # @api private
+    def format_article_entrance html, allowed_tags = Set.new
+      format_article_rec(
+        adapter.parse(escape_ltgt_inside_pre(html, allowed_tags)),
+        allowed_tags)
+    end
+
+    # recursion
+    # @api private
+    def format_article_rec elem, allowed_tags = Set.new, no_format_newline = false
+      elem.children.map{ |e|
+        if adapter.text?(e)
+          if no_format_newline
+            format_url(adapter.content(e))
           else
-            e.stag.inspect +
-              FriendlyFormat.format_article_elems(e, allowed_tags, e.stag.name == 'pre') +
-              (e.etag || Hpricot::ETag.new(e.stag.name)).inspect
+            format_newline(format_url(adapter.content(e)))
           end
-        else
-          if e.empty?
-            FriendlyFormat.escape_lt(e.stag.inspect)
+
+        elsif adapter.element?(e)
+          if allowed_tags.member?(e.name)
+            if adapter.empty?(e) || e.name == 'a'
+              adapter.to_xhtml(e)
+            else
+              "<#{e.name}>" +
+              format_article_rec(
+                e, allowed_tags, e.name == 'pre') +
+              "</#{e.name}>"
+            end
           else
-            FriendlyFormat.escape_lt(e.stag.inspect) +
-              FriendlyFormat.format_article_elems(e, allowed_tags) +
-              FriendlyFormat.escape_lt((e.etag || Hpricot::ETag.new(e.stag.name)).inspect)
+            if adapter.empty?(e)
+              "&lt;#{e.name}&gt;"
+            else
+              "&lt;#{e.name}&gt;" +
+              format_article_rec(e, allowed_tags) +
+              "&lt;/#{e.name}&gt;"
+            end
           end
+
         end
-      end
-    }.join
-  end
+      }.join
+    end
 
-  def self.escape_amp text
-    text.gsub('&', '&amp;')
-  end
+    # i cannot find a way to escape both lt and gt,
+    # so it's a trick that just escape lt and no browser
+    # would treat complex lt and gt structure to be a tag
+    # wraping content.
+    # @api private
+    def escape_ltgt text
+      text.gsub('<', '&lt;').gsub('>', '&gt;')
+    end
 
-  # i cannot find a way to escape both lt and gt,
-  # so it's a trick that just escape lt and no browser
-  # would treat complex lt and gt structure to be a tag
-  # wraping content.
-  def self.escape_lt text
-    text.gsub('<', '&lt;')
-  end
+    # force encoding for ruby 1.9
+    # @api private
+    def force_encoding output, input
+      if output.respond_to?(:force_encoding)
+        output.force_encoding(input.encoding)
+      else
+        output
+      end
+    end
 
+  end
 end

data/tasks/ann.rake

@@ -42,7 +42,7 @@ namespace :ann do
   desc "Send an email announcement"
   task :email => ['ann:prereqs', PROJ.ann.file] do
     ann = PROJ.ann
-    from = ann.email[:from] || PROJ.email
+    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
     to   = Array(ann.email[:to])
 
     ### build a mail header for RFC 822