Removing hpricot

awestruct.gemspec

@@ -23,7 +23,6 @@ spec = Gem::Specification.new do |s|
     s.requirements  << "Any markup languages you are using and it's dependencies" 
     s.requirements  << "If LESS is used, or some other fixes within tilt, it is required to use Bundler and the :git ref for the tilt gem"
 
-    s.add_dependency 'hpricot', '~> 0.8.6'
     s.add_dependency 'nokogiri', '~> 1.5.6'
     s.add_dependency 'tilt', '~> 1.3.3'
     s.add_dependency 'compass', '~> 0.12.1'

lib/awestruct/context_helper.rb

@@ -1,4 +1,4 @@
-require 'hpricot'
+require 'nokogiri'
 
 module Awestruct
   module ContextHelper
@@ -38,22 +38,24 @@ def summarize(text, numwords=20, ellipsis='...')
     end
 
     def fully_qualify_urls(base_url, text)
-      doc = Hpricot( text )
+      doc = Nokogiri::HTML.fragment( text )
 
-      doc.search( "//a" ).each do |a|
+      doc.css( "a" ).each do |a|
         a['href'] = fix_url( base_url, a['href'] ) if a['href']
       end
-      doc.search( "//link" ).each do |link|
+      doc.css( "link" ).each do |link|
         link['href'] = fix_url( base_url, link['href'] )
       end
-      doc.search( "//img" ).each do |img|
+      doc.css( "img" ).each do |img|
         img['src'] = fix_url( base_url, img['src'] )
       end
+
+      # TODO: Double check if this is true with Nokogiri
       # Hpricot::Doc#to_s output encoding is not necessarily the same as the encoding of text
       if RUBY_VERSION.start_with? '1.8'
-        doc.to_s
+        doc.to_xhtml
       else
-        doc.to_s.tap do |d| 
+        doc.to_xhtml.tap do |d| 
           d.force_encoding(text.encoding) if d.encoding != text.encoding 
         end
       end

lib/awestruct/handlers/restructuredtext_handler.rb

@@ -6,7 +6,7 @@
 require 'awestruct/handlers/interpolation_handler'
 require 'awestruct/handlers/layout_handler'
 
-require 'hpricot'
+require 'nokogiri'
 
 module Awestruct
   module Handlers
@@ -54,7 +54,7 @@ def rendered_content(context, with_layouts=true)
                                  "--no-doc-title",
                                  " --initial-header-level=#{hl}" ].join(' '), 
                                  content )
-          content = Hpricot( doc ).at( '/html/body/div[@class="document"]' ).inner_html.strip
+          content = Nokogiri::HTML.fragment( doc ).at( '/html/body/div[@class="document"]' ).inner_html.strip
           content = content.gsub( "\r", '' )
         rescue => e
           puts e