bluecloth 2.0.5-x86-mingw32 → 2.0.6.pre120-x86-mingw32

data/rake/manual.rb

@@ -69,7 +69,7 @@ module Manual
 		DEFAULT_CONFIG = {
 			'filters' => [ 'erb', 'links', 'textile' ],
 			'layout'  => 'default.page',
-			'cleanup' => true,
+			'cleanup' => false,
 		  }.freeze
 
 		# Pattern to match a source page with a YAML header

data/rake/packaging.rb

@@ -1,14 +1,12 @@
-# 
-# Packaging Rake Tasks
-
-# 
+#####################################################################
+###	P A C K A G I N G   T A S K S
+#####################################################################
 
 require 'rbconfig'
 require 'pathname'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
-require Pathname( __FILE__ ).dirname.expand_path + 'hg.rb'
 
 include Config
 
@@ -25,35 +23,19 @@ task :package => [:gem]
 
 
 ### Task: gem
-gempath = PKGDIR + GEM_FILE_NAME
-
-desc "Build a RubyGem package (#{GEM_FILE_NAME})"
-task :gem => gempath.to_s
-file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
-	when_writing( "Creating GEM" ) do
-		Gem::Builder.new( GEMSPEC ).build
-		verbose( true ) do
-			mv GEM_FILE_NAME, gempath
-		end
-	end
-end
-
-
-prerelease_gempath = PKGDIR + SNAPSHOT_GEM_NAME
-
-desc "Build a pre-release RubyGem package"
-task :prerelease_gem => prerelease_gempath.to_s
-file prerelease_gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
-	when_writing( "Creating prerelease GEM" ) do
-		gemspec = GEMSPEC.clone
-		gemspec.version = Gem::Version.create( "%s.%s" % [GEMSPEC.version, PKG_BUILD] )
-		Gem::Builder.new( gemspec ).build
-		verbose( true ) do
-			mv SNAPSHOT_GEM_NAME, prerelease_gempath
-		end
-	end
-end
-
+# gempath = PKGDIR + GEM_FILE_NAME
+# 
+# desc "Build a RubyGem package (#{GEM_FILE_NAME})"
+# task :gem => gempath.to_s
+# file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
+# 	when_writing( "Creating GEM" ) do
+# 		Gem::Builder.new( GEMSPEC ).build
+# 		verbose( true ) do
+# 			mv GEM_FILE_NAME, gempath
+# 		end
+# 	end
+# end
+# 
 
 ### Task: install
 desc "Install #{PKG_NAME} as a conventional library"
@@ -133,3 +115,12 @@ end
 
 
 
+desc "Add development depdendencies to the gemspec -- this is meant to be chained " +
+     "together with :gem"
+task :include_dev_dependencies do
+	DEVELOPMENT_DEPENDENCIES.each do |name, version|
+		version = '>= 0' if version.length.zero?
+		GEMSPEC.add_development_dependency( name, version )
+	end
+end
+

data/rake/publishing.rb

@@ -34,7 +34,7 @@ class Net::SMTP
 
 	def do_ssl_start( helodomain, user, secret, authtype )
 		raise IOError, 'SMTP session already started' if @started
-		check_auth_args user, secret, authtype if user or secret
+		check_auth_args( user, secret, 'plain' ) if user or secret
 
 		# Open the connection
       	@debug_output << "opening connection to #{@address}...\n" if @debug_output
@@ -85,7 +85,6 @@ begin
 	require 'tmail'
 	require 'net/smtp'
 	require 'etc'
-	require 'rubyforge'
 	require 'socket'
 	require 'text/format'
 
@@ -116,15 +115,12 @@ begin
 		desc "Generate the release notes"
 		task :notes => [RELEASE_NOTES_FILE]
 		file RELEASE_NOTES_FILE do |task|
-			last_rel_tag = get_latest_release_tag() or
-				fail ">>> No releases tagged! Try running 'rake prep_release' first"
-			trace "Last release tag is: %p" % [ last_rel_tag ]
-			start = get_last_changed_rev( last_rel_tag ) || 1
-			trace "Starting rev is: %p" % [ start ]
-			log_output = make_svn_log( '.', start, 'HEAD' )
+			last_tag = MercurialHelpers.get_tags.grep( /\d+\.\d+\.\d+/ ).
+				collect {|ver| vvec(ver) }.sort.last.unpack( 'N*' ).join('.')
 
 			File.open( task.name, File::WRONLY|File::TRUNC|File::CREAT ) do |fh|
