Skip to content

Commit b36dc91

Browse files
committed
Renamed Jrjackson adapter to JrJackson
1 parent 92e1369 commit b36dc91

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

lib/multi_json.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ def default_options=(value)
2727
end
2828

2929
REQUIREMENT_MAP = [
30-
['oj', :oj],
31-
['yajl', :yajl],
32-
['json', :json_gem],
33-
['gson', :gson],
34-
['jrjackson', :jrjackson],
35-
['json/pure', :json_pure]
30+
['oj', :oj],
31+
['yajl', :yajl],
32+
['json', :json_gem],
33+
['gson', :gson],
34+
['jrjackson_r', :jr_jackson],
35+
['json/pure', :json_pure]
3636
]
3737

3838
# The default adapter based on what you currently

spec/adapter_shared_example.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class << time
106106

107107
# This behavior is currently not supported by gson.rb
108108
# See discussion at https://github.com/intridea/multi_json/pull/71
109-
unless %w(gson jrjackson).include?(adapter)
109+
unless %w(gson jr_jackson).include?(adapter)
110110
it 'dumps custom objects that implement to_json' do
111111
klass = Class.new do
112112
def to_json(*)

spec/multi_json_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@
148148

149149
it_behaves_like 'has options', MultiJson
150150

151-
%w(gson jrjackson json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
152-
next if !jruby? && %w(gson jrjackson).include?(adapter)
151+
%w(gson jr_jackson json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
152+
next if !jruby? && %w(gson jr_jackson).include?(adapter)
153153
next if !macruby? && adapter == 'nsjsonserialization'
154154
next if jruby? && %w(oj yajl).include?(adapter)
155155

0 commit comments

Comments
 (0)