json 1.8.3 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of json might be problematic. Click here for more details.

Files changed (82) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.travis.yml +7 -10
  4. data/{CHANGES → CHANGES.md} +186 -90
  5. data/Gemfile +10 -6
  6. data/{README-json-jruby.markdown → README-json-jruby.md} +0 -0
  7. data/{README.rdoc → README.md} +184 -133
  8. data/Rakefile +33 -37
  9. data/VERSION +1 -1
  10. data/ext/json/ext/fbuffer/fbuffer.h +0 -3
  11. data/ext/json/ext/generator/generator.c +47 -61
  12. data/ext/json/ext/generator/generator.h +7 -2
  13. data/ext/json/ext/parser/extconf.rb +3 -0
  14. data/ext/json/ext/parser/parser.c +374 -459
  15. data/ext/json/ext/parser/parser.h +4 -5
  16. data/ext/json/ext/parser/parser.rl +133 -181
  17. data/ext/json/extconf.rb +0 -1
  18. data/java/src/json/ext/ByteListTranscoder.java +1 -2
  19. data/java/src/json/ext/Generator.java +11 -12
  20. data/java/src/json/ext/GeneratorMethods.java +1 -2
  21. data/java/src/json/ext/GeneratorService.java +1 -2
  22. data/java/src/json/ext/GeneratorState.java +3 -56
  23. data/java/src/json/ext/OptionsReader.java +2 -3
  24. data/java/src/json/ext/Parser.java +132 -415
  25. data/java/src/json/ext/Parser.rl +48 -124
  26. data/java/src/json/ext/ParserService.java +1 -2
  27. data/java/src/json/ext/RuntimeInfo.java +1 -6
  28. data/java/src/json/ext/StringDecoder.java +1 -2
  29. data/java/src/json/ext/StringEncoder.java +5 -0
  30. data/java/src/json/ext/Utils.java +1 -2
  31. data/json-java.gemspec +15 -0
  32. data/json.gemspec +0 -0
  33. data/json_pure.gemspec +24 -26
  34. data/lib/json/add/bigdecimal.rb +1 -0
  35. data/lib/json/add/complex.rb +2 -1
  36. data/lib/json/add/core.rb +1 -0
  37. data/lib/json/add/date.rb +1 -1
  38. data/lib/json/add/date_time.rb +1 -1
  39. data/lib/json/add/exception.rb +1 -1
  40. data/lib/json/add/ostruct.rb +3 -3
  41. data/lib/json/add/range.rb +1 -1
  42. data/lib/json/add/rational.rb +1 -0
  43. data/lib/json/add/regexp.rb +1 -1
  44. data/lib/json/add/set.rb +29 -0
  45. data/lib/json/add/struct.rb +1 -1
  46. data/lib/json/add/symbol.rb +1 -1
  47. data/lib/json/add/time.rb +1 -1
  48. data/lib/json/common.rb +24 -52
  49. data/lib/json/ext.rb +0 -6
  50. data/lib/json/generic_object.rb +5 -4
  51. data/lib/json/pure/generator.rb +61 -125
  52. data/lib/json/pure/parser.rb +33 -81
  53. data/lib/json/pure.rb +2 -8
  54. data/lib/json/version.rb +2 -1
  55. data/lib/json.rb +1 -0
  56. data/references/rfc7159.txt +899 -0
  57. data/tests/fixtures/obsolete_fail1.json +1 -0
  58. data/tests/{test_json_addition.rb → json_addition_test.rb} +32 -25
  59. data/tests/json_common_interface_test.rb +126 -0
  60. data/tests/json_encoding_test.rb +107 -0
  61. data/tests/json_ext_parser_test.rb +15 -0
  62. data/tests/{test_json_fixtures.rb → json_fixtures_test.rb} +5 -8
  63. data/tests/{test_json_generate.rb → json_generator_test.rb} +79 -39
  64. data/tests/{test_json_generic_object.rb → json_generic_object_test.rb} +15 -8
  65. data/tests/json_parser_test.rb +472 -0
  66. data/tests/json_string_matching_test.rb +38 -0
  67. data/tests/{setup_variant.rb → test_helper.rb} +6 -0
  68. data/tools/diff.sh +18 -0
  69. data/tools/fuzz.rb +1 -9
  70. metadata +29 -47
  71. data/COPYING +0 -58
  72. data/COPYING-json-jruby +0 -57
  73. data/GPL +0 -340
  74. data/TODO +0 -1
  75. data/data/example.json +0 -1
  76. data/data/index.html +0 -38
  77. data/data/prototype.js +0 -4184
  78. data/tests/fixtures/fail1.json +0 -1
  79. data/tests/test_json.rb +0 -553
  80. data/tests/test_json_encoding.rb +0 -65
  81. data/tests/test_json_string_matching.rb +0 -39
  82. data/tests/test_json_unicode.rb +0 -72
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 80c313748cbdd4d21299d85d68b5fad41fc042ed
4
- data.tar.gz: 6ec0ef5f281c89d45401a266d75023e0e6e1414f
2
+ SHA256:
3
+ metadata.gz: 0d5aa01bc44bdf00e8465d5acbde009357987e98ac653672feba63b81f98dfc8
4
+ data.tar.gz: 5845322c2daa41d815c4b845c6561d2addf86b459a5c093590317210d6d85901
5
5
  SHA512:
