bluecloth 2.0.5 → 2.0.6.pre120

data/rake/testing.rb

@@ -1,6 +1,6 @@
 # 
 # Rake tasklib for testing tasks
-# $Id: testing.rb 111 2009-07-15 16:05:47Z deveiant $
+
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -29,7 +29,7 @@ task :test do
 		log "Running specs"
 		Rake::Task['spec:quiet'].invoke
 	end
-	
+
 	unless TEST_FILES.empty?
 		log "Running unit tests"
 		Rake::Task[:unittests].invoke 
@@ -101,7 +101,7 @@ end
 ### Test::Unit tests
 begin
 	require 'rake/testtask'
-	
+
 	Rake::TestTask.new( :unittests ) do |task|
 		task.libs += [LIBDIR]
 		task.test_files = TEST_FILES
@@ -116,7 +116,7 @@ rescue LoadError => err
 	task :unittests => :no_rspec
 end
 
-	
+
 ### RCov (via RSpec) tasks
 begin
 	gem 'rcov'
@@ -136,16 +136,6 @@ begin
 			task.rcov = true
 		end
 	end
-# 	unless TEST_FILES.empty?
-# 		require 'rcov/rcovtask'
-
-# 		Rcov::RcovTask.new do |task|
-# 			task.libs += [LIBDIR]
-# 			task.test_files = TEST_FILES
-# 			task.verbose = true
-# 			task.rcov_opts = RCOV_OPTS
-# 		end
-# 	end
 
 
 	### Task: rcov
@@ -168,12 +158,6 @@ begin
 			task.rcov = true
 		end
 
-		### Task: verify coverage
-		desc "Build coverage statistics"
-		VerifyTask.new( :verify => :rcov ) do |task|
-			task.threshold = COVERAGE_MINIMUM
-		end
-
 		desc "Run RCov in 'spec-only' mode to check coverage from specs"
 		Spec::Rake::SpecTask.new( :speconly ) do |task|
 			task.spec_files = SPEC_FILES

data/rake/win32.rb

@@ -13,6 +13,7 @@
 # * Aaron Patterson
 #   http://tenderlovemaking.com/2008/11/21/cross-compiling-ruby-gems-for-win32/
 
+require 'rubygems'
 require 'rake'
 require 'pathname'
 require 'rubygems/platform'
@@ -67,7 +68,7 @@ def untar( tarfile, targetdir )
 	raise "No such directory: #{targetdir}" unless targetdir.directory?
 
 	reader = Archive::Tar::Reader.new( tarfile.to_s, TAR_OPTS )
-	
+
 	mkdir_p( targetdir )
 	reader.each( true ) do |header, body|
 		path = targetdir + header[:path]
@@ -84,7 +85,7 @@ def untar( tarfile, targetdir )
 		when :directory
 			trace "  #{path}"
 			path.mkpath
-			
+
 		when :link
 			linktarget = targetdir + header[:dest]
 			trace "  #{path} => #{linktarget}"
@@ -96,16 +97,16 @@ def untar( tarfile, targetdir )
 			path.make_symlink( linktarget )
 		end
 	end
-	
+
 end
 
 
 begin
 	require 'archive/tar'
-	
+
 	namespace :win32 do
 		directory XCOMPILER_DIR.to_s
-		
+
 		file XCOMPILER_DL => XCOMPILER_DIR do
 			# openuri can't handle this -- passive ftp required?
 			# run 'wget', '-O', XCOMPILER_DL, RUBY_DL_URI
@@ -140,7 +141,7 @@ begin
 					mv 'Makefile.in', 'Makefile.in.orig'
 					mv 'Makefile.in.new', 'Makefile.in'
 				end
-				
+
 				run *CONFIGURE_CMD
 				run 'make', 'ruby'
 				run 'make', 'rubyw.exe'
@@ -158,7 +159,7 @@ begin
 				sh 'make'
 			end
 		end
-		
+
 		desc "Build a binary gem for win32 systems"
 		task :gem => ['win32:build', PKGDIR.to_s] + WIN32_GEMSPEC.files do
 			when_writing( "Creating win32 GEM" ) do
@@ -171,16 +172,19 @@ begin
 	end
 
 rescue LoadError => err
+	trace "Couldn't load the win32 tasks: %s: %s" % [ err.class.name, err.message ]
+
 	task :no_win32_build do
 		abort "No win32 build: %s: %s" % [ err.class.name, err.message ]
 	end
