hparser 0.1.1 → 0.2.0

data/lib/hparser/block/pair.rb

@@ -16,23 +16,32 @@ module HParser
     # In short,some format is different in begining/ending string.
     # So this class have basic structure for that format.
     class Pair
-      # make parser by begin/end-ing string
-      def self.spliter(from,to)
+      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(/./)
+          end
+          content += "\n"+scanner.matched[0...-to.length]
+          return content.strip
+        end
+        return nil
+      end
 
+      # make parser by begin/end-ing string
+      def self.spliter(from,to)
         module_eval <<-"END"
         def self.parse(scanner,inlines)
-          if scanner.scan(/\\A#{from_q}(.*)#{to_q}\\Z/) then
-            content = scanner.matched
-            self.new inlines.parse(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(/./)
-            end
-            content += "\n"+scanner.matched[0...-#{to.length}]
-            self.new inlines.parse(content.strip)
+          content = get(scanner,"#{from}","#{to}")
+          if content then
+            self.new inlines.parse(content)
+          else
+            nil
           end
         end
         END

data/lib/hparser/block/super_pre.rb

@@ -5,7 +5,13 @@ module HParser
     # Super pre parser.
     class SuperPre < Pair
       include Collectable
-      spliter '>||','||<'
+
+      def self.parse scanner,inlines
+        content = get scanner,'>||','||<'
+        if content then
+          SuperPre.new content
+        end
+      end
 
       def self.<=>(o)
         -1

data/lib/hparser/hatena.rb

@@ -0,0 +1,138 @@
+# Author:: MIZUNO Hiroki (hiroki1124@gmail.com)
+# Copyright:: Copyright (c) 2006 MIZUNO Hiroki
+# License::   Distributes under the same terms as Ruby
+
+module HParser
+  # This module provide +to_hatena+ method.
+  # This method is intended to convert  hatena format node to hatena format.
+  #
+  # For example:
+  #  Hatena::Parser.parse('*foo').to_html # -> *foo
+  #  Hatena::Parser.parse('>|bar|<').to_html # -> >|bar|<
+  #
+  # Please see also HParser::Text
+  module Hatena
+    def to_hatena
+      content = hatena_content
+      if content.class == Array then
+        content = content.map{|x| x.to_hatena}.join
+      end
+      if self.respond_to? :hatena_filter,true
+        content = hatena_filter content
+      end
+      content+"\n"
+    end
+  end
+
+  module Block
+    class P
+      include Hatena
+      private
+      alias_method :hatena_content,:content
+    end
+
+    class Empty
+      include Hatena
+      private
+      def hatena_content
+        ""
+      end
+    end
+
+    class Head
+      include Hatena
+      private
+      def hatena_content
+        self.content
+      end
+
+      def hatena_filter content
+        '*'*self.level + content 
+      end
+    end
+
+    class Quote
+      include Hatena
+      alias_method :hatena_content,:content
+      def hatena_filter c
+        '>>'+c+'<<'
+      end
+    end
+
+    class Pre
+      include Hatena
+      alias_method :hatena_content,:content
+      def hatena_filter c
+        '>|'+c+'|<'
+      end
+    end
+
+    class SuperPre
+      include Hatena
+      alias_method :hatena_content,:content
+      def hatena_filter c
+        '>||'+c+'||<'
+      end
+    end
+
+    class Table
+      def to_hatena
+        map_row{|row|
+          '|'+ row.map{|cell| cell.to_hatena.chomp}.join('|')+'|'
+        }.join("\n")+"\n"
+      end
+    end
+
+    class TableHeader
+      include Hatena
+      alias_method :hatena_content,:content
+      def hatena_filter c
+        '*'+c
+      end
+    end
+
+    class TableCell
+      include Hatena
+      alias_method :hatena_content,:content
+    end
+
+    class UnorderList
+      def to_hatena(level=0,label=nil)
+        @items.map{|li| li.to_hatena(level+1,'-').chomp}.join("\n")+"\n"
+      end
+    end
+
+    class OrderList
+      def to_hatena(level=0,label=nil)
+        @items.map{|li| 
+          li.to_hatena(level+1,'+').chomp
+        }.join("\n")+"\n"
+      end
+    end
+
+    class ListItem
+      include Hatena
+      alias_method :hatena_content,:content
+      alias_method :_to_hatena_,:to_hatena
+      def to_hatena(level,label)
+        label*level + _to_hatena_
+      end
+    end
+  end
+
+  module Inline
+    class Text
+      alias_method :to_hatena,:text
+    end
+
+    class Url
+      alias_method :to_hatena,:url
+    end
+
+    class HatenaId
+      def to_hatena
+        "id:#{self.name}"
+      end
+    end
+  end
+end

data/lib/hparser/html.rb

@@ -87,12 +87,25 @@ module HParser
     class Table
       def to_html
         '<table>'+self.map_row{|tr|
-          '<tr>'+tr.map{|cell| tag = cell.class == Th ? 'th' : 'td'
-            "<#{tag}>#{cell.content.map{|x| x.to_html}.join}</#{tag}>"}.join+'</tr>'
+          '<tr>'+tr.map{|cell| cell.to_html }.join + '</tr>'
         }.join+'</table>'
       end
     end
 
+    class TableHeader
+      include Html
+      private
+      def html_tag() 'th' end
+      alias_method :html_content,:content
+    end
+
+    class TableCell
+      include Html
+      private
+      alias_method :html_content,:content
+      def html_tag() 'td' end
+    end
+
     class UnorderList
       include Html
       private

data/lib/hparser/text.rb

@@ -0,0 +1,120 @@
+# Author:: MIZUNO Hiroki (hiroki1124@gmail.com)
+# Copyright:: Copyright (c) 2006 MIZUNO Hiroki
+# License::   Distributes under the same terms as Ruby
+
+module HParser
+  # This module provide +to_text+ method.
+  # This method is intended to convert  hatena format to text.
+  #
+  # For example:
+  #  Hatena::Parser.parse('*foo').to_html # -> foo
+  #  Hatena::Parser.parse('>|bar|<').to_html # -> bar
+  #
+  # Please see also HParser::Hatena
+  module Text
+    def to_text
+      content = text_content
+      if content.class == Array then
+        content = content.map{|x| x.to_text}.join
+      end
+      content
+    end
+  end
+
+  module Block
+    class Head
+      include Text
+      alias_method :text_content,:content
+    end
+
+    class P
+      include Text
+      alias_method :text_content,:content
+    end
+
+    class Empty
+      include Text
+      def text_content
+        "\n"
+      end
+    end
+
+    module Indent
+      include Text
+      def text_content
+        self.content
+      end
+      alias_method :_to_text_,:to_text
+      def to_text
+        self._to_text_.split("\n").map{|line| '  '+line}.join("\n")
+      end
+    end
+
+    class Pre
+      include Indent
+    end
+    class SuperPre
+      include Indent
+    end
+    class Quote
+      include Indent
+    end
+
+    class Table
+      def to_text
+        map_row do |tr|
+          '|'+tr.map{|cell| cell.to_text}.join('|')+'|'
+        end.join("\n")
+      end
+    end
+
+    class TableHeader
+      include Text
+      alias_method :text_content,:content
+    end
+
+    class TableCell
+      include Text
+      alias_method :text_content,:content
+    end
+
+    class UnorderList
+      def to_text
+        @items.map{|li| '-'+li.to_text}.join("\n")
+      end
+    end
+
+    class OrderList
+      def to_text
+        i = 0
+        @items.map{|li| 
+          i += 1
+          "#{i}." +li.to_text 
+        }.join("\n")
+      end
+    end
+
+    class ListItem
+      include Text
+      def text_content
+        [HParser::Inline::Text.new(' '),self.content].flatten
+      end
+    end
+  end
+
+  module Inline
+    class Text
+      alias_method :to_text,:text
+    end
+
+    class Url
+      alias_method :to_text,:url
+    end
+
+    class HatenaId
+      def to_text
+        "id:#{self.name}"
+      end
+    end
+  end
+end

data/test/test_block.rb

@@ -61,7 +61,6 @@ END
   end
 
   def test_spre
-    p HParser::Parser.default_parser
     assert_equal [SuperPre.new('a')],parse(<<-END)
 >||
 a

data/test/test_hatena.rb

@@ -0,0 +1,60 @@
+require 'test/unit'
+require 'hparser'
+require 'hparser/hatena'
+
+class HatenaTest < Test::Unit::TestCase
+  include HParser::Block
+  include HParser::Inline
+  def setup
+    @parser = HParser::Parser.new
+  end
+
+  def assert_hatena expect,node
+    assert_equal expect+"\n",node.to_hatena
+  end
+
+  def test_head
+    assert_hatena "*foo",Head.new(1,[Text.new('foo')])
+  end
+
+  def test_p
+    assert_hatena "foobar",P.new([Text.new('foobar')])
+  end
+
+  def test_empty
+    assert_hatena "",Empty.new
+  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")])
+  end
+
+  def test_quote
+    assert_hatena '>>foobar<<',Quote.new([Text.new('foobar')])
+  end
+
+  def test_table
+    assert_hatena "|*foo|*bar|\n|baz|xyzzy|",
+                Table.new([th('foo'),th('bar')],
+                          [td('baz') ,td('xyzzy')])
+  end
+
+  def test_list
+    assert_hatena "-aaa\n-bbb",Ul.new(Li.new([Text.new('aaa')]),Li.new([Text.new('bbb')]))
+    assert_hatena "+aaa\n+bbb",Ol.new(Li.new([Text.new('aaa')]),Li.new([Text.new('bbb')]))
+    assert_hatena "+aaa\n--bbb",Ol.new(Li.new([Text.new('aaa')]),
+                                       Ul.new(Li.new([Text.new('bbb')])))
+    assert_hatena "-aaa\n--bbb",Ul.new(Li.new([Text.new('aaa')]),
+                                       Ul.new(Li.new([Text.new('bbb')])))
+  end
+
+  def th str
+    Th.new [Text.new(str)]
+  end
+
+  def td str
+    Td.new [Text.new(str)]
+  end
+end

data/test/test_pair.rb

@@ -27,8 +27,4 @@ class QuoteTest < Test::Unit::TestCase
   def test_pre
     assert_pair ">|","|<",Pre
   end
-  
-  def test_spre
-    assert_pair ">||","||<",SuperPre
-  end  
 end

data/test/test_text.rb

@@ -0,0 +1,60 @@
+require 'test/unit'
+require 'hparser'
+require 'hparser/text'
+
+class TextTest < Test::Unit::TestCase
+  include HParser::Block
+  include HParser::Inline
+  def setup
+    @parser = HParser::Parser.new
+  end
+
+  def assert_text expect,node
+    assert_equal expect,node.to_text
+  end
+
+  def test_head
+    assert_text 'foo',Head.new(1,[Text.new('foo')])
+  end
+
+  def test_p
+    assert_text 'foobar',P.new([Text.new('foobar')])
+  end
+
+  def test_empty
+    assert_text "\n",Empty.new
+  end
+
+  def test_pre
+    assert_text '  foobar',Pre.new([Text.new('foobar')])
+    assert_text '  foobar',SuperPre.new('foobar')
+    assert_text "  foobar\n  bar",Pre.new([Text.new("foobar\nbar")])
+  end
+
+  def test_quote
+    assert_text '  foobar',Quote.new([Text.new('foobar')])
+  end
+
+  def test_table
+    assert_text "|foo|bar|\n|baz|xyzzy|",
+                Table.new([th('foo'),th('bar')],
+                          [td('baz') ,td('xyzzy')])
+  end
+
+  def test_list
+    assert_text "- aaa\n- bbb",Ul.new(Li.new([Text.new('aaa')]),Li.new([Text.new('bbb')]))
+    assert_text "1. aaa\n2. bbb",Ol.new(Li.new([Text.new('aaa')]),Li.new([Text.new('bbb')]))
+    assert_text "1.- aaa\n2. bbb",Ol.new(Ul.new(Li.new([Text.new('aaa')])),
+                                           Li.new([Text.new('bbb')]))
+    assert_text "-- aaa\n- bbb",Ul.new(Ul.new(Li.new([Text.new('aaa')])),
+                                       Li.new([Text.new('bbb')]))
+  end
+
+  def th str
+    Th.new [Text.new(str)]
+  end
+
+  def td str
+    Td.new [Text.new(str)]
+  end
+end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: hparser
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 date: 2006-08-05 00:00:00 +09:00
 summary: Hatena Format Parser
 require_paths: 
@@ -29,6 +29,7 @@ authors:
 - MIZUNO Hiroki
 files: 
 - test/test_block.rb
+- test/test_hatena.rb
 - test/test_head.rb
 - test/test_html.rb
 - test/test_id.rb
@@ -37,10 +38,13 @@ files:
 - test/test_p.rb
 - test/test_pair.rb
 - test/test_table.rb
+- test/test_text.rb
 - test/test_url.rb
 - lib/hparser.rb
+- lib/hparser/hatena.rb
 - lib/hparser/html.rb
 - lib/hparser/parser.rb
+- lib/hparser/text.rb
 - lib/hparser/block/all.rb
 - lib/hparser/block/collectable.rb
 - lib/hparser/block/head.rb
@@ -62,6 +66,7 @@ files:
 - README
 test_files: 
 - test/test_block.rb
+- test/test_hatena.rb
 - test/test_head.rb
 - test/test_html.rb
 - test/test_id.rb
@@ -70,6 +75,7 @@ test_files:
 - test/test_p.rb
 - test/test_pair.rb
 - test/test_table.rb
+- test/test_text.rb
 - test/test_url.rb
 rdoc_options: 
 - --main