json 1.5.4 → 1.5.5

data/tests/test_json_addition.rb

@@ -71,11 +71,19 @@ class TC_JSONAddition < Test::Unit::TestCase
     a = A.new(666)
     assert A.json_creatable?
     json = generate(a)
-    a_again = JSON.parse(json)
+    a_again = JSON.parse(json, :create_additions => true)
     assert_kind_of a.class, a_again
     assert_equal a, a_again
   end
 
+  def test_extended_json_default
+    a = A.new(666)
+    assert A.json_creatable?
+    json = generate(a)
+    a_hash = JSON.parse(json)
+    assert_kind_of Hash, a_hash
+  end
+
   def test_extended_json_disabled
     a = A.new(666)
     assert A.json_creatable?
@@ -102,7 +110,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     c = C.new
     assert !C.json_creatable?
     json = generate(c)
-    assert_raises(ArgumentError, NameError) { JSON.parse(json) }
+    assert_raises(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) }
   end
 
   def test_raw_strings
@@ -120,7 +128,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     assert_match(/\A\{.*\}\Z/, json)
     assert_match(/"json_class":"String"/, json)
     assert_match(/"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json)
-    raw_again = JSON.parse(json)
+    raw_again = JSON.parse(json, :create_additions => true)
     assert_equal raw, raw_again
   end
 
@@ -128,17 +136,17 @@ class TC_JSONAddition < Test::Unit::TestCase
 
   def test_core
     t = Time.now
-    assert_equal t.inspect, JSON(JSON(t)).inspect
+    assert_equal t, JSON(JSON(t), :create_additions => true)
     d = Date.today
-    assert_equal d, JSON(JSON(d))
+    assert_equal d, JSON(JSON(d), :create_additions => true)
     d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161)
-    assert_equal d, JSON(JSON(d))
-    assert_equal 1..10, JSON(JSON(1..10))
-    assert_equal 1...10, JSON(JSON(1...10))
-    assert_equal "a".."c", JSON(JSON("a".."c"))
-    assert_equal "a"..."c", JSON(JSON("a"..."c"))
+    assert_equal d, JSON(JSON(d), :create_additions => true)
+    assert_equal 1..10, JSON(JSON(1..10), :create_additions => true)
+    assert_equal 1...10, JSON(JSON(1...10), :create_additions => true)
+    assert_equal "a".."c", JSON(JSON("a".."c"), :create_additions => true)
+    assert_equal "a"..."c", JSON(JSON("a"..."c"), :create_additions => true)
     s = MyJsonStruct.new 4711, 'foot'
-    assert_equal s, JSON(JSON(s))
+    assert_equal s, JSON(JSON(s), :create_additions => true)
     struct = Struct.new :foo, :bar
     s = struct.new 4711, 'foot'
     assert_raises(JSONError) { JSON(s) }
@@ -146,29 +154,29 @@ class TC_JSONAddition < Test::Unit::TestCase
       raise TypeError, "test me"
     rescue TypeError => e
       e_json = JSON.generate e
-      e_again = JSON e_json
+      e_again = JSON e_json, :create_additions => true
       assert_kind_of TypeError, e_again
       assert_equal e.message, e_again.message
       assert_equal e.backtrace, e_again.backtrace
     end
-    assert_equal(/foo/, JSON(JSON(/foo/)))
-    assert_equal(/foo/i, JSON(JSON(/foo/i)))
+    assert_equal(/foo/, JSON(JSON(/foo/), :create_additions => true))
+    assert_equal(/foo/i, JSON(JSON(/foo/i), :create_additions => true))
   end
 
   def test_utc_datetime
     now = Time.now
-    d = DateTime.parse(now.to_s)                    # usual case
-    assert_equal d, JSON.parse(d.to_json)
+    d = DateTime.parse(now.to_s, :create_additions => true)                    # usual case
+    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
     d = DateTime.parse(now.utc.to_s)                # of = 0
-    assert_equal d, JSON.parse(d.to_json)
+    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
     d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
-    assert_equal d, JSON.parse(d.to_json)
+    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
     d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
-    assert_equal d, JSON.parse(d.to_json)
+    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
   end
 
   def test_rational_complex
-    assert_equal Rational(2, 9), JSON(JSON(Rational(2, 9)))
-    assert_equal Complex(2, 9), JSON(JSON(Complex(2, 9)))
+    assert_equal Rational(2, 9), JSON.parse(JSON(Rational(2, 9)), :create_additions => true)
+    assert_equal Complex(2, 9), JSON.parse(JSON(Complex(2, 9)), :create_additions => true)
   end
 end

