wparser 0.0.2 → 0.1.0

data/Manifest.txt

@@ -6,16 +6,18 @@ Rakefile
 bin/wparser
 lib/wparser.rb
 lib/wparser/block/block.rb
-lib/wparser/block/blocks.rb
+lib/wparser/block/blockquote.rb
 lib/wparser/block/list_nonumber.rb
 lib/wparser/block/list_number.rb
-lib/wparser/break.rb
+lib/wparser/block/pre.rb
+lib/wparser/util/break.rb
 lib/wparser/cli.rb
 lib/wparser/inline/deleted.rb
 lib/wparser/inline/heading.rb
 lib/wparser/inline/http.rb
 lib/wparser/inline/inline.rb
 lib/wparser/inline/italic.rb
+lib/wparser/inline/paragraph.rb
 lib/wparser/inline/strong.rb
 lib/wparser/inline/underLine.rb
 lib/wparser/parser.rb

data/README.rdoc

@@ -1,9 +1,11 @@
 = wparser
 
-* http://github.com/#{github_username}/#{project_name}
+* http://github.com/iori/wparser
 
 == DESCRIPTION:
 
+http://wiki.github.com/iori/wparser/
+
 This package is Wiki Format Parser.
 Wiki => html
 
@@ -12,9 +14,11 @@ Wiki => html
 
 == SYNOPSIS:
 
+http://wiki.github.com/iori/wparser/tutorial
+
 require 'wparser'
 
-parser = WParser.parser.new
+parser = WParser.new
 parser.parse(text)
 
 == REQUIREMENTS:
@@ -23,7 +27,9 @@ parser.parse(text)
 
 == INSTALL:
 
-gem install wparser
+http://wiki.github.com/iori/wparser/setup
+
+$sudo gem install wparser
 
 == LICENSE:
 

data/lib/wparser.rb

@@ -3,10 +3,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 #require File.join(directory, 'wparser', 'Parser')
 require 'wparser/parser'
-module Wparser
-  VERSION = '0.0.2'
+module WParser
+  VERSION = '0.1.0'
 
-  def Wparser.new
+  def WParser.new
     Parser.new
   end
 end

data/lib/wparser/block/block.rb

@@ -1,17 +1,37 @@
-require 'wparser/block/blocks'
+require 'wparser/block/pre'
+require 'wparser/block/blockquote'
 require 'wparser/block/list_number'
 require 'wparser/block/list_nonumber'
 
 module Block
   include Blocks
-  include List_number
-  include List_nonumber
 
   def parse text
-    parse_text = Blocks.parse(text)
-    parse_text = List_number.parse(parse_text)
-    parse_text = List_nonumber.parse(parse_text)
+    @protected_preTag = nil
+    parse_text = text.collect{|line| parse_line line}
   end
 
-  module_function :parse
+  private
+  def parse_line line
+    parse_line = line
+    parse_line = Pre.parse parse_line
+
+    if parse_line =~ /^<pre.*>/
+      @protected_preTag = true
+    elsif parse_line =~ /<\/pre>/
+      @protected_preTag = nil
+    end
+
+    #puts @protected_preTag
+
+    if @protected_preTag == nil
+      parse_line = Blockquote.parse   parse_line
+      parse_line = List_number.parse   parse_line
+      parse_line = List_nonumber.parse parse_line
+    else
+      parse_line
+    end
+  end
+
+  module_function :parse, :parse_line
 end

data/lib/wparser/block/blockquote.rb

@@ -0,0 +1,15 @@
+require 'wparser/parse'
+
+module Blocks
+  class Blockquote < Parse
+    BLOCK_TABLE = {
+      ">>"      => '<blockquote>',
+      "<<"      => '</blockquote>',
+    }
+
+    def self.parse line
+      @result = line.gsub(/(^>>)|(^<<)/){|s| BLOCK_TABLE[s]}
+      super
+    end 
+  end
+end

data/lib/wparser/block/list_nonumber.rb

@@ -1,22 +1,19 @@
-module List_nonumber
-  def parse text
-    start_ul_rex = %r! 
-      ^\s*$\n        # 空行 => \n<ul>\n
-      ^\*\s(\w*)\n   # * list_start => <li>list_start</li>\n
-    !x
-    parse_text = text.gsub(start_ul_rex){|s| "\n<ul>\n<li>#$1</li>\n"}
+require 'wparser/parser'
 
