bluecloth 2.0.7-x86-mingw32 → 2.0.11pre158-x86-mingw32

data/spec/bluecloth/links_spec.rb

@@ -12,12 +12,10 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -25,8 +23,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "links" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "supports inline links" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/lists_spec.rb

@@ -8,16 +8,15 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 	
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -25,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "lists" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "support unordered lists with asterisk bullets" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/paragraphs_spec.rb

@@ -8,16 +8,15 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 	
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -25,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "document with paragraphs" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "wraps them in P tags" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/titles_spec.rb

@@ -8,16 +8,15 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 	
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -25,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "titles" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	# setext-style h1 -- three characters
 	it "transforms Setext-style level-one headers (three equals) into an H1" do

data/spec/bluecloth_spec.rb

@@ -8,16 +8,15 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 ### Output some debugging if $DEBUG is true
@@ -118,7 +117,7 @@ describe BlueCloth do
 		you might want to prevent.
 		---
 		<p>This is an example
-		[of something](javascript:do_something_bad())
+		[of something](javascript:do<em>something</em>bad())
 		you might want to prevent.</p>
 		---
 	end
@@ -152,7 +151,7 @@ describe BlueCloth do
 
 		it "correctly expands id: links when :pseudoprotocols are enabled" do
 			input = "It was [just as he said](id:foo) it would be."
-			expected = %{<p>It was <a id="foo">just as he said</a> it would be.</p>}
+			expected = %{<p>It was <span id="foo">just as he said</span> it would be.</p>}
 
 			the_markdown( input, :pseudoprotocols => true ).should be_transformed_into( expected )
 		end
