friendly_format 0.6.1 → 0.7.0

data/CHANGES

@@ -1,5 +1,17 @@
 = friendly_format changes history
 
+== friendly_format 0.7.0 / 2009-07-31
+
+* no more super long line. added a newline after br tag.
+* all adapters work nearly the same now.
+* dropped support for libxml
+* fixed a bug that ignored tag attributes
+* fixed a bug that in nested a tag
+* fixed a bug that added extra slash in not allowed tag
+* fixed format_autolink_rec, use the same trick in format_aritcle
+* now tag attributes are ordered by lexical order
+* now js attrs in allowed tags would be filter out
+
 == friendly_format 0.6.1 / 2009-04-05
 
 * added nokogiri and libxml-ruby support.

data/README

@@ -1,5 +1,5 @@
-= friendly_format 0.6
-by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
+= friendly_format 0.7.0
+by Lin Jen-Shin (aka godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
 == LINKS:
@@ -19,24 +19,23 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
  FriendlyFormat.format_article(text, FriendlyFormat::SetCommon.new)
 
  FriendlyFormat.adapter = FriendlyFormat::NokogiriAdapter
- FriendlyFormat.adapter = FriendlyFormat::LibxmlAdapter
  FriendlyFormat.adapter = FriendlyFormat::HpricotAdapter # default
 
 == REQUIREMENTS:
 
- * hpricot     >=0.6 or
- * nokogiri    >=1.1 or
- * libxml-ruby >=0.9
+ * ruby 1.8+ or 1.9.1+
+ * hpricot     >=0.8 or
+ * nokogiri    >=1.2 or
 
 == INSTALL:
 
-* sudo gem install friendly_format
+* gem install friendly_format
 
 == LICENSE:
 
 Apache License 2.0
 
-Copyright (c) 2008, Lin Jen-Shin (a.k.a. godfat 真常)
+Copyright (c) 2008, Lin Jen-Shin (aka godfat 真常)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -4,15 +4,13 @@ require 'bones'
 Bones.setup
 
 PROJ.name = 'friendly_format'
-PROJ.authors = 'Lin Jen-Shin (a.k.a. godfat 真常)'
+PROJ.authors = 'Lin Jen-Shin (aka 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.gem.development_dependencies << ['hpricot',     '>=0.8'] <<
+                                     ['nokogiri',    '>=1.2']
 # PROJ.ruby_opts.delete '-w'
 
 PROJ.description = PROJ.summary = paragraphs_of('README', 'description').join("\n\n")

data/TODO

@@ -1,5 +1,7 @@
 = friendly_article todo list
 
+* more test cases
+
 * 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

@@ -2,43 +2,40 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_format}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   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{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.authors = ["Lin Jen-Shin (aka godfat \347\234\237\345\270\270)"]
+  s.date = %q{2009-07-31}
+  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/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.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "friendly_format.gemspec", "lib/friendly_format.rb", "lib/friendly_format/adapter/hpricot_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.homepage = %q{http://github.com/godfat/friendly_format}
   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.rubygems_version = %q{1.3.5}
   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
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      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"])
+      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_development_dependency(%q<hpricot>, [">= 0.8"])
+      s.add_development_dependency(%q<nokogiri>, [">= 1.2"])
     else
-      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"])
+      s.add_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_dependency(%q<hpricot>, [">= 0.8"])
+      s.add_dependency(%q<nokogiri>, [">= 1.2"])
     end
   else
-    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"])
+    s.add_dependency(%q<bones>, [">= 2.5.1"])
+    s.add_dependency(%q<hpricot>, [">= 0.8"])
+    s.add_dependency(%q<nokogiri>, [">= 1.2"])
   end
 end

data/lib/friendly_format/adapter/hpricot_adapter.rb

@@ -2,33 +2,20 @@
 require 'hpricot'
 
 module FriendlyFormat
-  class HpricotAdapter
-    class << self
+  module HpricotAdapter
+    module_function
 
-      def parse html
-        Hpricot.parse(html)
-      end
+    def parse html
+      Hpricot.parse(html)
+    end
 
-      def to_xhtml node
-        node.to_html
-      end
+    def to_xhtml node
+      node.to_html
+    end
 
-      def content node
-        node.content
-      end
+    def empty? node
+      node.empty?
+    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/nokogiri_adapter.rb

@@ -1,21 +1,27 @@
 
-require 'friendly_format/adapter/abstract'
 require 'nokogiri'
 
 module FriendlyFormat
-  class NokogiriAdapter
-    extend Abstract
+  module NokogiriAdapter
+    module_function
 
-    def self.parse html
+    def 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>",
+        "<zzz>#{html.gsub("\n", '&#xA;')}</zzz>",
         nil, # url?
         html.respond_to?(:encoding) ? html.encoding.name : 'utf-8'
         ).root.children.first.children.first
     end
 
