bluecloth 2.0.9 → 2.0.10

data/spec/bluecloth/101_changes_spec.rb

@@ -4,16 +4,16 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	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'
@@ -25,7 +25,7 @@ require 'spec/lib/matchers'
 ###	C O N T E X T S
 #####################################################################
 
-describe BlueCloth, "1.0.1 changes" do
+describe BlueCloth, "after the 1.0.1 changes" do
 	include BlueCloth::TestConstants,
 	        BlueCloth::Matchers
 
@@ -36,16 +36,16 @@ describe BlueCloth, "1.0.1 changes" do
 		formatting syntax. For example, if you wanted to surround a word with
 		literal asterisks (instead of an HTML `<em>` tag), you can backslashes
 		before the asterisks, like this:
-		
+
 			\\*literal asterisks\\*
-		
+
 		---
 		<p>Markdown allows you to use backslash escapes to generate literal
 		characters which would otherwise have special meaning in Markdown's
 		formatting syntax. For example, if you wanted to surround a word with
 		literal asterisks (instead of an HTML <code>&lt;em&gt;</code> tag), you can backslashes
 		before the asterisks, like this:</p>
-		
+
 		<pre><code>\\*literal asterisks\\*
 		</code></pre>
 		---
@@ -63,11 +63,11 @@ describe BlueCloth, "1.0.1 changes" do
 	it "converts reference-style links at or deeper than tab width to code blocks" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		An [example][ex] reference-style link.
-		
+
 			[ex]: http://www.bluefi.com/
 		---
 		<p>An [example][ex] reference-style link.</p>
-		
+
 		<pre><code>[ex]: http://www.bluefi.com/
 		</code></pre>
 		---
@@ -115,23 +115,23 @@ describe BlueCloth, "1.0.1 changes" do
 	it "correctly marks up header + list + code" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		## This is a header.
-		
+
 		1.   This is the first list item.
 		2.   This is the second list item.
-		
+
 		Here's some example code:
-		
+
 			return shell_exec("echo $input | $markdown_script");
 		---
 		<h2>This is a header.</h2>
-		
+
 		<ol>
-		<li>This is the first list item.</li>
-		<li>This is the second list item.</li>
+		<li> This is the first list item.</li>
+		<li> This is the second list item.</li>
 		</ol>
-		
+
 		<p>Here's some example code:</p>
-		
+
 		<pre><code>return shell_exec("echo $input | $markdown_script");
 		</code></pre>
 		---

data/spec/bluecloth/autolinks_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/blockquotes_spec.rb

@@ -4,16 +4,16 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	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'
@@ -72,14 +72,14 @@ describe BlueCloth, "blockquotes" do
 		> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
 		consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
 		Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-		
+
 		> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
 		id sem consectetuer libero luctus adipiscing.
 		---
 		<blockquote><p>This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
 		consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
 		Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.</p>
-		
+
 		<p>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
 		id sem consectetuer libero luctus adipiscing.</p></blockquote>
 		---
@@ -90,23 +90,23 @@ describe BlueCloth, "blockquotes" do
 	it "supports other Markdown elements in blockquote sections" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		> ## This is a header.
-		> 
+		>
 		> 1.   This is the first list item.
 		> 2.   This is the second list item.
-		> 
+		>
 		> Here's some example code:
-		> 
+		>
 		>     return shell_exec("echo $input | $markdown_script");
 		---
 		<blockquote><h2>This is a header.</h2>
-		
+
 		<ol>
-		<li>This is the first list item.</li>
-		<li>This is the second list item.</li>
+		<li> This is the first list item.</li>
+		<li> This is the second list item.</li>
 		</ol>
-		
+
 		<p>Here's some example code:</p>
-		
+
 		<pre><code>return shell_exec("echo $input | $markdown_script");
 		</code></pre></blockquote>
 		---
@@ -121,19 +121,19 @@ describe BlueCloth, "blockquotes" do
 			> <pre>
 			> foo + bar; foo.factorize; foo.display
 			> </pre>
