friendly_format 0.5.1 → 0.6.1

data/tasks/gem.rake

@@ -37,8 +37,6 @@ class GemPackageTask < Rake::PackageTask
     local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
     if !test(?e, local_setup)
       Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
-      gem_spec.files = (gem_spec.files +
-          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
     end
   end
 
@@ -63,6 +61,10 @@ class GemPackageTask < Rake::PackageTask
 
     file package_dir_path => bones_files do
       mkdir_p package_dir rescue nil
+
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+
       bones_files.each do |fn|
         base_fn = File.join('tasks', File.basename(fn))
         f = File.join(package_dir_path, base_fn)
@@ -157,6 +159,13 @@ namespace :gem do
     puts PROJ.gem._spec.to_ruby
   end
 
+  desc 'Write the gemspec '
+  task :spec => 'gem:prereqs' do
+    File.open("#{PROJ.name}.gemspec", 'w') do |f|
+      f.write PROJ.gem._spec.to_ruby
+    end
+  end
+
   desc 'Install the gem'
   task :install => [:clobber, 'gem:package'] do
     sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"

data/tasks/post_load.rake

@@ -2,8 +2,8 @@
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
-PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
 PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
+                 "^#{Regexp.escape(PROJ.ignore_file)}$",
                  "^#{Regexp.escape(PROJ.rdoc.dir)}/",
                  "^#{Regexp.escape(PROJ.rcov.dir)}/"]
 
@@ -25,12 +25,7 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
 
 PROJ.summary ||= PROJ.description.split('.').first
 
-PROJ.gem.files ||=
-  if test(?f, PROJ.manifest_file)
-    files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
-    files.delete ''
-    files
-  else [] end
+PROJ.gem.files ||= manifest
 
 PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
 

data/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/setup.rb

@@ -4,8 +4,9 @@ require 'rake'
 require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
