rdiscount 1.2.6.2 → 1.2.7

data/{README → README.markdown}

@@ -1,16 +1,20 @@
-= RDiscount - Discount Markdown For Ruby
+Discount Markdown Processor for Ruby
+====================================
 
-Discount is an implementation of John Gruber's Markdown markup
-language in C. It implements all of the language as described in
-<http://daringfireball.net/projects/markdown/syntax>
-and passes the Markdown test suite at
-<http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip>
+Discount is an implementation of John Gruber's Markdown markup language in C. It
+implements all of the language described in [the markdown syntax document][1] and
+passes the [Markdown 1.0 test suite][2].
 
-Discount was developed by
-{David Loren Parsons}[http://www.pell.portland.or.us/~orc]. The
-RDiscount extension was developed by {Ryan Tomayko}[http://tomayko.com/].
+Discount was developed by [David Loren Parsons][3]. The Ruby extension was
+developed by [Ryan Tomayko][4].
 
-== Installation, Hacking
+[1]: http://daringfireball.net/projects/markdown/syntax
+[2]: http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip
+[3]: http://www.pell.portland.or.us/~orc
+[4]: http://tomayko.com/
+
+Installation, Hacking
+---------------------
 
 RDiscount Gem releases are published to RubyForge and can be installed as
 follows:
@@ -23,11 +27,10 @@ The RDiscount sources are available via Git:
   $ cd rdiscount
   $ rake --tasks
 
-For more information, see:
-
-http://github.com/rtomayko/rdiscount
+For more information, see [the project page](http://github.com/rtomayko/rdiscount).
 
-== Usage
+Usage
+-----
 
 RDiscount implements the basic protocol popularized by RedCloth and adopted
 by BlueCloth:
@@ -46,7 +49,8 @@ require statements with the following:
     require 'bluecloth'
   end
 
-== License
+COPYING
+-------
 
 Discount is free software;  it is released under a BSD-style license
 that allows you to do as you wish with it as long as you don't attempt

data/Rakefile

@@ -5,18 +5,18 @@ require 'rake/gempackagetask'
 task :default => 'test:unit'
 
 DLEXT = Config::CONFIG['DLEXT']
-VERS = '1.2.6.2'
+VERS = '1.2.7'
 
 spec =
   Gem::Specification.new do |s|
     s.name              = "rdiscount"
     s.version           = VERS
     s.summary           = "Fast Implementation of Gruber's Markdown in C"
-    s.files             = FileList['README','COPYING','Rakefile','test/**','{lib,ext}/**.rb','ext/*.{c,h}']
+    s.files             = FileList['README.markdown','COPYING','Rakefile','test/**','{lib,ext}/**.rb','ext/*.{c,h}']
     s.bindir            = 'bin'
     s.require_path      = 'lib'
     s.has_rdoc          = true
-    s.extra_rdoc_files  = ['README', 'COPYING']
+    s.extra_rdoc_files  = ['COPYING']
     s.test_files        = FileList['test/*_test.rb']
     s.extensions        = ['ext/extconf.rb']
 
@@ -62,7 +62,7 @@ task :build => "lib/rdiscount.#{DLEXT}"
 
 desc 'Run unit tests'
 task 'test:unit' => [:build] do |t|
-  ruby 'test/rdiscount_test.rb'
+  ruby 'test/markdown_test.rb'
 end
 
 desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
@@ -99,7 +99,7 @@ end
 desc 'Generate API documentation'
 task :doc => 'doc/index.html'
 
-file 'doc/index.html' => FileList['lib/rdiscount.rb','README'] do |f|
+file 'doc/index.html' => FileList['lib/*.rb'] do |f|
   sh((<<-end).gsub(/\s+/, ' '))
     hanna --charset utf8 \
           --fmt html \
@@ -129,6 +129,10 @@ task :release => [ "#{PKGNAME}.gem", "#{PKGNAME}.tar.gz" ] do |t|
   end
 end
 
+desc 'Publish API docs to rubyforge'
+task :publish => :doc do |t|
+  sh 'scp -rp doc/. rubyforge.org:/var/www/gforge-projects/wink/rdiscount'
+end
 
 # ==========================================================
 # Discount Submodule

data/ext/generate.c

@@ -701,7 +701,7 @@ maybe_tag_or_link(MMIOT *f)
 
     if ( maybetag  || (size >= 3 && strncmp(cursor(f), "!--", 3) == 0) ) {
 	Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
-	while ( ((c = peek(f, size+1)) != EOF) && (c != '>') )
+	while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
 	    cputc(pull(f), f);
 	return 1;
     }
@@ -925,6 +925,22 @@ text(MMIOT *f)
 	case '[':   if ( tag_text(f) || !linkylinky(0, f) )
 			Qchar(c, f);
 		    break;
+#if SUPERSCRIPT
+	case '^':   if ( isthisspace(f,-1) || isthisspace(f,1) )
+			Qchar(c,f);
+		    else {
+			char *sup = cursor(f);
+			int len = 0;
+			Qstring("<sup>",f);
+			while ( !isthisspace(f,1+len) ) {
+			    ++len;
+			}
+			shift(f,len);
+			reparse(sup, len, 0, f);
+			Qstring("</sup>", f);
+		    }
+		    break;
+#endif
 	case '*':
 	case '_':   if ( tag_text(f) )
 			Qchar(c, f);

data/ext/mkdio.c

@@ -80,7 +80,7 @@ snip(Line *p)
 
 /* build a Document from any old input.
  */
-typedef unsigned int (*getc_func)(void*);
+typedef int (*getc_func)(void*);
 
 Document *
 populate(getc_func getc, void* ctx, int flags)
@@ -156,7 +156,7 @@ struct string_ctx {
 } ;
 
 
-static char
+static int
 strget(struct string_ctx *in)
 {
     if ( !in->size ) return EOF;

data/lib/markdown.rb

@@ -0,0 +1 @@
+require 'rdiscount'

data/lib/rdiscount.rb

@@ -59,15 +59,8 @@ class RDiscount
     extensions.each { |e| send("#{e}=", true) }
   end
 
-  # Convert the Markdown #text to HTML.
-  #--
-  # This is method is replaced when the C extension is loaded.
-  def to_html
-    raise NotImplemented
-  end
-
 end
 
-# Load the extension library. This replaces RDiscount#to_html with a real
-# implementation.
+Markdown = RDiscount unless defined? Markdown
+
 require 'rdiscount.so'

data/test/benchmark.rb

@@ -2,16 +2,23 @@ require 'rubygems'
 
 iterations = 100
 test_file = "#{File.dirname(__FILE__)}/benchmark.txt"
-implementations = %w[BlueCloth RDiscount Maruku Markdown]
+implementations = %w[BlueCloth RDiscount Maruku PEGMarkdown]
 
 # Attempt to require each implementation and remove any that are not
 # installed.
 implementations.reject! do |class_name|
   begin
-    require class_name.downcase
+    module_path =
+      if class_name == 'PEGMarkdown'
+        'peg_markdown'
+      else
+        class_name.downcase
+      end
+    require module_path
     false
   rescue LoadError => boom
-    puts "#{class_name} excluded from benchmark. (Try: gem install #{class_name.downcase})"
+    module_path.tr! '_', '-'
+    puts "#{class_name} excluded. Try: gem install #{module_path}"
     true
   end
 end

data/test/{rdiscount_test.rb → markdown_test.rb}

@@ -1,31 +1,31 @@
 $: << File.join(File.dirname(__FILE__), "../lib")
 
 require 'test/unit'
-require 'rdiscount'
+require 'markdown'
 
 MARKDOWN_TEST_DIR = "#{File.dirname(__FILE__)}/MarkdownTest_1.0.3"
 
-class RDiscountTest < Test::Unit::TestCase
+class MarkdownTest < Test::Unit::TestCase
 
-  def test_that_extension_methods_are_present_on_rdiscount_class
-    assert RDiscount.instance_methods.include?('to_html'),
-      "RDiscount class should respond to #to_html"
+  def test_that_extension_methods_are_present_on_markdown_class
+    assert Markdown.instance_methods.include?('to_html'),
+      "Markdown class should respond to #to_html"
   end
 
   def test_that_simple_one_liner_goes_to_html
-    markdown = RDiscount.new('Hello World.')
+    markdown = Markdown.new('Hello World.')
     assert_respond_to markdown, :to_html
-    assert_equal "<p>Hello World.</p>\n", markdown.to_html
+    assert_equal "<p>Hello World.</p>", markdown.to_html.strip
   end
 
   def test_that_inline_markdown_goes_to_html
-    markdown = RDiscount.new('_Hello World_!')
+    markdown = Markdown.new('_Hello World_!')
     assert_respond_to markdown, :to_html
-    assert_equal "<p><em>Hello World</em>!</p>\n", markdown.to_html
+    assert_equal "<p><em>Hello World</em>!</p>", markdown.to_html.strip
   end
 
   def test_that_bluecloth_restrictions_are_supported
-    markdown = RDiscount.new('Hello World.')
+    markdown = Markdown.new('Hello World.')
     [:filter_html, :filter_styles].each do |restriction|
       assert_respond_to markdown, restriction
       assert_respond_to markdown, "#{restriction}="
@@ -33,26 +33,27 @@ class RDiscountTest < Test::Unit::TestCase
     assert_not_equal true, markdown.filter_html
     assert_not_equal true, markdown.filter_styles
 
-    markdown = RDiscount.new('Hello World.', :filter_html, :filter_styles)
+    markdown = Markdown.new('Hello World.', :filter_html, :filter_styles)
     assert_equal true, markdown.filter_html
     assert_equal true, markdown.filter_styles
   end
 
   def test_that_redcloth_attributes_are_supported
-    markdown = RDiscount.new('Hello World.')
+    markdown = Markdown.new('Hello World.')
     assert_respond_to markdown, :fold_lines
     assert_respond_to markdown, :fold_lines=
     assert_not_equal true, markdown.fold_lines
 
-    markdown = RDiscount.new('Hello World.', :fold_lines)
+    markdown = Markdown.new('Hello World.', :fold_lines)
     assert_equal true, markdown.fold_lines
   end
 
   def test_that_redcloth_to_html_with_single_arg_is_supported
-    markdown = RDiscount.new('Hello World.')
+    markdown = Markdown.new('Hello World.')
     assert_nothing_raised(ArgumentError) { markdown.to_html(true) }
   end
 
+
   # Build tests for each file in the MarkdownTest test suite
 
   Dir["#{MARKDOWN_TEST_DIR}/Tests/*.text"].each do |text_file|
@@ -62,13 +63,13 @@ class RDiscountTest < Test::Unit::TestCase
     method_name = basename.gsub(/[-,]/, '').gsub(/\s+/, '_').downcase
 
     define_method "test_#{method_name}" do
-      markdown = RDiscount.new(File.read(text_file))
+      markdown = Markdown.new(File.read(text_file))
       actual_html = markdown.to_html
       assert_not_nil actual_html
     end
 
     define_method "test_#{method_name}_with_smarty_enabled" do
-      markdown = RDiscount.new(File.read(text_file), :smart)
+      markdown = Markdown.new(File.read(text_file), :smart)
       actual_html = markdown.to_html
       assert_not_nil actual_html
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.2.6.2
+  version: 1.2.7
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-03 00:00:00 -04:00
+date: 2008-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,17 +20,17 @@ executables: []
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
-- README
 - COPYING
 files: 
-- README
+- README.markdown
 - COPYING
 - Rakefile
-- test/benchmark.rb
-- test/benchmark.txt
 - test/MarkdownTest_1.0
 - test/MarkdownTest_1.0.3
-- test/rdiscount_test.rb
+- test/benchmark.rb
+- test/benchmark.txt
+- test/markdown_test.rb
+- lib/markdown.rb
 - lib/rdiscount.rb
 - ext/extconf.rb
 - ext/docheader.c
@@ -69,9 +69,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Fast Implementation of Gruber's Markdown in C
 test_files: 
-- test/rdiscount_test.rb
+- test/markdown_test.rb