Fix json compatibility issues.

piotrmurach · piotrmurach · commit bfb6d7ae20c6 · 2012-09-02T21:53:28.000+01:00
diff --git a/lib/github_api/error/service_error.rb b/lib/github_api/error/service_error.rb
@@ -1,10 +1,13 @@
 # encoding: utf-8
-require 'multi_json'
+# require 'multi_json'
+require 'github_api/jsonable'
 
 module Github
   # Raised when GitHub returns any of the HTTP status codes
   module Error
     class ServiceError < GithubError
+      include ::Github::Jsonable
+
       attr_reader :http_headers
 
       def initialize(response)
@@ -20,7 +23,7 @@ def parse_response(response)
 
       def decode_body(body)
         if body.respond_to?(:to_str) && body.length >= 2
-           MultiJson.load(body, :symbolize_keys => true)
+           decode body, :symbolize_keys => true
         else
           body
         end
diff --git a/lib/github_api/jsonable.rb b/lib/github_api/jsonable.rb
@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'multi_json'
+
+module Github
+  module Jsonable
+    extend self
+
+    def decode(*args)
+      if MultiJson.respond_to?(:load)
+        MultiJson.load *args
+      else
+        MultiJson.decode *args
+      end
+    end
+  end
+end
diff --git a/lib/github_api/response/jsonize.rb b/lib/github_api/response/jsonize.rb
@@ -1,17 +1,16 @@
 # encoding: utf-8
 
 require 'faraday'
+require 'github_api/jsonable'
 
 module Github
   class Response::Jsonize < Response
+    include Github::Jsonable
+
     dependency 'multi_json'
 
     define_parser do |body|
-      if MultiJson.respond_to?(:load)
-        MultiJson.load body
-      else
-        MultiJson.decode body
-      end
+      Github::Jsonable.decode body
     end
 
     def parse(body)
