json 1.8.1-java → 1.8.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051bb7dee977c246c7207fc1ff0e53ab7d24bf9b
-  data.tar.gz: 888d7fc06132dca085189a158c53fe0c5d8ecfd6
+  metadata.gz: dedec927fc4d0b7e2a25506886539ab45d983fe2
+  data.tar.gz: aa0948094df5bf9c40fbcd3a7a5615b475d46b1d
 SHA512:
-  metadata.gz: ad56c1380688ad7a15ffba65e804477bf44151eb35bc45a2a408741e8a1e1e9bbeb829b294837adaa9481a0fd600e69f90c789d9200f2e72154f3bd88f7f08cf
-  data.tar.gz: c113d7eb559056851fa7cd3dfe4ee642d619117199491366ce6099093f40f3802b9d8d4120f7f5c618233d0124e7945884359246be7c2c72164f06efcb105535
+  metadata.gz: 590bc46bfdaf1b8c365265dacf1e5fc81cff2a91fb0bfa2da845555d9264d3bd164b19e8e1a1c066cda359ddacb8cfdebe562f73861183e155f1ef8c0695d2b5
+  data.tar.gz: 8b1fb13edd5ee877fc09c17b4ab78a41d303918cc473b04fad606fbbbf3197dcfa37a918d27c2d4632b4ee1209d1355d87ca668d3f5e317a57b35c451c7f5b2b

data/lib/json/add/complex.rb

@@ -4,10 +4,15 @@ end
 defined?(::Complex) or require 'complex'
 
 class Complex
+
+  # Deserializes JSON string by converting Real value <tt>r</tt>, imaginary
+  # value <tt>i</tt>, to a Complex object.
   def self.json_create(object)
     Complex(object['r'], object['i'])
   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,
@@ -16,7 +21,8 @@ class Complex
     }
   end
 
+  # Stores class name (Complex) along with real value <tt>r</tt> and imaginary value <tt>i</tt> as JSON string
   def to_json(*)
     as_json.to_json
   end
-end
+end

data/lib/json/add/rational.rb

@@ -4,10 +4,14 @@ end
 defined?(::Rational) or require 'rational'
 
 class Rational
+  # Deserializes JSON string by converting numerator value <tt>n</tt>,
+  # denominator value <tt>d</tt>, to a Rational object.
   def self.json_create(object)
     Rational(object['n'], object['d'])
   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,
@@ -16,6 +20,7 @@ class Rational
     }
   end
 
+  # Stores class name (Rational) along with numerator value <tt>n</tt> and denominator value <tt>d</tt> as JSON string
   def to_json(*)
     as_json.to_json
   end

data/lib/json/add/time.rb

@@ -10,7 +10,7 @@ class Time
     if usec = object.delete('u') # used to be tv_usec -> tv_nsec
       object['n'] = usec * 1000
     end
-    if instance_methods.include?(:tv_nsec)
+    if method_defined?(:tv_nsec)
       at(object['s'], Rational(object['n'], 1000))
     else
       at(object['s'], object['n'] / 1000)

data/lib/json/common.rb

@@ -148,7 +148,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 true.
+  #   defaults to false.
   # * *object_class*: Defaults to Hash
   # * *array_class*: Defaults to Array
   def parse(source, opts = {})
@@ -169,7 +169,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 true.
+  #   defaults to false.
   def parse!(source, opts = {})
     opts = {
       :max_nesting  => false,
@@ -390,7 +390,7 @@ module JSON
       end
     end
     opts = JSON.dump_default_options
-    limit and opts.update(:max_nesting => limit)
+    opts = opts.merge(:max_nesting => limit) if limit
     result = generate(obj, opts)
     if anIO
       anIO.write result
@@ -411,7 +411,7 @@ module JSON
     string
   end
 
-  # Shortuct for iconv.
+  # Shortcut for iconv.
   if ::String.method_defined?(:encode)
     # Encodes string using Ruby's _String.encode_
     def self.iconv(to, from, string)
@@ -448,7 +448,7 @@ module ::Kernel
     nil
   end
 
-  # Ouputs _objs_ to STDOUT as JSON strings in a pretty format, with
+  # Outputs _objs_ to STDOUT as JSON strings in a pretty format, with
   # indentation and over many lines.
   def jj(*objs)
     objs.each do |obj|

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.8.1'
+  VERSION         = '1.8.2'
   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

@@ -491,6 +491,8 @@ EOT
     assert_equal @hash, JSON.load(stringio)
     assert_equal nil, JSON.load(nil)
     assert_equal nil, JSON.load('')
+  ensure
+    tempfile.close!
   end
 
   def test_load_with_options
@@ -515,6 +517,12 @@ EOT
     assert_equal too_deep, output.string
   end
 
+  def test_dump_should_modify_defaults
+    max_nesting = JSON.dump_default_options[:max_nesting]
+    JSON.dump([], StringIO.new, 10)
+    assert_equal max_nesting, JSON.dump_default_options[:max_nesting]
+  end
+
   def test_big_integers
     json1 = JSON([orig = (1 << 31) - 1])
     assert_equal orig, JSON[json1][0]

data/tests/test_json_generate.rb

@@ -73,6 +73,19 @@ EOT
     assert_equal '666', pretty_generate(666, :quirks_mode => true)
   end
 
+  def test_generate_custom
+    state = State.new(:space_before => " ", :space => "   ", :indent => "<i>", :object_nl => "\n", :array_nl => "<a_nl>")
+    json = generate({1=>{2=>3,4=>[5,6]}}, state)
+    assert_equal(<<'EOT'.chomp, json)
+{
+<i>"1" :   {
+<i><i>"2" :   3,
+<i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
+<i>}
+}
+EOT
+  end
+
   def test_fast_generate
     json = fast_generate(@hash)
     assert_equal(JSON.parse(@json2), JSON.parse(json))
@@ -215,16 +228,18 @@ EOT
   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
+    if respond_to?(:assert_in_out_err)
+      assert_in_out_err(%w[-rjson --disable-gems], <<-EOS, [], [])
+        bignum_too_long_to_embed_as_string = 1234567890123456789012345
+        expect = bignum_too_long_to_embed_as_string.to_s
+        GC.stress = true
 
-    10.times do |i|
-      tmp = bignum_too_long_to_embed_as_string.to_json
-      assert_equal expect, tmp
+        10.times do |i|
+          tmp = bignum_too_long_to_embed_as_string.to_json
+          raise "'\#{expect}' is expected, but '\#{tmp}'" unless tmp == expect
+        end
+      EOS
     end
-  ensure
-    GC.stress = stress
   end if GC.respond_to?(:stress=)
 
   def test_configure_using_configure_and_merge

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies: []
 description: A JSON implementation as a JRuby extension.
 email: dev+ruby@mernen.com