@@ -173,30 +172,30 @@ describe BlueCloth do
 
 		it "correctly adds IDs to headers when :header_labels is enabled" do
 			input = %{# A header\n\nSome stuff\n\n## Another header\n\nMore stuff.\n\n}
-			expected = %{<h1 id=\"A+header\">A header</h1>\n\n<p>Some stuff</p>\n\n} +
-			           %{<h2 id=\"Another+header\">Another header</h2>\n\n<p>More stuff.</p>}
+			expected = %{<a name=\"A.header\"></a>\n<h1>A header</h1>\n\n<p>Some stuff</p>\n\n} +
+			           %{<a name=\"Another.header\"></a>\n<h2>Another header</h2>\n\n<p>More stuff.</p>}
 
 			the_markdown( input, :header_labels => true ).should be_transformed_into( expected )
 		end
 
-		it "expands superscripts when :strict_mode is disabled" do
+		it "expands superscripts only when :superscript is enabled" do
 			input = %{It used to be that E = mc^2 used to be the province of physicists.}
 			expected = %{<p>It used to be that E = mc<sup>2</sup> used to be the province} +
 			           %{ of physicists.</p>}
-			strict = %{<p>It used to be that E = mc^2 used to be the province} +
+			disabled = %{<p>It used to be that E = mc^2 used to be the province} +
 			         %{ of physicists.</p>}
 
-			the_markdown( input, :strict_mode => false ).should be_transformed_into( expected )
-			the_markdown( input, :strict_mode => true ).should be_transformed_into( strict )
+			the_markdown( input, :superscript => false ).should be_transformed_into( disabled )
+			the_markdown( input, :superscript => true ).should be_transformed_into( expected )
 		end
 
-		it "uses relaxed emphasis when :strict_mode is disabled" do
+		it "uses relaxed emphasis when :relaxed is enabled" do
 			input = %{If you use size_t instead, you _won't_ have to worry as much about portability.}
-			expected = %{<p>If you use size_t instead, you <em>won't</em> have to worry as much about portability.</p>}
+			relaxed = %{<p>If you use size_t instead, you <em>won't</em> have to worry as much about portability.</p>}
 			strict = %{<p>If you use size<em>t instead, you </em>won't_ have to worry as much about portability.</p>}
 
-			the_markdown( input, :strict_mode => false ).should be_transformed_into( expected )
-			the_markdown( input, :strict_mode => true ).should be_transformed_into( strict )
+			the_markdown( input, :relaxed => true ).should be_transformed_into( relaxed )
+			the_markdown( input, :relaxed => false ).should be_transformed_into( strict )
 		end
 
 	end
@@ -260,7 +259,7 @@ describe BlueCloth do
 	end
 
 
-	describe "encoding under Ruby 1.9.x" do
+	describe "encoding under Ruby 1.9.x", :ruby_19_only => true do
 
 		before( :each ) do
 			pending "only valid under a version of Ruby that has the Encoding class" unless
@@ -268,14 +267,29 @@ describe BlueCloth do
 		end
 
 
-		it "outputs HTML in the same encoding as the source string" do
-			pending "until I can figure out what the right way to do m17n in the C API is" do
-				utf8 = "a string".encode( "UTF-8" )
-				out  = BlueCloth.new( utf8 ).to_html
+		it "outputs HTML in UTF8 if given a UTF8 string" do
+			input = "a ∫‡®îñg".encode( Encoding::UTF_8 )
+			output = BlueCloth.new( input ).to_html
 
-				out.encoding.name.should == 'UTF-8'
-			end
+			output.encoding.should == Encoding::UTF_8
+		end
+
+		it "outputs HTML in KOI8-U if given a KOI8-U string" do
+			input = "Почему Молчишь".encode( Encoding::KOI8_U )
+			output = BlueCloth.new( input ).to_html
+
+			output.should == "<p>\xF0\xCF\xDE\xC5\xCD\xD5 \xED\xCF\xCC\xDE\xC9\xDB\xD8</p>".
+				force_encoding( Encoding::KOI8_U )
 		end
+
+		it "outputs HTML in Shift-JIS if given a Shift-JIS string" do
+			input = "日本語".encode( Encoding::SHIFT_JIS )
+			output = BlueCloth.new( input ).to_html
+
+			output.should == "<p>\x93\xFA\x96{\x8C\xEA</p>".
+				force_encoding( Encoding::SHIFT_JIS )
+		end
+
 	end
 
 end

data/spec/bugfix_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# coding: utf-8
 
 BEGIN {
 	require 'pathname'
@@ -7,17 +8,16 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'rubygems'
-require 'spec'
-require 'bluecloth'
+require 'timeout'
 
+require 'rspec'
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
+require 'bluecloth'
 
 
 #####################################################################
@@ -37,14 +37,14 @@ describe BlueCloth, "bugfixes" do
 
 	### Test to be sure the README file can be transformed.
 	it "can transform the included README file" do
-		readme = @basedir + 'README'
+		readme = @basedir + 'README.md'
 		contents = readme.read
 
 		bcobj = BlueCloth::new( contents )
 
-		lambda do
+		expect {
 			timeout( 2 ) { bcobj.to_html }
-		end.should_not raise_error()
+		}.to_not raise_error()
 	end
 
 
@@ -157,14 +157,94 @@ describe BlueCloth, "bugfixes" do
 		<ul>
 		<li><p>testing</p>
 
-		<pre><code>pre
+		<pre><code>  pre
 		</code></pre>
 
-		<p>more li</p></li>
+		<p>  more li</p></li>
 		</ul>
 		END_HTML
 	end
 
+	it "renders heading with trailing spaces correctly (#67)" do
+		the_indented_markdown( <<-"END_MARKDOWN" ).should be_transformed_into(<<-"END_HTML").without_indentation
+		The Ant-Sugar Tales 
+		=================== 
+
+		By Candice Yellowflower
+
+		Use of Metaphor 
+		--------------- 
+
+		The author's splendid...
+		END_MARKDOWN
+		<h1>The Ant-Sugar Tales </h1>
+
+		<p>By Candice Yellowflower</p>
+
+		<h2>Use of Metaphor </h2>
+
+		<p>The author's splendid...</p>
+		END_HTML
+	end
+
+	it "renders the example from #68 correctly" do
+		the_indented_markdown( <<-"END_MARKDOWN" ).should be_transformed_into(<<-"END_HTML").without_indentation
+		START example
+
+		1. ö
+		1. ü
+		1. ó
+		1. ő
+		1. ú
+		1. é
+		1. á
+		1. ű
+		1. í
+
+		- ö
+		- ü
+		- ó
+		- ő
+		- ú
+		- é
+		- á
+		- ű
+		- í
+
+		END example
+		END_MARKDOWN
+		<p>START example</p>
+
+		<ol>
+		<li>ö</li>
+		<li>ü</li>
+		<li>ó</li>
+		<li>ő</li>
+		<li>ú</li>
+		<li>é</li>
+		<li>á</li>
+		<li>ű</li>
+		<li><p>í</p></li>
+		<li><p>ö</p></li>
+		<li>ü</li>
+		<li>ó</li>
+		<li>ő</li>
+		<li>ú</li>
+		<li>é</li>
+		<li>á</li>
+		<li>ű</li>
+		<li>í</li>
+		</ol>
+
+		<p>END example</p>
+		END_HTML
+	end
+
+	it "renders alignments in code blocks without changing indentation (#71)" do
+		the_indented_markdown( "    Самообучение\n    Bugaga\n" ).
+			should be_transformed_into( "<pre><code>Самообучение\nBugaga\n</code></pre>" )
+	end
+
 end
 
 

data/spec/contributions_spec.rb

@@ -7,17 +7,16 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 	
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################

data/spec/discount_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#coding: utf-8
 
 BEGIN {
 	require 'pathname'
@@ -7,17 +8,16 @@ BEGIN {
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -25,8 +25,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "implementation of Discount-specific features" do
-	include BlueCloth::TestConstants,
-		BlueCloth::Matchers
 
 	before( :all ) do
 		@basedir = Pathname.new( __FILE__ ).dirname.parent
@@ -46,7 +44,7 @@ describe BlueCloth, "implementation of Discount-specific features" do
 
 		it "renders id: links as anchors with an ID" do
 			the_markdown( "[foo](id:bar)", :pseudoprotocols => true ).
-				should be_transformed_into( '<p><a id="bar">foo</a></p>' )
+				should be_transformed_into( '<p><span id="bar">foo</span></p>' )
 		end
 
 		it "renders class: links as SPANs with a CLASS" do
@@ -59,13 +57,30 @@ describe BlueCloth, "implementation of Discount-specific features" do
 				should be_transformed_into( '<p>bar</p>' )
 		end
 
+		it "renders lang: links as language-specified blocks" do
+			the_markdown( "[gift](lang:de)", :pseudoprotocols => true ).
+				should be_transformed_into( '<p><span lang="de">gift</span></p>' )
+		end
+
 	end
 
 
 	describe "Markdown-Extra tables" do
 
+		it "doesn't try to render tables if :tables isn't set" do
+			the_indented_markdown( <<-"END_MARKDOWN" ).should be_transformed_into(<<-"END_HTML").without_indentation
+			 a   |    b
+			-----|-----
+			hello|sailor
+			END_MARKDOWN
+			<p> a   |    b
+			-----|-----
+			hello|sailor</p>
+			END_HTML
+		end
+
 		it "renders the example from orc's blog" do
-			the_indented_markdown( <<-"END_MARKDOWN", :strict => false ).should be_transformed_into(<<-"END_HTML").without_indentation
+			the_indented_markdown( <<-"END_MARKDOWN", :tables => true ).should be_transformed_into(<<-"END_HTML").without_indentation
 			 a   |    b
 			-----|-----
 			hello|sailor
@@ -88,7 +103,7 @@ describe BlueCloth, "implementation of Discount-specific features" do
 		end
 
 		it "renders simple markdown-extra tables" do
-			the_indented_markdown( <<-"END_MARKDOWN", :strict => false ).should be_transformed_into(<<-"END_HTML").without_indentation
+			the_indented_markdown( <<-"END_MARKDOWN", :tables => true ).should be_transformed_into(<<-"END_HTML").without_indentation
 			First Header  | Second Header
 			------------- | -------------
 			Content Cell  | Content Cell
@@ -111,7 +126,7 @@ describe BlueCloth, "implementation of Discount-specific features" do
 
 		end
 
-  		it "renders tables with leading and trailing pipes" do
+  		it "renders tables with leading and trailing pipes", :pedantic => true do
  			pending "Discount doesn't support this kind (yet?)" do
  				the_indented_markdown( <<-"END_MARKDOWN", :tables => true ).should be_transformed_into(<<-"END_HTML").without_indentation
  				| First Header  | Second Header |
@@ -141,7 +156,7 @@ describe BlueCloth, "implementation of Discount-specific features" do
  			end
   		end
 
-  		it "renders tables with aligned columns" do
+  		it "renders tables with aligned columns", :pedantic => true do
  			pending "Discount doesn't support this kind (yet?)" do
  				the_indented_markdown( <<-"END_MARKDOWN", :tables => true ).should be_transformed_into(<<-"END_HTML").without_indentation
  				| Item      | Value |
@@ -177,6 +192,31 @@ describe BlueCloth, "implementation of Discount-specific features" do
 		end
 	end
 
+
+	describe "tilde strike-through" do
+
+		it "doesn't render tilde-bracketed test when :strikethrough isn't set" do
+			the_markdown( "~~cancelled~~" ).
+				should be_transformed_into( '<p>~~cancelled~~</p>' )
+		end
+
+		it "renders double tilde-bracketed text as strikethrough" do
+			the_markdown( "~~cancelled~~", :strikethrough => true ).
+				should be_transformed_into( '<p><del>cancelled</del></p>' )
+		end
+
+		it "renders tilde-bracketed text for tilde-brackets of more than two tildes" do
+			the_markdown( "~~~~cancelled~~~~", :strikethrough => true ).
+				should be_transformed_into( '<p><del>cancelled</del></p>' )
+		end
+
+		it "includes extra tildes in tilde-bracketed text" do
+			the_markdown( "~~~cancelled~~", :strikethrough => true ).
+				should be_transformed_into( '<p><del>~cancelled</del></p>' )
+		end
+
+	end
+
 end