From 28887505edda85ae5f986ab2df8de1720093bf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
Date: Fri, 15 Jun 2012 00:44:40 -0700
Subject: [PATCH 1/2] Rakefile: do not fail to run rake on Ruby 1.9 just for
 the site

The simple markup is gone with RDoc 3 (at least), but it works fine
with Ruby 1.8 because it loads the bundled RDoc.
---
 Rakefile | 73 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/Rakefile b/Rakefile
index 4d097df..a38bdbc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -290,45 +290,48 @@ namespace :todo do
   end
 end if File.exists?(File.join(library_root, 'TODO'))
 
-namespace :site do
-  require 'erb'
-  require 'rdoc/markup/simple_markup'
-  require 'rdoc/markup/simple_markup/to_html'
-  
-  readme    = lambda { IO.read('README')[/^== Getting started\n(.*)/m, 1] }
+begin
+  namespace :site do
+    require 'erb'
+    require 'rdoc/markup/simple_markup'
+    require 'rdoc/markup/simple_markup/to_html'
+
+    readme    = lambda { IO.read('README')[/^== Getting started\n(.*)/m, 1] }
 
-  readme_to_html = lambda do
-    handler = SM::ToHtml.new
-    handler.instance_eval do
-      require 'syntax'
-      require 'syntax/convertors/html'
-      def accept_verbatim(am, fragment) 
-        syntax = Syntax::Convertors::HTML.for_syntax('ruby')
-        @res << %(<div class="ruby">#{syntax.convert(fragment.txt, true)}</div>)
+    readme_to_html = lambda do
+      handler = SM::ToHtml.new
+      handler.instance_eval do
+        require 'syntax'
+        require 'syntax/convertors/html'
+        def accept_verbatim(am, fragment)
+          syntax = Syntax::Convertors::HTML.for_syntax('ruby')
+          @res << %(<div class="ruby">#{syntax.convert(fragment.txt, true)}</div>)
+        end
       end
+      SM::SimpleMarkup.new.convert(readme.call, handler)
     end
-    SM::SimpleMarkup.new.convert(readme.call, handler)
-  end
-  
-  desc 'Regenerate the public website page'
-  task :build => 'doc:readme' do
-    open('site/public/index.html', 'w') do |file|
-      erb_data = {}
-      erb_data[:readme] = readme_to_html.call
-      file.write ERB.new(IO.read('site/index.erb')).result(binding)
+
+    desc 'Regenerate the public website page'
+    task :build => 'doc:readme' do
+      open('site/public/index.html', 'w') do |file|
+        erb_data = {}
+        erb_data[:readme] = readme_to_html.call
+        file.write ERB.new(IO.read('site/index.erb')).result(binding)
+      end
+    end
+
+    task :refresh => :build do
+      system 'open site/public/index.html'
+    end
+
+    desc 'Update the live website'
+    task :deploy => :build do
+      site_files = FileList['site/public/*']
+      site_files.delete_if {|file| File.directory?(file)}
+      sh %(scp #{site_files.join ' '} marcel@rubyforge.org:/var/www/gforge-projects/amazon/)
     end
   end
-  
-  task :refresh => :build do
-    system 'open site/public/index.html'
-  end
-  
-  desc 'Update the live website'
-  task :deploy => :build do
-    site_files = FileList['site/public/*']
-    site_files.delete_if {|file| File.directory?(file)}
-    sh %(scp #{site_files.join ' '} marcel@rubyforge.org:/var/www/gforge-projects/amazon/)
-  end
-end 
+rescue LoadError
+end
 
 task :clean => ['dist:clobber_package', 'doc:clobber_rdoc', 'test:clobber_coverage']

From 7d76eeea4e7eb93773b780e7219eabb2ba924e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
Date: Fri, 15 Jun 2012 00:46:19 -0700
Subject: [PATCH 2/2] Make sure to declare the file is encoded in UTF-8.

This fixes tests with Ruby 1.9.
---
 test/extensions_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/extensions_test.rb b/test/extensions_test.rb
index 1c868ee..921e6b5 100644
--- a/test/extensions_test.rb
+++ b/test/extensions_test.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/test_helper'
 
 class HashExtensionsTest < Test::Unit::TestCase
@@ -342,4 +343,4 @@ def test_setting_the_proxy_as_non_exclusive
     
     assert_equal 'baz', n.foo
   end
-end
\ No newline at end of file
+end