json 1.6.7-java → 1.6.8-java

data/lib/json/common.rb

@@ -293,21 +293,28 @@ module JSON
     attr_accessor :load_default_options
   end
   self.load_default_options = {
-    :max_nesting => false,
-    :allow_nan   => true,
-    :quirks_mode => true,
+    :max_nesting      => false,
+    :allow_nan        => true,
+    :quirks_mode      => true,
+    :create_additions => true,
   }
 
   # 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. The default
-  # options for the parser can be changed via the load_default_options method.
+  # Ruby object as an argument recursively in depth first order. To modify the
+  # default options pass in the optional _options_ argument as well.
+  #
+  # BEWARE: This method is meant to serialise data from trusted user input,
+  # like from your own database server or clients under your control, it could
+  # be dangerous to allow untrusted users to pass JSON sources into it. The
+  # default options for the parser can be changed via the load_default_options
+  # method.
   #
   # This method is part of the implementation of the load/dump interface of
   # Marshal and YAML.
-  def load(source, proc = nil)
-    opts = load_default_options
+  def load(source, proc = nil, options = {})
+    opts = load_default_options.merge options
     if source.respond_to? :to_str
       source = source.to_str
     elsif source.respond_to? :to_io

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 false, the Parser doesn't create
-      #   additions even if a matchin class and create_id was found. This option
-      #   defaults to true.
+      # * *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.
       # * *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 = true
+          @create_additions = false
         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.6.7'
+  VERSION         = '1.6.8'
   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

@@ -329,12 +329,12 @@ class TestJSON < Test::Unit::TestCase
   def test_generate_core_subclasses_with_new_to_json
     obj = SubHash2["foo" => SubHash2["bar" => true]]
     obj_json = JSON(obj)
-    obj_again = JSON(obj_json)
+    obj_again = JSON.parse(obj_json, :create_additions => true)
     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"]))
+    assert_equal ["foo"], JSON(JSON(SubArray2["foo"]), :create_additions => true)
   end
 
   def test_generate_core_subclasses_with_default_to_json
@@ -493,6 +493,12 @@ EOT
     assert_equal nil, 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_dump
     too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]'
     assert_equal too_deep, JSON.dump(eval(too_deep))

data/tests/test_json_addition.rb

@@ -73,11 +73,19 @@ class TestJSONAddition < 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?
@@ -104,7 +112,7 @@ class TestJSONAddition < 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
@@ -122,7 +130,7 @@ class TestJSONAddition < 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
 
@@ -130,17 +138,17 @@ class TestJSONAddition < Test::Unit::TestCase
 
   def test_core
     t = Time.now
-    assert_equal t, JSON(JSON(t))
+    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) }
@@ -148,41 +156,41 @@ class TestJSONAddition < 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
 
   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)))
+    assert_equal BigDecimal('3.141', 23), JSON(JSON(BigDecimal('3.141', 23)), :create_additions => true)
+    assert_equal BigDecimal('3.141', 666), JSON(JSON(BigDecimal('3.141', 666)), :create_additions => true)
   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))
+    assert_equal o, JSON.parse(JSON(o), :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,121 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.6.7
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.6.8
 platform: java
-authors: 
-  - Daniel Luz
-autorequire: 
+authors:
+- Daniel Luz
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-04-28 00:00:00 Z
+date: 2013-02-10 00:00:00.000000000 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/version.rb
-  - lib/json/common.rb
-  - lib/json/ext.rb
-  - lib/json/pure.rb
-  - lib/json/light_object.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/bigdecimal.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/add/ostruct.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/version.rb
+- lib/json/common.rb
+- lib/json/ext.rb
+- lib/json/pure.rb
+- lib/json/light_object.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/bigdecimal.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/add/ostruct.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
 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 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
 requirements: []
-
 rubyforge_project: json-jruby
-rubygems_version: 1.8.22
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: JSON implementation for JRuby
 test_files: []
-