6
- metadata.gz: 662fd98151f47aeaaa3e0c90be27331aed79a17ff5871e8751803f2e1398ffdfa46952b098099b3bdc0e10ed1fed0280a52d728f2570e33d8b37ad39f31b7c4a
7
- data.tar.gz: c5908b10b4a178e0869b6fa26f48d65ccd78e6e0df971db9abb4eace9c33486021098936421ad30939aa6dcb8600aac5ba3f37584841417518af35dd1bfea2fb
6
+ metadata.gz: f553341d9b8c4d20788255a35a48816a59cacb408f183e8a6009ab9326b66d80078961d4cc9da8e62155e4bb00f31dedddb449cf30afdb386ab6b49e248299dd
7
+ data.tar.gz: e74601af87a7ec32952fd596b4981b0d26c4f96ddb88979a26b2fb06604dff204d38ba7c120cd0389756edb83cbd81b6fc569d16f5f7740b8b2915d63cdc8f22
data/.gitignore CHANGED
@@ -14,3 +14,4 @@ Gemfile.lock
14
14
  .DS_Store
15
15
  */**/Makefile
16
16
  */**/*.o
17
+ .byebug_history
data/.travis.yml CHANGED
@@ -4,23 +4,20 @@ language: ruby
4
4
 
5
5
  # Specify which ruby versions you wish to run your tests on, each version will be used
6
6
  rvm:
7
- - 1.8.7
8
- - 1.9.2
9
7
  - 1.9.3
10
8
  - 2.0.0
11
9
  - 2.1
12
- - 2.2.1
13
- - 2.2.2
14
10
  - 2.2
15
- - ree
16
- - rbx-2
17
- - jruby-18mode
18
- - jruby-19mode
11
+ - 2.3
12
+ - 2.4
13
+ - 2.5
14
+ - 2.6
19
15
  - ruby-head
16
+ - jruby
20
17
  matrix:
21
18
  allow_failures:
22
- - rvm: rbx-2
19
+ - rvm: 1.9.3
23
20
  - rvm: ruby-head
21
+ - rvm: jruby
24
22
  script: "bundle exec rake"
25
-
26
23
  sudo: false