-    end_ul_rex = %r! 
-      ^\*\s(\w*)\n # * list_end => <li>list_end</li>\n
-      ^\s*$\n      # 空行 => </ul>\n\n
-    !x
-    parse_text = parse_text.gsub(end_ul_rex){|s| "<li>#$1</li>\n</ul>\n\n"}
-
-    # * list => <li>list</li>
-    parse_text = parse_text.gsub(/^\*\s(\w*)\n/){|s| "<li>#$1</li>\n"}
-    return text if parse_text == nil
-    parse_text
-  end 
-
-  module_function :parse
+module Blocks
+  class List_nonumber < Parse
+    def self.parse line
+      rex = /^\*\s*(\w*)/
+      @result = if line =~ rex and @list_flag == nil
+                  @list_flag = true
+                  line.sub(rex, "<ul>\n<li>#$1</li>")
+                elsif line =~ rex
+                  line.sub(rex, "<li>#$1</li>")
+                elsif line !~ rex and @list_flag == true
+                  @list_flag = nil
+                  "</ul>#{line}\n"
+                end
+      super
+    end 
+  end
 end

data/lib/wparser/block/list_number.rb

@@ -1,22 +1,20 @@
-module List_number
-  def parse text
-    start_ul_rex = %r! 
-      ^\s*$\n         # 空行 => \n<ul>\n
-      ^\#\s(\w*)\n    # # list_start => <li>list_start</li>\n
-    !x
-    parse_text = text.gsub(start_ul_rex){|s| "\n<ol>\n<li>#$1</li>\n"}
+require 'wparser/parse'
 
-    end_ul_rex = %r! 
-      ^\#\s(\w*)\n  # # list_end => <li>list_end</li>\n
-      ^\s*$\n       # 空行 => </ol>\n\n
-    !x
-    parse_text = parse_text.gsub(end_ul_rex){|s| "<li>#$1</li>\n</ol>\n\n"}
+module Blocks
+  class List_number < Parse
+    def self.parse line
+      rex = /^\#\s*(\w*)/
+        @result = if line =~ rex and @list_flag == nil 
+                    @list_flag = true
+                    line.sub(rex, "<ol>\n<li>#$1</li>")
+                  elsif line =~ rex 
+                    line.sub(rex, "<li>#$1</li>")
+                  elsif line !~ rex and @list_flag == true
+                    @list_flag = nil 
+                    "</ol>#{line}\n"
+                  end 
+      super
 
