json 1.5.5-java → 1.6.0.1-java

data/lib/json/add/symbol.rb

@@ -0,0 +1,25 @@
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+# Symbol serialization/deserialization
+class Symbol
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      's'            => to_s,
+    }
+  end
+
+  # Stores class name (Symbol) with String representation of Symbol as a JSON string.
+  def to_json(*a)
+    as_json.to_json(*a)
+  end
+
+  # Deserializes JSON string by converting the <tt>string</tt> value stored in the object to a Symbol
+  def self.json_create(o)
+    o['s'].to_sym
+  end
+end

data/lib/json/add/time.rb

@@ -0,0 +1,35 @@
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+
+# Time serialization/deserialization
+class Time
+
+  # Deserializes JSON string by converting time since epoch to Time
+  def self.json_create(object)
+    if usec = object.delete('u') # used to be tv_usec -> tv_nsec
+      object['n'] = usec * 1000
+    end
+    if respond_to?(:tv_nsec)
+      at(*object.values_at('s', 'n'))
+    else
+      at(object['s'], object['n'] / 1000)
+    end
+  end
+
+  # Returns a hash, that will be turned into a JSON object and represent this
+  # object.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      's'            => tv_sec,
+      'n'            => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
+    }
+  end
+
+  # Stores class name (Time) with number of seconds since epoch and number of
+  # microseconds for Time as JSON string
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end

data/lib/json/common.rb

@@ -141,7 +141,7 @@ module JSON
   #   the default.
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matching class and create_id was found. This option
-  #   defaults to false.
+  #   defaults to true.
   # * *object_class*: Defaults to Hash
   # * *array_class*: Defaults to Array
   def parse(source, opts = {})
@@ -162,7 +162,7 @@ module JSON
   #   to true.
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matching class and create_id was found. This option
-  #   defaults to false.
+  #   defaults to true.
   def parse!(source, opts = {})
     opts = {
       :max_nesting  => false,
@@ -287,18 +287,11 @@ module JSON
   # Load a ruby data structure from a JSON _source_ and return it. A source can
   # either be a string-like object, an IO-like object, or an object responding
   # to the read method. If _proc_ was given, it will be called with any nested
-  # Ruby object as an argument recursively in depth first order. To modify the
-  # default options pass in the optional _options_ argument as well.
+  # Ruby object as an argument recursively in depth first order.
   #
   # This method is part of the implementation of the load/dump interface of
   # Marshal and YAML.
-  def load(source, proc = nil, options = {})
-    load_default_options = {
-      :max_nesting      => false,
-      :allow_nan        => true,
-      :create_additions => false
-    }
-    opts = load_default_options.merge options
+  def load(source, proc = nil)
     if source.respond_to? :to_str
       source = source.to_str
     elsif source.respond_to? :to_io
@@ -306,7 +299,7 @@ module JSON
     else
       source = source.read
     end
-    result = parse(source, opts)
+    result = parse(source, :max_nesting => false, :allow_nan => true)
     recurse_proc(result, &proc) if proc
     result
   end

data/lib/json/pure/parser.rb

@@ -63,9 +63,9 @@ module JSON
       # * *symbolize_names*: If set to true, returns symbols for the names
       #   (keys) in a JSON object. Otherwise strings are returned, which is also
       #   the default.
-      # * *create_additions*: If set to true, the Parser creates
-      #   additions when if a matching class and create_id was found. This
-      #   option defaults to false.
+      # * *create_additions*: If set to false, the Parser doesn't create
+      #   additions even if a matchin class and create_id was found. This option
+      #   defaults to true.
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array
       # * *quirks_mode*: Enables quirks_mode for parser, that is for example
@@ -88,7 +88,7 @@ module JSON
         if opts.key?(:create_additions)
           @create_additions = !!opts[:create_additions]
         else
-          @create_additions = false
+          @create_additions = true
         end
         @create_id = @create_additions ? JSON.create_id : nil
         @object_class = opts[:object_class] || Hash

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.5.5'
+  VERSION         = '1.6.0'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_json.rb

@@ -4,7 +4,6 @@
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
 require 'stringio'
-require 'tempfile'
 
 unless Array.method_defined?(:permutation)
   begin
@@ -264,12 +263,12 @@ class TC_JSON < Test::Unit::TestCase
   def test_generation_of_core_subclasses_with_new_to_json
     obj = SubHash2["foo" => SubHash2["bar" => true]]
     obj_json = JSON(obj)
-    obj_again = JSON.parse(obj_json, :create_additions => true)
+    obj_again = JSON(obj_json)
     assert_kind_of SubHash2, obj_again
     assert_kind_of SubHash2, obj_again['foo']
     assert obj_again['foo']['bar']
     assert_equal obj, obj_again
-    assert_equal ["foo"], JSON(JSON(SubArray2["foo"]), :create_additions => true)
+    assert_equal ["foo"], JSON(JSON(SubArray2["foo"]))
   end
 
   def test_generation_of_core_subclasses_with_default_to_json
@@ -415,25 +414,6 @@ EOT
       JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
   end
 
-  def test_load
-    assert_equal @hash, JSON.load(@json)
-    tempfile = Tempfile.open('json')
-    tempfile.write @json
-    tempfile.rewind
-    assert_equal @hash, JSON.load(tempfile)
-    stringio = StringIO.new(@json)
-    stringio.rewind
-    assert_equal @hash, JSON.load(stringio)
-    assert_raise(NoMethodError) { JSON.load(nil) }
-    assert_raise(JSON::ParserError) {JSON.load('') }
-  end
-
-  def test_load_with_options
-    small_hash  = JSON("foo" => 'bar')
-    symbol_hash = { :foo => 'bar' }
-    assert_equal symbol_hash, JSON.load(small_hash, nil, :symbolize_names => true)
-  end
-
   def test_load_dump
     too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]'
     assert_equal too_deep, JSON.dump(eval(too_deep))