@@ -1,94 +1,156 @@
1
- 2015-06-01 (1.8.3)
1
+ # Changes
2
+
3
+ ## 2019-02-21 (2.2.0)
4
+ * Adds support for 2.6 BigDecimal and ruby standard library Set datetype.
5
+
6
+ ## 2017-04-18 (2.1.0)
7
+ * Allow passing of `decimal_class` option to specify a class as which to parse
8
+ JSON float numbers.
9
+ ## 2017-03-23 (2.0.4)
10
+ * Raise exception for incomplete unicode surrogates/character escape
11
+ sequences. This problem was reported by Daniel Gollahon (dgollahon).
12
+ * Fix arbitrary heap exposure problem. This problem was reported by Ahmad
13
+ Sherif (ahmadsherif).
14
+
15
+ ## 2017-01-12 (2.0.3)
16
+ * Set `required_ruby_version` to 1.9
17
+ * Some small fixes
18
+
19
+ ## 2016-07-26 (2.0.2)
20
+ * Specify `required_ruby_version` for json\_pure.
21
+ * Fix issue #295 failure when parsing frozen strings.
22
+
23
+ ## 2016-07-01 (2.0.1)
24
+ * Fix problem when requiring json\_pure and Parser constant was defined top
25
+ level.
26
+ * Add `RB_GC_GUARD` to avoid possible GC problem via Pete Johns.
27
+ * Store `current_nesting` on stack by Aaron Patterson.
28
+
29
+ ## 2015-09-11 (2.0.0)
30
+ * Now complies to newest JSON RFC 7159.
31
+ * Implements compatibiliy to ruby 2.4 integer unification.
32
+ * Drops support for old rubies whose life has ended, that is rubies < 2.0.
33
+ Also see https://www.ruby-lang.org/en/news/2014/07/01/eol-for-1-8-7-and-1-9-2/
34
+ * There were still some mentions of dual GPL licensing in the source, but JSON
35
+ has just the Ruby license that itself includes an explicit dual-licensing
36
+ clause that allows covered software to be distributed under the terms of
37
+ the Simplified BSD License instead for all ruby versions >= 1.9.3. This is
38
+ however a GPL compatible license according to the Free Software Foundation.
39
+ I changed these mentions to be consistent with the Ruby license setting in
40
+ the gemspec files which were already correct now.
41
+
42
+ ## 2015-06-01 (1.8.3)
2
43
  * Fix potential memory leak, thx to nobu.
3
- 2015-01-08 (1.8.2)
44
+
45
+ ## 2015-01-08 (1.8.2)
4
46
  * Some performance improvements by Vipul A M <vipulnsward@gmail.com>.
5
47
  * Fix by Jason R. Clark <jclark@newrelic.com> to avoid mutation of
6
- JSON.dump_default_options.
48
+ `JSON.dump_default_options`.
7
49
  * More tests by Michael Mac-Vicar <mmacvicar@gmail.com> and fixing
8
- space_before accessor in generator.
9
- * Performance on Jruby improvemed by Ben Browning <bbrownin@redhat.com>.
50
+ `space_before` accessor in generator.
51
+ * Performance on Jruby improved by Ben Browning <bbrownin@redhat.com>.
10
52
  * Some fixes to be compatible with the new Ruby 2.2 by Zachary Scott <e@zzak.io>
11
53
  and SHIBATA Hiroshi <hsbt@ruby-lang.org>.
12
- 2013-05-13 (1.8.1)
54
+
55
+ ## 2013-05-13 (1.8.1)
13
56
  * Remove Rubinius exception since transcoding should be working now.
14
- 2013-05-13 (1.8.0)
57
+
58
+ ## 2013-05-13 (1.8.0)
15
59
  * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
16
60
  Lafortune <github_rocks@marc-andre.ca>. Thanks!
17
61
  * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with
18
62
  -Wchar-subscripts and better validate UTF-8 strings.
19
63
  * Applied patch by ginriki@github to remove unnecessary if.
20
- * Add load/dump interface to JSON::GenericObject to make
21
- serialize :some_attribute, JSON::GenericObject
22
- work in Rails active models for convenient SomeModel#some_attribute.foo.bar
64
+ * Add load/dump interface to `JSON::GenericObject` to make
65
+ serialize :some_attribute, `JSON::GenericObject`
66
+ work in Rails active models for convenient `SomeModel#some_attribute.foo.bar`
23
67
  access to serialised JSON data.
24
- 2013-02-04 (1.7.7)
68
+
69
+ ## 2013-02-04 (1.7.7)
25
70
  * Security fix for JSON create_additions default value and
26
- JSON::GenericObject. It should not be possible to create additions unless
71
+ `JSON::GenericObject`. It should not be possible to create additions unless
27
72
  explicitely requested by setting the create_additions argument to true or
28
- using the JSON.load/dump interface. If JSON::GenericObject is supposed to
73
+ using the JSON.load/dump interface. If `JSON::GenericObject` is supposed to
29
74
  be automatically deserialised, this has to be explicitely enabled by
30
75
  setting
31
- JSON::GenericObject.json_creatable = true
76
+ JSON::GenericObject.json_creatable = true
32
77
  as well.
33
78
  * Remove useless assert in fbuffer implementation.
34
79
  * Apply patch attached to https://github.com/flori/json/issues#issue/155
35
80
  provided by John Shahid <jvshahid@gmail.com>, Thx!