data/tests/test_json_string_matching.rb

@@ -27,14 +27,13 @@ class TestJsonStringMatching < Test::Unit::TestCase
     t = TestTime.new
     t_json = [ t ].to_json
     assert_equal [ t ],
-      JSON.parse(t_json,
-        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime })
+      JSON.parse(t_json, :create_additions => true,
+        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
     assert_equal [ t.strftime('%FT%T%z') ],
-      JSON.parse(t_json,
-        :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime })
+      JSON.parse(t_json, :create_additions => true,
+        :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
     assert_equal [ t.strftime('%FT%T%z') ],
       JSON.parse(t_json,
-        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime },
-        :create_additions => false)
+        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: permutation
-  requirement: &2157055580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157055580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bullshit
-  requirement: &2157055140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157055140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &2157054720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,155 +53,164 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157054720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a JSON implementation as a Ruby extension in C.
 email: flori@ping.de
 executables:
 - edit_json.rb
 - prettify_json.rb
 extensions:
-- ext/json/ext/parser/extconf.rb
 - ext/json/ext/generator/extconf.rb
+- ext/json/ext/parser/extconf.rb
 extra_rdoc_files:
 - README.rdoc
 files:
-- tests/test_json_string_matching.rb
-- tests/test_json_fixtures.rb
-- tests/setup_variant.rb
-- tests/fixtures/fail6.json
-- tests/fixtures/fail9.json
-- tests/fixtures/fail10.json
-- tests/fixtures/fail24.json
-- tests/fixtures/fail28.json
-- tests/fixtures/fail13.json
-- tests/fixtures/fail4.json
-- tests/fixtures/pass3.json
-- tests/fixtures/fail11.json
-- tests/fixtures/fail14.json
-- tests/fixtures/fail3.json
-- tests/fixtures/fail12.json
-- tests/fixtures/pass16.json
-- tests/fixtures/pass15.json
-- tests/fixtures/fail20.json
-- tests/fixtures/fail8.json
-- tests/fixtures/pass2.json
-- tests/fixtures/fail5.json
-- tests/fixtures/fail1.json
-- tests/fixtures/fail25.json
-- tests/fixtures/pass17.json
-- tests/fixtures/fail7.json
-- tests/fixtures/pass26.json
-- tests/fixtures/fail21.json
-- tests/fixtures/pass1.json
-- tests/fixtures/fail23.json
-- tests/fixtures/fail18.json
-- tests/fixtures/fail2.json
-- tests/fixtures/fail22.json
-- tests/fixtures/fail27.json
-- tests/fixtures/fail19.json
-- tests/test_json_unicode.rb
-- tests/test_json_addition.rb
-- tests/test_json_generate.rb
-- tests/test_json_encoding.rb
-- tests/test_json.rb
+- 0001-Security-fix-create_additons-JSON-GenericObject.patch
+- 0001-Security-fix-create_additons-problem-1.5.5.patch
+- 0001-Security-fix-for-create_additions-problem-1.6.8.patch
+- CHANGES
 - COPYING
-- TODO
+- COPYING-json-jruby
+- GPL
+- Gemfile
+- Gemfile.lock
+- README-json-jruby.markdown
+- README.rdoc
 - Rakefile
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
+- TODO
+- VERSION
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
 - benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
 - benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
-- benchmarks/parser2_benchmark.rb
-- benchmarks/parser_benchmark.rb
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
 - benchmarks/generator2_benchmark.rb
 - benchmarks/generator_benchmark.rb
-- benchmarks/ohai.ruby
 - benchmarks/ohai.json
-- lib/json/json.xpm
-- lib/json/TrueClass.xpm
-- lib/json/version.rb
-- lib/json/Array.xpm
-- lib/json/add/complex.rb
-- lib/json/add/rational.rb
-- lib/json/add/core.rb
-- lib/json/common.rb
-- lib/json/pure/generator.rb
-- lib/json/pure/parser.rb
-- lib/json/ext.rb
-- lib/json/pure.rb
-- lib/json/Key.xpm
-- lib/json/FalseClass.xpm
-- lib/json/editor.rb
-- lib/json/Numeric.xpm
-- lib/json/NilClass.xpm
-- lib/json/String.xpm
-- lib/json/Hash.xpm
-- lib/json.rb
-- Gemfile
-- README.rdoc
-- json_pure.gemspec
-- GPL
-- CHANGES
-- bin/prettify_json.rb
+- benchmarks/ohai.ruby
+- benchmarks/parser2_benchmark.rb
+- benchmarks/parser_benchmark.rb
 - bin/edit_json.rb
