Skip to content

Commit 315b6e4

Browse files
author
Rex Chung
committed
reorder JrJackson before json_gem
1 parent 6dd3d69 commit 315b6e4

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/multi_json.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ def default_options=(value)
4242
REQUIREMENT_MAP = [
4343
['oj', :oj],
4444
['yajl', :yajl],
45+
['jrjackson', :jr_jackson],
4546
['json/ext', :json_gem],
4647
['gson', :gson],
47-
['jrjackson', :jr_jackson],
4848
['json/pure', :json_pure]
4949
]
5050

@@ -55,9 +55,9 @@ def default_options=(value)
5555
def default_adapter
5656
return :oj if defined?(::Oj)
5757
return :yajl if defined?(::Yajl)
58+
return :jr_jackson if defined?(::JrJackson)
5859
return :json_gem if defined?(::JSON)
5960
return :gson if defined?(::Gson)
60-
return :jr_jackson if defined?(::JrJackson)
6161

6262
REQUIREMENT_MAP.each do |library, adapter|
6363
begin

spec/multi_json_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
unless jruby?
7878
expect(MultiJson.adapter).to eq MultiJson::Adapters::Oj
7979
else
80-
expect(MultiJson.adapter).to eq MultiJson::Adapters::JsonGem
80+
expect(MultiJson.adapter).to eq MultiJson::Adapters::JrJackson
8181
end
8282
end
8383

0 commit comments

Comments
 (0)