36
81
  * Add license information to rubygems spec data, reported by Jordi Massaguer Pla <jmassaguerpla@suse.de>.
37
82
  * Improve documentation, thx to Zachary Scott <zachary@zacharyscott.net>.
38
- 2012-11-29 (1.7.6)
39
- * Add GeneratorState#merge alias for JRuby, fix state accessor methods. Thx to
83
+
84
+ ## 2012-11-29 (1.7.6)
85
+ * Add `GeneratorState#merge` alias for JRuby, fix state accessor methods. Thx to
40
86
  jvshahid@github.
41
87
  * Increase hash likeness of state objects.
42
- 2012-08-17 (1.7.5)
88
+
89
+ ## 2012-08-17 (1.7.5)
43
90
  * Fix compilation of extension on older rubies.
44
- 2012-07-26 (1.7.4)
91
+
92
+ ## 2012-07-26 (1.7.4)
45
93
  * Fix compilation problem on AIX, see https://github.com/flori/json/issues/142
46
- 2012-05-12 (1.7.3)
94
+
95
+ ## 2012-05-12 (1.7.3)
47
96
  * Work around Rubinius encoding issues using iconv for conversion instead.
48
- 2012-05-11 (1.7.2)
97
+
98
+ ## 2012-05-11 (1.7.2)
49
99
  * Fix some encoding issues, that cause problems for the pure and the
50
100
  extension variant in jruby 1.9 mode.
51
- 2012-04-28 (1.7.1)
101
+
102
+ ## 2012-04-28 (1.7.1)
52
103
  * Some small fixes for building
53
- 2012-04-28 (1.7.0)
54
- * Add JSON::GenericObject for method access to objects transmitted via JSON.
55
- 2012-04-27 (1.6.7)
104
+
105
+ ## 2012-04-28 (1.7.0)
106
+ * Add `JSON::GenericObject` for method access to objects transmitted via JSON.
107
+
108
+ ## 2012-04-27 (1.6.7)
56
109
  * Fix possible crash when trying to parse nil value.
57
- 2012-02-11 (1.6.6)
110
+
111
+ ## 2012-02-11 (1.6.6)
58
112
  * Propagate src encoding to values made from it (fixes 1.9 mode converting
59
113
  everything to ascii-8bit; harmless for 1.8 mode too) (Thomas E. Enebo
60
114
  <tom.enebo@gmail.com>), should fix
61
115
  https://github.com/flori/json/issues#issue/119.
62
116
  * Fix https://github.com/flori/json/issues#issue/124 Thx to Jason Hutchens.
63
117
  * Fix https://github.com/flori/json/issues#issue/117
64
- 2012-01-15 (1.6.5)
118
+
119
+ ## 2012-01-15 (1.6.5)
65
120
  * Vit Ondruch <v.ondruch@tiscali.cz> reported a bug that shows up when using
66
121
  optimisation under GCC 4.7. Thx to him, Bohuslav Kabrda
67
122
  <bkabrda@redhat.com> and Yui NARUSE <naruse@airemix.jp> for debugging and
68
123
  developing a patch fix.
69
- 2011-12-24 (1.6.4)
124
+
125
+ ## 2011-12-24 (1.6.4)
70
126
  * Patches that improve speed on JRuby contributed by Charles Oliver Nutter
71
127
  <headius@headius.com>.
72
- * Support object_class/array_class with duck typed hash/array.
73
- 2011-12-01 (1.6.3)
74
- * Let JSON.load('') return nil as well to make mysql text columns (default to
75
- '') work better for serialization.
76
- 2011-11-21 (1.6.2)
128
+ * Support `object_class`/`array_class` with duck typed hash/array.
129
+
130
+ ## 2011-12-01 (1.6.3)
131
+ * Let `JSON.load('')` return nil as well to make mysql text columns (default to
132
+ `''`) work better for serialization.
133
+
134
+ ## 2011-11-21 (1.6.2)
77
135
  * Add support for OpenStruct and BigDecimal.
78
- * Fix bug when parsing nil in quirks_mode.
136
+ * Fix bug when parsing nil in `quirks_mode`.
79
137
  * Make JSON.dump and JSON.load methods better cooperate with Rails' serialize
80
- method. Just use: serialize :value, JSON
138
+ method. Just use:
139
+ serialize :value, JSON
81
140
  * Fix bug with time serialization concerning nanoseconds. Thanks for the
