oj 2.18.2 → 2.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e75fe6286b1a83b703bbb5fe4ef67620471ed85c
-  data.tar.gz: 11c1c0a4025e7230882265540158df6ca22c8324
+  metadata.gz: cc95283102d735d5d75c5e028656180772d68503
+  data.tar.gz: a50e4cafdbd11e8af300dd1aa7ff05a0904904eb
 SHA512:
-  metadata.gz: be67841c21694aeea3c687dac1e5e2c76a2069198dfc4e8edc9efc469a97489265e1814b4607740ee38814885868f6b7822cadd2ca5b5c1f3b058d2f318b951f
-  data.tar.gz: 53b40092ab955eed576c31a4c755583ba14ed6d1013363dbb6e8c256298c36bf0e67de9b9472be1ef1f0aa574735ba4ef417308beb283a43a698a9993ecd1d1a
+  metadata.gz: b9165d68d3e5d0aec5a49c1fdf436361d6051ae9b7d07493a4b5db4d38c4dc711f8ebb5a2691963b38c8db564e5616553a82d0e9d2bb4606f155d8f99d90aed2
+  data.tar.gz: 8c720169ce7c784c96645e7535c18f72f6dd27775a52a8d9d5d57219f12eedbbdd9d2b69521e5005505ea78a28496dc22554cdb0af62e5a7d7ceda37e6cc4274

data/README.md

@@ -153,6 +153,9 @@ Oj.default_options = {:mode => :compat }
  * `:use_to_json` [Boolean] call to_json() methods on dump, default is
    false
    
+ * `:use_as_json` [Boolean] call as_json() methods on dump, default is
+   false
+   
  * `:nilnil` [Boolean] if true a nil input to load will return nil and
    not raise an Exception
    
@@ -167,6 +170,14 @@ Oj.default_options = {:mode => :compat }
   number, :word places Infinity or NaN, :raise raises and exception, :auto uses
   default for each mode which are :raise for :strict, :null for :null, and :word
   for :compat. Default is :auto.
+  
+* `:allow_invalid_unicode` [Boolean] Allow invalid unicode, default is
+  false (don't allow)
+  
+* `:hash_class` [Class] Class to use instead of Hash on load
+
+* `:omit_nil` [Boolean] If true, Hash and Object attributes with nil values
+  are omitted
 
 ## Releases
 

data/ext/oj/parse.c

@@ -732,28 +732,28 @@ oj_num_as_value(NumInfo ni) {
 	    }
 	} else {
 	    // All these machinations are to get rounding to work better.
-	    double	d = (double)ni->i * (double)ni->div + (double)ni->num;
+	    long double	d = (long double)ni->i * (long double)ni->div + (long double)ni->num;
 	    int		x = ni->exp - ni->di;
 
 	    // 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)) {
+	    if ((long 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);
+		d = roundl(d);
 		if (0 < x) {
-		    d *= pow(10.0L, x);
+		    d *= powl(10.0L, x);
 		} else if (0 > x) {
-		    d /= pow(10.0L, -x);
+		    d /= powl(10.0L, -x);
 		}
 		if (ni->neg) {
 		    d = -d;
 		}
-		rnum = rb_float_new(d);
+		rnum = rb_float_new((double)d);
 	    }
 	}
     }

data/lib/oj/version.rb

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