-	
+
 	namespace :win32 do
 		desc "Build a binary Gem for Win32 systems, installing a cross " +
 		     "compiled Ruby if necessary"
+		task :gem => :no_win32_build
 		task :build => :no_win32_build
 	end
-			
+
 end
 
 

data/spec/bluecloth/blockquotes_spec.rb

@@ -113,28 +113,30 @@ describe BlueCloth, "blockquotes" do
 
 	# Blockquotes with a <pre> section
 	it "supports block-level HTML inside of blockquotes" do
-		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
-		> The best approximation of the problem is the following code:
-		>
-		> <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>
-		---
+		pending "a fix in Discount" do
+			the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+			> The best approximation of the problem is the following code:
+			>
+			> <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>
+			---
+		end
 	end
 
 

data/spec/bluecloth_spec.rb

@@ -60,6 +60,20 @@ describe BlueCloth do
 	end
 
 
+	it "handles non-string content safely" do
+		BlueCloth.new( nil ).text.should == ''
+	end
+
+
+	it "inherits the taintedness of its input" do
+		str = "a string"
+		BlueCloth.new( str ).should_not be_tainted()
+
+		str.taint
+		BlueCloth.new( str ).should be_tainted()
+	end
+
+
 	it "allows output to be rendered several times" do
 		bc = BlueCloth.new( "Some text" )
 		bc.to_html.should == bc.to_html
@@ -245,6 +259,23 @@ describe BlueCloth do
 		end
 	end
 
+
+	describe "encoding under Ruby 1.9.x" do
+
+		before( :each ) do
+			pending "only valid under a version of Ruby that has the Encoding class" unless
+				Object.const_defined?( :Encoding )
+		end
+
+
+		it "outputs HTML in the same encoding as the source string" do
+			utf8 = "a string".encode( "UTF-8" )
+			out  = BlueCloth.new( utf8 ).to_html
+
+			out.encoding.name.should == 'UTF-8'
+		end
+	end
+
 end
 
 # vim: set nosta noet ts=4 sw=4:

data/spec/bugfix_spec.rb

@@ -120,7 +120,7 @@ describe BlueCloth, "bugfixes" do
 		the_indented_markdown( <<-"END_MARKDOWN" ).should be_transformed_into(<<-"END_HTML").without_indentation
 		This line of markdown below will hang you if you're running BlueCloth 1.x.
 		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   
-		
+
 		END_MARKDOWN
 		<p>This line of markdown below will hang you if you're running BlueCloth 1.x.</p>
 
@@ -128,6 +128,42 @@ describe BlueCloth, "bugfixes" do
 		END_HTML
 	end
 