82
141
  patch go to Josh Partlow (jpartlow@github).
83
142
  * Improve parsing speed for JSON numbers (integers and floats) in a similar way to
84
143
  what Evan Phoenix <evan@phx.io> suggested in:
85
144
  https://github.com/flori/json/pull/103
86
- 2011-09-18 (1.6.1)
145
+
146
+ ## 2011-09-18 (1.6.1)
87
147
  * Using -target 1.5 to force Java bits to compile with 1.5.
88
- 2011-09-12 (1.6.0)
148
+
149
+ ## 2011-09-12 (1.6.0)
89
150
  * Extract utilities (prettifier and GUI-editor) in its own gem json-utils.
90
151
  * Split json/add/core into different files for classes to be serialised.
91
- 2011-08-31 (1.5.4)
152
+
153
+ ## 2011-08-31 (1.5.4)
92
154
  * Fix memory leak when used from multiple JRuby. (Patch by
93
155
  jfirebaugh@github).
94
156
  * Apply patch by Eric Wong <nocode@yhbt.net> that fixes garbage collection problem
@@ -96,42 +158,50 @@
96
158
  * Add :quirks_mode option to parser and generator.
97
159
  * Add support for Rational and Complex number additions via json/add/complex
98
160
  and json/add/rational requires.
99
- 2011-06-20 (1.5.3)
161
+
162
+ ## 2011-06-20 (1.5.3)
100
163
  * Alias State#configure method as State#merge to increase duck type synonymy with Hash.
101
- * Add as_json methods in json/add/core, so rails can create its json objects
164
+ * Add `as_json` methods in json/add/core, so rails can create its json objects
102
165
  the new way.
103
- 2011-05-11 (1.5.2)
166
+
167
+ ## 2011-05-11 (1.5.2)
104
168
  * Apply documentation patch by Cory Monty <cory.monty@gmail.com>.
105
- * Add gemspecs for json and json_pure.
169
+ * Add gemspecs for json and json\_pure.
106
170
  * Fix bug in jruby pretty printing.
107
- * Fix bug in object_class and array_class when inheriting from Hash or Array.
108
- 2011-01-24 (1.5.1)
171
+ * Fix bug in `object_class` and `array_class` when inheriting from Hash or
172
+ Array.
173
+
174
+ ## 2011-01-24 (1.5.1)
109
175
  * Made rake-compiler build a fat binary gem. This should fix issue
110
176
  https://github.com/flori/json/issues#issue/54.
111
- 2011-01-22 (1.5.0)
177
+
178
+ ## 2011-01-22 (1.5.0)
112
179
  * Included Java source codes for the Jruby extension made by Daniel Luz
113
180
  <dev@mernen.com>.
114
- * Output full exception message of deep_const_get to aid debugging.
115
- * Fixed an issue with ruby 1.9 Module#const_defined? method, that was
181
+ * Output full exception message of `deep_const_get` to aid debugging.
182
+ * Fixed an issue with ruby 1.9 `Module#const_defined?` method, that was
116
183
  reported by Riley Goodside.
117
- 2010-08-09 (1.4.6)
184
+
185
+ ## 2010-08-09 (1.4.6)
118
186
  * Fixed oversight reported in http://github.com/flori/json/issues/closed#issue/23,
119
187
  always create a new object from the state prototype.
120
188
  * Made pure and ext api more similar again.
121
- 2010-08-07 (1.4.5)
189
+
190
+ ## 2010-08-07 (1.4.5)
122
191
  * Manage data structure nesting depth in state object during generation. This
123
- should reduce problems with to_json method definіtions that only have one
192
+ should reduce problems with `to_json` method definіtions that only have one
124
193
  argument.
125
194
  * Some fixes in the state objects and additional tests.
126
- 2010-08-06 (1.4.4)
195
+ ## 2010-08-06 (1.4.4)
127
196
  * Fixes build problem for rubinius under OS X, http://github.com/flori/json/issues/closed#issue/25
128
197
  * Fixes crashes described in http://github.com/flori/json/issues/closed#issue/21 and
129
198
  http://github.com/flori/json/issues/closed#issue/23
130
- 2010-05-05 (1.4.3)
199
+ ## 2010-05-05 (1.4.3)
131
200
  * Fixed some test assertions, from Ruby r27587 and r27590, patch by nobu.