data/tests/test_json_addition.rb

@@ -71,19 +71,11 @@ class TC_JSONAddition < Test::Unit::TestCase
     a = A.new(666)
     assert A.json_creatable?
     json = generate(a)
-    a_again = JSON.parse(json, :create_additions => true)
+    a_again = JSON.parse(json)
     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?
@@ -110,7 +102,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     c = C.new
     assert !C.json_creatable?
     json = generate(c)
-    assert_raises(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) }
+    assert_raises(ArgumentError, NameError) { JSON.parse(json) }
   end
 
   def test_raw_strings
@@ -128,7 +120,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, :create_additions => true)
+    raw_again = JSON.parse(json)
     assert_equal raw, raw_again
   end
 
@@ -136,17 +128,17 @@ class TC_JSONAddition < Test::Unit::TestCase
 
   def test_core
     t = Time.now
-    assert_equal t, JSON(JSON(t), :create_additions => true)
+    assert_equal t.inspect, JSON(JSON(t)).inspect
     d = Date.today
-    assert_equal d, JSON(JSON(d), :create_additions => true)
+    assert_equal d, JSON(JSON(d))
     d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161)
-    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)
+    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"))
     s = MyJsonStruct.new 4711, 'foot'
-    assert_equal s, JSON(JSON(s), :create_additions => true)
+    assert_equal s, JSON(JSON(s))
     struct = Struct.new :foo, :bar
     s = struct.new 4711, 'foot'
     assert_raises(JSONError) { JSON(s) }
@@ -154,29 +146,29 @@ class TC_JSONAddition < Test::Unit::TestCase
       raise TypeError, "test me"
     rescue TypeError => e
       e_json = JSON.generate e
-      e_again = JSON e_json, :create_additions => true
+      e_again = JSON e_json
       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/), :create_additions => true))
-    assert_equal(/foo/i, JSON(JSON(/foo/i), :create_additions => true))
+    assert_equal(/foo/, JSON(JSON(/foo/)))
+    assert_equal(/foo/i, JSON(JSON(/foo/i)))
   end
 
   def test_utc_datetime
     now = Time.now
-    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.to_s)                    # usual case
+    assert_equal d, JSON.parse(d.to_json)
     d = DateTime.parse(now.utc.to_s)                # of = 0
-    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
+    assert_equal d, JSON.parse(d.to_json)
     d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
-    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
+    assert_equal d, JSON.parse(d.to_json)
     d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
-    assert_equal d, JSON.parse(d.to_json, :create_additions => true)
+    assert_equal d, JSON.parse(d.to_json)
   end
 
   def test_rational_complex
-    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)
+    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_string_matching.rb

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

metadata

@@ -1,113 +1,112 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: json
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.5.5
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 1.6.0.1
 platform: java
-authors:
-- Daniel Luz
-autorequire:
+authors: 
+  - Daniel Luz
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+
+date: 2011-09-13 00:00:00 Z
 dependencies: []
+
 description: A JSON implementation as a JRuby extension.
 email: dev+ruby@mernen.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/json.rb
-- lib/json/json.xpm
-- lib/json/TrueClass.xpm
-- lib/json/version.rb
-- lib/json/Array.xpm
-- lib/json/common.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/add/complex.rb
-- lib/json/add/rational.rb
-- lib/json/add/core.rb
-- lib/json/pure/generator.rb
-- lib/json/pure/parser.rb
-- lib/json/ext/generator.jar
-- lib/json/ext/parser.jar
-- tests/test_json_string_matching.rb
-- tests/test_json_fixtures.rb
-- tests/setup_variant.rb
-- tests/test_json_unicode.rb
-- tests/test_json_addition.rb
-- tests/test_json_generate.rb
-- tests/test_json_encoding.rb
-- tests/test_json.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
+
+files: 
+  - lib/json.rb
+  - lib/json/common.rb
+  - lib/json/ext.rb
+  - lib/json/pure.rb
+  - lib/json/version.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/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/ext/generator.jar
+  - lib/json/ext/parser.jar
+  - lib/json/pure/generator.rb
+  - lib/json/pure/parser.rb
+  - 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
+  - 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
 homepage: http://json-jruby.rubyforge.org/
 licenses: []
-post_install_message:
+
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: !binary |-
-        MA==
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: !binary |-
-        MA==
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: json-jruby
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.9
+signing_key: 
 specification_version: 3
 summary: JSON implementation for JRuby
 test_files: []
+