bluecloth 2.0.7 → 2.0.9

data/spec/bluecloth/code_spans_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/emphasis_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/entities_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/hrules_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/images_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/inline_html_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }
@@ -123,67 +124,6 @@ describe BlueCloth, "document with inline HTML" do
 	end
 
 
-	it "preserves MathML block" do
-		pending "discount doesn't support this, it explicitly matches block-level HTML elements only"
-		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
-		Examples
-		--------
-		
-		Now that we have met some of the key players, it is time to see what we can
-		do. Here are some examples and comments which illustrate the use of the basic
-		layout and token elements. Consider the expression x2 + 4x + 4 = 0. A basic
-		MathML presentation encoding for this would be:
-		
-		<math>
-		  <mrow>
-			<msup>
-			  <mi>x</mi>
-			  <mn>2</mn>
-			</msup>
-			<mo>+</mo>
-			<mn>4</mn>
-			<mi>x</mi>
-			<mo>+</mo>
-			<mn>4</mn>
-			<mo>=</mo>
-			<mn>0</mn>
-		  </mrow>
-		</math>
-		
-		This encoding will display as you would expect. However, if we were interested
-		in reusing this expression in unknown situations, we would likely want to spend
-		a little more effort analyzing and encoding the logical expression structure.
-		---
-		<h2>Examples</h2>
-		
-		<p>Now that we have met some of the key players, it is time to see what we can
-		do. Here are some examples and comments which illustrate the use of the basic
-		layout and token elements. Consider the expression x2 + 4x + 4 = 0. A basic
-		MathML presentation encoding for this would be:</p>
-		
-		<math>
-		  <mrow>
-		    <msup>
-		      <mi>x</mi>
-		      <mn>2</mn>
-		    </msup>
-		    <mo>+</mo>
-		    <mn>4</mn>
-		    <mi>x</mi>
-		    <mo>+</mo>
-		    <mn>4</mn>
-		    <mo>=</mo>
-		    <mn>0</mn>
-		  </mrow>
-		</math>
-		
-		<p>This encoding will display as you would expect. However, if we were interested
-		in reusing this expression in unknown situations, we would likely want to spend
-		a little more effort analyzing and encoding the logical expression structure.</p>
-		---
-	end
-
-
 	it "preserves span-level HTML" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		This is some stuff with a <span class="foo">spanned bit of text</span> in
@@ -232,6 +172,30 @@ describe BlueCloth, "document with inline HTML" do
 		---
 	end
 
+	it "preserves HTML5 tags" do
+		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+		<aside>
+			<p>This is a sidebar that explains some stuff.</p>
+		</aside>
+
+		The main content.
+
+		<footer>
+			<p>Copyright &copy; 2010 by J. Random Hacker.</p>
+		</footer>
+		---
+		<aside>
+		    <p>This is a sidebar that explains some stuff.</p>
+		</aside>
+
+		<p>The main content.</p>
+
+		<footer>
+		    <p>Copyright &copy; 2010 by J. Random Hacker.</p>
+		</footer>
+		---
+	end
+
 
 end
 

data/spec/bluecloth/lists_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/paragraphs_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth/titles_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }

data/spec/bluecloth_spec.rb

@@ -8,6 +8,7 @@ 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 )
 }
@@ -268,14 +269,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,6 +8,7 @@ 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 )
 }
@@ -157,14 +159,89 @@ 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
+
 end
 
 

data/spec/contributions_spec.rb

@@ -7,6 +7,7 @@ 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 )
 }

data/spec/discount_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#coding: utf-8
 
 BEGIN {
 	require 'pathname'
@@ -7,6 +8,7 @@ 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 )
 }
@@ -59,13 +61,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 +107,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
@@ -177,6 +196,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
 
 

data/spec/lib/helpers.rb

@@ -20,27 +20,27 @@ require 'spec/runner/formatter/html_formatter'
 class Spec::Runner::Formatter::HtmlFormatter
 	def example_failed( example, counter, failure )
 		failure_style = failure.pending_fixed? ? 'pending_fixed' : 'failed'
-		
+
 		unless @header_red
 			@output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>"
 			@header_red = true
 		end
-		
+
 		unless @example_group_red
 			css_class = 'example_group_%d' % [current_example_group_number||0]
 			@output.puts "    <script type=\"text/javascript\">makeRed('#{css_class}');</script>"
 			@example_group_red = true
 		end
-		
+
 		move_progress()
-		
+
 		@output.puts "    <dd class=\"spec #{failure_style}\">",
 		             "      <span class=\"failed_spec_name\">#{h(example.description)}</span>",
 		             "      <div class=\"failure\" id=\"failure_#{counter}\">"
 		if failure.exception
 			backtrace = format_backtrace( failure.exception.backtrace )
 			message = failure.exception.message
-			
+
 			@output.puts "        <div class=\"message\"><code>#{h message}</code></div>",
 			             "        <div class=\"backtrace\"><pre>#{backtrace}</pre></div>"
 		end
@@ -48,7 +48,7 @@ class Spec::Runner::Formatter::HtmlFormatter
 		if extra = extra_failure_content( failure )
 			@output.puts( extra )
 		end
-		
+
 		@output.puts "      </div>",
 		             "    </dd>"
 		@output.flush
@@ -56,7 +56,7 @@ class Spec::Runner::Formatter::HtmlFormatter
 
 
 	alias_method :default_global_styles, :global_styles
-	
+
 	def global_styles
 		css = default_global_styles()
 		css << %Q{
@@ -129,7 +129,7 @@ class Spec::Runner::Formatter::HtmlFormatter
 				color:  white;
 			}
 		}
-		
+
 		return css
 	end
 end