-    # * list => <li>list</li>
-    parse_text = parse_text.gsub(/^\#\s(\w*)\n/){|s| "<li>#$1</li>\n"}
-    return text if parse_text == nil
-    parse_text
-  end 
-
-  module_function :parse
+    end 
+  end
 end

data/lib/wparser/block/pre.rb

@@ -0,0 +1,23 @@
+require 'wparser/parse'
+
+module Blocks
+  class Pre < Parse
+    BLOCK_TABLE = {
+      ">||"     => '<pre>',
+      "||<"     => '</pre>',
+      ">|code|" => '<pre class="prettyprint">',
+      "|code|<" => '</pre>'
+    }
+
+    def self.parse line
+      block_rex = %r! 
+        (^>\|\|)|(^\|\|<)           # pre
+        |
+        (^\>\|code\|)|(^\|code\|\<) # google-code-prettify
+      !x
+
+      @result = line.gsub(block_rex){|s| BLOCK_TABLE[s]}
+      super
+    end 
+  end
+end

data/lib/wparser/inline/deleted.rb

@@ -1,9 +1,13 @@
-module Deleted
-  def parse line
-    parse_line = line.sub(/-\b(\w*)\b-/){|s| "<S>#$1</S>"}
-    return line if parse_line == nil
-    parse_line
-  end
+require 'wparser/parse'
 
-  module_function :parse
+module Inlines
+  class Deleted < Parse
+    def self.parse line
+      @result = line.gsub!(/(?:(?!\\-)(^|.)-)(.+?)(?:(?!\\-)(.)-)/){|s|
+        "#$1<S>#$2#$3</S>"
+      }
+      @result = line.gsub!(/\\-/, '-')
+      super
+    end
+  end
 end

data/lib/wparser/inline/heading.rb

@@ -1,9 +1,10 @@
-module Heading
-  def parse line
-    parse_line = line.sub(/^h([1-6])\.\s(.*)\n/){|s| "<h#$1>#$2</h#$1>\n" }
-    return line if parse_line == nil
-    parse_line
-  end
+require 'wparser/parse'
 
-  module_function :parse
+module Inlines
+  class Heading < Parse
+    def self.parse line
+      @result = line.sub(/^h([1-6])\.\s(.*)\n/){|s| "<h#$1>#$2</h#$1>\n"}
+      super
+    end
+  end
 end

data/lib/wparser/inline/http.rb

@@ -1,19 +1,21 @@
-module Http
-  # (?<![.,?\!]) 1.8.7では後読みが出来ない、どーするか。
-  def parse text
-    url_rex = %r! 
-      \b
-      (
-        http:// [-a-z0-9]+(\.[-a-z0-9]+)*\.(com|edu|info|net) \b 
+require 'wparser/parse'
+
+module Inlines
+  class Http < Parse
+    # (?<![.,?\!]) 1.8.7では後読みが出来ない、どーするか。
+    def self.parse text
+      url_rex = %r! 
+        \b
         (
-          / [-a-z0-9_:\@&?=+,.\!/~*'%\$]*[^.,?\!]
-        )?
-      )
-    !x
-    parse_text = text.gsub(url_rex){|s| "<a href=\"#$1\">#$1</a>"}
-    return text if parse_text == nil
-    parse_text
-  end 
+          http:// [-a-z0-9]+(\.[-a-z0-9]+)*\.(com|edu|info|net) \b 
+          (
+            / [-a-z0-9_:\@&?=+,.\!/~*'%\$]*[^.,?\!]
+          )?
+        )
+      !x
 
-  module_function :parse
+    @result = text.gsub(url_rex){|s| "<a href=\"#$1\">#$1</a>"}
+    super
+    end 
+  end
 end

data/lib/wparser/inline/inline.rb

@@ -4,31 +4,39 @@ require 'wparser/inline/italic'
 require 'wparser/inline/underLine'
 require 'wparser/inline/deleted'
 require 'wparser/inline/http'
+require 'wparser/inline/paragraph'
 
 module Inline
-  include Heading
-  include Strong
-  include Italic
-  include UnderLine
-  include Deleted
-  include Http
+  include Inlines
 
   def parse text
-    parse_text = ""
+    @protected_preTag = nil
+    parse_lines = text.collect {|line| parse_line line}
 
-    text.each do |line|
-      parse_line = Heading.parse(line)
-      parse_line = Strong.parse(parse_line)
-      parse_line = Italic.parse(parse_line)
-      parse_line = UnderLine.parse(parse_line)
-      parse_line = Deleted.parse(parse_line)
+    Http.parse parse_lines.to_s
+  end
 
-      parse_text << parse_line
+  private
+  # １行ずつ処理したいメソッド郡
+  def parse_line line
+    if line =~ /^<pre.*>/
+      @protected_preTag = true
+    elsif line =~ /<\/pre>/
+      @protected_preTag = nil
     end
 
-    parse_text = Http.parse(parse_text)
-    parse_text
+    parse_line = line
+    if @protected_preTag == nil
+      parse_line = Heading.parse   parse_line
+      parse_line = Strong.parse    parse_line
+      parse_line = Italic.parse    parse_line
+      parse_line = UnderLine.parse parse_line
+      parse_line = Deleted.parse   parse_line
+      parse_line = Paragraph.parse   parse_line
+    else
+      parse_line
+    end
   end
 
-  module_function :parse
+  module_function :parse, :parse_line
 end

data/lib/wparser/inline/italic.rb

@@ -1,9 +1,13 @@
-module Italic
-  def parse line
-    parse_line = line.sub(/\b_(\w*)_\b/){|s| "<I>#$1</I>"}
-    return line if parse_line == nil
-    parse_line
-  end
+require 'wparser/parse'
 
-  module_function :parse
+module Inlines
+  class Italic < Parse
+    def self.parse line
+      @result = line.gsub!(/(?:(?!\\_)(^|.)_)(.+?)(?:(?!\\_)(.)_)/){|s|
+        "#$1<I>#$2#$3</I>"
+      }
+      @result = line.gsub!(/\\_/, '_')
+      super
+    end
+  end
 end

data/lib/wparser/inline/paragraph.rb

@@ -0,0 +1,27 @@
+require 'wparser/parse'
+
+module Inline
+  class Paragraph < Parse
+    def self.parse line
+      rex = %r!
+      ^((<(\/?pre.*|\/?h\d|\/?p|\/?ol|\/?ul|\/?li|\/?blockquote)>)
+        |
+          (\s?\n))
+      !x
+      @result = if @p_flag == nil
+                  if line !~ rex and @pre_flag == nil
+                    @p_flag = true
+                    "<p>\n" + line.sub(/\n/, "<br />\n")
+                  end
+                else # <p>と</>の間にいます。
+                  if line =~ rex # 段落の終了点
+                    @p_flag = nil
+                    "</p>\n" + line
+                  else
+                    line.sub(/\n/, "<br />\n")
+                  end
+                end
+      super
+    end
+  end
+end

data/lib/wparser/inline/strong.rb

@@ -1,9 +1,13 @@
-module Strong
-  def parse line
-    parse_line = line.sub(/\*\b(\w*)\b\*/){|s| "<strong>#$1</strong>"}
-    return line if parse_line == nil
-    parse_line
-  end
+require 'wparser/parse'
 
-  module_function :parse
+module Inlines
+  class Strong < Parse
+    def self.parse line
+      @result = line.gsub!(/(?:(?!\\\*)(^|.)\*)(.+?)(?:(?!\\\*)(.)\*)/){|s|
+        "#$1<strong>#$2#$3</strong>"
+      }
+      @result = line.gsub!(/\\\*/, '*')
+      super
+    end
+  end
 end

data/lib/wparser/inline/underLine.rb

@@ -1,9 +1,13 @@
-module UnderLine
-  def parse line
-    parse_line = line.sub(/\+\b(\w*)\b\+/){|s| "<U>#$1</U>"}
-    return line if parse_line == nil
-    parse_line
-  end
+require 'wparser/parse'
 
-  module_function :parse
+module Inlines
+  class UnderLine < Parse
+    def self.parse line
+      @result = line.gsub!(/(?:(?!\\\+)(^|.)\+)(.+?)(?:(?!\\\+)(.)\+)/){|s|
+        "#$1<U>#$2#$3</U>"
+      }
+      @result = line.gsub!(/\\\+/, '+')
+      super
+    end
+  end
 end

data/lib/wparser/parser.rb

@@ -1,14 +1,18 @@
-require 'wparser/break'
+require 'wparser/util/break'
 require 'wparser/inline/inline'
 require 'wparser/block/block'
 
 class Parser
   def parse text
-    text = Break.parse(text)
-    text = Inline.parse(text)
-    text = Block.parse(text)
+    parse_all text
+  end
+
+  private
+  def parse_all text
+    parse_text = text
 
-    #html = text.to_html
-    text
+    parse_text = Break.parse  parse_text
+    parse_text = Block.parse  parse_text
+    parse_text = Inline.parse parse_text # <p>の為にblockよりも後に！
   end
 end

data/lib/wparser/util/break.rb

@@ -0,0 +1,8 @@
+require 'wparser/parse'
+
+class Break < Parse
+  def self.parse text
+    @result = text.gsub(/\r\n/, "\n").gsub(/\r/, "\n")
+    super
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - iori
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +09:00
+date: 2010-08-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,8 @@ dependencies:
   type: :development
   version_requirements: *id002
 description: |-
+  http://wiki.github.com/iori/wparser/
+  
   This package is Wiki Format Parser.
   Wiki => html
 email: 
@@ -72,16 +74,18 @@ files:
 - bin/wparser
 - lib/wparser.rb
 - lib/wparser/block/block.rb
-- lib/wparser/block/blocks.rb
+- lib/wparser/block/blockquote.rb
 - lib/wparser/block/list_nonumber.rb
 - lib/wparser/block/list_number.rb
-- lib/wparser/break.rb
+- lib/wparser/block/pre.rb
+- lib/wparser/util/break.rb
 - lib/wparser/cli.rb
 - lib/wparser/inline/deleted.rb
 - lib/wparser/inline/heading.rb
 - lib/wparser/inline/http.rb
 - lib/wparser/inline/inline.rb
 - lib/wparser/inline/italic.rb
+- lib/wparser/inline/paragraph.rb
 - lib/wparser/inline/strong.rb
 - lib/wparser/inline/underLine.rb
 - lib/wparser/parser.rb
@@ -95,7 +99,7 @@ files:
 - spec/wparser_spec.rb
 - tasks/rspec.rake
 has_rdoc: true
-homepage: http://github.com/#{github_username}/#{project_name}
+homepage: http://github.com/iori/wparser
 licenses: []
 
 post_install_message: PostInstall.txt
@@ -128,6 +132,6 @@ rubyforge_project: wparser
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: This package is Wiki Format Parser
+summary: http://wiki.github.com/iori/wparser/  This package is Wiki Format Parser
 test_files: []
 

data/lib/wparser/block/blocks.rb

@@ -1,26 +0,0 @@
-module Blocks
-  BLOCK_TABLE = {
-    ">>"      => '<blockquote>',
-    "<<"      => '</blockquote>',
-    ">||"     => '<pre>',
-    "||<"     => '</pre>',
-    ">|code|" => '<pre class="prettyprint">',
-    "|code|<" => '</pre>'
-  }
-
-  def parse text
-    block_rex = %r! 
-      (^>>)|(^<<)                 # blockquote
-      |
-      (^>\|\|)|(^\|\|<)           # pre
-      |
-      (^\>\|code\|)|(^\|code\|\<) # google-code-prettify
-    !x
-
-    parse_text = text.gsub(block_rex){|s| BLOCK_TABLE[s]}
-    return text if parse_text == nil
-    parse_text
-  end 
-
-  module_function :parse
-end

data/lib/wparser/break.rb

@@ -1,10 +0,0 @@
-module Break
-  def parse text
-    parse_text = text.gsub(/\r/, "\n").gsub(/\r\n/, "\n")
-
-    return text if parse_text ==nil
-    parse_text
-  end
-
-  module_function :parse
-end