132
201
  * Fixed issue http://github.com/flori/json/issues/#issue/20 reported by
133
202
  electronicwhisper@github. Thx!
134
- 2010-04-26 (1.4.2)
203
+
204
+ ## 2010-04-26 (1.4.2)
135
205
  * Applied patch from naruse Yui NARUSE <naruse@airemix.com> to make building with
136
206
  Microsoft Visual C possible again.
137
207
  * Applied patch from devrandom <c1.github@niftybox.net> in order to allow building of
@@ -139,34 +209,43 @@
139
209
  * Thanks to Dustin Schneider <dustin@stocktwits.com>, who reported a memory
140
210
  leak, which is fixed in this release.
141
211
  * Applied 993f261ccb8f911d2ae57e9db48ec7acd0187283 patch from josh@github.
142
- 2010-04-25 (1.4.1)
212
+
213
+ ## 2010-04-25 (1.4.1)
143
214
  * Fix for a bug reported by Dan DeLeo <dan@kallistec.com>, caused by T_FIXNUM
144
215
  being different on 32bit/64bit architectures.
145
- 2010-04-23 (1.4.0)
216
+
217
+ ## 2010-04-23 (1.4.0)
146
218
  * Major speed improvements and building with simplified
147
219
  directory/file-structure.
148
220
  * Extension should at least be comapatible with MRI, YARV and Rubinius.
149
- 2010-04-07 (1.2.4)
221
+
222
+ ## 2010-04-07 (1.2.4)
150
223
  * Triger const_missing callback to make Rails' dynamic class loading work.
151
- 2010-03-11 (1.2.3)
152
- * Added a State#[] method which returns an attribute's value in order to
224
+
225
+ ## 2010-03-11 (1.2.3)
226
+ * Added a `State#[]` method which returns an attribute's value in order to
153
227
  increase duck type compatibility to Hash.
154
- 2010-02-27 (1.2.2)
228
+
229
+ ## 2010-02-27 (1.2.2)
155
230
  * Made some changes to make the building of the parser/generator compatible
156
231
  to Rubinius.
157
- 2009-11-25 (1.2.1)
158
- * Added :symbolize_names option to Parser, which returns symbols instead of
232
+
233
+ ## 2009-11-25 (1.2.1)
234
+ * Added `:symbolize_names` option to Parser, which returns symbols instead of
159
235
  strings in object names/keys.
160
- 2009-10-01 (1.2.0)
161
- * fast_generate now raises an exeception for nan and infinite floats.
236
+
237
+ ## 2009-10-01 (1.2.0)
238
+ * `fast_generate` now raises an exeception for nan and infinite floats.
162
239
  * On Ruby 1.8 json supports parsing of UTF-8, UTF-16BE, UTF-16LE, UTF-32BE,
163
240
  and UTF-32LE JSON documents now. Under Ruby 1.9 the M17n conversion
164
241
  functions are used to convert from all supported encodings. ASCII-8BIT
165
242
  encoded strings are handled like all strings under Ruby 1.8 were.
166
243
  * Better documentation
167
- 2009-08-23 (1.1.9)
168
- * Added forgotten main doc file extra_rdoc_files.
169
- 2009-08-23 (1.1.8)
244
+
245
+ ## 2009-08-23 (1.1.9)
246
+ * Added forgotten main doc file `extra_rdoc_files`.
247
+
248
+ ## 2009-08-23 (1.1.8)
170
249
  * Applied a patch by OZAWA Sakuro <sakuro@2238club.org> to make json/pure
171
250
  work in environments that don't provide iconv.
172
251
  * Applied patch by okkez_ in order to fix Ruby Bug #1768:
@@ -174,7 +253,8 @@
174
253
  * Finally got around to avoid the rather paranoid escaping of ?/ characters
175
254
  in the generator's output. The parsers aren't affected by this change.
176
255
  Thanks to Rich Apodaca <rapodaca@metamolecular.com> for the suggestion.
177
- 2009-06-29 (1.1.7)
256
+
257
+ ## 2009-06-29 (1.1.7)
178
258
  * Security Fix for JSON::Pure::Parser. A specially designed string could
179
259
  cause catastrophic backtracking in one of the parser's regular expressions
180
260
  in earlier 1.1.x versions. JSON::Ext::Parser isn't affected by this issue.