-				fh.print( log_output )
+				fh.puts "Release Notes for #{PKG_VERSION}",
+				        "--------------------------------", '', ''
 			end
 
 			edit task.name
@@ -198,14 +194,16 @@ begin
 		desc 'Send out a release announcement'
 		task :announce => [RELEASE_ANNOUNCE_FILE] do
 			email         = TMail::Mail.new
-			if $publish_privately
+
+			if $publish_privately || RELEASE_ANNOUNCE_ADDRESSES.empty?
 				trace "Sending private announce mail"
 				email.to = 'rubymage@gmail.com'
 			else
 				trace "Sending public announce mail"
-				email.to  = 'Ruby-Talk List <ruby-talk@ruby-lang.org>'
+				email.to  = RELEASE_ANNOUNCE_ADDRESSES
 				email.bcc = 'rubymage@gmail.com'
 			end
+
 			email.from    = GEMSPEC.email
 			email.subject = "[ANN] #{PKG_NAME} #{PKG_VERSION}"
 			email.body    = File.read( RELEASE_ANNOUNCE_FILE )
@@ -218,7 +216,7 @@ begin
 			     email.to_s,
 			     '---'
 
-				ask_for_confirmation( "Will send via #{SMTP_HOST}." ) do
+			ask_for_confirmation( "Will send via #{SMTP_HOST}." ) do
 				pwent = Etc.getpwuid( Process.euid )
 				curuser = pwent ? pwent.name : 'unknown'
 				username = prompt_with_default( "SMTP user", curuser )
@@ -239,61 +237,11 @@ begin
 		end
 
 
-		desc 'Publish the new release to RubyForge'
-		task :publish => [:clean, :package, :notes] do |task|
-			project = GEMSPEC.rubyforge_project
-
-			if $publish_privately
-				log "Skipping push of release files to RubyForge"
-			else
-				rf = RubyForge.new
-				log "Loading RubyForge config"
-				rf.configure
-
-				group_id = rf.autoconfig['group_ids'][RUBYFORGE_GROUP] or
-					fail "Your configuration doesn't have a group id for '#{RUBYFORGE_GROUP}'"
-
-				# If this project doesn't yet exist, create it
-				unless rf.autoconfig['package_ids'].key?( project )
-					ask_for_confirmation( "Package '#{project}' doesn't exist on RubyForge. Create it?" ) do
-						log "Creating new package '#{project}'"
-						rf.create_package( group_id, project )
-					end
-				end
-
-				package_id = rf.autoconfig['package_ids'][ project ]
-
-				# Make sure this release doesn't already exist
-				releases = rf.autoconfig['release_ids']
-				if releases.key?( GEMSPEC.name ) && releases[ GEMSPEC.name ].key?( PKG_VERSION )
-					log "Rubyforge seems to already have #{ PKG_FILE_NAME }"
-				else
-					config = rf.userconfig or
-						fail "You apparently haven't set up your RubyForge credentials on this machine."
-					config['release_notes'] = GEMSPEC.description
-					config['release_changes'] = File.read( RELEASE_NOTES_FILE )
-
-					files = FileList[ PKGDIR + GEM_FILE_NAME ]
-					files.include PKGDIR + "#{PKG_FILE_NAME}.tar.gz"
-					files.include PKGDIR + "#{PKG_FILE_NAME}.tar.bz2"
-					files.include PKGDIR + "#{PKG_FILE_NAME}.zip"
-
-					log "Releasing #{PKG_FILE_NAME}"
-					when_writing do
-						log "Publishing to RubyForge: \n",
-							"\tproject: #{RUBYFORGE_GROUP}\n",
-							"\tpackage: #{PKG_NAME.downcase}\n",
-							"\tpackage version: #{PKG_VERSION}\n",
-							"\tfiles: " + files.collect {|f| f.to_s }.join(', ') + "\n"
-
-						ask_for_confirmation( "Publish to RubyForge?" ) do
-							log 'Logging in...'
-							rf.login
-							log "Adding the new release to the '#{project}' project"
-							rf.add_release( group_id, package_id, PKG_VERSION, *files )
-						end
-					end
-				end
+		desc 'Publish the new release to Gemcutter'
+		task :publish => [:clean, :gem, :notes] do |task|
+			ask_for_confirmation( "Publish #{GEM_FILE_NAME} to Gemcutter?", false ) do
+				gempath = PKGDIR + GEM_FILE_NAME
+				sh 'gem', 'push', gempath
 			end
 		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