wparser 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,18 @@
+=== 0.1.3 2011-01-02
+Ruby1.9.2 対応
+    
+    block.rb - text.collect => text.each_line.collect
+    1.9でString#collectが無くなった為。
+    
+    inline.rb - Http.parse parse_lines.to_s
+     => Http.parse parse_lines.join
+    1.9と1.8でto_sの挙動が違った為。
+
+httpの適用と修正
+    
+    全てのDomainに対応。
+    パスを表記すると<a>タグがおかしくなるBugFix.
+
 === 0.1.2 2010-08-24
 version0.1.2のリリース 1行のコードの整形
 @と@に囲まれている部分が、以下のようになります。

data/lib/wparser.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 #require File.join(directory, 'wparser', 'Parser')
 require 'wparser/parser'
 module WParser
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   def WParser.new
     Parser.new

data/lib/wparser/block/block.rb

@@ -8,7 +8,7 @@ module Block
 
   def parse text
     @protected_preTag = nil
-    parse_text = text.collect{|line| parse_line line}
+    parse_text = text.each_line.collect{|line| parse_line line}
   end
 
   private

data/lib/wparser/inline/http.rb

@@ -7,10 +7,22 @@ module Inlines
       url_rex = %r! 
         \b
         (
-          http:// [-a-z0-9]+(\.[-a-z0-9]+)*\.(com|edu|info|net) \b 
-          (
+          https?:// [-a-z0-9]+(\.[-a-z0-9]+)*\.(?:com
+                                                |edu
+                                                |biz
+                                                |org
+                                                |gov
+                                                |in(?:t|fo)
+                                                |mil
+                                                |net
+                                                |name
+                                                |museum
+                                                |coop
+                                                |aero
+                                                |[a-z][a-z]) \b 
+          (?:
             / [-a-z0-9_:\@&?=+,.\!/~*'%\$]*[^.,?\!]
-          )?
+          )? \b
         )
       !x
 

data/lib/wparser/inline/inline.rb

@@ -12,9 +12,12 @@ module Inline
 
   def parse text
     @protected_preTag = nil
-    parse_lines = text.collect {|line| parse_line line}
+    
+    parse_lines = text.inject([]) do |r, line|
+      r << parse_line(Http.parse line)
+    end
 
-    Http.parse parse_lines.to_s
+    parse_lines.join
   end
 
   private
@@ -30,11 +33,11 @@ module Inline
     if @protected_preTag == nil
       parse_line = Heading.parse   parse_line
       parse_line = Strong.parse    parse_line
-      parse_line = Code.parse    parse_line
+      parse_line = Code.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
+      parse_line = Paragraph.parse parse_line
     else
       parse_line
     end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ begin
   require 'spec'
 rescue LoadError
   require 'rubygems' unless ENV['NO_RUBYGEMS']
-  gem 'rspec'
+  gem 'spec'
   require 'spec'
 end
 

data/spec/wparser_spec.rb

@@ -1,11 +1,126 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/ruby -Ku
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 # Time to add your specs!
 # http://rspec.info/
-describe "Place your specs here" do
-  
-  it "find this spec in spec directory" do
-    # violated "Be sure to write your specs"
+describe WParser, "Test Method" do
+  before(:all) do
+    @parser = WParser.new
+  end
+
+  it "Heading" do
+    (1..6).each do |n|
+      @parser.parse("h#{n}. Rubyist\n").should == "<h#{n}>Rubyist</h#{n}>\n"
+    end
+  end
+
+  it "Inline" do
+    before_kouyaTakao = <<-EOS
+ぬしの*女房*はんに、\\*わちき\\*、なりたいんざます。
+_来年三月十五日_、年季（ねん）が\\_明ける\\_んざます。
++そのとき+は眉毛-落として-歯に鉄漿（かね）染めて、 ぬしの傍に参りんすよって、お内儀（かみ）さんにしてくんなますか？
+
+    EOS
+
+    after_kouyaTakao = <<-EOS
+<p>
+ぬしの<strong>女房</strong>はんに、*わちき*、なりたいんざます。<br />
+<I>来年三月十五日</I>、年季（ねん）が_明ける_んざます。<br />
+<U>そのとき</U>は眉毛<S>落として</S>歯に鉄漿（かね）染めて、 ぬしの傍に参りんすよって、お内儀（かみ）さんにしてくんなますか？<br />
+</p>
+
+    EOS
+
+    @parser.parse(before_kouyaTakao).should == after_kouyaTakao
+  end
+
+  it "Code" do
+    @parser.parse("@printf \"Hello World!\"@").should == 
+      "<pre><code>printf \"Hello World!\"</code></pre>"
+  end
+
+  it "Pre" do
+    text = <<-EOS
+This *is* _wiki_ +style+ *parser*. _Italic_ +UnderLine+.
+
+# list1
+# list2
+
+* list1
+* list2
+    EOS
+
+    @parser.parse(">||#{text}||<").should == "<pre>#{text}</pre>"
+  end
+
+  it "Pre class=\"prettyprint\"" do
+    text = <<-EOS
+This *is* _wiki_ +style+ *parser*. _Italic_ +UnderLine+.
+
+# list1
+# list2
+
+* list1
+* list2
+    EOS
+
+    @parser.parse(">|code|#{text}|code|<").should == 
+      "<pre class=\"prettyprint\">#{text}</pre>"
+  end
+
+  it "Blockquote" do
+    text = <<-EOS
+>>
+Blockquote
+<<
+    EOS
+    @parser.parse(text).should == <<-EOS
+<blockquote>
+<p>
+Blockquote<br />
+</p>
+</blockquote>
+    EOS
+  end
+
+  it "List\'s" do
+    text = <<-EOS
+# list1
+# list2
+
+* list1
+* list2
+
+    EOS
+
+    @parser.parse(text).should == <<-EOS
+<ol>
+<li>list1</li>
+<li>list2</li>
+</ol>
+
+<ul>
+<li>list1</li>
+<li>list2</li>
+</ul>
+
+    EOS
+  end
+
+  it "http" do
+    domains = %w[com edu biz org gov int info mil net name museum coop aero]
+    domains.each do |domain|
+      @parser.parse("http://www.arnote.#{domain}\n\n").should == <<-EOS
+<p>
+<a href=\"http://www.arnote.#{domain}\">http://www.arnote.#{domain}</a><br />
+</p>\n
+      EOS
+      @parser.parse("https://www.arnote.#{domain}/rspec\n\n").should == <<-EOS
+<p>
+<a href=\"https://www.arnote.#{domain}/rspec\">https://www.arnote.#{domain}/rspec</a><br />
+</p>\n
+      EOS
+    end
   end
-  
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wparser
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - iori
@@ -15,41 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +09:00
+date: 2011-01-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
+        - 8
         - 0
-        - 4
-        version: 2.0.4
+        version: 2.8.0
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
-  version_requirements: *id002
 description: |-
   http://wiki.github.com/iori/wparser/
   
@@ -115,7 +97,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -124,7 +105,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"