@@ -182,16 +262,19 @@
182
262
  problem.
183
263
  * This release also uses a less strict ruby version requirement for the
184
264
  creation of the mswin32 native gem.
185
- 2009-05-10 (1.1.6)
265
+
266
+ ## 2009-05-10 (1.1.6)
186
267
  * No changes. І tested native linux gems in the last release and they don't
187
268
  play well with different ruby versions other than the one the gem was built
188
269
  with. This release is just to bump the version number in order to skip the
189
270
  native gem on rubyforge.
190
- 2009-05-10 (1.1.5)
271
+
272
+ ## 2009-05-10 (1.1.5)
191
273
  * Started to build gems with rake-compiler gem.
192
274
  * Applied patch object/array class patch from Brian Candler
193
275
  <B.Candler@pobox.com> and fixes.
194
- 2009-04-01 (1.1.4)
276
+
277
+ ## 2009-04-01 (1.1.4)
195
278
  * Fixed a bug in the creation of serialized generic rails objects reported by
196
279
  Friedrich Graeter <graeter@hydrixos.org>.
197
280
  * Deleted tests/runner.rb, we're using testrb instead.
@@ -200,7 +283,8 @@
200
283
  1.9.
201
284
  * Improved speed of the code path for the fast_generate method in the pure
202
285
  variant.
203
- 2008-07-10 (1.1.3)
286
+
287
+ ## 2008-07-10 (1.1.3)
204
288
  * Wesley Beary <monki@geemus.com> reported a bug in json/add/core's DateTime
205
289
  handling: If the nominator and denominator of the offset were divisible by
206
290
  each other Ruby's Rational#to_s returns them as an integer not a fraction
@@ -210,7 +294,8 @@
210
294
  * Supports ragel >= 6.0 now.
211
295
  * Corrected some tests.
212
296
  * Some minor changes.
213
- 2007-11-27 (1.1.2)
297
+
298
+ ## 2007-11-27 (1.1.2)
214
299
  * Remember default dir (last used directory) in editor.
215
300
  * JSON::Editor.edit method added, the editor can now receive json texts from
216
301
  the clipboard via C-v.
@@ -226,13 +311,14 @@
226
311
  generator by returning something other than a String instance from a
227
312
  to_json method. I now guard against this by doing a rather crude type
228
313
  check, which raises an exception instead of crashing.
229
- 2007-07-06 (1.1.1)
314
+
315
+ ## 2007-07-06 (1.1.1)
230
316
  * Yui NARUSE <naruse@airemix.com> sent some patches to fix tests for Ruby
231
317
  1.9. I applied them and adapted some of them a bit to run both on 1.8 and
232
318
  1.9.
233
- * Introduced a JSON.parse! method without depth checking for people who like
234
- danger.
235
- * Made generate and pretty_generate methods configurable by an options hash.
319
+ * Introduced a `JSON.parse!` method without depth checking for people who
320
+ like danger.
321
+ * Made generate and `pretty_generate` methods configurable by an options hash.
236
322
  * Added :allow_nan option to parser and generator in order to handle NaN,
237
323
  Infinity, and -Infinity correctly - if requested. Floats, which aren't numbers,
238
324
  aren't valid JSON according to RFC4627, so by default an exception will be
@@ -241,55 +327,65 @@
241
327
  * Fixed some more tests for Ruby 1.9.
242
328
  * Implemented dump/load interface of Marshal as suggested in ruby-core:11405
243
329
  by murphy <murphy@rubychan.de>.
244
- * Implemented the max_nesting feature for generate methods, too.
330
+ * Implemented the `max_nesting` feature for generate methods, too.
245
331
  * Added some implementations for ruby core's custom objects for
246
332
  serialisation/deserialisation purposes.
247
- 2007-05-21 (1.1.0)
333
+
334
+ ## 2007-05-21 (1.1.0)
248
335
  * Implemented max_nesting feature for parser to avoid stack overflows for
249
336
  data from untrusted sources. If you trust the source, you can disable it
250
337
  with the option max_nesting => false.
251
338
  * Piers Cawley <pdcawley@bofh.org.uk> reported a bug, that not every
