Clean up more LOAD_PATH manipulation, add myself to authors

AUTHORS

@@ -10,6 +10,7 @@ Code and patches from:
 * Damir Zekic (z3c)
 * Alexandr Mankuta (cheba)
 * Nathan Weizenbaum <nex342@gmail.com>
+* [Ben Hollis][http://benhollis.net]
 
 Bug reporting, feature requests and praise:
 

CHANGELOG.md

@@ -10,3 +10,5 @@
   before it produced XML entity references.
 
 * Empty link references now match the way other Markdown implementations work.
+
+* Maruku now requires Ruby 1.8.7 or newer.

markdown-test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 puts "Maruku:"
-puts `bin/maruku -o - --html-frag #{ARGV[0]}`
+puts `ruby -Ilib bin/maruku -o - --html-frag #{ARGV[0]}`
 
 puts "Old Maruku:"
 puts `maruku -o - --html-frag #{ARGV[0]}`

maruku.gemspec

@@ -1,23 +1,23 @@
-($LOAD_PATH << File.expand_path("../lib", __FILE__)).uniq!
-require "maruku/version"
+require File.expand_path("../lib/maruku/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'maruku'
   s.version = MaRuKu::Version
   s.summary = "Maruku is a Markdown-superset interpreter written in Ruby."
-  s.description = %{Maruku is a Markdown interpreter in Ruby.
+  s.description = "Maruku is a Markdown interpreter in Ruby.
 	It features native export to HTML and PDF (via Latex). The
-	output is really beautiful!
-	}
+	output is really beautiful!"
   s.license = 'GPL-2'
-  s.authors = ["Andrea Censi", "Nathan Weizenbaum"]
+  s.authors = ["Andrea Censi", "Nathan Weizenbaum", "Ben Hollis"]
   s.email = "ben@benhollis.net"
   s.homepage = "http://github.com/bhollis/maruku"
 
-  s.files = Dir['lib/**/*.rb'] + Dir['lib/*.rb'] +
-    Dir['docs/*.md'] +	Dir['docs/*.html'] +
-    Dir['spec/**/*.rb'] + Dir['spec/**/*.md'] +
-    Dir['data/*'] + Dir['bin/*'] + ['Rakefile']
+  s.files = Dir['lib/**/*.rb',
+                'docs/*.{md,html}',
+                'spec/**/*.{rb,md}',
+                'data/*',
+                'bin/*',
+                'LICENSE']
 
   s.bindir = 'bin'
   s.executables = ['maruku','marutex']

spec/block_spec.rb

@@ -1,7 +1,8 @@
 # encoding: UTF-8
 Encoding.default_external=('UTF-8') if ''.respond_to?(:force_encoding)
-require File.dirname(__FILE__) + "/spec_helper"
 
+require 'rspec'
+require 'maruku'
 require 'nokogiri/diff'
 
 # Fix nokogiri-diff to understand comments (until they release a fixed version):

spec/span_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'rspec'
+require 'maruku'
 
 EXPECTATIONS = Maruku.new.instance_eval do
   [

spec/to_html_utf8_spec.rb

@@ -1,8 +1,9 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + "/spec_helper"
+require 'rspec'
+require 'maruku'
 
 describe "Maruku to_html" do
-  # This test hangs in JRuby!
+  # This test used to hang in JRuby!
   it "can produce HTML for a document that contains non-ASCII characters" do
     doc = Maruku.new.instance_eval 'md_el(:document,["è"],{},[])'
     doc.to_html.strip.should == "è"