json 1.7.5-java → 1.7.6-java

data/lib/json/add/bigdecimal.rb

@@ -4,10 +4,16 @@ end
 defined?(::BigDecimal) or require 'bigdecimal'
 
 class BigDecimal
+  # Import a JSON Marshalled object.
+  #
+  # method used for JSON marshalling support.
   def self.json_create(object)
     BigDecimal._load object['b']
   end
 
+  # Marshal the object to JSON.
+  #
+  # method used for JSON marshalling support.
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -15,6 +21,7 @@ class BigDecimal
     }
   end
 
+  # return the JSON value
   def to_json(*)
     as_json.to_json
   end

data/lib/json/common.rb

@@ -139,7 +139,7 @@ module JSON
   # keys:
   # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
   #   structures. Disable depth checking with :max_nesting => false. It defaults
-  #   to 19.
+  #   to 100.
   # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
   #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
   #   to false.
@@ -199,7 +199,7 @@ module JSON
   #   encountered. This options defaults to false.
   # * *max_nesting*: The maximum depth of nesting allowed in the data
   #   structures from which JSON is to be generated. Disable depth checking
-  #   with :max_nesting => false, it defaults to 19.
+  #   with :max_nesting => false, it defaults to 100.
   #
   # See also the fast_generate for the fastest creation method with the least
   # amount of sanity checks, and the pretty_generate method for some

data/lib/json/generic_object.rb

@@ -10,6 +10,21 @@ module JSON
         data.delete JSON.create_id
         self[data]
       end
+
+      def from_hash(object)
+        case
+        when object.respond_to?(:to_hash)
+          result = new
+          object.to_hash.each do |key, value|
+            result[key] = from_hash(value)
+          end
+          result
+        when object.respond_to?(:to_ary)
+          object.to_ary.map { |a| from_hash(a) }
+        else
+          object
+        end
+      end
     end
 
     def to_hash

data/lib/json/pure/generator.rb

@@ -220,17 +220,22 @@ module JSON
         # Configure this State instance with the Hash _opts_, and return
         # itself.
         def configure(opts)
-          @indent         = opts[:indent] if opts.key?(:indent)
-          @space          = opts[:space] if opts.key?(:space)
-          @space_before   = opts[:space_before] if opts.key?(:space_before)
-          @object_nl      = opts[:object_nl] if opts.key?(:object_nl)
-          @array_nl       = opts[:array_nl] if opts.key?(:array_nl)
-          @allow_nan      = !!opts[:allow_nan] if opts.key?(:allow_nan)
-          @ascii_only     = opts[:ascii_only] if opts.key?(:ascii_only)
-          @depth          = opts[:depth] || 0
-          @quirks_mode    = opts[:quirks_mode] if opts.key?(:quirks_mode)
-          if !opts.key?(:max_nesting) # defaults to 19
-            @max_nesting = 19
+          for key, value in opts
+            instance_variable_set "@#{key}", value
+          end
+          @indent                = opts[:indent] if opts.key?(:indent)
+          @space                 = opts[:space] if opts.key?(:space)
+          @space_before          = opts[:space_before] if opts.key?(:space_before)
+          @object_nl             = opts[:object_nl] if opts.key?(:object_nl)
+          @array_nl              = opts[:array_nl] if opts.key?(:array_nl)
+          @allow_nan             = !!opts[:allow_nan] if opts.key?(:allow_nan)
+          @ascii_only            = opts[:ascii_only] if opts.key?(:ascii_only)
+          @depth                 = opts[:depth] || 0
+          @quirks_mode           = opts[:quirks_mode] if opts.key?(:quirks_mode)
+          @buffer_initial_length ||= opts[:buffer_initial_length]
+
+          if !opts.key?(:max_nesting) # defaults to 100
+            @max_nesting = 100
           elsif opts[:max_nesting]
             @max_nesting = opts[:max_nesting]
           else
@@ -244,12 +249,15 @@ module JSON
         # passed to the configure method.
         def to_h
           result = {}
-          for iv in %w[indent space space_before object_nl array_nl allow_nan max_nesting ascii_only quirks_mode buffer_initial_length depth]
-            result[iv.intern] = instance_variable_get("@#{iv}")
+          for iv in instance_variables
+            iv = iv.to_s[1..-1]
+            result[iv.to_sym] = self[iv]
           end
           result
         end
 
