oj 2.14.2 → 2.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba2532677f201c509765f805bcbcf1cbdddcac7
-  data.tar.gz: 56fc6f4ccc428ac6f07a3453fba0fbd9f0ee6509
+  metadata.gz: 0e9413b81d3efaee1f673a90f9f6fbbfa3c8ebe2
+  data.tar.gz: cf61d3cf4f800dc535befff9ac0ca436356727e1
 SHA512:
-  metadata.gz: 80690fabb4c159ef4bafebe48843da2f7e6de4e5236545163472575fe555458e2e57a78e4d823c64ae9a1f37d34f4b6af8bc33b106d73243600b2d8a92c143b4
-  data.tar.gz: c17262ab7020f38281534b821f7541d9a5b1cc3b193ac0ed404f0f241819907a9631dc96b248720ffb944b1c2b6ac6e38893801b4e176b8fa67e4ff4f82030ab
+  metadata.gz: 321c45f5f2de1ad7aab6d8cbf595fc911f5172a6688a9816a4efe78a07ec84229e86bd3aa5fd170a8b98434db9aa4aa502ea8cda7f44f0ba1a4e4818446085fe
+  data.tar.gz: f610cf7d169c86dfc02fc6fb5cc3a018cc86a5f890c4a7f2ae251bbf97083ebb6d7307ec907b36c1bfb7fc10fe8bed76ca2c756716288228a60bea31e8d09d8a

data/README.md

@@ -159,14 +159,9 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-**Release 2.14.2**
+**Release 2.14.3**
 
- - Non-UTF-8 string input is now converted to UTF-8.
-
-**Release 2.14.1**
-
- - Fixed bug that reverted to BigDecimal when a decimal had preceeding zeros
-   after the decimal point.
+ - Updated to support Ruby 2.3.0.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/extconf.rb

@@ -34,6 +34,7 @@ dflags = {
   'USE_RB_MUTEX' => (is_windows && !('1' == version[0] && '8' == version[1])) ? 1 : 0,
   'DATETIME_1_8' => ('ruby' == type && ('1' == version[0] && '8' == version[1])) ? 1 : 0,
   'NO_TIME_ROUND_PAD' => ('rubinius' == type) ? 1 : 0,
+  'HAS_DATA_OBJECT_WRAP' => ('ruby' == type && '2' == version[0] && '3' <= version[1]) ? 1 : 0,
 }
 # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
 # some reason math.h and string.h contents are not processed. Might be a

data/ext/oj/fast.c

@@ -813,7 +813,11 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
     }
 #endif
     // last arg is free func void* func(void*)
+#if HAS_DATA_OBJECT_WRAP
+    doc->self = rb_data_object_wrap(clas, doc, 0, free_doc_cb);
+#else
     doc->self = rb_data_object_alloc(clas, doc, 0, free_doc_cb);
+#endif
     rb_gc_register_address(&doc->self);
     doc->json = json;
     DATA_PTR(doc->self) = doc;

data/ext/oj/hash_test.c

@@ -445,9 +445,8 @@ static struct _StrLen data[] = {
 static uint64_t
 micro_time() {
     struct timeval	tv;
-    struct timezone	tz;
 
-    gettimeofday(&tv, &tz);
+    gettimeofday(&tv, NULL);
 
     return (uint64_t)tv.tv_sec * 1000000ULL + (uint64_t)tv.tv_usec;
 }

data/ext/oj/reader.c

@@ -109,7 +109,7 @@ int
 oj_reader_read(Reader reader) {
     int		err;
     size_t	shift = 0;
-    
+
     if (0 == reader->read_func) {
 	return -1;
     }
@@ -165,7 +165,7 @@ rescue_cb(VALUE rbuf, VALUE err) {
     if (rb_eTypeError != clas && rb_eEOFError != clas) {
 	Reader	reader = (Reader)rbuf;
 
-	rb_raise(err, "at line %d, column %d\n", reader->line, reader->col);
+	rb_raise(clas, "at line %d, column %d\n", reader->line, reader->col);
     }
     return Qfalse;
 }
@@ -185,6 +185,7 @@ partial_io_cb(VALUE rbuf) {
     }
     str = StringValuePtr(rstr);
     cnt = RSTRING_LEN(rstr);
+    //printf("*** partial read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(reader->tail, str);
     reader->read_end = reader->tail + cnt;
 

data/lib/oj/version.rb

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

data/test/test_scp.rb

@@ -73,6 +73,7 @@ class AllHandler < Oj::ScHandler
 end # AllHandler
 
 class Closer < AllHandler
+  attr_accessor :io
   def initialize(io)
     super()
     @io = io
@@ -340,7 +341,13 @@ class ScpTest < Minitest::Test
                       [:hash_set, 'one', true]], handler.calls)
       else
         read_io.close
-        write_io.write json
+        write_io.write json[0..11]
+        sleep(0.1)
+        begin
+          write_io.write json[12..-1]
+        rescue Exception => e
+          # ignore, should fail to write
+        end
         write_io.close
         Process.exit(0)
       end
@@ -357,8 +364,15 @@ class ScpTest < Minitest::Test
     end
     Thread.start(json) do |j|
       c = server.accept()
-      c.puts json
-      c.close
+      c.puts json[0..11]
+      10.times {
+        break if c.closed?
+        sleep(0.1)
+      }
+      unless c.closed?
+        c.puts json[12..-1]
+        c.close
+      end
     end
     begin
       sock = TCPSocket.new('localhost', 8080)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.14.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler