lib/macaroons/serializers/json.rb in macaroons-0.4.1 vs lib/macaroons/serializers/json.rb in macaroons-0.5.1
- old
+ new
@@ -1,6 +1,6 @@
-require 'json'
+require 'multi_json'
module Macaroons
class JsonSerializer
def serialize(macaroon)
@@ -8,14 +8,14 @@
location: macaroon.location,
identifier: macaroon.identifier,
caveats: macaroon.caveats.map!(&:to_h),
signature: macaroon.signature
}
- return serialized.to_json
+ MultiJson.dump(serialized)
end
def deserialize(serialized)
- deserialized = JSON.parse(serialized)
+ deserialized = MultiJson.load(serialized)
macaroon = Macaroons::RawMacaroon.new(key: 'no_key', identifier: deserialized['identifier'], location: deserialized['location'])
deserialized['caveats'].each do |c|
caveat = Macaroons::Caveat.new(c['cid'], c['vid'], c['cl'])
macaroon.caveats << caveat
end