From b38845ac6f8bd638c96ff17a26f85e0c501de9e7 Mon Sep 17 00:00:00 2001
From: spodlecki <spodlecki@skintertainment.com>
Date: Wed, 30 Dec 2015 16:40:05 -0600
Subject: [PATCH 1/2] removing httpclient due to deprecation warning

---
 impressionist.gemspec     |  2 --
 lib/impressionist/bots.rb | 19 +++++++++++--------
 tests/test_app/Gemfile    |  3 +++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/impressionist.gemspec b/impressionist.gemspec
index 92813c6..cd7867f 100644
--- a/impressionist.gemspec
+++ b/impressionist.gemspec
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
   s.require_path  = 'lib'
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
 
-  s.add_dependency 'httpclient', '~> 2.2'
   s.add_dependency 'nokogiri', '~> 1.6'
-
   s.add_development_dependency 'bundler', '~> 1.0'
 end
diff --git a/lib/impressionist/bots.rb b/lib/impressionist/bots.rb
index 10d3fd6..93c11d2 100644
--- a/lib/impressionist/bots.rb
+++ b/lib/impressionist/bots.rb
@@ -1,18 +1,21 @@
-require 'httpclient'
+require 'timeout'
+require 'net/http'
 require 'nokogiri'
 
 module Impressionist
   module Bots
     LIST_URL = "http://www.user-agents.org/allagents.xml"
     def self.consume
-      response = HTTPClient.new.get_content(LIST_URL)
-      doc = Nokogiri::XML(response)
-      list = []
-      doc.xpath('//user-agent').each do |agent|
-        type = agent.xpath("Type").text
-        list << agent.xpath("String").text.gsub("&lt;","<") if ["R","S"].include?(type) #gsub hack for badly formatted data
+      Timeout.timeout(4) do
+        response = Net::HTTP.get(URI.parse(LIST_URL))
+        doc = Nokogiri::XML(response)
+        list = []
+        doc.xpath('//user-agent').each do |agent|
+          type = agent.xpath("Type").text
+          list << agent.xpath("String").text.gsub("&lt;","<") if ["R","S"].include?(type) #gsub hack for badly formatted data
+        end
+        list
       end
-      list
     end
   end
 end
diff --git a/tests/test_app/Gemfile b/tests/test_app/Gemfile
index 0446278..7a93eb0 100644
--- a/tests/test_app/Gemfile
+++ b/tests/test_app/Gemfile
@@ -36,6 +36,9 @@ group :development, :test do
   gem 'autotest-notification'
   gem 'rspec-rails', '~> 2.14.0'
   gem 'spork'
+
+  # test/unit has been removed by default in Ruby 2.2.x+
+  gem 'test-unit'
 end
 
 group :test do

From 14794f8e34c65c953f385ce47ad772a7a679fe56 Mon Sep 17 00:00:00 2001
From: spodlecki <spodlecki@skintertainment.com>
Date: Wed, 30 Dec 2015 16:54:57 -0600
Subject: [PATCH 2/2] travis updates and gemfile test for travis

---
 .travis.yml              | 2 +-
 gemfiles/rails32.gemfile | 3 +++
 gemfiles/rails40.gemfile | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index db89bc3..afc0fb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 before_script:
   - cd tests/test_app
   - bundle exec rails g impressionist -f
-  - bundle exec rake db:migrate
+  - bundle exec rake db:create db:migrate RAILS_ENV=test
   - cd ..
 rvm:
   - 1.9.3
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
index 08a2fae..35d20f1 100644
--- a/gemfiles/rails32.gemfile
+++ b/gemfiles/rails32.gemfile
@@ -22,6 +22,9 @@ group :test do
   gem 'simplecov'
   gem 'systemu'
   gem 'friendly_id', '~> 4.0.9'
+
+  # test/unit has been removed by default in Ruby 2.2.x+
+  gem 'test-unit'
 end
 
 gemspec :path => '../'
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
index beb41c9..18557d2 100644
--- a/gemfiles/rails40.gemfile
+++ b/gemfiles/rails40.gemfile
@@ -22,6 +22,9 @@ group :test do
   gem 'simplecov'
   gem 'systemu'
   gem 'friendly_id', '~> 5.1.0'
+
+  # test/unit has been removed by default in Ruby 2.2.x+
+  gem 'test-unit'
 end
 
 gemspec :path => '../'