summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZack Hobson2013-12-26 11:33:11 -0800
committerZack Hobson2013-12-26 11:33:11 -0800
commitedce556e090c2ef2d6459d88d724ce4a05ce8725 (patch)
treea96353bc7123b1f2403b7b2f76070441b1271fae
parentee3a92987ddcc4e2901ad319d904c40c4a7970da (diff)
downloadhcl-edce556e090c2ef2d6459d88d724ce4a05ce8725.tar.bz2
use escape_utils instead of CGI
-rw-r--r--Gemfile.lock10
-rw-r--r--hcl.gemspec1
-rw-r--r--lib/hcl/harvest_middleware.rb4
3 files changed, 13 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 5572f3d..9b76d3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,6 +3,7 @@ PATH
specs:
hcl (0.4.9)
chronic
+ escape_utils
faraday
faraday_middleware
highline
@@ -14,11 +15,13 @@ GEM
specs:
chronic (0.10.2)
coderay (1.0.9)
+ escape_utils (1.0.0)
fakeweb (1.3.0)
faraday (0.8.8)
multipart-post (~> 1.2.0)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
+ ffi (1.9.3-java)
highline (1.6.20)
metaclass (0.0.1)
method_source (0.8.2)
@@ -31,6 +34,11 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
+ pry (0.9.12.2-java)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.4)
+ spoon (~> 0.0)
rake (10.1.0)
rubinius-coverage (2.0.3)
rubygems-tasks (0.2.4)
@@ -43,6 +51,8 @@ GEM
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.7)
+ spoon (0.0.4)
+ ffi
trollop (2.0)
yajl-ruby (1.1.0)
yard (0.8.7.3)
diff --git a/hcl.gemspec b/hcl.gemspec
index 4b769fc..29214ae 100644
--- a/hcl.gemspec
+++ b/hcl.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'faraday'
s.add_runtime_dependency 'faraday_middleware'
s.add_runtime_dependency 'multi_json'
+ s.add_runtime_dependency 'escape_utils'
s.add_development_dependency 'rake'
s.add_development_dependency 'rubygems-tasks'
s.add_development_dependency 'mocha'
diff --git a/lib/hcl/harvest_middleware.rb b/lib/hcl/harvest_middleware.rb
index 4d742ed..db9d50f 100644
--- a/lib/hcl/harvest_middleware.rb
+++ b/lib/hcl/harvest_middleware.rb
@@ -1,6 +1,6 @@
require 'faraday_middleware/response_middleware'
require 'multi_json'
-require 'cgi'
+require 'escape_utils'
class HCl::HarvestMiddleware < FaradayMiddleware::ResponseMiddleware
class Failure < StandardError; end
@@ -40,7 +40,7 @@ class HCl::HarvestMiddleware < FaradayMiddleware::ResponseMiddleware
elsif obj.kind_of? Array
obj.inject([]){|o,v| o << unescape(v);o}
else
- CGI.unescape_html(obj.to_s)
+ EscapeUtils.unescape_html(obj.to_s)
end
end