json 1.1.0 → 1.1.1

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.

Potentially problematic release.

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

Files changed (27) hide show
  1. data/CHANGES +18 -0
  2. data/Rakefile +5 -5
  3. data/VERSION +1 -1
  4. data/benchmarks/benchmark_generator.rb +5 -1
  5. data/benchmarks/benchmark_parser.rb +5 -1
  6. data/bin/edit_json.rb +11 -11
  7. data/ext/json/ext/generator/extconf.rb +2 -2
  8. data/ext/json/ext/generator/generator.c +185 -50
  9. data/ext/json/ext/parser/extconf.rb +2 -2
  10. data/ext/json/ext/parser/parser.c +246 -117
  11. data/ext/json/ext/parser/parser.rl +54 -6
  12. data/lib/json.rb +23 -0
  13. data/lib/json/add/core.rb +119 -0
  14. data/lib/json/add/rails.rb +52 -0
  15. data/lib/json/common.rb +174 -23
  16. data/lib/json/editor.rb +12 -14
  17. data/lib/json/pure/generator.rb +83 -10
  18. data/lib/json/pure/parser.rb +15 -1
  19. data/lib/json/version.rb +1 -1
  20. data/tests/fixtures/fail18.json +1 -1
  21. data/tests/test_json.rb +51 -12
  22. data/tests/test_json_addition.rb +34 -3
  23. data/tests/test_json_fixtures.rb +2 -2
  24. data/tests/test_json_generate.rb +21 -2
  25. data/tests/test_json_unicode.rb +4 -1
  26. data/tools/fuzz.rb +2 -1
  27. metadata +6 -3
data/tests/test_json_unicode.rb CHANGED
@@ -40,13 +40,16 @@ class TC_JSONUnicode < Test::Unit::TestCase
40
40
  def test_chars
41
41
  (0..0x7f).each do |i|
42
42
  json = '["\u%04x"]' % i
43
+ if RUBY_VERSION >= "1.9."
44
+ i = i.chr
45
+ end
43
46
  assert_equal i, JSON.parse(json).first[0]
44
47
  if i == ?\b
45
48
  generated = JSON.generate(["" << i])
46
49
  assert '["\b"]' == generated || '["\10"]' == generated
47
50
  elsif [?\n, ?\r, ?\t, ?\f].include?(i)
48
51
  assert_equal '[' << ('' << i).dump << ']', JSON.generate(["" << i])
49
- elsif i < 0x20
52
+ elsif i.chr < 0x20.chr
50
53
  assert_equal json, JSON.generate(["" << i])
51
54
  end
52
55
  end
data/tools/fuzz.rb CHANGED
@@ -84,7 +84,8 @@ class MyState < JSON.state
84
84
  :space => make_spaces,
85
85
  :space_before => make_spaces,
86
86
  :object_nl => make_spaces,
87
- :array_nl => make_spaces
87
+ :array_nl => make_spaces,
88
+ :max_nesting => false
88
89
  )
89
90
  end
90
91
 
metadata CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
3
3
  specification_version: 1
4
4
  name: json
5
5
  version: !ruby/object:Gem::Version
6
- version: 1.1.0
7
- date: 2007-06-04 00:00:00 +02:00
6
+ version: 1.1.1
7
+ date: 2007-07-06 00:00:00 +02:00
8
8
  summary: A JSON implementation as a Ruby extension
9
9
  require_paths:
10
10
  - ext/json/ext
@@ -94,7 +94,6 @@ files:
94
94
  - ext/json/ext/generator/unicode.h
95
95
  - ext/json/ext/generator/extconf.rb
96
96
  - ext/json/ext/generator/generator.c
97
- - ext/json/ext/parser/parser.c
98
97
  - ext/json/ext/parser/unicode.c
99
98
  - ext/json/ext/parser/parser.rl
100
99
  - ext/json/ext/parser/unicode.h
@@ -110,6 +109,7 @@ files:
110
109
  - lib/json.rb
111
110
  - lib/json/FalseClass.xpm
112
111
  - lib/json/TrueClass.xpm
112
+ - lib/json/add
113
113
  - lib/json/ext.rb
114
114
  - lib/json/common.rb
115
115
  - lib/json/Hash.xpm
@@ -123,10 +123,13 @@ files:
123
123
  - lib/json/NilClass.xpm
124
124
  - lib/json/version.rb
125
125
  - lib/json/json.xpm
126
+ - lib/json/add/core.rb
127
+ - lib/json/add/rails.rb
126
128
  - lib/json/pure/parser.rb
127
129
  - lib/json/pure/generator.rb
128
130
  - tools/server.rb
129
131
  - tools/fuzz.rb
132
+ - ext/json/ext/parser/parser.c
130
133
  test_files:
131
134
  - tests/runner.rb
132
135
  rdoc_options: