oj 2.13.1 → 2.14.0

data/ext/oj/oj.h

@@ -46,6 +46,7 @@ extern "C" {
 #endif
 
 #include "stdint.h"
+#include "stdbool.h"
 
 #if USE_PTHREAD_MUTEX
 #include <pthread.h>
@@ -114,11 +115,12 @@ typedef enum {
 } StreamWriterType;
 
 typedef struct _DumpOpts {
-    const char	*indent;
-    const char	*before_sep;
-    const char	*after_sep;
-    const char	*hash_nl;
-    const char	*array_nl;
+    bool	use;
+    char	indent_str[16];
+    char	before_sep[16];
+    char	after_sep[16];
+    char	hash_nl[16];
+    char	array_nl[16];
     uint8_t	indent_size;
     uint8_t	before_size;
     uint8_t	after_size;
@@ -127,26 +129,26 @@ typedef struct _DumpOpts {
 } *DumpOpts;
 
 typedef struct _Options {
-    int		indent;		// indention for dump, default 2
-    char	circular;	// YesNo
-    char	auto_define;	// YesNo
-    char	sym_key;	// YesNo
-    char	escape_mode;	// Escape_Mode
-    char	mode;		// Mode
-    char	class_cache;	// YesNo
-    char	time_format;	// TimeFormat
-    char	bigdec_as_num;	// YesNo
-    char	bigdec_load;	// BigLoad
-    char	to_json;	// YesNo
-    char	nilnil;		// YesNo
-    char	allow_gc;	// allow GC during parse
-    char	quirks_mode;	// allow single JSON values instead of documents
-    const char	*create_id;	// 0 or string
-    size_t	create_id_len;	// length of create_id
-    int		sec_prec;	// second precision when dumping time
-    DumpOpts	dump_opts;
-    char	float_prec;	// float precision, linked to float_fmt
-    char	float_fmt[7];	// float format for dumping, if empty use Ruby
+    int			indent;		// indention for dump, default 2
+    char		circular;	// YesNo
+    char		auto_define;	// YesNo
+    char		sym_key;	// YesNo
+    char		escape_mode;	// Escape_Mode
+    char		mode;		// Mode
+    char		class_cache;	// YesNo
+    char		time_format;	// TimeFormat
+    char		bigdec_as_num;	// YesNo
+    char		bigdec_load;	// BigLoad
+    char		to_json;	// YesNo
+    char		nilnil;		// YesNo
+    char		allow_gc;	// allow GC during parse
+    char		quirks_mode;	// allow single JSON values instead of documents
+    const char		*create_id;	// 0 or string
+    size_t		create_id_len;	// length of create_id
+    int			sec_prec;	// second precision when dumping time
+    char		float_prec;	// float precision, linked to float_fmt
+    char		float_fmt[7];	// float format for dumping, if empty use Ruby
+    struct _DumpOpts	dump_opts;
 } *Options;
 
 typedef struct _Out {

data/ext/oj/parse.c

@@ -720,16 +720,26 @@ oj_num_as_value(NumInfo ni) {
 	    double	d = (double)ni->i * (double)ni->div + (double)ni->num;
 	    int		x = ni->exp - ni->di;
 
-	    d = round(d);
-	    if (0 < x) {
-		d *= pow(10.0L, x);
-	    } else if (0 > x) {
-		d /= pow(10.0L, -x);
-	    }
-	    if (ni->neg) {
-		d = -d;
+	    // Rounding sometimes cuts off the last digit even if there are only
+	    // 15 digits. This attempts to fix those few cases where this
+	    // occurs.
+	    if ((double)INT64_MAX > d && (int64_t)d != (ni->i * ni->div + ni->num)) {
+		rnum = rb_funcall(oj_bigdecimal_class, oj_new_id, 1, rb_str_new(ni->str, ni->len));
+		if (ni->no_big) {
+		    rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
+		}
+	    } else {
+		d = round(d);
+		if (0 < x) {
+		    d *= pow(10.0L, x);
+		} else if (0 > x) {
+		    d /= pow(10.0L, -x);
+		}
+		if (ni->neg) {
+		    d = -d;
+		}
+		rnum = rb_float_new(d);
 	    }
-	    rnum = rb_float_new(d);
 	}
     }
     return rnum;

data/lib/oj/version.rb

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

data/test/test_various.rb

@@ -115,27 +115,10 @@ class Juice < Minitest::Test
   end
 =end
   def test_set_options
-    orig ={
-      :indent=>0,
-      :second_precision=>9,
-      :circular=>false,
-      :class_cache=>true,
-      :auto_define=>false,
-      :symbol_keys=>false,
-      :bigdecimal_as_decimal=>true,
-      :use_to_json=>true,
-      :nilnil=>false,
-      :allow_gc=>true,
-      :quirks_mode=>true,
-      :float_precision=>15,
-      :mode=>:object,
-      :escape_mode=>:json,
-      :time_format=>:unix,
-      :bigdecimal_load=>:auto,
-      :create_id=>'json_class'}
-    o2 = {
-      :indent=>4,
-      :second_precision=>7,
+    orig = Oj.default_options()
+    alt ={
+      :indent=>" - ",
+      :second_precision=>5,
       :circular=>true,
       :class_cache=>false,
       :auto_define=>true,
@@ -144,19 +127,26 @@ class Juice < Minitest::Test
       :use_to_json=>false,
       :nilnil=>true,
       :allow_gc=>false,
-      :quirks_mode=>true,
-      :float_precision=>15,
-      :mode=>:compat,
-      :escape_mode=>:json,
-      :time_format=>:ruby,
-      :bigdecimal_load=>:bigdecimal,
-      :create_id=>nil}
-    o3 = { :indent => 4 }
-    Oj.default_options = o2
+      :quirks_mode=>false,
+      :float_precision=>13,
+      :mode=>:strict,
+      :escape_mode=>:ascii,
+      :time_format=>:unix_zone,
+      :bigdecimal_load=>:float,
+      :create_id=>'classy',
+      :space=>'z',
+      :array_nl=>'a',
+      :object_nl=>'o',
+      :space_before=>'b',
+    }
+    Oj.default_options = alt
     opts = Oj.default_options()
-    assert_equal(o2, opts);
-    Oj.default_options = o3 # see if it throws an exception
+    assert_equal(alt, opts);
+
     Oj.default_options = orig # return to original
+    # verify back to original
+    opts = Oj.default_options()
+    assert_equal(orig, opts);
   end
 
   def test_nil
@@ -260,6 +250,31 @@ class Juice < Minitest::Test
     assert_equal(json, json2)
   end
 
+  def test_dump_options
+    json = Oj.dump({ 'a' => 1, 'b' => [true, false]},
+                   :mode => :compat,
+                   :indent => "--",
+                   :array_nl => "\n",
+                   :object_nl => "#\n",
+                   :space => "*",
+                   :space_before => "~")
+    assert(%{{#
+--"a"~:*1,#
+--"b"~:*[
+----true,
+----false
+--]#
+}} == json ||
+%{{#
+--"b"~:*[
+----true,
+----false
+--],#
+--"a"~:*1#
+}} == json)
+
+  end
+
   def test_null_char
     assert_raises(Oj::ParseError) { Oj.load("\"\0\"") }
     assert_raises(Oj::ParseError) { Oj.load("\"\\\0\"") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -161,7 +161,6 @@ files:
 - test/test_various.rb
 - test/test_writer.rb
 - test/write_timebars.rb
-- test/zip.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -248,5 +247,4 @@ test_files:
 - test/test_various.rb
 - test/test_writer.rb
 - test/write_timebars.rb
-- test/zip.rb
 has_rdoc: true

data/test/zip.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-require 'zlib'
-
-File.open('test.json.gz', 'r') do |file|
-  Zlib::GzipReader.wrap(file) do |f2|
-    puts "*** f2: #{f2}"
-    Oj.load(f2) do |val|
-      puts val
-    end
-  end
-end
-
-=begin
-And a json file with the following contents (then gzipped):
-
-{"a":2}
-{"b":2}
-The output is:
-
-{"a"=>2}
-{"b"=>2}
-bin/test:8:in `load': undefined method `new' for #<EOFError: end of file reached> (NoMethodError)
-    from bin/test:8:in `block (2 levels) in <main>'
-    from bin/test:7:in `wrap'
-    from bin/test:7:in `block in <main>'
-    from bin/test:6:in `open'
-    from bin/test:6:in `<main>'
-=end