Replace deprecated hpricot with nokogiri.

bborn · Apr 27, 2016 · ade91ef · ade91ef
1 parent 1eedc56
commit ade91ef
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
@@ -1,4 +1,4 @@
-require 'hpricot'
+require 'nokogiri'
 require 'open-uri'
 require 'pp'
 

diff --git a/app/controllers/clippings_controller.rb b/app/controllers/clippings_controller.rb
@@ -82,7 +82,7 @@ def show
   def load_images_from_uri
     uri = URI.parse(params[:uri])
     begin
-      doc = Hpricot( open( uri ) )
+      doc = Nokogiri::HTML( open( uri ) )
     rescue
       return
     end

diff --git a/app/helpers/base_helper.rb b/app/helpers/base_helper.rb
@@ -100,7 +100,7 @@ def truncate_words_with_highlight(text, phrase)
 
   def excerpt_with_jump(text, end_string = ' ...')
     return if text.blank?
-    doc = Hpricot( text )
+    doc = Nokogiri::HTML( text )
     paragraph = doc.at("p")
     if paragraph
       paragraph.to_html + end_string

diff --git a/app/models/post.rb b/app/models/post.rb
@@ -114,7 +114,7 @@ def next_post
   end
 
   def first_image_in_body(size = nil, options = {})
-    doc = Hpricot( post )
+    doc = Nokogiri::HTML( post )
     image = doc.at("img")
     image ? image['src'] : nil
   end

diff --git a/community_engine.gemspec b/community_engine.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency "dynamic_form",              ">= 0"
   s.add_dependency "friendly_id",               "~> 5.1.0"
   s.add_dependency "haml",                      ">= 0"
-  s.add_dependency "hpricot",                   ">= 0"
+  s.add_dependency "nokogiri",                  ">= 0"
   s.add_dependency "htmlentities",              ">= 0"
   s.add_dependency "kaminari",                  ">= 0"
   s.add_dependency "koala",                     "~> 1.6.0"

diff --git a/lib/community_engine.rb b/lib/community_engine.rb
@@ -12,7 +12,7 @@
 require 'community_engine/engines_extensions'
 
 require 'configatron'
-require 'hpricot'
+require 'nokogiri'
 require 'htmlentities'
 require 'haml'
 require 'sass-rails'

diff --git a/test/unit/page_test.rb b/test/unit/page_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
-require 'hpricot'
-    
+require 'nokogiri'
+
 class PageTest < ActiveSupport::TestCase
   fixtures :pages
 

diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'hpricot'
+require 'nokogiri'
 
 class PostTest < ActiveSupport::TestCase
   fixtures :all

diff --git a/test/unit/user_notifier_test.rb b/test/unit/user_notifier_test.rb
@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'hpricot'
+require 'nokogiri'
 
 class UserNotifierTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'