Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bump multi_json dependency to ~> 1.3.2

  • Loading branch information...
commit dd0a577722eee99ca081fc40fb0d01628bea1ad2 1 parent 82ffece
@snusnu snusnu authored
View
2  Gemfile
@@ -17,7 +17,7 @@ gem 'dm-core', DM_VERSION,
:branch => CURRENT_BRANCH
gem 'fastercsv', '~> 1.5.4'
-gem 'multi_json', '~> 1.0.3'
+gem 'multi_json', '~> 1.3.2'
gem 'json', '~> 1.5.4', :platforms => [ :ruby_18, :jruby ]
gem 'json_pure', '~> 1.5.4', :platforms => [ :mswin ]
View
2  dm-serializer.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
gem.version = DataMapper::Serializer::VERSION
gem.add_runtime_dependency('dm-core', '~> 1.3.0.beta')
- gem.add_runtime_dependency('multi_json', '~> 1.0.3')
+ gem.add_runtime_dependency('multi_json', '~> 1.3.2')
gem.add_runtime_dependency('fastercsv', '~> 1.5.4')
gem.add_development_dependency('rake', '~> 0.9.2')
View
6 lib/dm-serializer/to_json.rb
@@ -60,7 +60,7 @@ def to_json(*args)
# default to making JSON
if options.fetch(:to_json, true)
- MultiJson.encode(result)
+ MultiJson.dump(result)
else
result
end
@@ -69,7 +69,7 @@ def to_json(*args)
module ValidationErrors
module ToJson
def to_json(*args)
- MultiJson.encode(Hash[ errors ])
+ MultiJson.dump(Hash[ errors ])
end
end
end
@@ -86,7 +86,7 @@ def to_json(*args)
# default to making JSON
if options.fetch(:to_json, true)
- MultiJson.encode(collection)
+ MultiJson.dump(collection)
else
collection
end
Please sign in to comment.
Something went wrong with that request. Please try again.