+        alias to_hash to_h
+
         # Generates a valid JSON document from object +obj+ and returns the
         # result. If no valid JSON document can be created this method raises a
         # GeneratorError exception.
@@ -267,7 +275,19 @@ module JSON
 
         # Return the value returned by method +name+.
         def [](name)
-          __send__ name
+          if respond_to?(name)
+            __send__(name)
+          else
+            instance_variable_get("@#{name}")
+          end
+        end
+
+        def []=(name, value)
+          if respond_to?(name_writer = "#{name}=")
+            __send__ name_writer, value
+          else
+            instance_variable_set "@#{name}", value
+          end
         end
       end
 

data/lib/json/pure/parser.rb

@@ -56,7 +56,7 @@ module JSON
       # keys:
       # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
       #   structures. Disable depth checking with :max_nesting => false|nil|0,
-      #   it defaults to 19.
+      #   it defaults to 100.
       # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
       #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
       #   to false.
@@ -76,8 +76,8 @@ module JSON
           source = convert_encoding source
         end
         super source
-        if !opts.key?(:max_nesting) # defaults to 19
-          @max_nesting = 19
+        if !opts.key?(:max_nesting) # defaults to 100
+          @max_nesting = 100
         elsif opts[:max_nesting]
           @max_nesting = opts[:max_nesting]
         else

data/lib/json/version.rb

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

data/tests/fixtures/fail18.json

@@ -1 +1 @@
-[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]

data/tests/test_json.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
@@ -446,12 +446,12 @@ EOT
     assert_raises(JSON::NestingError) { JSON.parse '[[]]', :max_nesting => 1 }
     assert_raises(JSON::NestingError) { JSON.parser.new('[[]]', :max_nesting => 1).parse }
     assert_equal [[]], JSON.parse('[[]]', :max_nesting => 2)
-    too_deep = '[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]'
+    too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
     too_deep_ary = eval too_deep
     assert_raises(JSON::NestingError) { JSON.parse too_deep }
     assert_raises(JSON::NestingError) { JSON.parser.new(too_deep).parse }
-    assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 19 }
-    ok = JSON.parse too_deep, :max_nesting => 20
+    assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 100 }
+    ok = JSON.parse too_deep, :max_nesting => 101
     assert_equal too_deep_ary, ok
     ok = JSON.parse too_deep, :max_nesting => nil
     assert_equal too_deep_ary, ok
@@ -462,8 +462,8 @@ EOT
     assert_raises(JSON::NestingError) { JSON.generate [[]], :max_nesting => 1 }
     assert_equal '[[]]', JSON.generate([[]], :max_nesting => 2)
     assert_raises(JSON::NestingError) { JSON.generate too_deep_ary }
-    assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 19 }
-    ok = JSON.generate too_deep_ary, :max_nesting => 20
+    assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 }
+    ok = JSON.generate too_deep_ary, :max_nesting => 101
     assert_equal too_deep, ok
     ok = JSON.generate too_deep_ary, :max_nesting => nil
     assert_equal too_deep, ok
@@ -494,18 +494,18 @@ EOT
   end
 
   def test_dump
-    too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]'
+    too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
     assert_equal too_deep, JSON.dump(eval(too_deep))
     assert_kind_of String, Marshal.dump(eval(too_deep))
-    assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 19) }
-    assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 19) }
-    assert_equal too_deep, JSON.dump(eval(too_deep), 20)
-    assert_kind_of String, Marshal.dump(eval(too_deep), 20)
+    assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 100) }
+    assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
+    assert_equal too_deep, JSON.dump(eval(too_deep), 101)
+    assert_kind_of String, Marshal.dump(eval(too_deep), 101)
     output = StringIO.new
     JSON.dump(eval(too_deep), output)
     assert_equal too_deep, output.string
     output = StringIO.new
-    JSON.dump(eval(too_deep), output, 20)
+    JSON.dump(eval(too_deep), output, 101)
     assert_equal too_deep, output.string
   end
 

data/tests/test_json_encoding.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')

data/tests/test_json_fixtures.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')

data/tests/test_json_generate.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
@@ -130,7 +130,7 @@ EOT
       :quirks_mode           => false,
       :depth                 => 0,
       :indent                => "  ",
