oj 2.12.12 → 2.12.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e345b717fb9e6ce7ab0c1f7e96c23586148c16
-  data.tar.gz: 19dd28489fcd97c301e4ea744f3b9114c3de107b
+  metadata.gz: 5f901c34e6bd4d7a0dec0fbff5e72e62d2ade9f9
+  data.tar.gz: fabea9097473451a41172f859d224d1ba45df888
 SHA512:
-  metadata.gz: cdc08e19e3621678e07531b89831fda57c23b4b4efa1f50ec94573058e0f82864dab1cfd62b4a9bc4a97732d17fb77c49d1f88bad7c7503334cc78e15981095e
-  data.tar.gz: 46a77fd33b9b2b2424082f84e401d39bad85da74887e35cc4450310c4b0798f490e440a4a21e2987868e0f0c07486020bf885a1ec4d85314682164d0b7537d9a
+  metadata.gz: fb4cc5e9d368ac919c849d97abc36cba6510437ee5934a6fa4cddb0eaa185c548baaf0589eda779ddc921b295cdbd99b65d516c957fa4dd77ba82cdfcc8e580f
+  data.tar.gz: b2a6822d4b6a8261040b5585a87c01f6529a3b25376bce9623ea547d4a81a1fef9075f9172bdc9de73ec4469bdb558424c3ed824519c757d7d95647d932910b6

data/README.md

@@ -26,15 +26,17 @@ 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.12.12
+## Future Release 2.12.13
 
- - Thanks to asurin for adding support for arguments to to_json() that rails uses.
+ - Added a check for the second argument to load() is a Hash.
+
+ - Yet another attempt to make floating point numbers display better.
 
-## Release 2.12.11
+ - Thanks to mkillianey for getting the extconf.rb and gemspec file updated.
 
- - Oj::ParseError is now thrown instead of SyntaxError when there are multiple 
-   JSON documents in a string or file and there is no proc or block associated
-   with the parse call. 
+## Current Release 2.12.12
+
+ - Thanks to asurin for adding support for arguments to to_json() that rails uses.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/extconf.rb

@@ -56,6 +56,6 @@ dflags.each do |k,v|
 end
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
-create_makefile(extension_name)
+create_makefile("#{extension_name}/#{extension_name}")
 
 %x{make clean}

data/ext/oj/oj.c

@@ -725,6 +725,7 @@ load(int argc, VALUE *argv, VALUE self) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
 
+	Check_Type(ropts, T_HASH);
 	if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
 	    if (object_sym == v) {
 		mode = ObjectMode;
@@ -795,6 +796,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
 
+	Check_Type(ropts, T_HASH);
 	if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
 	    if (object_sym == v) {
 		mode = ObjectMode;
@@ -1802,8 +1804,8 @@ static struct _Options	mimic_object_to_json_options = {
     10,			// create_id_len
     9,			// sec_prec
     0,			// dump_opts
-    16,			// float_prec
-    "%0.16g",		// float_fmt
+    15,			// float_prec
+    "%0.15g",		// float_fmt
 };
 
 static VALUE

data/ext/oj/parse.c

@@ -395,6 +395,7 @@ read_num(ParseInfo pi) {
     ni.i = 0;
     ni.num = 0;
     ni.div = 1;
+    ni.di = 0;
     ni.len = 0;
     ni.exp = 0;
     ni.dec_cnt = 0;
@@ -459,6 +460,7 @@ read_num(ParseInfo pi) {
 		// TBD move size check here
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
+		ni.di++;
 		if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
 		    ni.big = 1;
 		}
@@ -726,14 +728,19 @@ oj_num_as_value(NumInfo ni) {
 		rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
 	    }
 	} else {
-	    double	d = (double)ni->i + (double)ni->num * (1.0L / ni->div);
-
+	    // All these machinations are to get rounding to work better.
+	    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;
 	    }
-	    if (0 != ni->exp) {
-		d *= pow(10.0L, ni->exp);
-	    }
 	    rnum = rb_float_new(d);
 	}
     }

data/ext/oj/parse.h

@@ -44,6 +44,7 @@ typedef struct _NumInfo {
     int64_t	i;
     int64_t	num;
     int64_t	div;
+    int64_t	di;
     const char	*str;
     size_t	len;
     long	exp;

data/ext/oj/sparse.c

@@ -406,6 +406,7 @@ read_num(ParseInfo pi) {
     ni.i = 0;
     ni.num = 0;
     ni.div = 1;
+    ni.di = 0;
     ni.len = 0;
     ni.exp = 0;
     ni.dec_cnt = 0;
@@ -460,6 +461,7 @@ read_num(ParseInfo pi) {
 		ni.dec_cnt++;
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
+		ni.di++;
 		if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
 		    ni.big = 1;
 		}
@@ -510,6 +512,7 @@ read_nan(ParseInfo pi) {
     ni.i = 0;
     ni.num = 0;
     ni.div = 1;
+    ni.di = 0;
     ni.len = 0;
     ni.exp = 0;
     ni.dec_cnt = 0;
@@ -679,6 +682,7 @@ oj_sparse2(ParseInfo pi) {
 		ni.i = 0;
 		ni.num = 0;
 		ni.div = 1;
+		ni.di = 0;
 		ni.len = 0;
 		ni.exp = 0;
 		ni.dec_cnt = 0;

data/lib/oj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.12.12
+  version: 2.12.13
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -171,7 +171,6 @@ rdoc_options:
 - README.md
 require_paths:
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -188,4 +187,64 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files: []
+test_files:
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/bug.rb
+- test/bug2.rb
+- test/bug3.rb
+- test/bug_fast.rb
+- test/bug_load.rb
+- test/example.rb
+- test/files.rb
+- test/helper.rb
+- test/io.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/mod.rb
+- test/perf.rb
+- test/perf_compat.rb
+- test/perf_fast.rb
+- test/perf_file.rb
+- test/perf_object.rb
+- test/perf_saj.rb
+- test/perf_scp.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/sample/change.rb
+- test/sample/dir.rb
+- test/sample/doc.rb
+- test/sample/file.rb
+- test/sample/group.rb
+- test/sample/hasprops.rb
+- test/sample/layer.rb
+- test/sample/line.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb
+- test/sample.rb
+- test/sample_json.rb
+- test/struct.rb
+- test/test_compat.rb
+- test/test_debian.rb
+- test/test_fast.rb
+- test/test_file.rb
+- test/test_gc.rb
+- test/test_object.rb
+- test/test_saj.rb
+- test/test_scp.rb
+- test/test_serializer.rb
+- test/test_strict.rb
+- test/test_various.rb
+- test/test_writer.rb
+- test/write_timebars.rb
+- test/zip.rb
+has_rdoc: true