data/test/curl/curl_oj.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+#$VERBOSE = true
+
+$: << File.dirname(__FILE__)
+$: << File.expand_path("../../ext")
+$: << File.expand_path("../../lib")
+$: << File.expand_path("../../../curb/ext")
+$: << File.expand_path("../../../curb/lib")
+
+require 'curb'
+require 'oj'
+
+$cnt = 0
+
+$url = "localhost:7660/data.json"
+
+begin
+  while true
+    before = GC.count
+    curl = Curl::Easy.new($url)
+    curl.ssl_verify_host = false
+    curl.http_get
+    if before != GC.count
+      puts " did a GC in curl #{GC.count}"
+      before = GC.count      
+    end
+=begin
+    data = Oj.load(curl.body, symbol_keys: true, mode: :strict)
+    puts " did a GC in Oj #{GC.count}" if before != GC.count
+
+    if data[:data].nil? or data[:data].any? { |e| e.empty? }
+      puts "body: #{curl.body}"
+      raise "FAILED" 
+    end
+=end
+    $cnt += 1
+    print "\r #{$cnt}"
+  end
+rescue Exception => e
+  puts "#{e.class}: #{e.message}"
+  puts "url: #{$url}"
+  #puts "data: #{data}"
+  #puts "data[data]: #{data[:data]}"
+end

data/test/curl/get_oj.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$VERBOSE = true
+
+$: << File.dirname(__FILE__)
+$: << File.expand_path("../../ext")
+$: << File.expand_path("../../lib")
+
+require 'net/http'
+require 'uri'
+require 'oj'
+
+$url = URI.parse("http://localhost:7660/data.json")
+
+$cnt = 0
+
+while true
+  response = Net::HTTP.get_response($url)
+  data = Oj.load(response.body, symbol_keys: true, mode: :strict)
+  raise "FAILED" if data[:data].any? { |e| e.empty? }
+  $cnt += 1
+  print "\r #{$cnt}"
+end

data/test/curl/just_curl.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+#$VERBOSE = true
+
+$: << File.dirname(__FILE__)
+#$: << File.expand_path("../../../curb/ext")
+#$: << File.expand_path("../../../curb/lib")
+
+require 'curb'
+
+$cnt = 0
+$url = "localhost:7660/data.json"
+
+begin
+  while true
+    before = GC.count
+    curl = Curl::Easy.new($url)
+    curl.ssl_verify_host = false
+    curl.http_get
+    if before != GC.count
+      puts " did a GC in curl #{GC.count}"
+      before = GC.count      
+    end
+    $cnt += 1
+    print "\r #{$cnt}"
+  end
+rescue Exception => e
+  puts "#{e.class}: #{e.message}"
+  puts "url: #{$url}"
+end

data/test/curl/just_oj.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$VERBOSE = true
+
+$: << File.dirname(__FILE__)
+$: << File.expand_path("../../ext")
+$: << File.expand_path("../../lib")
+
+require 'oj'
+
+$json = %|
+{
+  "data" : [ {
+    "action" : "login",
+    "event" : "user",
+    "field" : "login",
+    "value" : "foobar",
+    "info" : "Authenticated \\"Foo Bar\\"",
+    "id" : "585929918297f2740ed9f5f0",
+    "_metadata" : {
+      "version" : "1"
+    },
+    "timestamp" : "2016-12-20T07:52:33",
+    "key_id" : "4"
+  } ],
+  "info" : {
+    "view" : "partial",
+    "limit" : 500,
+    "offset" : 2000,
+    "results" : 500,
+    "ordering" : "timestamp desc,id",
+    "previous" : "https://api.server.com/some/path/event?calculate_total=false&draft=base&order_by=timestamp_desc&order_by=id&subdraft=none&offset=1500&limit=500",
+    "next" : "https://api.server.com/some/path/event?calculate_total=false&draft=base&order_by=timestamp_desc&order_by=id&subdraft=none&offset=2500&limit=500",
+    "draft" : "base",
+    "subdraft" : "none",
+    "total_results" : 100000
+  }
+}
+|
+
+$cnt = 0
+  
+while true
+  before = GC.count
+  data = Oj.load($json, symbol_keys: true, mode: :strict)
+  puts " did a GC in Oj #{GC.count} - #{$cnt}" if before != GC.count
+  raise "FAILED" if data[:data].any? { |e| e.empty? }
+  $cnt += 1
+  print "\r #{$cnt}" if 0 == ($cnt % 10000)
+end

data/test/foo.rb