-			> 
+			>
 			> This should result in an error on any little-endian platform.
-			> 
+			>
 			> <div>- Garrick Mettronne</div>
 			---
 			<blockquote><p>The best approximation of the problem is the following code:</p>
-			
+
 			<pre>
 			foo + bar; foo.factorize; foo.display
 			</pre>
-			
+
 			<p>This should result in an error on any little-endian platform.</p>
-			
+
 			<div>- Garrick Mettronne</div>
 			</blockquote>
 			---

data/spec/bluecloth/code_spans_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/emphasis_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/entities_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/hrules_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/images_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/inline_html_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/links_spec.rb

@@ -12,7 +12,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/lists_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/paragraphs_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth/titles_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/bluecloth_spec.rb

@@ -13,7 +13,7 @@ BEGIN {
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
@@ -119,7 +119,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
@@ -153,7 +153,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
@@ -174,30 +174,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 = %{<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>}
 
 			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

data/spec/bugfix_spec.rb

@@ -14,7 +14,7 @@ BEGIN {
 }
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
@@ -242,6 +242,11 @@ describe BlueCloth, "bugfixes" do
 		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

@@ -13,7 +13,7 @@ BEGIN {
 }
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'

data/spec/discount_spec.rb

@@ -14,7 +14,7 @@ BEGIN {
 }
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
@@ -48,7 +48,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

data/spec/lib/helpers.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # encoding: utf-8
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 
@@ -12,126 +12,3 @@ module BlueCloth::SpecHelpers
 	###############
 
 end
-
-
-# Override the badly-formatted output of the RSpec HTML formatter
-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
-
-		if extra = extra_failure_content( failure )
-			@output.puts( extra )
-		end
-
-		@output.puts "      </div>",
-		             "    </dd>"
-		@output.flush
-	end
-
-
-	alias_method :default_global_styles, :global_styles
-
-	def global_styles
-		css = default_global_styles()
-		css << %Q{
-			/* Stuff added by #{__FILE__} */
-
-			/* Overrides */
-			#rspec-header {
-				-webkit-box-shadow: #333 0 2px 5px;
-				margin-bottom: 1em;
-			}
-
-			.example_group dt {
-				-webkit-box-shadow: #333 0 2px 3px;
-			}
-
-			/* Style for log output */
-			dd.log-message {
-				background: #eee;
-				padding: 0 2em;
-				margin: 0.2em 1em;
-				border-bottom: 1px dotted #999;
-				border-top: 1px dotted #999;
-				text-indent: -1em;
-			}
-
-			/* Parts of the message */
-			dd.log-message .log-time {
-				font-weight: bold;
-			}
-			dd.log-message .log-time:after {
-				content: ": ";
-			}
-			dd.log-message .log-level {
-				font-variant: small-caps;
-				border: 1px solid #ccc;
-				padding: 1px 2px;
-			}
-			dd.log-message .log-name {
-				font-size: 1.2em;
-				color: #1e51b2;
-			}
-			dd.log-message .log-name:before { content: "«"; }
-			dd.log-message .log-name:after { content:  "»"; }
-
-			dd.log-message .log-message-text {
-				padding-left: 4px;
-				font-family: Monaco, "Andale Mono", "Vera Sans Mono", mono;
-			}
-
-
-			/* Distinguish levels */
-			dd.log-message.debug { color: #666; }
-			dd.log-message.info {}
-
-			dd.log-message.warn,
-			dd.log-message.error {
-				background: #ff9;
-			}
-			dd.log-message.error .log-level,
-			dd.log-message.error .log-message-text {
-				color: #900;
-			}
-			dd.log-message.fatal {
-				background: #900;
-				color: white;
-				font-weight: bold;
-				border: 0;
-			}
-			dd.log-message.fatal .log-name {
-				color:  white;
-			}
-		}
-
-		return css
-	end
-end
-
-