From 13528d8d6710981aa911cf57711b593db870cbbb Mon Sep 17 00:00:00 2001
From: Jens Finkhaeuser <jens@finkhaeuser.de>
Date: Tue, 14 Jul 2015 17:08:59 +0200
Subject: [PATCH] Include faraday_json in the API class. Also bump
 dependencies.

---
 Gemfile.lock            | 29 ++++++++++++++++++-----------
 lapis_lazuli.gemspec    | 13 +++++++------
 lib/lapis_lazuli/api.rb |  3 ++-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 055d503..fea3168 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    lapis_lazuli (0.7.0)
+    lapis_lazuli (0.8.1)
       facets (~> 2.9)
-      faraday (~> 0.9.0)
-      faraday_middleware (~> 0.9.1)
-      json (~> 1.8.1)
-      minitest (~> 5.5.1)
-      multi_xml (~> 0.5.5)
-      teelogger (~> 0.4.0)
+      faraday (~> 0.9)
+      faraday_json (~> 0.1)
+      faraday_middleware (~> 0.9)
+      json (~> 1.8)
+      minitest (~> 5.5)
+      multi_xml (~> 0.5)
+      teelogger (~> 0.4)
       thor (~> 0.19)
 
 GEM
@@ -18,20 +19,26 @@ GEM
     facets (2.9.3)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
+    faraday_json (0.1.2)
       faraday (>= 0.7.4, < 0.10)
-    json (1.8.2)
-    minitest (5.5.1)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    json (1.8.3)
+    minitest (5.7.0)
     multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     rake (10.4.2)
+    require_all (1.3.2)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
-    teelogger (0.4.1)
+    tai64 (0.0.5)
+    teelogger (0.5.1)
+      require_all (~> 1.3)
+      tai64 (~> 0.0)
     thor (0.19.1)
 
 PLATFORMS
diff --git a/lapis_lazuli.gemspec b/lapis_lazuli.gemspec
index fcfb494..db6c434 100644
--- a/lapis_lazuli.gemspec
+++ b/lapis_lazuli.gemspec
@@ -35,10 +35,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 0.19"
   spec.add_dependency "facets", "~> 2.9"
-  spec.add_dependency "json", "~> 1.8.1"
-  spec.add_dependency "faraday", "~> 0.9.0"
-  spec.add_dependency "faraday_middleware", "~> 0.9.1"
-  spec.add_dependency "multi_xml", "~> 0.5.5"
-  spec.add_dependency "teelogger", "~> 0.4.0"
-  spec.add_dependency "minitest", "~> 5.5.1"
+  spec.add_dependency "json", "~> 1.8"
+  spec.add_dependency "faraday", "~> 0.9"
+  spec.add_dependency "faraday_middleware", "~> 0.9"
+  spec.add_dependency "faraday_json", "~> 0.1"
+  spec.add_dependency "multi_xml", "~> 0.5"
+  spec.add_dependency "teelogger", "~> 0.4"
+  spec.add_dependency "minitest", "~> 5.5"
 end
diff --git a/lib/lapis_lazuli/api.rb b/lib/lapis_lazuli/api.rb
index 3c5d48a..1f07e1b 100644
--- a/lib/lapis_lazuli/api.rb
+++ b/lib/lapis_lazuli/api.rb
@@ -2,12 +2,13 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2014 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2015 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 
 require "faraday"
 require "faraday_middleware"
+require "faraday_json"
 require "multi_xml"
 
 module LapisLazuli