summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZack Hobson2013-12-22 17:37:25 -0800
committerZack Hobson2013-12-22 17:37:25 -0800
commit54af5191fb6723e17f4427974a90488bfb341936 (patch)
tree2eb4f8656ae0e640bc68af58dbb349fee4db88c2 /lib
parentce8ebf8d59953684c9f8f7e0ed3ca7d94f809f96 (diff)
downloadhcl-54af5191fb6723e17f4427974a90488bfb341936.tar.bz2
use multi-json instead of ruby-yajl
Diffstat (limited to 'lib')
-rw-r--r--lib/hcl.rb2
-rw-r--r--lib/hcl/harvest_middleware.rb (renamed from lib/hcl/yajl_middleware.rb)6
-rw-r--r--lib/hcl/timesheet_resource.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/hcl.rb b/lib/hcl.rb
index f4a085b..3108fe1 100644
--- a/lib/hcl.rb
+++ b/lib/hcl.rb
@@ -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