json-maglev- 1.6.1 → 1.6.3

data/tests/test_json_addition.rb

@@ -6,6 +6,8 @@ require File.join(File.dirname(__FILE__), 'setup_variant')
 require 'json/add/core'
 require 'json/add/complex'
 require 'json/add/rational'
+require 'json/add/bigdecimal'
+require 'json/add/ostruct'
 require 'date'
 
 class TC_JSONAddition < Test::Unit::TestCase
@@ -128,7 +130,7 @@ 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))
     d = Date.today
     assert_equal d, JSON(JSON(d))
     d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161)
@@ -171,4 +173,16 @@ class TC_JSONAddition < Test::Unit::TestCase
     assert_equal Rational(2, 9), JSON(JSON(Rational(2, 9)))
     assert_equal Complex(2, 9), JSON(JSON(Complex(2, 9)))
   end
+
+  def test_bigdecimal
+    assert_equal BigDecimal('3.141', 23), JSON(JSON(BigDecimal('3.141', 23)))
+    assert_equal BigDecimal('3.141', 666), JSON(JSON(BigDecimal('3.141', 666)))
+  end
+
+  def test_ostruct
+    o = OpenStruct.new
+    # XXX this won't work; o.foo = { :bar => true }
+    o.foo = { 'bar' => true }
+    assert_equal o, JSON(JSON(o))
+  end
 end

data/tests/test_json_generate.rb

@@ -43,6 +43,8 @@ EOT
   def test_generate
     json = generate(@hash)
     assert_equal(JSON.parse(@json2), JSON.parse(json))
+    json = JSON[@hash]
+    assert_equal(JSON.parse(@json2), JSON.parse(json))
     parsed_json = parse(json)
     assert_equal(@hash, parsed_json)
     json = generate({1=>2})
@@ -121,48 +123,51 @@ EOT
   def test_pretty_state
     state = PRETTY_STATE_PROTOTYPE.dup
     assert_equal({
-      :allow_nan    => false,
-      :array_nl     => "\n",
-      :ascii_only   => false,
-      :quirks_mode  => false,
-      :depth        => 0,
-      :indent       => "  ",
-      :max_nesting  => 19,
-      :object_nl    => "\n",
-      :space        => " ",
-      :space_before => "",
+      :allow_nan             => false,
+      :array_nl              => "\n",
+      :ascii_only            => false,
+      :buffer_initial_length => 1024,
+      :quirks_mode           => false,
+      :depth                 => 0,
+      :indent                => "  ",
+      :max_nesting           => 19,
+      :object_nl             => "\n",
+      :space                 => " ",
+      :space_before          => "",
     }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
   end
 
   def test_safe_state
     state = SAFE_STATE_PROTOTYPE.dup
     assert_equal({
-      :allow_nan    => false,
-      :array_nl     => "",
-      :ascii_only   => false,
-      :quirks_mode  => false,
-      :depth        => 0,
-      :indent       => "",
-      :max_nesting  => 19,
-      :object_nl    => "",
-      :space        => "",
-      :space_before => "",
+      :allow_nan             => false,
+      :array_nl              => "",
+      :ascii_only            => false,
+      :buffer_initial_length => 1024,
+      :quirks_mode           => false,
+      :depth                 => 0,
+      :indent                => "",
+      :max_nesting           => 19,
+      :object_nl             => "",
+      :space                 => "",
+      :space_before          => "",
     }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
   end
 
   def test_fast_state
     state = FAST_STATE_PROTOTYPE.dup
     assert_equal({
-      :allow_nan    => false,
-      :array_nl     => "",
-      :ascii_only   => false,
-      :quirks_mode  => false,
-      :depth        => 0,
-      :indent       => "",
-      :max_nesting  => 0,
-      :object_nl    => "",
-      :space        => "",
-      :space_before => "",
+      :allow_nan             => false,
+      :array_nl              => "",
+      :ascii_only            => false,
+      :buffer_initial_length => 1024,
+      :quirks_mode           => false,
+      :depth                 => 0,
+      :indent                => "",
+      :max_nesting           => 0,
+      :object_nl             => "",
+      :space                 => "",
+      :space_before          => "",
     }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
   end
 
@@ -198,6 +203,17 @@ EOT
     assert_equal 19, s.depth
   end
 
+  def test_buffer_initial_length
+    s = JSON.state.new
+    assert_equal 1024, s.buffer_initial_length
+    s.buffer_initial_length = 0
+    assert_equal 1024, s.buffer_initial_length
+    s.buffer_initial_length = -1
+    assert_equal 1024, s.buffer_initial_length
+    s.buffer_initial_length = 128
+    assert_equal 128, s.buffer_initial_length
+  end
+
   def test_gc
     bignum_too_long_to_embed_as_string = 1234567890123456789012345
     expect = bignum_too_long_to_embed_as_string.to_s
@@ -210,4 +226,24 @@ EOT
   ensure
     GC.stress = stress
   end if GC.respond_to?(:stress=)
+
+  def test_broken_bignum # [ruby-core:38867]
+    pid = fork do
+      Bignum.class_eval do
+        def to_s
+        end
+      end
+      begin
+        JSON::Ext::Generator::State.new.generate(1<<64)
+        exit 1
+      rescue TypeError
+        exit 0
+      end
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+  rescue NotImplementedError
+    # forking to avoid modifying core class of a parent process and
+    # introducing race conditions of tests are run in parallel
+  end if defined?(JSON::Ext)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-maglev-
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 -07:00
+date: 2011-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,139 +70,148 @@ extensions:
 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
+- .gitignore
+- .travis.yml
+- CHANGES
 - COPYING
-- TODO
+- COPYING-json-jruby
+- GPL
+- Gemfile
+- 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/.keep
 - 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/data/.keep
 - benchmarks/generator2_benchmark.rb
 - benchmarks/generator_benchmark.rb
-- benchmarks/ohai.ruby
 - benchmarks/ohai.json
-- lib/json/version.rb
-- lib/json/add/symbol.rb
-- lib/json/add/struct.rb
-- lib/json/add/complex.rb
-- lib/json/add/rational.rb
-- lib/json/add/exception.rb
-- lib/json/add/time.rb
-- lib/json/add/date_time.rb
-- lib/json/add/core.rb
-- lib/json/add/range.rb
-- lib/json/add/date.rb
-- lib/json/add/regexp.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.rb
-- Gemfile
-- README.rdoc
-- json_pure.gemspec
-- GPL
-- CHANGES
-- 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
+- benchmarks/ohai.ruby
+- benchmarks/parser2_benchmark.rb
+- benchmarks/parser_benchmark.rb
+- data/example.json
+- data/index.html
+- data/prototype.js
+- diagrams/.keep
+- ext/json/ext/fbuffer/fbuffer.h
 - 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/add/bigdecimal.rb
+- lib/json/add/complex.rb
+- lib/json/add/core.rb
+- lib/json/add/date.rb
+- lib/json/add/date_time.rb
+- lib/json/add/exception.rb
+- lib/json/add/ostruct.rb
+- lib/json/add/range.rb
+- lib/json/add/rational.rb
+- lib/json/add/regexp.rb
+- lib/json/add/struct.rb
+- lib/json/add/symbol.rb
+- lib/json/add/time.rb
+- lib/json/common.rb
+- lib/json/ext.rb
+- lib/json/ext/.keep
+- 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
@@ -247,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: json
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: JSON Implementation for Ruby