Merge pull request #50 from jhund/multi_json

Replace Oj with MultiJson for JSON handling

Thanks Jo!

Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     neography (0.0.28)
       httparty (>= 0.8.1)
       json
-      oj
+      multi_json
       os
       rake (>= 0.8.7)
       rubyzip
@@ -20,7 +20,6 @@ GEM
     multi_json (1.3.6)
     multi_xml (0.5.1)
     net-http-spy (0.2.1)
-    oj (1.2.9)
     os (0.9.6)
     rake (0.8.7)
     rspec (2.10.0)

lib/neography.rb

@@ -18,13 +18,13 @@ def find_and_require_user_defined_code
 require 'cgi'
 require 'httparty'
 require 'json'
-require 'oj'
+require 'multi_json'
 require 'logger'
 require 'ostruct'
 require 'os'
 require 'zip/zipfilesystem'
 
-require 'neography/oj_parser'
+require 'neography/multi_json_parser'
 
 require 'neography/config'
 require 'neography/rest'

lib/neography/config.rb

@@ -15,6 +15,6 @@ class << self; attr_accessor :protocol, :server, :port, :directory, :cypher_path
     @authentication = {}
     @username       = nil
     @password       = nil
-    @parser         = {:parser => OjParser}
+    @parser         = {:parser => MultiJsonParser}
   end
-end
+end

lib/neography/multi_json_parser.rb

@@ -0,0 +1,9 @@
+class MultiJsonParser < HTTParty::Parser
+
+  protected
+
+    def json
+      MultiJson.load(body)
+    end
+
+end

neography.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"
-  s.add_dependency "oj"
+  s.add_dependency "multi_json"
 end