+	it "recognizes closing block tags even when they're not on their own line" do
+		the_indented_markdown( <<-"END_MARKDOWN" ).should be_transformed_into(<<-"END_HTML").without_indentation
+		Para 1
+
+		<div><pre>HTML block
+		</pre></div>
+
+		Para 2 [Link](#anchor)
+		END_MARKDOWN
+		<p>Para 1</p>
+
+		<div><pre>HTML block
+		</pre></div>
+
+		<p>Para 2 <a href=\"#anchor\">Link</a></p>
+		END_HTML
+	end
+
+	it "correctly wraps lines after a code block in a list item" do
+		the_indented_markdown( <<-"END_MARKDOWN" ).should be_transformed_into(<<-"END_HTML").without_indentation
+		* testing
+
+		        pre
+
+		    more li
+		END_MARKDOWN
+		<ul>
+		<li><p>testing</p>
+
+		<pre><code>pre
+		</code></pre>
+
+		<p>more li</p></li>
+		</ul>
+		END_HTML
+	end
 
 end
 

data/spec/discount_spec.rb

@@ -60,6 +60,123 @@ describe BlueCloth, "implementation of Discount-specific features" do
 		end
 
 	end
+
+
+	describe "Markdown-Extra tables" do
+
+		it "renders the example from orc's blog" do
+			the_indented_markdown( <<-"END_MARKDOWN", :strict => false ).should be_transformed_into(<<-"END_HTML").without_indentation
+			 a   |    b
+			-----|-----
+			hello|sailor
+			END_MARKDOWN
+			<table>
+			<thead>
+			<tr>
+			<th> a   </th>
+			<th>    b</th>
+			</tr>
+			</thead>
+			<tbody>
+			<tr>
+			<td>hello</td>
+			<td>sailor</td>
+			</tr>
+			</tbody>
+			</table>
+			END_HTML
+		end
+
+		it "renders simple markdown-extra tables" do
+			the_indented_markdown( <<-"END_MARKDOWN", :strict => false ).should be_transformed_into(<<-"END_HTML").without_indentation
+			First Header  | Second Header
+			------------- | -------------
+			Content Cell  | Content Cell
+			END_MARKDOWN
+			<table>
+			<thead>
+			<tr>
+			<th>First Header  </th>
+			<th> Second Header</th>
+			</tr>
+			</thead>
+			<tbody>
+			<tr>
+			<td>Content Cell  </td>
+			<td> Content Cell</td>
+			</tr>
+			</tbody>
+			</table>
+			END_HTML
+
+		end
+
+  		it "renders tables with leading and trailing pipes" 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 |
+ 				| ------------- | ------------- |
+ 				| Content Cell  | Content Cell  |
+ 				| Content Cell  | Content Cell  |
+ 				END_MARKDOWN
+ 				<table>
+ 				<thead>
+ 				<tr>
+ 				<th>First Header  </th>
+ 				<th> Second Header</th>
+ 				</tr>
+ 				</thead>
+ 				<tbody>
+ 				<tr>
+ 				<td>Content Cell  </td>
+ 				<td> Content Cell</td>
+ 				</tr>
+ 				<tr>
+ 				<td>Content Cell  </td>
+ 				<td> Content Cell</td>
+ 				</tr>
+ 				</tbody>
+ 				</table>
+ 				END_HTML
+ 			end
+  		end
+
+  		it "renders tables with aligned columns" 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 |
+ 				| --------- | -----:|
+ 				| Computer  | $1600 |
+ 				| Phone     |   $12 |
+ 				| Pipe      |    $1 |
+ 				END_MARKDOWN
+ 				<table>
+ 				<thead>
+ 				<tr>
+ 				<th>Item      </th>
+ 				<th align="right"> Value</th>
+ 				</tr>
+ 				</thead>
+ 				<tbody>
+ 				<tr>
+ 				<td>Computer </td>
+ 				<td align="right"> $1600</td>
+ 				</tr>
+ 				<tr>
+ 				<td>Phone    </td>
+ 				<td align="right">   $12</td>
+ 				</tr>
+ 				<tr>
+ 				<td>Pipe     </td>
+ 				<td align="right">    $1</td>
+ 				</tr>
+ 				</tbody>
+ 				</table>
+ 				END_HTML
+ 			end
+		end
+	end
+
 end
 
 

data/spec/markdowntest_spec.rb

@@ -3,10 +3,10 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
@@ -33,7 +33,7 @@ describe BlueCloth, "-- MarkdownTest 1.0.3: " do
 	before( :all ) do
 		soext = Config::CONFIG['LIBRUBY_ALIASES'].sub( /.*\./, '' )
 		@dlname = "libtidy.#{soext}"
-	
+
 		begin
 			DL.dlopen( @dlname )
 		rescue RuntimeError => err
@@ -46,7 +46,7 @@ describe BlueCloth, "-- MarkdownTest 1.0.3: " do
 			@have_libtidy = true
 			@tidy_error = nil
 		end
-		
+
 		begin
 			require 'tidy'
 		rescue LoadError, NameError => err
@@ -55,12 +55,12 @@ describe BlueCloth, "-- MarkdownTest 1.0.3: " do
 		end
 
 	end
-	
+
 	before( :each ) do
 		pending( "These tests require the tidy library: #@tidy_error" ) unless @have_libtidy
 	end
-	
-	
+
+
 	markdowntest_dir = Pathname.new( __FILE__ ).dirname + 'data/markdowntest'
 	pattern = markdowntest_dir + '*.text'
 	Pathname.glob( pattern.to_s ).each do |textfile|
@@ -70,7 +70,7 @@ describe BlueCloth, "-- MarkdownTest 1.0.3: " do
 			markdown = textfile.read
 			expected = resultfile.read
 			options = { :smartypants => false }
-		
+
 			the_markdown( markdown, options ).should be_transformed_into_normalized_html( expected )
 		end
 	end