bluefeather 0.30 → 0.31

data/doc/en/index.bfdoc

@@ -10,7 +10,7 @@ BlueFeather Manual
 
 -> [Japanese version (original)](../index.html)
 
-(2009-08-01: this document based on version 0.30)
+(2009-09-26: this document based on version 0.31)
 
  BlueFeather is software for converting text written by extended Markdown like 
 [PHP Markdown Extra][] to html. It is pair of command-line tool and pure Ruby

data/doc/en/index.html

@@ -12,7 +12,7 @@
 
 <p>-> <a href="../index.html">Japanese version (original)</a></p>
 
-<p>(2009-08-01: this document based on version 0.30)</p>
+<p>(2009-09-26: this document based on version 0.31)</p>
 
 <p>BlueFeather is software for converting text written by extended Markdown like 
 <a href="http://michelf.com/projects/php-markdown/extra/">PHP Markdown Extra</a> to html. It is pair of command-line tool and pure Ruby

data/doc/index.bfdoc

@@ -9,7 +9,7 @@ BlueFeather マニュアル
 → [English version](en/index.html)
 
 
-（2009-08-01 バージョン 0.30 準拠）
+（2009-09-26 バージョン 0.31 準拠）
 
 BlueFeather は、拡張 Markdown 記法で書かれたテキストを html に変換するソフトウェアです。
 コマンドラインツールと、Ruby スクリプト内で変換を行うためのライブラリがセットになっています。

data/doc/index.html

@@ -13,7 +13,7 @@
 
 <p>→ <a href="en/index.html">English version</a></p>
 
-<p>（2009-08-01 バージョン 0.30 準拠）</p>
+<p>（2009-09-26 バージョン 0.31 準拠）</p>
 
 <p>BlueFeather は、拡張 Markdown 記法で書かれたテキストを html に変換するソフトウェアです。
 コマンドラインツールと、Ruby スクリプト内で変換を行うためのライブラリがセットになっています。</p>

data/lib/bluefeather.rb

@@ -42,9 +42,9 @@ require 'uri'
 
 
 module BlueFeather
-	VERSION = '0.30'
-	VERSION_NUMBER = 0.30
-	RELEASE_DATE = '2009-08-01'
+	VERSION = '0.31'
+	VERSION_NUMBER = 0.31
+	RELEASE_DATE = '2009-09-26'
 	VERSION_LABEL = "#{VERSION} (#{RELEASE_DATE})"
 	
 	UTF8_BOM = "\xef\xbb\xbf"
@@ -1149,7 +1149,6 @@ module BlueFeather
 				@log.debug "  Found list %p" % list
 				bullet = $1
 				list_type = (ListMarkerUl.match(bullet) ? "ul" : "ol")
-				list.gsub!( /\n{2,}/, "\n\n\n" )
 	
 				%{<%s>\n%s</%s>\n} % [
 					list_type,
@@ -1158,16 +1157,15 @@ module BlueFeather
 				]
 			}
 		end
-	
-	
+		
 		# Pattern for transforming list items
 		ListItemRegexp = %r{
 			(\n)?							# leading line = $1
 			(^[ ]*)							# leading whitespace = $2
 			(#{ListMarkerAny}) [ ]+			# list marker = $3
 			((?m:.+?)						# list item text   = $4
-			(\n{1,2}))
-			(?= \n* (\z | \2 (#{ListMarkerAny}) [ ]+))
+			\n)
+			(?= (\n*) (\z | \2 (#{ListMarkerAny}) [ ]+))
 		  }x
 	
 		### Transform list items in a copy of the given +str+ and return it.
@@ -1176,12 +1174,12 @@ module BlueFeather
 	
 			# Trim trailing blank lines
 			str = str.sub( /\n{2,}\z/, "\n" )
-	
 			str.gsub( ListItemRegexp ) {|line|
 				@log.debug "  Found item line %p" % line
 				leading_line, item = $1, $4
+				separating_lines = $5 
 	
-				if leading_line or /\n{2,}/.match( item )
+				if leading_line or /\n{2,}/.match(item) or not separating_lines.empty? then
 					@log.debug "   Found leading line or item has a blank"
 					item = apply_block_transforms( outdent(item), rs )
 				else

data/spec/code-block.rb

@@ -143,3 +143,32 @@ describe 'Fenced Code Block:' do
 	
 
 end
+
+describe "0.30 code block bug in list item:" do
+	before(:each) do
+		@bf = BlueFeather::Parser.new
+		@html = @bf.parse_text(@src)
+		@doc = Hpricot(@html)
+	end
+	
+	before(:all) do
+		@src = <<MARKDOWN
+* example list
+
+	~~~
+	code line a
+	
+	code line b
+	~~~
+MARKDOWN
+	end
+	
+	specify 'overview' do
+		@doc.should have_elements(1, 'ul li pre code')
+	end
+			
+	specify 'body' do
+		@doc.at('pre code').inner_text.should == "code line a\n\ncode line b\n"
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluefeather
 version: !ruby/object:Gem::Version 
-  version: "0.30"
+  version: "0.31"
 platform: ruby
 authors: 
 - Dice
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 +09:00
+date: 2009-09-26 00:00:00 +09:00
 default_executable: 
 dependencies: []