From: Tom Clegg <tom@clinicalfuture.com>
Date: Wed, 6 Feb 2013 21:35:27 +0000 (-0500)
Subject: use JSON.dump so timestamps load back as Time, and Oj.load for fast loading
X-Git-Tag: 1.1.0~3374^2~54
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7219237f88b0535d04974afecba7239155fc4cdc?ds=sidebyside

use JSON.dump so timestamps load back as Time, and Oj.load for fast loading
---

diff --git a/app/models/orvos_api_client.rb b/app/models/orvos_api_client.rb
index 0e57cfd76f..aa73856aef 100644
--- a/app/models/orvos_api_client.rb
+++ b/app/models/orvos_api_client.rb
@@ -16,7 +16,7 @@ class OrvosApiClient
         elsif v == true or v == false
           dataargs << "#{k}=#{v ? 1 : 0}"
         else
-          dataargs << "#{k}=#{MultiJson.dump(v)}"
+          dataargs << "#{k}=#{JSON.dump(v)}"
         end
       end
     else
@@ -33,7 +33,7 @@ class OrvosApiClient
              'r') do |io|
       json = io.read
     end
-    resp = MultiJson.load(json, :symbolize_keys => true)
+    resp = Oj.load(json, :symbol_keys => true)
     if resp[:errors]
       if resp[:errors][0] == 'Not logged in'
         raise NotLoggedInException.new