File tree Expand file tree Collapse file tree 3 files changed +8
-24
lines changed Expand file tree Collapse file tree 3 files changed +8
-24
lines changed Original file line number Diff line number Diff line change 1
1
require 'redis/namespace'
2
2
3
- begin
4
- require 'yajl'
5
- rescue LoadError
6
- require 'json'
7
- end
8
-
9
3
require 'resque/version'
10
4
11
5
require 'resque/errors'
Original file line number Diff line number Diff line change
1
+ require 'multi_json'
2
+
1
3
module Resque
2
4
# Methods used by various classes in Resque.
3
5
module Helpers
@@ -11,29 +13,17 @@ def redis
11
13
# Given a Ruby object, returns a string suitable for storage in a
12
14
# queue.
13
15
def encode ( object )
14
- if defined? Yajl
15
- Yajl ::Encoder . encode ( object )
16
- else
17
- object . to_json
18
- end
16
+ ::MultiJson . encode ( object )
19
17
end
20
18
21
19
# Given a string, returns a Ruby object.
22
20
def decode ( object )
23
21
return unless object
24
22
25
- if defined? Yajl
26
- begin
27
- Yajl ::Parser . parse ( object , :check_utf8 => false )
28
- rescue Yajl ::ParseError => e
29
- raise DecodeException , e
30
- end
31
- else
32
- begin
33
- JSON . parse ( object )
34
- rescue JSON ::ParserError => e
35
- raise DecodeException , e
36
- end
23
+ begin
24
+ ::MultiJson . decode ( object )
25
+ rescue ::MultiJson ::DecodeError => e
26
+ raise DecodeException , e
37
27
end
38
28
end
39
29
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
24
24
s . add_dependency "redis-namespace" , "~> 1.0.2"
25
25
s . add_dependency "vegas" , "~> 0.1.2"
26
26
s . add_dependency "sinatra" , ">= 0.9.2"
27
- s . add_dependency "json " , ">= 1.4.6" , "< 1.6 "
27
+ s . add_dependency "multi_json " , "~> 1.0 "
28
28
29
29
s . description = <<description
30
30
Resque is a Redis-backed Ruby library for creating background jobs,
You can’t perform that action at this time.
0 commit comments