json 1.5.3 → 1.5.4

data/tests/test_json_addition.rb

@@ -3,7 +3,9 @@
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
-load 'json/add/core.rb'
+require 'json/add/core'
+require 'json/add/complex'
+require 'json/add/rational'
 require 'date'
 
 class TC_JSONAddition < Test::Unit::TestCase
@@ -19,7 +21,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     def ==(other)
       a == other.a
     end
-    
+
     def self.json_create(object)
       new(*object['args'])
     end
@@ -164,4 +166,9 @@ class TC_JSONAddition < Test::Unit::TestCase
     d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
     assert_equal d, JSON.parse(d.to_json)
   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)))
+  end
 end

data/tests/test_json_generate.rb

@@ -50,6 +50,7 @@ EOT
     parsed_json = parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_raise(GeneratorError) { generate(666) }
+    assert_equal '666', generate(666, :quirks_mode => true)
   end
 
   def test_generate_pretty
@@ -67,6 +68,7 @@ EOT
     parsed_json = parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_raise(GeneratorError) { pretty_generate(666) }
+    assert_equal '666', pretty_generate(666, :quirks_mode => true)
   end
 
   def test_fast_generate
@@ -79,9 +81,24 @@ EOT
     parsed_json = parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_raise(GeneratorError) { fast_generate(666) }
+    assert_equal '666', fast_generate(666, :quirks_mode => true)
   end
 
-
+  def test_own_state
+    state = State.new
+    json = generate(@hash, state)
+    assert_equal(JSON.parse(@json2), JSON.parse(json))
+    parsed_json = parse(json)
+    assert_equal(@hash, parsed_json)
+    json = generate({1=>2}, state)
+    assert_equal('{"1":2}', json)
+    parsed_json = parse(json)
+    assert_equal({"1"=>2}, parsed_json)
+    assert_raise(GeneratorError) { generate(666, state) }
+    state.quirks_mode = true
+    assert state.quirks_mode?
+    assert_equal '666', generate(666, state)
+  end
 
   def test_states
     json = generate({1=>2}, nil)
@@ -107,6 +124,7 @@ EOT
       :allow_nan    => false,
       :array_nl     => "\n",
       :ascii_only   => false,
+      :quirks_mode  => false,
       :depth        => 0,
       :indent       => "  ",
       :max_nesting  => 19,
@@ -122,6 +140,7 @@ EOT
       :allow_nan    => false,
       :array_nl     => "",
       :ascii_only   => false,
+      :quirks_mode  => false,
       :depth        => 0,
       :indent       => "",
       :max_nesting  => 19,
@@ -137,6 +156,7 @@ EOT
       :allow_nan    => false,
       :array_nl     => "",
       :ascii_only   => false,
+      :quirks_mode  => false,
       :depth        => 0,
       :indent       => "",
       :max_nesting  => 0,
@@ -177,4 +197,17 @@ EOT
     assert_raises(JSON::NestingError) { ary.to_json(s) }
     assert_equal 19, s.depth
   end
+
+  def test_gc
+    bignum_too_long_to_embed_as_string = 1234567890123456789012345
+    expect = bignum_too_long_to_embed_as_string.to_s
+    stress, GC.stress = GC.stress, true
+
+    10.times do |i|
+      tmp = bignum_too_long_to_embed_as_string.to_json
+      assert_equal expect, tmp
+    end
+  ensure
+    GC.stress = stress
+  end if GC.respond_to?(:stress=)
 end

data/tools/fuzz.rb

@@ -120,7 +120,7 @@ loop do
   if $DEBUG
     puts "-" * 80
     puts json, json.size
-  else 
+  else
     puts json.size
   end
   begin

metadata

@@ -1,61 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.5.4
   prerelease: 
-  version: 1.5.3
 platform: ruby
-authors: 
+authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-31 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: permutation
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157055580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bullshit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157055580
+- !ruby/object:Gem::Dependency
+  name: bullshit
+  requirement: &2157055140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157055140
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &2157054720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2157054720
 description: This is a JSON implementation as a Ruby extension in C.
 email: flori@ping.de
-executables: 
+executables:
 - edit_json.rb
 - prettify_json.rb
-extensions: 
+extensions:
 - ext/json/ext/parser/extconf.rb
 - ext/json/ext/generator/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - tests/test_json_string_matching.rb
 - tests/test_json_fixtures.rb
 - tests/setup_variant.rb
@@ -139,8 +138,9 @@ files:
 - 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/add/rails.rb
 - lib/json/common.rb
 - lib/json/pure/generator.rb
 - lib/json/pure/parser.rb
@@ -203,37 +203,35 @@ files:
 - ./tests/test_json.rb
 homepage: http://flori.github.com/json
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - JSON implemention for Ruby
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - ext/json/ext
 - ext
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: json
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: JSON Implementation for Ruby
-test_files: 
+test_files:
 - ./tests/test_json_string_matching.rb
 - ./tests/test_json_fixtures.rb
 - ./tests/test_json_unicode.rb

data/lib/json/add/rails.rb

@@ -1,8 +0,0 @@
-# This file used to implementations of rails custom objects for
-# serialisation/deserialisation and is obsoleted now.
-
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
-  require 'json'
-end
-
-$DEBUG and warn "required json/add/rails which is obsolete now!"