ext/rdiscount.c lib/rdiscount.rb @@ -1,4 +1,4 @@ -ext/discount.o +ext/rdiscount.o ext/docheader.o ext/dumptree.o ext/generate.o @@ -6,6 +6,11 @@ ext/markdown.o ext/mkdio.o ext/rbstrio.o ext/resource.o -ext/discount.bundle -lib/discount.bundle +ext/rdiscount.bundle +ext/rdiscount.so +ext/rdiscount.dll +lib/rdiscount.bundle +lib/rdiscount.so +lib/rdiscount.dll ext/Makefile +pkg .gitignore @@ -9,9 +9,9 @@ VERS = '1.2.6.1' spec = Gem::Specification.new do |s| - s.name = "discount" + s.name = "rdiscount" s.version = VERS - s.summary = "Discount Implementation of Gruber's Markdown" + s.summary = "Fast Implementation of Gruber's Markdown in C" s.files = FileList['README','COPYING','Rakefile','test/**/*','{lib,ext}/**.rb','ext/*.{c,h}'] s.bindir = 'bin' s.require_path = 'lib' @@ -70,19 +70,19 @@ end file 'ext/Makefile' => FileList['ext/{*.c,*.h,*.rb}'] do chdir('ext') { ruby 'extconf.rb' } end -CLEAN.include 'ext/Makefile' +CLEAN.include 'ext/Makefile', 'ext/mkmf.log' -file "ext/discount.#{DLEXT}" => FileList['ext/Makefile', 'ext/*.{c,h,rb}'] do |f| +file "ext/rdiscount.#{DLEXT}" => FileList['ext/Makefile', 'ext/*.{c,h,rb}'] do |f| sh 'cd ext && make' end CLEAN.include 'ext/*.{o,bundle,so,dll}' -file "lib/discount.#{DLEXT}" => "ext/discount.#{DLEXT}" do |f| +file "lib/rdiscount.#{DLEXT}" => "ext/rdiscount.#{DLEXT}" do |f| cp f.prerequisites, "lib/", :preserve => true end -desc 'Build the discount extension' -task :build => "lib/discount.#{DLEXT}" +desc 'Build the rdiscount extension' +task :build => "lib/rdiscount.#{DLEXT}" desc 'Run unit tests' task 'test:unit' => [:build] do |t| @@ -115,12 +115,12 @@ task :test => %w[test:unit test:conformance] # Rubyforge # ========================================================== -PKGNAME = "pkg/discount-#{VERS}" +PKGNAME = "pkg/rdiscount-#{VERS}" desc 'Publish new release to rubyforge' task :release => [ "#{PKGNAME}.gem", "#{PKGNAME}.tar.gz" ] do |t| sh <<-end - rubyforge add_release wink discount #{VERS} #{PKGNAME}.gem && - rubyforge add_file wink discount #{VERS} #{PKGNAME}.tar.gz + rubyforge add_release wink rdiscount #{VERS} #{PKGNAME}.gem && + rubyforge add_file wink rdiscount #{VERS} #{PKGNAME}.tar.gz end end Rakefile @@ -1,5 +1,5 @@ #!/usr/bin/env ruby $: << File.expand_path(File.dirname(__FILE__) + "/../lib") -require 'discount' -STDOUT.write(Discount.new(ARGF.read).to_html) +require 'rdiscount' +STDOUT.write(RDiscount.new(ARGF.read).to_html) bin/rdiscount @@ -1,4 +1,3 @@ require 'mkmf' - -dir_config('discount') -create_makefile('discount') +dir_config('rdiscount') +create_makefile('rdiscount') ext/extconf.rb @@ -1,54 +1,54 @@ $: << File.join(File.dirname(__FILE__), "lib") require 'test/unit' -require 'discount' +require 'rdiscount' -class DiscountTest < Test::Unit::TestCase +class RDiscountTest < Test::Unit::TestCase - def test_that_extension_methods_are_present_on_discount_class - assert Discount.instance_methods.include?('to_html'), - "Discount class should respond to #to_html" + def test_that_extension_methods_are_present_on_rdiscount_class + assert RDiscount.instance_methods.include?('to_html'), + "RDiscount class should respond to #to_html" end def test_that_simple_one_liner_goes_to_html - discount = Discount.new('Hello World.') - assert_respond_to discount, :to_html - assert_equal "<p>Hello World.</p>\n", discount.to_html + markdown = RDiscount.new('Hello World.') + assert_respond_to markdown, :to_html + assert_equal "<p>Hello World.</p>\n", markdown.to_html end def test_that_inline_markdown_goes_to_html - discount = Discount.new('_Hello World_!') - assert_respond_to discount, :to_html - assert_equal "<p><em>Hello World</em>!</p>\n", discount.to_html + markdown = RDiscount.new('_Hello World_!') + assert_respond_to markdown, :to_html + assert_equal "<p><em>Hello World</em>!</p>\n", markdown.to_html end def test_that_bluecloth_restrictions_are_supported - discount = Discount.new('Hello World.') + markdown = RDiscount.new('Hello World.') [:filter_html, :filter_styles].each do |restriction| - assert_respond_to discount, restriction - assert_respond_to discount, "#{restriction}=" + assert_respond_to markdown, restriction + assert_respond_to markdown, "#{restriction}=" end - assert_not_equal true, discount.filter_html - assert_not_equal true, discount.filter_styles + assert_not_equal true, markdown.filter_html + assert_not_equal true, markdown.filter_styles - discount = Discount.new('Hello World.', :filter_html, :filter_styles) - assert_equal true, discount.filter_html - assert_equal true, discount.filter_styles + markdown = RDiscount.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 - discount = Discount.new('Hello World.') - assert_respond_to discount, :fold_lines - assert_respond_to discount, :fold_lines= - assert_not_equal true, discount.fold_lines + markdown = RDiscount.new('Hello World.') + assert_respond_to markdown, :fold_lines + assert_respond_to markdown, :fold_lines= + assert_not_equal true, markdown.fold_lines - discount = Discount.new('Hello World.', :fold_lines) - assert_equal true, discount.fold_lines + markdown = RDiscount.new('Hello World.', :fold_lines) + assert_equal true, markdown.fold_lines end def test_that_redcloth_to_html_with_single_arg_is_supported - discount = Discount.new('Hello World.') - assert_nothing_raised(ArgumentError) { discount.to_html(true) } + markdown = RDiscount.new('Hello World.') + assert_nothing_raised(ArgumentError) { markdown.to_html(true) } end # Build tests for each file in the MarkdownTest test suite @@ -60,14 +60,14 @@ class DiscountTest < Test::Unit::TestCase method_name = basename.gsub(/[-,]/, '').gsub(/\s+/, '_').downcase define_method "test_#{method_name}" do - discount = Discount.new(File.read(text_file)) - actual_html = discount.to_html + markdown = RDiscount.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 - discount = Discount.new(File.read(text_file), :smart) - actual_html = discount.to_html + markdown = RDiscount.new(File.read(text_file), :smart) + actual_html = markdown.to_html assert_not_nil actual_html end test.rb ext/discount.c lib/discount.rb a5855f42153b8d23ce7402cd32b100e64c40fef1 Ryan Tomayko rtomayko@gmail.com http://github.com/rtomayko/rdiscount/commit/a79b616e22ed99c9ae310b60ab8cc462ba3104b4 a79b616e22ed99c9ae310b60ab8cc462ba3104b4 2008-06-03T03:59:06-07:00 2008-06-02T16:36:40-07:00 Rename Discount as RDiscount The "Discount" name is likely to clash at the top level. f834b5a2c9ee39e53164f64ed4b0230d0b2bd056 Ryan Tomayko rtomayko@gmail.com