@@ -1,28 +1,24 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+$VERBOSE = true
+
+here = File.expand_path(File.dirname(__FILE__))
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(here), 'ext')
+$: << File.join(File.dirname(here), 'lib')
 
-require 'stringio'
 require 'oj'
-require 'jsonlint'
 
-json = %|{
-  "id": "babrams",
-  "ssh_keys": [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMCKMvMJ2yb13pHLsIPqi2xHOBKFZKa8+FM1FUqNbIxKeq3LLw+4WiXLK60DxxS6hmOnXD+FcWNaykkGLyGQeYHxsHynsXo9BPaG/ewaAp5SDU/zAIAaex15s/zvo5l+5Pq9OwXYtFRmfezk3ImCx7SZ8sMmHiFHYD8d38XBlGX53kLSFm5HLEopEvSCRTUyTj+tPIspgYR6IvCTdXnamO9FT8Rkeqw+mqjX9sVTaLuuqwQZlRFRMslrrJbSfv+7XvyKsjOsmAlkEYRlpHbUCxUh2Hc5q2Wfm+acOHPkkUPX8kLeT2vW+Bd/9LlPi9BN0dbmazGPbf5kv02MRNQNeUrdRfdzRIOG4tUEv154msF7QdEuy9W4pv9p0z2rNOqOQEw9HPhMiAkftIVGnvvGRj9+jIARIVzV5gAfVm2DQbPJClr0tGNCfzHmndt6FddawubXFPvFNrKgdC38Ts0Jzl1F3aWGHT8UyURDbezrTGpxg+Cqq4YUXIZfrrqB8nzF8qK3eMW2Tcxdy2m+fFBzQeHlozBSP55dcdjekdQrcVcwkYux4jecJ9BU++DjWtMtY93LgVL5BnHixS4ybo7loCndYkpsI6ZZm9oLVxHsjeoaM9D9iYoN28LIlALBm/dnfCh92G/H40v/X25DMIvRqcfnE31gsOCJ85A29twSC+Cw== babrams@system76.servalws",
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy3cbPekJYHAIa8J1fOr2iIqpx/7pl4giJYAG7HCfsunRRUq3dY1KhVw1BlmMGIDzNwcuNVIfBS5HS/wREqbHMXxbwAjWrMwUofWd09CTuKJZiyTLUC5pSQWKDXZrefH/Fwd7s+YKk1s78b49zkyDcHSnKxjN+5veinzeU+vaUF9duFAJ9OsL7kTDEzOUU0zJdSdUV0hH1lnljnvk8kXHLFl9sKS3iM2LRqW4B6wOc2RbXUnx+jwNaBsq1zd73F2q3Ta7GXdtW/q4oDYl3s72oW4ySL6TZfpLCiv/7txHicZiY1eqc591CON0k/Rh7eR7XsphwkUstoUPQcBuLqQPA529zBigD7A8PBmeHISxL2qirWjR2+PrEGn1b0yu8IHHz9ZgliX83Q4WpjXvJ3REj2jfM8hiFRV3lA/ovjQrmLLV8WUAZ8updcLE5mbhZzIsC4U/HKIJS02zoggHGHZauClwwcdBtIJnJqtP803yKNPO2sDudTpvEi8GZ8n6jSXo/N8nBVId2LZa5YY/g/v5kH0akn+/E3jXhw4CICNW8yICpeJO8dGYMOp3Bs9/cRK8QYomXqgpoFlvkgzT2h4Ie6lyRgNv5QnUyAnW43O5FdBnPk/XZ3LA462VU3uOfr0AQtEJzPccpFC6OCFYWdGwZQA/r1EZQES0yRfJLpx+uZQ== babrams@babrams-Serval-WS"
-  ],
-  "htpasswd": "$1$i2xUX9a4$6LwYbCk4K6JErTDdaiZy50",
-  "groups": [
-    "devops"
-  ],
-  "shell": "\/bin\/bash",
-  "comment": "Ben Abrams"
-}|
+Oj.mimic_JSON()
+
+class Foo
+  def as_json
+    { foo: 'bar' }
+  end
+end
 
