Skip to content
This repository
Browse code

Bump multi_json dependency to ~> 1.3.2

  • Loading branch information...
commit dd0a577722eee99ca081fc40fb0d01628bea1ad2 1 parent 82ffece
Martin Gamsjaeger authored
2  Gemfile
@@ -17,7 +17,7 @@ gem 'dm-core', DM_VERSION,
17 17
   :branch => CURRENT_BRANCH
18 18
 
19 19
 gem 'fastercsv',  '~> 1.5.4'
20  
-gem 'multi_json', '~> 1.0.3'
  20
+gem 'multi_json', '~> 1.3.2'
21 21
 gem 'json',       '~> 1.5.4', :platforms => [ :ruby_18, :jruby ]
22 22
 gem 'json_pure',  '~> 1.5.4', :platforms => [ :mswin ]
23 23
 
2  dm-serializer.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
17 17
   gem.version       = DataMapper::Serializer::VERSION
18 18
 
19 19
   gem.add_runtime_dependency('dm-core',    '~> 1.3.0.beta')
20  
-  gem.add_runtime_dependency('multi_json', '~> 1.0.3')
  20
+  gem.add_runtime_dependency('multi_json', '~> 1.3.2')
21 21
   gem.add_runtime_dependency('fastercsv',  '~> 1.5.4')
22 22
 
23 23
   gem.add_development_dependency('rake',  '~> 0.9.2')
6  lib/dm-serializer/to_json.rb
@@ -60,7 +60,7 @@ def to_json(*args)
60 60
 
61 61
       # default to making JSON
62 62
       if options.fetch(:to_json, true)
63  
-        MultiJson.encode(result)
  63
+        MultiJson.dump(result)
64 64
       else
65 65
         result
66 66
       end
@@ -69,7 +69,7 @@ def to_json(*args)
69 69
     module ValidationErrors
70 70
       module ToJson
71 71
         def to_json(*args)
72  
-          MultiJson.encode(Hash[ errors ])
  72
+          MultiJson.dump(Hash[ errors ])
73 73
         end
74 74
       end
75 75
     end
@@ -86,7 +86,7 @@ def to_json(*args)
86 86
 
87 87
       # default to making JSON
88 88
       if options.fetch(:to_json, true)
89  
-        MultiJson.encode(collection)
  89
+        MultiJson.dump(collection)
90 90
       else
91 91
         collection
92 92
       end

0 notes on commit dd0a577

Please sign in to comment.
Something went wrong with that request. Please try again.