multi_json 1.3.5 → 1.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/multi_json/adapters/oj.rb +2 -1
  2. data/lib/multi_json/version.rb +1 -1
  3. metadata +84 -71
data/lib/multi_json/adapters/oj.rb CHANGED
@@ -9,7 +9,8 @@ module MultiJson
9
9
  ::Oj.default_options = {:mode => :compat}
10
10
 
11
11
  def self.load(string, options={}) #:nodoc:
12
- ::Oj.load(string, :symbol_keys => options[:symbolize_keys])
12
+ options.merge!(:symbol_keys => options[:symbolize_keys] || options['symbolize_keys'])
13
+ ::Oj.load(string, options)
13
14
  end
14
15
 
15
16
  def self.dump(object, options={}) #:nodoc:
data/lib/multi_json/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MultiJson
2
- VERSION = "1.3.5" unless defined?(MultiJson::VERSION)
2
+ VERSION = "1.3.6" unless defined?(MultiJson::VERSION)
3
3
  end
metadata CHANGED
@@ -1,94 +1,97 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: multi_json
3
- version: !ruby/object:Gem::Version
4
- version: 1.3.5
3
+ version: !ruby/object:Gem::Version
4
+ hash: 23
5
5
  prerelease:
6
+ segments:
7
+ - 1
8
+ - 3
9
+ - 6
10
+ version: 1.3.6
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Michael Bleigh
9
14
  - Josh Kalderimis
10
15
  - Erik Michaels-Ober
11
16
  autorequire:
12
17
  bindir: bin
13
18
  cert_chain: []
14
- date: 2012-05-12 00:00:00.000000000 Z
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
19
+
20
+ date: 2012-05-28 00:00:00 Z
21
+ dependencies:
22
+ - !ruby/object:Gem::Dependency
17
23
  name: rake
18
- requirement: !ruby/object:Gem::Requirement
19
- none: false
20
- requirements:
21
- - - ~>
22
- - !ruby/object:Gem::Version
23
- version: '0.9'
24
- type: :development
25
24
  prerelease: false
26
- version_requirements: !ruby/object:Gem::Requirement
27
- none: false
28
- requirements:
29
- - - ~>
30
- - !ruby/object:Gem::Version
31
- version: '0.9'
32
- - !ruby/object:Gem::Dependency
33
- name: rdoc
34
- requirement: !ruby/object:Gem::Requirement
25
+ requirement: &id001 !ruby/object:Gem::Requirement
35
26
  none: false
36
- requirements:
27
+ requirements:
37
28
  - - ~>
38
- - !ruby/object:Gem::Version
39
- version: '3.9'
29
+ - !ruby/object:Gem::Version
30
+ hash: 25
31
+ segments:
32
+ - 0
33
+ - 9
34
+ version: "0.9"
40
35
  type: :development
36
+ version_requirements: *id001
37
+ - !ruby/object:Gem::Dependency
38
+ name: rdoc
41
39
  prerelease: false
42
- version_requirements: !ruby/object:Gem::Requirement
43
- none: false
44
- requirements:
45
- - - ~>
46
- - !ruby/object:Gem::Version
47
- version: '3.9'
48
- - !ruby/object:Gem::Dependency
49
- name: rspec
50
- requirement: !ruby/object:Gem::Requirement
40
+ requirement: &id002 !ruby/object:Gem::Requirement
51
41
  none: false
52
- requirements:
42
+ requirements:
53
43
  - - ~>
54
- - !ruby/object:Gem::Version
55
- version: '2.6'
44
+ - !ruby/object:Gem::Version
45
+ hash: 21
46
+ segments:
47
+ - 3
48
+ - 9
49
+ version: "3.9"
56
50
  type: :development
51
+ version_requirements: *id002
52
+ - !ruby/object:Gem::Dependency
53
+ name: rspec
57
54
  prerelease: false
58
- version_requirements: !ruby/object:Gem::Requirement
59
- none: false
60
- requirements:
61
- - - ~>
62
- - !ruby/object:Gem::Version
63
- version: '2.6'
64
- - !ruby/object:Gem::Dependency
65
- name: simplecov
66
- requirement: !ruby/object:Gem::Requirement
55
+ requirement: &id003 !ruby/object:Gem::Requirement
67
56
  none: false
68
- requirements:
57
+ requirements:
69
58
  - - ~>
70
- - !ruby/object:Gem::Version
71
- version: '0.4'
59
+ - !ruby/object:Gem::Version
60
+ hash: 15
61
+ segments:
62
+ - 2
63
+ - 6
64
+ version: "2.6"
72
65
  type: :development
66
+ version_requirements: *id003
67
+ - !ruby/object:Gem::Dependency
68
+ name: simplecov
73
69
  prerelease: false
74
- version_requirements: !ruby/object:Gem::Requirement
70
+ requirement: &id004 !ruby/object:Gem::Requirement
75
71
  none: false
76
- requirements:
72
+ requirements:
77
73
  - - ~>
78
- - !ruby/object:Gem::Version
79
- version: '0.4'
80
- description: A gem to provide easy switching between different JSON backends, including
81
- Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.
82
- email:
74
+ - !ruby/object:Gem::Version
75
+ hash: 3
76
+ segments:
77
+ - 0
78
+ - 4
79
+ version: "0.4"
80
+ type: :development
81
+ version_requirements: *id004
82
+ description: A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.
83
+ email:
83
84
  - michael@intridea.com
84
85
  - josh.kalderimis@gmail.com
85
86
  - sferik@gmail.com
86
87
  executables: []
88
+
87
89
  extensions: []
88
- extra_rdoc_files:
90
+
91
+ extra_rdoc_files:
89
92
  - LICENSE.md
90
93
  - README.md
91
- files:
94
+ files:
92
95
  - LICENSE.md
93
96
  - README.md
94
97
  - Rakefile
@@ -112,30 +115,40 @@ files:
112
115
  - lib/multi_json.rb
113
116
  homepage: http://github.com/intridea/multi_json
114
117
  licenses: []
118
+
115
119
  post_install_message:
116
- rdoc_options:
120
+ rdoc_options:
117
121
  - --charset=UTF-8
118
- require_paths:
122
+ require_paths:
119
123
  - lib
120
- required_ruby_version: !ruby/object:Gem::Requirement
124
+ required_ruby_version: !ruby/object:Gem::Requirement
121
125
  none: false
122
- requirements:
123
- - - ! '>='
124
- - !ruby/object:Gem::Version
125
- version: '0'
126
- required_rubygems_version: !ruby/object:Gem::Requirement
126
+ requirements:
127
+ - - ">="
128
+ - !ruby/object:Gem::Version
129
+ hash: 3
130
+ segments:
131
+ - 0
132
+ version: "0"
133
+ required_rubygems_version: !ruby/object:Gem::Requirement
127
134
  none: false
128
- requirements:
129
- - - ! '>='
130
- - !ruby/object:Gem::Version
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ hash: 23
139
+ segments:
140
+ - 1
141
+ - 3
142
+ - 6
131
143
  version: 1.3.6
132
144
  requirements: []
145
+
133
146
  rubyforge_project:
134
147
  rubygems_version: 1.8.24
135
148
  signing_key:
136
149
  specification_version: 3
137
150
  summary: A gem to provide swappable JSON backends.
138
- test_files:
151
+ test_files:
139
152
  - spec/adapter_shared_example.rb
140
153
  - spec/helper.rb
141
154
  - spec/multi_json_spec.rb