hparser 0.2.2 → 0.3.0

data/lib/hparser/block/dl.rb

@@ -0,0 +1,45 @@
+# Author:: MIZUNO Hiroki (hiroki1124@gmail.com)
+# Copyright:: Copyright (c) 2006 MIZUNO Hiroki
+# License::   Distributes under the same terms as Ruby
+
+require 'hparser/block/collectable'
+module HParser
+  module Block
+    class Dl
+      include Collectable
+      class Item
+        attr_reader :title,:description
+        def initialize(title,description)
+          @title = title
+          @description = description
+        end
+
+        def ==(o)
+          self.class == o.class and 
+            self.title == o.title and
+            self.description == o.description
+        end
+      end
+
+      def self.parse(scanner,inlines)
+        items = []
+        while scanner.scan(/\A:/)
+          i = scanner.matched.index(':',1)
+          title = inlines.parse scanner.matched[1...i]
+          description = inlines.parse scanner.matched[i+1..-1]
+          items.push Item.new(title,description)
+        end
+        items == [] ? nil : self.new(*items)
+      end
+
+      attr_reader :items
+      def initialize(*items)
+        @items = items
+      end
+
+      def ==(o)
+        o.class == self.class and o.items == self.items
+      end
+    end
+  end
+end

data/lib/hparser/html.rb

@@ -92,6 +92,26 @@ module HParser
       end
     end
 
+    class Dl
+      include Html
+
+      class Item
+        def to_html
+          dt = self.title.map{|x| x.to_html}.join
+          dd = self.description.map{|x| x.to_html}.join
+          "<dt>#{dt}</dt><dd>#{dd}</dd>"
+        end
+      end
+
+      def html_tag() 
+        'dl' 
+      end
+
+      def html_content
+        @items
+      end
+    end
+
     class TableHeader
       include Html
       private

data/lib/hparser/text.rb

@@ -84,6 +84,23 @@ module HParser
       end
     end
 
+    class Dl
+      class Item
+        def to_text
+          dt = self.title.map{|x| x.to_html}.join
+          dd = self.description.map{|x| x.to_html}.join.split("\n").map{|x|
+            '  '+x
+          }.join("\n")
+          "#{dt}\n#{dd}"
+        end
+      end
+
+      def to_text
+        @items.map{|x| x.to_text}.join("\n")
+      end
+    end
+
+
     class OrderList
       def to_text
         i = 0

data/test/test_dl.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'hparser/parser'
+require 'hparser/block/dl'
+
+class DlTest < Test::Unit::TestCase
+  include HParser::Block
+  include HParser::Inline
+
+  def setup
+    @parser = HParser::Parser.new [Dl]
+  end
+
+  def parse str
+    @parser.parse str
+  end
+
+  def test_dl
+    first = Dl::Item.new([Text.new('foo')],[Text.new('foo is ...')])
+    second = Dl::Item.new([Text.new('bar')],[Text.new('bar is ...')])
+    assert_equal [Dl.new(first,second)],
+                  parse(<<-END)
+:foo:foo is ...
+:bar:bar is ...
+                  END
+  end
+end

data/test/test_html.rb

@@ -7,8 +7,9 @@ class HtmlTest < Test::Unit::TestCase
   include HParser::Block
   include HParser::Inline
   def setup
-    @parser = HParser::Parser.new
+#    @parser = HParser::Parser.new
   end
+
   def assert_html expect,node
     assert_equal expect,node.to_html
   end
@@ -44,6 +45,13 @@ class HtmlTest < Test::Unit::TestCase
                                                                     Li.new([Text.new('bbb')]))
   end
 
+  def test_dl
+    expect = '<dl><dt>foo</dt><dd>foo is ...</dd><dt>bar</dt><dd>bar is ...</dd></dl>'
+    first = Dl::Item.new([Text.new('foo')],[Text.new('foo is ...')])
+    second = Dl::Item.new([Text.new('bar')],[Text.new('bar is ...')])
+    assert_html expect,Dl.new(first,second)
+  end
+
   def th str
     Th.new [Text.new(str)]
   end

data/test/test_text.rb

@@ -35,6 +35,18 @@ class TextTest < Test::Unit::TestCase
     assert_text '  foobar',Quote.new([Text.new('foobar')])
   end
 
+  def test_dl
+    expect = <<-END.chomp
+foo
+  foo is ...
+bar
+  bar is ...
+END
+    first = Dl::Item.new([Text.new('foo')],[Text.new('foo is ...')])
+    second = Dl::Item.new([Text.new('bar')],[Text.new('bar is ...')])
+    assert_text expect,Dl.new(first,second)
+  end
+
   def test_table
     assert_text "|foo|bar|\n|baz|xyzzy|",
                 Table.new([th('foo'),th('bar')],

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: hparser
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2006-08-15 00:00:00 +09:00
+  version: 0.3.0
+date: 2006-08-17 00:00:00 +09:00
 summary: Hatena Format Parser
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ authors:
 - MIZUNO Hiroki
 files: 
 - test/test_block.rb
+- test/test_dl.rb
 - test/test_hatena.rb
 - test/test_head.rb
 - test/test_html.rb
@@ -47,6 +48,7 @@ files:
 - lib/hparser/text.rb
 - lib/hparser/block/all.rb
 - lib/hparser/block/collectable.rb
+- lib/hparser/block/dl.rb
 - lib/hparser/block/head.rb
 - lib/hparser/block/list.rb
 - lib/hparser/block/p.rb
@@ -66,6 +68,7 @@ files:
 - README
 test_files: 
 - test/test_block.rb
+- test/test_dl.rb
 - test/test_hatena.rb
 - test/test_head.rb
 - test/test_html.rb