projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4cb8f82
)
use JSON.dump so timestamps load back as Time, and Oj.load for fast loading
author
Tom Clegg <tom@clinicalfuture.com>
Wed, 6 Feb 2013 21:35:27 +0000
(16:35 -0500)
committer
Tom Clegg <tom@clinicalfuture.com>
Wed, 6 Feb 2013 21:35:27 +0000
(16:35 -0500)
app/models/orvos_api_client.rb
patch
|
blob
|
history
diff --git
a/app/models/orvos_api_client.rb
b/app/models/orvos_api_client.rb
index 0e57cfd76ff2f0fb3104fa8c47dd96c0b3944d8d..aa73856aefd893f5d30030ff5df8e3cb3af70f22 100644
(file)
--- 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
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
end
end
else
@@
-33,7
+33,7
@@
class OrvosApiClient
'r') do |io|
json = io.read
end
'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
if resp[:errors]
if resp[:errors][0] == 'Not logged in'
raise NotLoggedInException.new