+require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -27,8 +28,8 @@ PROJ = OpenStruct.new(
   :ruby_opts => %w(-w),
   :libs => [],
   :history_file => 'History.txt',
-  :manifest_file => 'Manifest.txt',
   :readme_file => 'README.txt',
+  :ignore_file => '.bnsignore',
 
   # Announce
   :ann => OpenStruct.new(
@@ -62,7 +63,7 @@ PROJ = OpenStruct.new(
   # File Annotations
   :notes => OpenStruct.new(
     :exclude => %w(^tasks/setup\.rb$),
-    :extensions => %w(.txt .rb .erb) << '',
+    :extensions => %w(.txt .rb .erb .rdoc) << '',
     :tags => %w(FIXME OPTIMIZE TODO)
   ),
 
@@ -77,7 +78,7 @@ PROJ = OpenStruct.new(
   # Rdoc
   :rdoc => OpenStruct.new(
     :opts => [],
-    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$ \.rdoc$),
     :exclude => %w(extconf\.rb$),
     :main => nil,
     :dir => 'doc',
@@ -123,9 +124,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -138,21 +137,15 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin
@@ -254,9 +247,29 @@ end
 # Scans the current working directory and creates a list of files that are
 # candidates to be in the manifest.
 #
-def manifest_files
+def manifest
   files = []
-  exclude = Regexp.new(PROJ.exclude.join('|'))
+  exclude = PROJ.exclude.dup
+  comment = %r/^\s*#/
+ 
+  # process the ignore file and add the items there to the exclude list
+  if test(?f, PROJ.ignore_file)
+    ary = []
+    File.readlines(PROJ.ignore_file).each do |line|
+      next if line =~ comment
+      line.chomp!
+      line.strip!
+      next if line.nil? or line.empty?
+
+      glob = line =~ %r/\*\./ ? File.join('**', line) : line
+      Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"}
+    end
+    exclude.concat ary
+  end
+
+  # generate a regular expression from the exclude list
+  exclude = Regexp.new(exclude.join('|'))
+
   Find.find '.' do |path|
     path.sub! %r/^(\.\/|\/)/o, ''
     next unless test ?f, path

data/test/sample/complex_article_result.txt

@@ -2,93 +2,93 @@
  標題  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>
-&lt;a href="<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>">
-測試&lt;/a>
-&lt;a href="<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>">
-&lt;img src="<a href="http://phpbb.godfat.org/templates/subSilver/images/logo_phpBB.gif" title="http://phpbb.godfat.org/templates/subSilver/images/logo_phpBB.gif">http://phpbb.godfat.org/templates/subSilver/images/logo_phpBB.gif</a>"/>&lt;/a>
+&lt;a href="<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>"&gt;
+測試&lt;/a&gt;
+&lt;a href="<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>"&gt;
+&lt;img src="<a href="http://phpbb.godfat.org/templates/subSilver/images/logo_phpBB.gif" title="http://phpbb.godfat.org/templates/subSilver/images/logo_phpBB.gif">http://phpbb.godfat.org/templates/subSilver/images/logo_phpBB.gif</a>"/&gt;&lt;/a&gt;
 ※ 引述《godfat (godfat 真常)》之銘言：
-> 3. tuple + traits, 也就是一堆 template 技巧了
-> class Dispatcher{
->     template &lt;class T>
->     void sub(shared_ptr&lt;T> p){
->         get_tuple_data_field_by_type&lt;T>(data).push_back(p);
->     }
->     tuple&lt;A, B, C> data;
-> };
-
-以上 A, B, C 是指 timer_subscriber_list&lt;A>, etc.
-
-這個東西會需要從 T => tuple index 的 mapping
+&gt; 3. tuple + traits, 也就是一堆 template 技巧了
+&gt; class Dispatcher{
+&gt;     template &lt;class T&gt;
+&gt;     void sub(shared_ptr&lt;T&gt; p){
+&gt;         get_tuple_data_field_by_type&lt;T&gt;(data).push_back(p);
+&gt;     }
+&gt;     tuple&lt;A, B, C&gt; data;
+&gt; };
+
+以上 A, B, C 是指 timer_subscriber_list&lt;A&gt;, etc.
+
+這個東西會需要從 T =&gt; tuple index 的 mapping
 現在這部份做完了...........（template 沒忘太多啊哈哈）
 
-#include &lt;tr1/tuple>
-#include &lt;tr1/type_traits>
-#include &lt;iostream>
+#include &lt;tr1/tuple&gt;
+#include &lt;tr1/type_traits&gt;
+#include &lt;iostream&gt;
 
 using namespace std::tr1;
 
 // 拿來判斷兩個整數是否相同，這是為了檢查有沒有爆表
-// 像是 tuple_element&lt;3, tuple&lt;int,int,int> >::type
+// 像是 tuple_element&lt;3, tuple&lt;int,int,int&gt; &gt;::type
 // 這樣就是爆表，因為這 tuple 沒這麼大
-template &lt;bool> struct is_equal_type       { typedef true_type type; };
-template &lt;>     struct is_equal_type&lt;false>{ typedef false_type type; };
+template &lt;bool&gt; struct is_equal_type       { typedef true_type type; };
+template &lt;&gt;     struct is_equal_type&lt;false&gt;{ typedef false_type type; };
 
-// 定義相等的話，is_equal&lt;1,1>::value 會是 1
-//               is_equal&lt;1,2>::value 會是 0
+// 定義相等的話，is_equal&lt;1,1&gt;::value 會是 1
+//               is_equal&lt;1,2&gt;::value 會是 0
 //                            ::type 會是 true_type/false_type (from tr1)
-template &lt;int Lhs, int Rhs> struct is_equal{
+template &lt;int Lhs, int Rhs&gt; struct is_equal{
     enum{ value = Lhs == Rhs };
-    typedef typename is_equal_type&lt;value>::type type;
+    typedef typename is_equal_type&lt;value&gt;::type type;
 };
 
-template &lt;class T, class Tuple, int Index> struct type_index_imp;
+template &lt;class T, class Tuple, int Index&gt; struct type_index_imp;
 
 // 如果跑到這裡，表示爆表了，在我的 g++4.3 上會顯示：
 // tuple.cpp:20: error: ‘type_not_found’ is not a member of "T"
-template &lt;class T, class Tuple, int Index, class Bool>
+template &lt;class T, class Tuple, int Index, class Bool&gt;
 struct type_index_check{
     enum{ value = T::type_not_found };
 };
 
 // 沒有爆表就繼續找吧
-template &lt;class T, class Tuple, int Index>
-struct type_index_check&lt;T, Tuple, Index, false_type>{
-        enum{ value = type_index_imp&lt;T, Tuple, Index+1>::value };
+template &lt;class T, class Tuple, int Index&gt;
+struct type_index_check&lt;T, Tuple, Index, false_type&gt;{
+        enum{ value = type_index_imp&lt;T, Tuple, Index+1&gt;::value };
 };
 
 // 找到了！
-template &lt;class T, class Tuple, int Index, class Bool>
+template &lt;class T, class Tuple, int Index, class Bool&gt;
 struct type_index_if{
     enum{ value = Index }; // found, stop recursion
 };
 
 // 不直接呼叫 imp, 呼叫 check 檢查是否爆表
-template &lt;class T, class Tuple, int Index>
-struct type_index_if&lt;T, Tuple, Index, false_type>{
+template &lt;class T, class Tuple, int Index&gt;
+struct type_index_if&lt;T, Tuple, Index, false_type&gt;{
     enum{ value = type_index_check&lt;T, Tuple, Index,
-            typename is_equal&lt;Index+1, tuple_size&lt;Tuple>::value>::type>::value };
+            typename is_equal&lt;Index+1, tuple_size&lt;Tuple&gt;::value&gt;::type&gt;::value };
 };
 
 // 檢查兩個型別是否相同
-template &lt;class T, class Tuple, int Index>
+template &lt;class T, class Tuple, int Index&gt;
 struct type_index_imp{
     enum{ value = type_index_if&lt;T, Tuple, Index,
-            typename is_same&lt;T, typename tuple_element&lt;Index, Tuple>::type>::type>::value };
+            typename is_same&lt;T, typename tuple_element&lt;Index, Tuple&gt;::type&gt;::type&gt;::value };
 };
 
 // simple wrapper
-template &lt;class T, class Tuple>
+template &lt;class T, class Tuple&gt;
 struct type_index{
-    enum{ value = type_index_imp&lt;T, Tuple, 0>::value };
+    enum{ value = type_index_imp&lt;T, Tuple, 0&gt;::value };
 };
 
 int main(){
-    typedef tuple&lt;int, char, void> test_t;
-    std::cout &lt;&lt; type_index&lt;int, test_t>::value &lt;&lt; std::endl;
-    std::cout &lt;&lt; type_index&lt;char, test_t>::value &lt;&lt; std::endl;
-    std::cout &lt;&lt; type_index&lt;void, test_t>::value &lt;&lt; std::endl;
-    std::cout &lt;&lt; tuple_size&lt;test_t>::value &lt;&lt; std::endl;
-    // std::cout &lt;&lt; type_index&lt;int*, test_t>::value &lt;&lt; std::endl;
+    typedef tuple&lt;int, char, void&gt; test_t;
+    std::cout &lt;&lt; type_index&lt;int, test_t&gt;::value &lt;&lt; std::endl;
+    std::cout &lt;&lt; type_index&lt;char, test_t&gt;::value &lt;&lt; std::endl;
+    std::cout &lt;&lt; type_index&lt;void, test_t&gt;::value &lt;&lt; std::endl;
+    std::cout &lt;&lt; tuple_size&lt;test_t&gt;::value &lt;&lt; std::endl;
+    // std::cout &lt;&lt; type_index&lt;int*, test_t&gt;::value &lt;&lt; std::endl;
 }
 
 輸出：
@@ -105,4 +105,4 @@ 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

@@ -1,17 +1,23 @@
 # encoding: utf-8
 
 require 'rubygems'
-require 'minitest/unit'
-MiniTest::Unit.autorun
+
+TestCase = begin
+             require 'minitest/unit'
+             MiniTest::Unit.autorun
+             MiniTest::Unit::TestCase
+           rescue LoadError
+             require 'test/unit'
+             Test::Unit::TestCase
+           end
 
 require 'friendly_format'
 
-# 2008-05-09 godfat
-class TestFriendlyFormat < MiniTest::Unit::TestCase
+module TestCases
   include FriendlyFormat
 
   def test_article
-    str = 
+    str =
 ' http://friends.roodo.com/forum/viewTopic/10170
 用 Haskell 寫成的名軟體？
 
@@ -37,7 +43,9 @@ OpenGL, 還有一些 web cgi 之類的東西也有。
 
 現在切入正是時機啊... XD'
 
-    assert_equal \
+    s = format_autolink(str)
+
+    assert(
 ' <a href="http://friends.roodo.com/forum/viewTopic/10170" title="http://friends.roodo.com/forum/viewTopic/10170">http://friends.roodo.com/forum/viewTopic/10170</a>
 用 Haskell 寫成的名軟體？
 
@@ -61,29 +69,43 @@ svn 其實也差不多是要慢慢式微了...
 很多知名 library 都有 haskell binding 了，wxWidgets,
 OpenGL, 還有一些 web cgi 之類的東西也有。
 
-現在切入正是時機啊... XD', s = format_autolink(str)
-    assert_equal s, format_autolink_regexp(str)
+現在切入正是時機啊... XD' == s)
+    assert_equal(s, format_autolink_regexp(str))
   end
   def test_persent
     str =
 'XDDDD
 http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~Ar-tonelico2-hymmnos-concert-Side-%E7%B4%85~/dp/B000VKZL30/ref=pd_sbs_sw_img_2 orz'
 
-    assert_equal \
+    s = format_autolink(str)
+
+    assert_equal(
 'XDDDD
-<a href="http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~Ar-tonelico2-hymmnos-concert-Side-%E7%B4%85~/dp/B000VKZL30/ref=pd_sbs_sw_img_2" title="http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~Ar-tonelico2-hymmnos-concert-Side-%E7%B4%85~/dp/B000VKZL30/ref=pd_sbs_sw_img_2">http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E...</a> orz', s = format_autolink(str)
+<a href="http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~Ar-tonelico2-hymmnos-concert-Side-%E7%B4%85~/dp/B000VKZL30/ref=pd_sbs_sw_img_2" title="http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~Ar-tonelico2-hymmnos-concert-Side-%E7%B4%85~/dp/B000VKZL30/ref=pd_sbs_sw_img_2">http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E...</a> orz', s)
     assert_equal s, format_autolink_regexp(str)
   end
   def test_img_src
-    str = 
+    str =
 'Thirst for Knowledge
 <img src="http://friends.roodo.com/images/diary_photos_large/15386/MjMyNjYtdGhpcnN0X2Zvcl9rbm93bGVkZ2U=.jpg" />
 
 2007年12月14日
 '
-    assert_equal str, s = format_autolink(str)
-    assert_equal s, format_autolink_regexp(str)
+    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, format_autolink_regexp(str))
   end
+
   def test_wikipedia_persent
     str = 'http://en.wikipedia.org/wiki/Haskell_%28programming_language%29'
     assert_equal \
@@ -111,14 +133,20 @@ http://www.amazon.co.jp/%E3%80%8C%E7%84%94~%E3%83%9B%E3%83%A0%E3%83%A9%E3%80%8D~
   def test_escape_html_and_correct_html
     str = 'test<p>if missing end of p'
     assert_equal 'test<p>if missing end of p</p>', format_article(str, :p)
-    assert_equal 'test&lt;p>if missing end of p&lt;/p>', format_article(str, :a)
+    assert_equal 'test&lt;p&gt;if missing end of p&lt;/p&gt;', format_article(str, :a)
+
     str = '<pre>asdasd<a>orz'
-    assert_equal '<pre>asdasd&lt;a>orz</pre>', format_article(str, :a, :pre)
-    assert_equal '&lt;pre>asdasd<a>orz</a>&lt;/pre>', format_article(str, :a)
-    assert_equal '<pre>asdasd&lt;a>orz</pre>', format_article(str, :pre)
+    assert_equal '<pre>asdasd&lt;a&gt;orz</pre>', format_article(str, :a, :pre)
+    assert_equal '&lt;pre&gt;asdasd<a>orz</a>&lt;/pre&gt;', format_article(str, :a)
+    assert_equal '<pre>asdasd&lt;a&gt;orz</pre>', format_article(str, :pre)
+
     str = 'orz<img>asd'
-    assert_equal 'orz<img />asd', format_article(str, :img)
-    assert_equal 'orz&lt;img>asd', format_article(str)
+    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)
   end
   def test_trim_url
     str = 'test with http://890123456789012345678901234567890123456789012345678901234567890123456789.com'
@@ -127,17 +155,25 @@ 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 s, format_autolink_regexp(str)
   end
   def test_escape_html
-    str = 'a lambda expression is &lambda; x. x+1'
-    assert_equal str, format_article(str)
+       str = 'a lambda expression is &lambda; x. x+1'
+    libxml = 'a lambda expression is λ x. x+1'
+    result = format_article(str)
+
+    if FriendlyFormat.adapter == FriendlyFormat::HpricotAdapter
+      assert_equal(str, result)
+    else
+      assert_equal(libxml, result)
+    end
+
     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')
+    result = File.read('test/sample/complex_article_result.txt').chop
     input  = File.read('test/sample/complex_article.txt')
 
-    assert_equal result, format_article(input, :pre)
-    assert_equal result, format_article(input, SetCommon.new)
+    assert_equal(result, format_article(input, :pre))
+    assert_equal(result, format_article(input, SetCommon.new))
   end
   def test_simple_link
     s = '今天是我一歲生日 <a href="http://godfat.org/" title="http://godfat.org/">http://godfat.org/</a> 真的嗎？'
@@ -160,9 +196,39 @@ 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 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><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></zzz>'
+    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>'
+
+    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
+  end
 
-    assert_equal expected, format_article(input, SetCommon.new, :zzz)
+  def test_empty_article
+    assert_equal '', format_article('')
+    assert_equal ' ', format_article(' ')
+    assert_equal 'a', format_article('a')
+  end
 
+  def test_custom_set
+    s = '<z>zzz</z>'
+    assert_equal s, format_article(s, Set.new << :z)
   end
 end
+
+%w[HpricotAdapter NokogiriAdapter LibxmlAdapter].each{ |adapter|
+  eval <<-RUBY
+    class Test#{adapter} < TestCase
+      include TestCases
+
+      def setup
+        FriendlyFormat.adapter = FriendlyFormat::#{adapter}
+      end
+    end
+  RUBY
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_format
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - "Lin Jen-Shin (a.k.a. godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,38 +9,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 +08:00
+date: 2009-04-05 00:00:00 +08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: nokogiri
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: libxml-ruby
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        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.
 email: godfat (XD) godfat.org
@@ -64,6 +74,10 @@ 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
 - lib/friendly_format/version.rb
@@ -71,7 +85,6 @@ files:
 - tasks/bones.rake
 - tasks/gem.rake
 - tasks/git.rake
-- tasks/manifest.rake
 - tasks/notes.rake
 - tasks/post_load.rake
 - tasks/rdoc.rake
@@ -87,7 +100,6 @@ has_rdoc: true
 homepage: http://github.com/godfat/friendly_format
 post_install_message: 
 rdoc_options: 
-- --diagram
 - --charset=utf-8
 - --inline-source
 - --line-numbers