hparser 0.2.0 → 0.2.1

data/lib/hparser/block/pair.rb

@@ -8,29 +8,31 @@ module HParser
     # Some formats have common structure.
     # 
     # Qutoe is defined as
-    #  >>quoted string<<
+    #  >>
+    #  quoted string
+    #  <<
     #
     # Pre is defiend as
-    #  >|plain text|<
+    #  >|
+    #  plain text
+    #  |<
     #
     # In short,some format is different in begining/ending string.
     # So this class have basic structure for that format.
+    #
+    # Remark:Strictly,quote is defined as "from the line that contain only '>>' to
+    # the line that contain only '<<'"
     class Pair
       def self.get(scanner,from,to)
         from_q = Regexp.quote from
         to_q = Regexp.quote to
-        if scanner.scan(/\A#{from_q}(.*)#{to_q}\Z/) then
-          content = scanner.matched
-          return content[from.length...-to.length].strip
-        elsif scanner.scan(/\A#{from_q}/)
-          content = scanner.matched[from.length..-1]
-          until scanner.scan(/#{to_q}\Z/) do
-            content += "\n"+ scanner.scan(/./)
+        if scanner.scan(/^#{from_q}$/)
+          content = ''
+          until scanner.scan(/^#{to_q}$/) do
+            content += "\n"+ scanner.scan(/.*/)
           end
-          content += "\n"+scanner.matched[0...-to.length]
           return content.strip
         end
-        return nil
       end
 
       # make parser by begin/end-ing string

data/lib/hparser/hatena.rb

@@ -32,10 +32,8 @@ module HParser
     end
 
     class Empty
-      include Hatena
-      private
-      def hatena_content
-        ""
+      def to_hatena
+        ''
       end
     end
 
@@ -55,7 +53,7 @@ module HParser
       include Hatena
       alias_method :hatena_content,:content
       def hatena_filter c
-        '>>'+c+'<<'
+        ">>\n"+c+"\n<<"
       end
     end
 
@@ -63,7 +61,7 @@ module HParser
       include Hatena
       alias_method :hatena_content,:content
       def hatena_filter c
-        '>|'+c+'|<'
+        ">|\n"+c+"\n|<"
       end
     end
 
@@ -71,7 +69,7 @@ module HParser
       include Hatena
       alias_method :hatena_content,:content
       def hatena_filter c
-        '>||'+c+'||<'
+        ">||\n"+c+"\n||<"
       end
     end
 

data/lib/hparser/inline/text.rb

@@ -14,7 +14,7 @@ module HParser
       end
 
       def self.parse(scanner)
-        if scanner.scan(%r!<a.*</a>!) or scanner.scan(/./)
+        if scanner.scan(%r!<a.*</a>!) or scanner.scan(/./m)
           Text.new(scanner.matched)
         end
       end

data/test/test_hatena.rb

@@ -22,17 +22,17 @@ class HatenaTest < Test::Unit::TestCase
   end
 
   def test_empty
-    assert_hatena "",Empty.new
+    assert_equal "",Empty.new.to_hatena
   end
 
   def test_pre
-    assert_hatena '>|foobar|<',Pre.new([Text.new('foobar')])
-    assert_hatena '>||foobar||<',SuperPre.new('foobar')
-    assert_hatena ">|foobar\nbar|<",Pre.new([Text.new("foobar\nbar")])
+    assert_hatena ">|\nfoobar\n|<",Pre.new([Text.new('foobar')])
+    assert_hatena ">||\nfoobar\n||<",SuperPre.new('foobar')
+    assert_hatena ">|\nfoobar\nbar\n|<",Pre.new([Text.new("foobar\nbar")])
   end
 
   def test_quote
-    assert_hatena '>>foobar<<',Quote.new([Text.new('foobar')])
+    assert_hatena ">>\nfoobar\n<<",Quote.new([Text.new('foobar')])
   end
 
   def test_table

data/test/test_inline.rb

@@ -16,5 +16,6 @@ class InlineTest < Test::Unit::TestCase
 
   def test_text
     assert_equal [Text.new("foo is bar")],parse("foo is bar")
+    assert_equal [Text.new("foo\nbar")],parse("foo\nbar")
   end
 end

data/test/test_pair.rb

@@ -8,7 +8,7 @@ class QuoteTest < Test::Unit::TestCase
   include HParser::Inline
 
   def setup
-    @parser = HParser::Parser.new [SuperPre,Pre,Quote]
+    @parser = HParser::Parser.new [SuperPre,Pre,Quote,P]
   end
 
   def parse str
@@ -16,8 +16,15 @@ class QuoteTest < Test::Unit::TestCase
   end
 
   def assert_pair(from,to,klass)
-    assert_equal [klass.new([Text.new("aaa")])], parse("#{from}aaa#{to}")
+    assert_equal [P.new([Text.new("#{from}aaa#{to}")])], parse("#{from}aaa#{to}")
     assert_equal [klass.new([Text.new("aaa")])], parse("#{from}\naaa\n#{to}")
+    assert_equal [klass.new([Text.new("aaa\n\nbbb")])],parse(<<-"END")
+#{from}
+aaa
+
+bbb
+#{to}
+    END
   end
 
   def test_quote

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: hparser
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-08-05 00:00:00 +09:00
+  version: 0.2.1
+date: 2006-08-09 00:00:00 +09:00
 summary: Hatena Format Parser
 require_paths: 
 - lib