252
- character can be escaped by ?\ as required by RFC4627. There's a
339
+ character can be escaped by `\` as required by RFC4627. There's a
253
340
  contradiction between David Crockford's JSON checker test vectors (in
254
341
  tests/fixtures) and RFC4627, though. I decided to stick to the RFC, because
255
342
  the JSON checker seems to be a bit older than the RFC.
256
343
  * Extended license to Ruby License, which includes the GPL.
257
344
  * Added keyboard shortcuts, and 'Open location' menu item to edit_json.rb.
258
- 2007-05-09 (1.0.4)
345
+
346
+ ## 2007-05-09 (1.0.4)
259
347
  * Applied a patch from Yui NARUSE <naruse@airemix.com> to make JSON compile
260
348
  under Ruby 1.9. Thank you very much for mailing it to me!
261
349
  * Made binary variants of JSON fail early, instead of falling back to the
262
350
  pure version. This should avoid overshadowing of eventual problems while
263
351
  loading of the binary.
264
- 2007-03-24 (1.0.3)
352
+
353
+ ## 2007-03-24 (1.0.3)
265
354
  * Improved performance of pure variant a bit.
266
355
  * The ext variant of this release supports the mswin32 platform. Ugh!
267
- 2007-03-24 (1.0.2)
356
+
357
+ ## 2007-03-24 (1.0.2)
268
358
  * Ext Parser didn't parse 0e0 correctly into 0.0: Fixed!
269
- 2007-03-24 (1.0.1)
359
+
360
+ ## 2007-03-24 (1.0.1)
270
361
  * Forgot some object files in the build dir. I really like that - not!
271
- 2007-03-24 (1.0.0)
362
+
363
+ ## 2007-03-24 (1.0.0)
272
364
  * Added C implementations for the JSON generator and a ragel based JSON
273
365
  parser in C.
274
366
  * Much more tests, especially fixtures from json.org.
275
367
  * Further improved conformance to RFC4627.
276
- 2007-02-09 (0.4.3)
368
+
369
+ ## 2007-02-09 (0.4.3)
277
370
  * Conform more to RFC4627 for JSON: This means JSON strings
278
- now always must contain exactly one object "{ ... }" or array "[ ... ]" in
371
+ now always must contain exactly one object `"{ ... }"` or array `"[ ... ]"` in
279
372
  order to be parsed without raising an exception. The definition of what
280
373
  constitutes a whitespace is narrower in JSON than in Ruby ([ \t\r\n]), and
281
374
  there are differences in floats and integers (no octals or hexadecimals) as
282
375
  well.
283
- * Added aliases generate and pretty_generate of unparse and pretty_unparse.
376
+ * Added aliases generate and `pretty_generate` of unparse and `pretty_unparse`.
284
377
  * Fixed a test case.
285
- * Catch an Iconv::InvalidEncoding exception, that seems to occur on some Sun
378
+ * Catch an `Iconv::InvalidEncoding` exception, that seems to occur on some Sun
286
379
  boxes with SunOS 5.8, if iconv doesn't support utf16 conversions. This was
287
380
  reported by Andrew R Jackson <andrewj@bcm.tmc.edu>, thanks a bunch!
288
- 2006-08-25 (0.4.2)
381
+
382
+ ## 2006-08-25 (0.4.2)
289
383
  * Fixed a bug in handling solidi (/-characters), that was reported by
290
384
  Kevin Gilpin <kevin.gilpin@alum.mit.edu>.
291
- 2006-02-06 (0.4.1)
385
+
386
+ ## 2006-02-06 (0.4.1)
292
387
  * Fixed a bug related to escaping with backslashes. Thanks for the report go
293
388
  to Florian Munz <surf@theflow.de>.
294
- 2005-09-23 (0.4.0)
389
+
390
+ ## 2005-09-23 (0.4.0)
295
391
  * Initial Rubyforge Version
data/Gemfile CHANGED
@@ -2,9 +2,13 @@
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- gemspec :name => 'json'
6
- gemspec :name => 'json_pure'
7
- gemspec :name => 'json-java'
8
-
9
- gem 'utils'
10
- gem 'test-unit'
5
+ case ENV['JSON']
6
+ when 'ext', nil
7
+ if ENV['RUBY_ENGINE'] == 'jruby'
8
+ gemspec :name => 'json-java'
9
+ else
10
+ gemspec :name => 'json'
11
+ end
12
+ when 'pure'
13
+ gemspec :name => 'json_pure'
14
+ end