-linter = JsonLint::Linter.new
-linter.check_stream(StringIO.new(json))
+opts = {}
 
-puts "errors: #{linter.errors}"
+puts Foo.new.to_json
+puts Foo.new.to_json(opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.18.2
+  version: 2.18.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -113,6 +113,10 @@ files:
 - test/bug_fast.rb
 - test/bug_load.rb
 - test/crash.rb
+- test/curl/curl_oj.rb
+- test/curl/get_oj.rb
+- test/curl/just_curl.rb
+- test/curl/just_oj.rb
 - test/example.rb
 - test/files.rb
 - test/foo.rb
@@ -128,9 +132,7 @@ files:
 - test/isolated/test_mimic_rails_before.rb
 - test/isolated/test_mimic_rails_datetime.rb
 - test/isolated/test_mimic_redefine.rb
-- test/mem.rb
 - test/mod.rb
-- test/omit.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -198,71 +200,73 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/perf_object.rb
-- test/test_hash.rb
-- test/bug3.rb
-- test/write_timebars.rb
-- test/test_writer.rb
-- test/russian.rb
-- test/omit.rb
-- test/test_gc.rb
-- test/_test_active_mimic.rb
-- test/test_serializer.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/text.rb
-- test/sample/doc.rb
-- test/sample/line.rb
-- test/sample/dir.rb
-- test/sample/shape.rb
-- test/sample/change.rb
-- test/crash.rb
-- test/io.rb
-- test/test_object.rb
-- test/struct.rb
-- test/mod.rb
-- test/sample.rb
-- test/perf_scp.rb
-- test/bug2.rb
-- test/test_saj.rb
-- test/test_strict.rb
-- test/perf_saj.rb
-- test/perf_simple.rb
-- test/perf_fast.rb
-- test/example.rb
 - test/_test_active.rb
-- test/perf_compat.rb
-- test/test_various.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
 - test/activesupport_datetime_test.rb
-- test/test_scp.rb
+- test/bug.rb
+- test/bug2.rb
+- test/bug3.rb
+- test/bug_fast.rb
 - test/bug_load.rb
+- test/crash.rb
+- test/curl/curl_oj.rb
+- test/curl/get_oj.rb
+- test/curl/just_curl.rb
+- test/curl/just_oj.rb
+- test/example.rb
 - test/files.rb
 - test/foo.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_datetime.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/test_mimic_as_json.rb
+- test/helper.rb
+- test/io.rb
 - test/isolated/shared.rb
-- test/isolated/test_mimic_alone.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_rails_before.rb
 - test/isolated/test_mimic_define.rb
-- test/_test_mimic_rails.rb
-- test/test_file.rb
-- test/bug.rb
-- test/mem.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_rails_datetime.rb
+- test/isolated/test_mimic_redefine.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/rails.rb
+- test/russian.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/rails.rb
-- test/perf_file.rb
-- test/test_compat.rb
-- test/helper.rb
-- test/perf.rb
-- test/bug_fast.rb
-- test/perf_strict.rb
+- test/test_file.rb
+- test/test_gc.rb
+- test/test_hash.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

data/test/mem.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-
-h = {
-  'a' => 1,
-  'b' => 2,
-  'c' => 3,
-  'd' => 4,
-  'e' => 5,
-}
-
-10000.times do
-  GC.start
-  Oj.dump(h)
-end

data/test/omit.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-require 'stringio'
-require 'parallel'
-
-h = { a: 1, b: nil, c: 3 }
-outputs = Parallel.map((0...30).to_a, in_process: 30) do |i|
-  io = StringIO.new('wb+')
-  Oj.to_stream(io, h, omit_nil: false)
-  io.string
-end
-
-outputs.each do |output|
-  puts output
-end