From 5a52fba2f553195435e2adf0133eb2cf14221c79 Mon Sep 17 00:00:00 2001
From: Xavier Shay <xavier@rhnh.net>
Date: Sat, 12 Nov 2011 16:15:47 -0800
Subject: [PATCH] Remove hpricot, upgrade nokogiri for windows compat (I hope).
 Fixes #34.

---
 Gemfile                        |  2 +-
 Gemfile.lock                   | 10 +++-------
 spec/support/be_valid_html5.rb |  3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 066d2d7ea..651c69228 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,5 +43,5 @@ group :development, :test do
   gem 'factory_girl'
   gem 'rspec'
   gem 'rspec-rails'
-  gem 'hpricot'
+  gem 'nokogiri', '~> 1.5.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 6dd6e8077..b08c9f004 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,8 +58,6 @@ GEM
       json (~> 1.4.6)
     gherkin (2.3.3-java)
       json (~> 1.4.6)
-    hpricot (0.8.3)
-    hpricot (0.8.3-java)
     i18n (0.5.0)
     jdbc-sqlite3 (3.7.2)
     jruby-openssl (0.7.4)
@@ -74,9 +72,8 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.4)
-    nokogiri (1.4.4-java)
-      weakling (>= 0.0.3)
+    nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -126,7 +123,6 @@ GEM
       trinidad_jars (>= 1.0.1)
     trinidad_jars (1.0.1)
     tzinfo (0.3.24)
-    weakling (0.0.4-java)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
@@ -145,9 +141,9 @@ DEPENDENCIES
   cucumber-rails
   factory_girl
   formtastic
-  hpricot
   jruby-openssl
   lesstile
+  nokogiri (~> 1.5.0)
   rack-openid
   rails (= 3.0.4)
   rspec
diff --git a/spec/support/be_valid_html5.rb b/spec/support/be_valid_html5.rb
index 46c7257a9..dc531a950 100644
--- a/spec/support/be_valid_html5.rb
+++ b/spec/support/be_valid_html5.rb
@@ -1,7 +1,6 @@
 # Paste me into spec_helper.rb, or save me somewhere else and require me in.
 require 'net/http'
 require 'digest/md5'
-require 'hpricot'
 
 class BeValidHtml5
 
@@ -59,7 +58,7 @@ def matches?(rendered)
     unless markup_is_valid
       fragment.split($/).each_with_index{|line, index| message << "#{'%04i' % (index+1)} : #{line}#{$/}"} if @@display_invalid_content
       @message = "Invalid markup:\n"
-      @elements = Hpricot(response.body.force_encoding('utf-8')).search("li.msg_err > span.msg")
+      @elements = Nokogiri::HTML(response.body.force_encoding('utf-8')).css("li.msg_err > span.msg")
       (@elements).each { |span| @message << CGI.unescapeHTML(span.inner_html) + "\n" }
     end
     if markup_is_valid