diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | hcl.gemspec | 2 | ||||
| -rw-r--r-- | lib/hcl.rb | 2 | ||||
| -rw-r--r-- | lib/hcl/harvest_middleware.rb (renamed from lib/hcl/yajl_middleware.rb) | 6 | ||||
| -rw-r--r-- | lib/hcl/timesheet_resource.rb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index db5a77d..5572f3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,8 +6,8 @@ PATH faraday faraday_middleware highline + multi_json trollop - yajl-ruby GEM remote: https://rubygems.org/ diff --git a/hcl.gemspec b/hcl.gemspec index fd5e526..4b769fc 100644 --- a/hcl.gemspec +++ b/hcl.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'highline' s.add_runtime_dependency 'faraday' s.add_runtime_dependency 'faraday_middleware' - s.add_runtime_dependency 'yajl-ruby' + s.add_runtime_dependency 'multi_json' s.add_development_dependency 'rake' s.add_development_dependency 'rubygems-tasks' s.add_development_dependency 'mocha' @@ -7,5 +7,5 @@ module HCl autoload :Project, 'hcl/project' autoload :Task, 'hcl/task' autoload :DayEntry, 'hcl/day_entry' - autoload :YajlMiddleware, 'hcl/yajl_middleware' + autoload :HarvestMiddleware, 'hcl/harvest_middleware' end diff --git a/lib/hcl/yajl_middleware.rb b/lib/hcl/harvest_middleware.rb index 8d914d7..2be04bc 100644 --- a/lib/hcl/yajl_middleware.rb +++ b/lib/hcl/harvest_middleware.rb @@ -1,8 +1,8 @@ require 'faraday_middleware/response_middleware' -require 'yajl' +require 'multi_json' require 'cgi' -class HCl::YajlMiddleware < FaradayMiddleware::ResponseMiddleware +class HCl::HarvestMiddleware < FaradayMiddleware::ResponseMiddleware def self.unescape obj if obj.kind_of? Hash obj.inject({}){|o,(k,v)| o[k] = unescape(v);o} @@ -14,6 +14,6 @@ class HCl::YajlMiddleware < FaradayMiddleware::ResponseMiddleware end define_parser do |body| - unescape Yajl::Parser.parse(body, symbolize_keys:true) + unescape MultiJson.load(body, symbolize_keys:true) end end diff --git a/lib/hcl/timesheet_resource.rb b/lib/hcl/timesheet_resource.rb index cb6fce5..ff25c01 100644 --- a/lib/hcl/timesheet_resource.rb +++ b/lib/hcl/timesheet_resource.rb @@ -59,7 +59,7 @@ module HCl f.headers['Accept'] = 'application/json' f.request :json f.request :basic_auth, login, password - f.use HCl::YajlMiddleware, content_type: /\bjson$/ + f.use HCl::HarvestMiddleware, content_type: /\bjson$/ f.adapter Faraday.default_adapter end end |