+    def to_xhtml node
+      node.to_xhtml
+    end
+
+    def empty? node
+      node.children.empty?
+    end
+
   end # of NokogiriAdapter
 end # of FriendlyFormat

data/lib/friendly_format/version.rb

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

data/lib/friendly_format.rb

@@ -91,7 +91,7 @@ module FriendlyFormat
   def format_newline text
     # windows: \r\n
     # mac os 9: \r
-    text.gsub("\r\n", "\n").tr("\r", "\n").gsub("\n", '<br />')
+    text.gsub("\r\n", "\n").tr("\r", "\n").gsub("\n", "<br />\n")
   end
 
 
@@ -148,14 +148,14 @@ module FriendlyFormat
     # @api private
     def format_autolink_rec elem, attrs = {}
       elem.children.map{ |e|
-        if adapter.text?(e)
+        if e.text?
           format_url(e.content, attrs)
 
-        elsif adapter.element?(e)
+        elsif e.elem?
           if adapter.empty?(e)
             adapter.to_xhtml(e)
           else
-            "<#{e.name}>" +
+            node_tag_normal(e) +
             format_autolink_rec(e, attrs) +
             "</#{e.name}>"
           end
@@ -178,30 +178,31 @@ module FriendlyFormat
 
     # recursion
     # @api private
-    def format_article_rec elem, allowed_tags = Set.new, no_format_newline = false
+    def format_article_rec(elem, allowed_tags = Set.new, tag_name = nil)
+
       elem.children.map{ |e|
-        if adapter.text?(e)
-          if no_format_newline
-            format_url(adapter.content(e))
-          else
-            format_newline(format_url(adapter.content(e)))
+        if e.text?
+          result = e.to_html
+          case tag_name
+            when 'pre'; format_url(    result)
+            when   'a'; format_newline(result)
+            else      ; format_newline(format_url(result))
           end
 
-        elsif adapter.element?(e)
+        elsif e.elem?
           if allowed_tags.member?(e.name)
-            if adapter.empty?(e) || e.name == 'a'
-              adapter.to_xhtml(e)
+            if adapter.empty?(e)
+              node_tag_single(e)
             else
-              "<#{e.name}>" +
-              format_article_rec(
-                e, allowed_tags, e.name == 'pre') +
+              node_tag_normal(e) +
+              format_article_rec(e, allowed_tags, e.name) +
               "</#{e.name}>"
             end
           else
+            node_tag_escape(e) +
             if adapter.empty?(e)
-              "&lt;#{e.name}&gt;"
+              ''
             else
-              "&lt;#{e.name}&gt;" +
               format_article_rec(e, allowed_tags) +
               "&lt;/#{e.name}&gt;"
             end
@@ -211,10 +212,6 @@ module FriendlyFormat
       }.join
     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;')
@@ -230,5 +227,29 @@ module FriendlyFormat
       end
     end
 
+    def node_tag_single node
+      "<#{node.name}#{node_attrs_reject_js(node)} />"
+    end
+
+    def node_tag_normal node
+      "<#{node.name}#{node_attrs_reject_js(node)}>"
+    end
+
+    def node_tag_escape node
+      "&lt;#{node.name}#{node_attrs(node)}&gt;"
+    end
+
+    def node_attrs node
+      attrs2str(node.attributes)
+    end
+
+    def node_attrs_reject_js node
+      attrs2str(node.attributes.reject{ |k, v| k =~ /\Aon/ })
+    end
+
+    def attrs2str attrs
+      attrs.sort.inject(''){ |i, (k, v)| i + " #{k}=\"#{v}\"" }
+    end
+
   end
 end

data/tasks/setup.rb

@@ -147,7 +147,7 @@ RCOV = "#{RUBY} -S rcov"
 RDOC = "#{RUBY} -S rdoc"
 GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

data/test/sample/complex_article_result.txt

@@ -1,4 +1,5 @@
-<a href="http://phpbb.godfat.org/viewtopic.php?t=873" title="http://phpbb.godfat.org/viewtopic.php?t=873">http://phpbb.godfat.org/viewtopic.php?t=873</a><br /><pre> 作者  godfat (godfat 真常)                                 站內  ProjectX
+<a href="http://phpbb.godfat.org/viewtopic.php?t=873" title="http://phpbb.godfat.org/viewtopic.php?t=873">http://phpbb.godfat.org/viewtopic.php?t=873</a><br />
+<pre> 作者  godfat (godfat 真常)                                 站內  ProjectX
  標題  Re: [PSC] variants timer
  時間  2008/03/04 Tue 00:34:54
 <a href="http://phpbb.godfat.org/viewtopic.php?t=873" title="http://phpbb.godfat.org/viewtopic.php?t=873">http://phpbb.godfat.org/viewtopic.php?t=873</a>
@@ -105,4 +106,7 @@ tuple.cpp:20: error:  "type_not_found" is not a member of "T"
 
 --
  ※ Orign:  群星的眷屬  chance.twbbs.org
- ◆ Author: godfat From 220-135-28-18.HINET-IP.hinet.net</pre><br /><br />end of article...<br />
+ ◆ Author: godfat From 220-135-28-18.HINET-IP.hinet.net</pre><br />
+<br />
+end of article...<br />
+

data/test/test_friendly_format.rb

@@ -89,20 +89,10 @@ http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~
 'Thirst for Knowledge
 <img src="http://friends.roodo.com/images/diary_photos_large/15386/MjMyNjYtdGhpcnN0X2Zvcl9rbm93bGVkZ2U=.jpg" />
 
-2007年12月14日
-'
-    libxml =
-'Thirst for Knowledge
-<img src="http://friends.roodo.com/images/diary_photos_large/15386/MjMyNjYtdGhpcnN0X2Zvcl9rbm93bGVkZ2U=.jpg"/>
-
 2007年12月14日
 '
     s = format_autolink(str)
-    if FriendlyFormat.adapter == FriendlyFormat::LibxmlAdapter
-      assert_equal(libxml, s)
-    else
-      assert_equal(str, s)
-    end
+    assert_equal(str, s)
     assert_equal(str, format_autolink_regexp(str))
   end
 
@@ -141,19 +131,17 @@ http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~
     assert_equal '<pre>asdasd&lt;a&gt;orz</pre>', format_article(str, :pre)
 
     str = 'orz<img>asd'
-    if FriendlyFormat.adapter == FriendlyFormat::LibxmlAdapter
-      assert_equal('orz<img/>asd', format_article(str, :img))
-    else
-      assert_equal('orz<img />asd', format_article(str, :img))
-    end
-    assert_equal 'orz&lt;img&gt;asd', format_article(str)
+    assert_equal('orz<img />asd', format_article(str, :img))
+    assert_equal('orz&lt;img&gt;asd', format_article(str))
   end
+
   def test_trim_url
     str = 'test with http://890123456789012345678901234567890123456789012345678901234567890123456789.com'
 
     assert_equal 'test with <a href="http://890123456789012345678901234567890123456789012345678901234567890123456789.com" title="http://890123456789012345678901234567890123456789012345678901234567890123456789.com">http://89012345678901234567890123456789012345678901234567890123456789012...</a>', s = format_article(str)
     assert_equal s, format_autolink_regexp(str)
   end
+
   def test_escape_html
        str = 'a lambda expression is &lambda; x. x+1'
     libxml = 'a lambda expression is λ x. x+1'
@@ -168,6 +156,7 @@ http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~
     str = 'as you can see, use &lt;img src="asd"/&gt; to use'
     assert_equal str, format_article(str)
   end
+
   def test_html_with_pre_and_newline2br
     result = File.read('test/sample/complex_article_result.txt').chop
     input  = File.read('test/sample/complex_article.txt')
@@ -196,17 +185,23 @@ compilation mode. 非常驚人的開發速度。
 此外，其中一位開發者，<a href="http://blog.headius.com/">Charles Nutter</a> 也經常參與 <a href="http://www.ruby-forum.com/forum/14">ruby-core</a> 的討論，
 對於 Ruby 的開發頗有貢獻。'
 
-    expected = '<img style="float: right;" src="http://flolac.iis.sinica.edu.tw/lambdawan/sites/default/files/ruby.png.thumb.jpg" /><br /><a href="http://www.ruby-forum.com/topic/169911">JRuby 1.1.5 Released</a><br /><a href="http://jruby.codehaus.org/">JRuby</a> 是用 Java 寫成的 Ruby interpreter/compiler.<br />原本 JRuby 只是普通的 open source project, 後來因為 <a href="http://www.sun.com/">Sun Microsystem</a>,<br />也就是 Java 的開發公司，看好 JRuby, 於是僱用 JRuby team,<br />full time 開發 JRuby. 後來 JRuby 在各方面都快速大幅成長，<br />尤其效能有了不可思議的大幅提昇，可能是 Sun 有一些撇步沒有公開吧。<br /><br />效能大幅提昇之後，JRuby 開發沒有停緩，接下來是非常大量的相容性提昇。<br />也從原本僅支援 interpret mode 到後來也支援 just in time 與 ahead of time 的<br />compilation mode. 非常驚人的開發速度。<br /><zzz>&lt;xd&gt;<br />此外，其中一位開發者，<a href="http://blog.headius.com/">Charles Nutter</a> 也經常參與 <a href="http://www.ruby-forum.com/forum/14">ruby-core</a> 的討論，<br />對於 Ruby 的開發頗有貢獻。&lt;/xd&gt;</zzz>'
-
-    # img style after img src
-    expected_18_hpricot = '<img src="http://flolac.iis.sinica.edu.tw/lambdawan/sites/default/files/ruby.png.thumb.jpg" style="float: right;" /><br /><a href="http://www.ruby-forum.com/topic/169911">JRuby 1.1.5 Released</a><br /><a href="http://jruby.codehaus.org/">JRuby</a> 是用 Java 寫成的 Ruby interpreter/compiler.<br />原本 JRuby 只是普通的 open source project, 後來因為 <a href="http://www.sun.com/">Sun Microsystem</a>,<br />也就是 Java 的開發公司，看好 JRuby, 於是僱用 JRuby team,<br />full time 開發 JRuby. 後來 JRuby 在各方面都快速大幅成長，<br />尤其效能有了不可思議的大幅提昇，可能是 Sun 有一些撇步沒有公開吧。<br /><br />效能大幅提昇之後，JRuby 開發沒有停緩，接下來是非常大量的相容性提昇。<br />也從原本僅支援 interpret mode 到後來也支援 just in time 與 ahead of time 的<br />compilation mode. 非常驚人的開發速度。<br /><zzz>&lt;xd&gt;<br />此外，其中一位開發者，<a href="http://blog.headius.com/">Charles Nutter</a> 也經常參與 <a href="http://www.ruby-forum.com/forum/14">ruby-core</a> 的討論，<br />對於 Ruby 的開發頗有貢獻。&lt;/xd&gt;</zzz>'
+    expected = '<img src="http://flolac.iis.sinica.edu.tw/lambdawan/sites/default/files/ruby.png.thumb.jpg" style="float: right;" /><br />
+<a href="http://www.ruby-forum.com/topic/169911">JRuby 1.1.5 Released</a><br />
+<a href="http://jruby.codehaus.org/">JRuby</a> 是用 Java 寫成的 Ruby interpreter/compiler.<br />
+原本 JRuby 只是普通的 open source project, 後來因為 <a href="http://www.sun.com/">Sun Microsystem</a>,<br />
+也就是 Java 的開發公司，看好 JRuby, 於是僱用 JRuby team,<br />
+full time 開發 JRuby. 後來 JRuby 在各方面都快速大幅成長，<br />
+尤其效能有了不可思議的大幅提昇，可能是 Sun 有一些撇步沒有公開吧。<br />
+<br />
+效能大幅提昇之後，JRuby 開發沒有停緩，接下來是非常大量的相容性提昇。<br />
+也從原本僅支援 interpret mode 到後來也支援 just in time 與 ahead of time 的<br />
+compilation mode. 非常驚人的開發速度。<br />
+<zzz>&lt;xd&gt;<br />
+此外，其中一位開發者，<a href="http://blog.headius.com/">Charles Nutter</a> 也經常參與 <a href="http://www.ruby-forum.com/forum/14">ruby-core</a> 的討論，<br />
+對於 Ruby 的開發頗有貢獻。&lt;/xd&gt;</zzz>'
 
     result = format_article(input, SetCommon.new, :zzz)
-    if RUBY_VERSION =~ /^1\.8/ && FriendlyFormat.adapter == FriendlyFormat::HpricotAdapter
-      assert(result == expected_18_hpricot)
-    else
-      assert(result == expected)
-    end
+    assert_equal(expected, result)
   end
 
   def test_empty_article
@@ -219,9 +214,32 @@ compilation mode. 非常驚人的開發速度。
     s = '<z>zzz</z>'
     assert_equal s, format_article(s, Set.new << :z)
   end
+
+  def test_preserve_attributes
+    s = '<a href="#">text</a>'
+    assert_equal('&lt;a href="#"&gt;text&lt;/a&gt;', format_article(s))
+
+    s = '<div class="orz">test</div>'
+    assert_equal(s, format_article(s, 'div'))
+
+    assert_equal(s, format_autolink(s))
+  end
+
+  def test_nested_a_tag
+    s = '<a href="uri"><img src="uri" /></a>'
+    assert_equal(s, format_article(s, 'img', 'a'))
+  end
+
+  def test_filter_js
+    s = '<a href="#" onclick="window.alert(\'attack!\')">js</a>'
+    assert_equal('<a href="#">js</a>', format_article(s, SetCommon.new))
+
+    s = '<a href="#" onclick="window.alert(\'attack!\')">js</a>'
+    assert_equal(FriendlyFormat.escape_ltgt(s), format_article(s))
+  end
 end
 
-%w[HpricotAdapter NokogiriAdapter LibxmlAdapter].each{ |adapter|
+%w[HpricotAdapter NokogiriAdapter].each{ |adapter|
   eval <<-RUBY
     class Test#{adapter} < TestCase
       include TestCases

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_format
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
-- "Lin Jen-Shin (a.k.a. godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
+- "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 +08:00
+date: 2009-07-31 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.2
+        version: 2.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0.8"
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -40,19 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: "1.2"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-    version: 
-description: 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.
+description: " make user input be valid xhtml and format it with gsub(\"\\n\", \"<br/>\") etc.\n you can partially allow some tags and don't escape them."
 email: godfat (XD) godfat.org
 executables: []
 
@@ -74,9 +64,7 @@ files:
 - 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
@@ -93,11 +81,14 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
+- tasks/zentest.rake
 - test/sample/complex_article.txt
 - test/sample/complex_article_result.txt
 - test/test_friendly_format.rb
 has_rdoc: true
 homepage: http://github.com/godfat/friendly_format
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=utf-8
@@ -123,9 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ludy
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: 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.
 test_files: 
 - test/test_friendly_format.rb

data/lib/friendly_format/adapter/abstract.rb

@@ -1,31 +0,0 @@
-
-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/libxml_adapter.rb

@@ -1,25 +0,0 @@
-
-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