-- COPYING-json-jruby
-- ext/json/ext/parser/parser.h
-- ext/json/ext/parser/extconf.rb
-- ext/json/ext/parser/parser.rl
-- ext/json/ext/parser/parser.c
-- ext/json/ext/generator/generator.c
+- bin/prettify_json.rb
+- data/example.json
+- data/index.html
+- data/prototype.js
 - ext/json/ext/generator/extconf.rb
+- ext/json/ext/generator/generator.c
 - ext/json/ext/generator/generator.h
-- VERSION
-- data/prototype.js
-- data/index.html
-- data/example.json
-- json.gemspec
-- java/src/json/ext/Parser.java
-- java/src/json/ext/RuntimeInfo.java
+- ext/json/ext/parser/extconf.rb
+- ext/json/ext/parser/parser.c
+- ext/json/ext/parser/parser.h
+- ext/json/ext/parser/parser.rl
+- install.rb
+- java/lib/bytelist-1.0.6.jar
+- java/lib/jcodings.jar
+- java/src/json/ext/ByteListTranscoder.java
+- java/src/json/ext/Generator.java
+- java/src/json/ext/GeneratorMethods.java
+- java/src/json/ext/GeneratorService.java
 - java/src/json/ext/GeneratorState.java
 - java/src/json/ext/OptionsReader.java
-- java/src/json/ext/ParserService.java
+- java/src/json/ext/Parser.java
 - java/src/json/ext/Parser.rl
+- java/src/json/ext/ParserService.java
+- java/src/json/ext/RuntimeInfo.java
+- java/src/json/ext/StringDecoder.java
 - java/src/json/ext/StringEncoder.java
-- java/src/json/ext/GeneratorService.java
 - java/src/json/ext/Utils.java
-- java/src/json/ext/StringDecoder.java
-- java/src/json/ext/Generator.java
-- java/src/json/ext/ByteListTranscoder.java
-- java/src/json/ext/GeneratorMethods.java
-- java/lib/bytelist-1.0.6.jar
-- java/lib/jcodings.jar
-- README-json-jruby.markdown
-- install.rb
 - json-java.gemspec
+- json.gemspec
+- json_pure.gemspec
+- lib/json.rb
+- lib/json/Array.xpm
+- lib/json/FalseClass.xpm
+- lib/json/Hash.xpm
+- lib/json/Key.xpm
+- lib/json/NilClass.xpm
+- lib/json/Numeric.xpm
+- lib/json/String.xpm
+- lib/json/TrueClass.xpm
+- lib/json/add/complex.rb
+- lib/json/add/core.rb
+- lib/json/add/rational.rb
+- lib/json/common.rb
+- lib/json/editor.rb
+- lib/json/ext.rb
+- lib/json/json.xpm
+- lib/json/pure.rb
+- lib/json/pure/generator.rb
+- lib/json/pure/parser.rb
+- lib/json/version.rb
+- tests/fixtures/fail1.json
+- tests/fixtures/fail10.json
+- tests/fixtures/fail11.json
+- tests/fixtures/fail12.json
+- tests/fixtures/fail13.json
+- tests/fixtures/fail14.json
+- tests/fixtures/fail18.json
+- tests/fixtures/fail19.json
+- tests/fixtures/fail2.json
+- tests/fixtures/fail20.json
+- tests/fixtures/fail21.json
+- tests/fixtures/fail22.json
+- tests/fixtures/fail23.json
+- tests/fixtures/fail24.json
+- tests/fixtures/fail25.json
+- tests/fixtures/fail27.json
+- tests/fixtures/fail28.json
+- tests/fixtures/fail3.json
+- tests/fixtures/fail4.json
+- tests/fixtures/fail5.json
+- tests/fixtures/fail6.json
+- tests/fixtures/fail7.json
+- tests/fixtures/fail8.json
+- tests/fixtures/fail9.json
+- tests/fixtures/pass1.json
+- tests/fixtures/pass15.json
+- tests/fixtures/pass16.json
+- tests/fixtures/pass17.json
+- tests/fixtures/pass2.json
+- tests/fixtures/pass26.json
+- tests/fixtures/pass3.json
+- tests/setup_variant.rb
+- tests/test_json.rb
+- tests/test_json_addition.rb
+- tests/test_json_encoding.rb
+- tests/test_json_fixtures.rb
+- tests/test_json_generate.rb
+- tests/test_json_string_matching.rb
+- tests/test_json_unicode.rb
 - tools/fuzz.rb
 - tools/server.rb
 - ./tests/test_json_string_matching.rb
@@ -219,6 +238,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -399171405044678908
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: json
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: JSON Implementation for Ruby