oj 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3e4872cc8b3155f8547f4ab99ad2f0767ba878
-  data.tar.gz: 5ca0ea5af332edfdda45af2deca6323543395bfb
+  metadata.gz: f27c42c67b86cac4812b8452cbc81242a348e8e0
+  data.tar.gz: 71dd249f7dccc0136180b8661e6f33208025c237
 SHA512:
-  metadata.gz: 951e8ce648c1afb634ef3b4b21387043dd918cc513b3f26c7966c5ef08c6ee03b41cb531ecc7065ac667612e334870a4ff3eac063606a626f799ea6a84ef3b24
-  data.tar.gz: 8c3fa952247342e7f58ce3c6a0966beba3dc89701a15fd72affa1cdcd1c2c5542df07db734753499cb363d51fba4a63e569ff31765cab006615d592c369ce60a
+  metadata.gz: c033fbec5b0af79396795bb4d1dd8c4be2984d27c1d87d008c7994e3fcd46f1e2f41caa85b0a3d0b9f0642ab9abac643c8c014e4b01c186775b3454797adb25b
+  data.tar.gz: 61d7bb7f02ddeaf63b94d6f27bfbc496a4d3a15f1fb85b714119d34762bcc432b80fa668c68cc65f2c55608d0bd3dc47b35d112477c2a43198fc500ffd7728a2

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2012 Peter Ohler
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -26,7 +26,15 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.11.1
+## Current Release 2.11.2
+
+ - Changed the defaults for mimic_JSON to use 16 significant digits instead of
+   the default 15.
+
+ - Fixed bug where a subclass of Array would be serialized as if in object mode
+   instead of compat when in compat mode.
+
+### Release 2.11.1
 
  - Changed the use_to_json option to still allow as_json even when set to false.
 

data/ext/oj/dump.c

@@ -654,7 +654,7 @@ dump_array(VALUE a, VALUE clas, int depth, Out out) {
     if (id < 0) {
 	return;
     }
-    if (Qundef != clas && rb_cArray != clas) {
+    if (Qundef != clas && rb_cArray != clas && ObjectMode == out->opts->mode) {
 	dump_obj_attrs(a, clas, 0, depth, out);
 	return;
     }

data/ext/oj/oj.c

@@ -1760,7 +1760,7 @@ static struct _Options	mimic_object_to_json_options = {
     No,			// class_cache
     RubyTime,		// time_format
     No,			// bigdec_as_num
-    AutoDec,		// bigdec_load
+    FloatDec,		// bigdec_load
     No,			// to_json
     Yes,		// nilnil
     Yes,		// allow_gc
@@ -1769,8 +1769,8 @@ static struct _Options	mimic_object_to_json_options = {
     10,			// create_id_len
     9,			// sec_prec
     0,			// dump_opts
-    15,			// float_prec
-    "%0.15g",		// float_fmt
+    16,			// float_prec
+    "%0.16g",		// float_fmt
 };
 
 static VALUE

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.11.1'
+  VERSION = '2.11.2'
 end

data/test/_test_mimic_rails.rb

@@ -4,7 +4,7 @@
 $: << File.dirname(__FILE__)
 
 require 'helper'
-Oj.mimic_JSON
+#Oj.mimic_JSON
 require 'rails/all'
 
 require 'active_model'
@@ -15,7 +15,7 @@ require 'active_support/all'
 
 require 'oj/active_support_helper'
 
-#Oj.mimic_JSON
+Oj.mimic_JSON
 
 class Category
   include ActiveModel::Model

data/test/test_scp.rb

@@ -4,6 +4,7 @@
 $: << File.dirname(__FILE__)
 
 require 'helper'
+require 'socket'
 
 $json = %{{
   "array": [
@@ -71,6 +72,25 @@ class AllHandler < Oj::ScHandler
 
 end # AllHandler
 
+class Closer < AllHandler
+  def initialize(io)
+    super()
+    @io = io
+  end
+
+  def hash_start()
+    @calls << [:hash_start]
+    @io.close
+    {}
+  end
+
+  def hash_set(h, key, value)
+    @calls << [:hash_set, key, value]
+    @io.close
+  end
+
+end # Closer
+
 class ScpTest < Minitest::Test
 
   def setup
@@ -303,4 +323,52 @@ class ScpTest < Minitest::Test
     end
   end
 
+  def test_pipe_close
+    json = %{{"one":true,"two":false}}
+    IO.pipe do |read_io, write_io|
+      if fork
+        write_io.close
+        handler = Closer.new(read_io)
+        err = nil
+        begin
+          Oj.sc_parse(handler, read_io)
+          read_io.close
+        rescue Exception => e
+          err = e.class.to_s
+        end
+        assert_equal("IOError", err)
+        assert_equal([[:hash_start],
+                      [:hash_key, 'one'],
+                      [:hash_set, 'one', true]], handler.calls)
+      else
+        read_io.close
+        write_io.write json
+        write_io.close
+        Process.exit(0)
+      end
+    end
+  end
+
+  def test_socket_close
+    json = %{{"one":true,"two":false}}
+    Thread.start(json) do |j|
+      server = TCPServer.new(6969)
+      c = server.accept()
+      c.puts json
+      c.close
+    end
+    sock = TCPSocket.new('localhost', 6969)
+    handler = Closer.new(sock)
+    err = nil
+    begin
+      Oj.sc_parse(handler, sock)
+    rescue Exception => e
+      err = e.class.to_s
+    end
+    assert_equal("IOError", err)
+    assert_equal([[:hash_start],
+                  [:hash_key, 'one'],
+                  [:hash_set, 'one', true]], handler.calls)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -60,6 +60,7 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
+- LICENSE
 - README.md
 - ext/oj/buf.h
 - ext/oj/cache8.c
@@ -178,9 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true