-      :max_nesting           => 19,
+      :max_nesting           => 100,
       :object_nl             => "\n",
       :space                 => " ",
       :space_before          => "",
@@ -147,7 +147,7 @@ EOT
       :quirks_mode           => false,
       :depth                 => 0,
       :indent                => "",
-      :max_nesting           => 19,
+      :max_nesting           => 100,
       :object_nl             => "",
       :space                 => "",
       :space_before          => "",
@@ -200,7 +200,7 @@ EOT
     s = JSON.state.new
     assert_equal 0, s.depth
     assert_raises(JSON::NestingError) { ary.to_json(s) }
-    assert_equal 19, s.depth
+    assert_equal 100, s.depth
   end
 
   def test_buffer_initial_length
@@ -227,6 +227,30 @@ EOT
     GC.stress = stress
   end if GC.respond_to?(:stress=)
 
+  def test_configure_using_configure_and_merge
+    numbered_state = {
+      :indent       => "1",
+      :space        => '2',
+      :space_before => '3',
+      :object_nl    => '4',
+      :array_nl     => '5'
+    }
+    state1 = JSON.state.new
+    state1.merge(numbered_state)
+    assert_equal '1', state1.indent
+    assert_equal '2', state1.space
+    assert_equal '3', state1.space_before
+    assert_equal '4', state1.object_nl
+    assert_equal '5', state1.array_nl
+    state2 = JSON.state.new
+    state2.configure(numbered_state)
+    assert_equal '1', state2.indent
+    assert_equal '2', state2.space
+    assert_equal '3', state2.space_before
+    assert_equal '4', state2.object_nl
+    assert_equal '5', state2.array_nl
+  end
+
   if defined?(JSON::Ext::Generator)
     def test_broken_bignum # [ruby-core:38867]
       pid = fork do
@@ -248,4 +272,28 @@ EOT
       # introducing race conditions of tests are run in parallel
     end
   end
+
+  def test_hash_likeness_set_symbol
+    state = JSON.state.new
+    assert_equal nil, state[:foo]
+    assert_equal nil, state['foo']
+    state[:foo] = :bar
+    assert_equal :bar, state[:foo]
+    assert_equal :bar, state['foo']
+    state_hash = state.to_hash
+    assert_kind_of Hash, state_hash
+    assert_equal :bar, state_hash[:foo]
+  end
+
+  def test_hash_likeness_set_string
+    state = JSON.state.new
+    assert_equal nil, state[:foo]
+    assert_equal nil, state['foo']
+    state['foo'] = :bar
+    assert_equal :bar, state[:foo]
+    assert_equal :bar, state['foo']
+    state_hash = state.to_hash
+    assert_kind_of Hash, state_hash
+    assert_equal :bar, state_hash[:foo]
+  end
 end

data/tests/test_json_generic_object.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
@@ -32,4 +32,15 @@ class TestJSONGenericObject < Test::Unit::TestCase
       l = JSON('{ "a": { "b": 2 } }', :object_class => GenericObject)
     assert_equal 2, l.a.b
   end
+
+  def test_from_hash
+    result  = GenericObject.from_hash(
+      :foo => { :bar => { :baz => true }, :quux => [ { :foobar => true } ] })
+    assert_kind_of GenericObject, result.foo
+    assert_kind_of GenericObject, result.foo.bar
+    assert_equal   true, result.foo.bar.baz
+    assert_kind_of GenericObject, result.foo.quux.first
+    assert_equal   true, result.foo.quux.first.foobar
+    assert_equal   true, GenericObject.from_hash(true)
+  end
 end

data/tests/test_json_string_matching.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')

data/tests/test_json_unicode.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')

metadata

@@ -1,122 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.7.5
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.7.6
 platform: java
-authors: 
-  - Daniel Luz
-autorequire: 
+authors:
+- Daniel Luz
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-08-17 00:00:00 Z
+date: 2012-12-31 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/common.rb
-  - lib/json/ext.rb
-  - lib/json/generic_object.rb
-  - lib/json/pure.rb
-  - lib/json/version.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/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_generic_object.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
+files:
+- lib/json.rb
+- lib/json/version.rb
+- lib/json/common.rb
+- lib/json/ext.rb
+- lib/json/pure.rb
+- lib/json/generic_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_generic_object.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.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: JSON implementation for JRuby
 test_files: []
-