1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Remove usage of multi_json gem

This commit is contained in:
Mike Perham 2013-05-12 14:33:49 -07:00
parent 4679c95f49
commit 894e3e6e87
3 changed files with 6 additions and 4 deletions

View file

@ -10,6 +10,8 @@
when Redis is back.
- Fix unclean shutdown leading to duplicate jobs [#897]
- Add Korean locale [#890]
- Upgrade test suite to Minitest 5
- Remove usage of `multi_json` as `json` is now robust on all platforms.
2.11.2
-----------

View file

@ -7,7 +7,7 @@ require 'sidekiq/redis_connection'
require 'sidekiq/util'
require 'sidekiq/api'
require 'multi_json'
require 'json'
module Sidekiq
NAME = "Sidekiq"
@ -90,11 +90,11 @@ module Sidekiq
end
def self.load_json(string)
MultiJson.decode(string, :symbolize_keys => false)
JSON.parse(string)
end
def self.dump_json(object)
MultiJson.encode(object)
JSON.generate(object)
end
def self.logger

View file

@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.add_dependency 'redis-namespace'
gem.add_dependency 'connection_pool', '>= 1.0.0'
gem.add_dependency 'celluloid', '>= 0.14.0'
gem.add_dependency 'multi_json'
gem.add_dependency 'json'
gem.add_development_dependency 'sinatra'
gem.add_development_dependency 'slim'
gem.add_development_dependency 'minitest', '~> 5'