oj 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1a6d1169dfa2ef1c28a09f66c30d1441eeb687580063d9f9e1a7a109aeb12e
-  data.tar.gz: 10b6ab680f89ec60767f7cb35753acdf6eff3aad46e2b4ce0df03548854cab75
+  metadata.gz: 6f32c75eebaa4589864b9f86babc4a75a50fcb8a332e729fae0efad8aa6e237c
+  data.tar.gz: 8babb9c5d3738f3e3e10cb821b4b1ec9d2a8b669152daef099a0637e53b9477f
 SHA512:
-  metadata.gz: ea073f98957802f427450a299867dbabde338fd8dc809e1ff7413ee2601dd8c72ed3e0b0e9fc944e06618e2e14f4980d908637f3ac98a021deb6714bccb9c2e5
-  data.tar.gz: f4176bed42ae5092069984ba5f74a07dfacd1f9c6615d5b2ec108b8f37f0c0e95223751528e42f6ab6b17e0eee77cb98f8485df724cbee69df2207ed6274737c
+  metadata.gz: d077e44e7422e57a3332926cfbe67a46311a4a005ca49bfce7a44b620b4a73d5d4c0d355885017ca3343eb0b63a2539e3609cdb2671d0b87f932101a2cdf3e7e
+  data.tar.gz: 674b27cecfb35ac204a2e51bd692364fd5c4235d0aeceb0988d37ec7fb1d25027f7a2b3b248425fdb7fa5311dde50299a655c1efa432ce42049c7cf3f162f2d1

data/ext/oj/parse.c

@@ -444,9 +444,13 @@ read_num(ParseInfo pi) {
 	}
 	if ('.' == *pi->cur) {
 	    pi->cur++;
-	    if (*pi->cur < '0' || '9' < *pi->cur) {
-		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
-		return;
+	    // A trailing . is not a valid decimal but if encountered allow it
+	    // except when mimicing the JSON gem.
+	    if (CompatMode == pi->options.mode) {
+		if (*pi->cur < '0' || '9' < *pi->cur) {
+		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
+		    return;
+		}
 	    }
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		int	d = (*pi->cur - '0');
@@ -964,6 +968,9 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	if (0 != line) {
 	    VALUE	ec = rb_obj_class(rb_errinfo());
 
+	    if (rb_eIOError != ec) {
+		goto CLEANUP;
+	    }
 	    if (rb_eArgError != ec && 0 != ec) {
 		err_class = ec;
 	    }
@@ -987,6 +994,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	    }
 	}
     }
+CLEANUP:
     // proceed with cleanup
     if (0 != pi->circ_array) {
 	oj_circ_array_free(pi->circ_array);

data/ext/oj/sparse.c

@@ -456,8 +456,12 @@ read_num(ParseInfo pi) {
 	}
 	if ('.' == c) {
 	    c = reader_get(&pi->rd);
-	    if (c < '0' || '9' < c) {
-		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
+	    // A trailing . is not a valid decimal but if encountered allow it
+	    // except when mimicing the JSON gem.
+	    if (CompatMode == pi->options.mode) {
+		if (c < '0' || '9' < c) {
+		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
+		}
 	    }
 	    for (; '0' <= c && c <= '9'; c = reader_get(&pi->rd)) {
 		int	d = (c - '0');
@@ -838,7 +842,10 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
 	if (0 != line) {
 	    VALUE	ec = rb_obj_class(rb_errinfo());
 
-	    // Sometimes the claass of the error is 0 which seems broken.
+	    if (rb_eIOError != ec) {
+		goto CLEANUP;
+	    }
+	    // Sometimes the class of the error is 0 which seems broken.
 	    if (rb_eArgError != ec && 0 != ec) {
 		err_class = ec;
 	    }
@@ -862,6 +869,7 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
 	    }
 	}
     }
+CLEANUP:
     // proceed with cleanup
     if (0 != pi->circ_array) {
 	oj_circ_array_free(pi->circ_array);

data/lib/oj/version.rb

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

data/test/bar.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'oj'
+require 'tracer'
+
+#Tracer.on
+
+Oj.load_file(ARGV[0], mode: :strict) { |obj|
+  puts Oj.dump(obj, indent: 2)
+}

data/test/foo.rb

@@ -1,32 +1,83 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-$: << '.'
-$: << '../lib'
-$: << '../ext'
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
 
 require 'oj'
+require 'tracer'
 
+#Tracer.on
 
 class MyParser
+  attr_accessor :enum
+
   def initialize
-    @current_depth = 0
-  end
+    @io = StringIO.new
+    @writer = Oj::StreamWriter.new(@io)
 
-  def parse(file)
-    Oj.sc_parse(self, file)
+    json_string = Oj.dump({ records: 1.upto(2).map{|i| { id: i, name: "record_#{i}" }} }, mode: :strict)
+    @test_json = StringIO.new(json_string)
+
+    @enum = Enumerator.new do |yielder|
+      @yielder = yielder
+      Oj.sc_parse(self, @test_json)
+    end
   end
 
+  # Stream parsing methods
   def hash_start
-    puts "start"
-    @current_depth += 1
-    raise Exception.new("Hello")
-    {}
+    @writer.push_object
+  end
+
+  def hash_end
+    @writer.pop unless @io.eof
+  end
+
+  def hash_key(key)
+    @writer.push_key(key)
+  end
+
+  def hash_set(h, key, value)
+    @writer.push_value(value)
+  end
+
+  def array_start
+    @writer.push_array
   end
 
-  # Other Oj::ScHandler methods go below.
-  # The parser's purpose is to find a specific value nested deep within the streaming JSON
-  # and to stop parsing immediately afterward.
+  def array_end
+    @writer.pop
+  end
+
+  def array_append(a, value)
+    yield_data
+  end
+
+  def add_value(value);end
+
+  def yield_data
+    @writer.pop_all
+    @yielder << @io.string
+    @io.reopen("")
+    array_start
+  end
+end
+
+#puts MyParser.new.enum.to_a
+
+puts "------------"
+
+MyError = Class.new(StandardError)
+
+MyParser.new.enum.each.with_index do |r, i|
+  puts "========="
+  raise MyError.new('hello')
+  #raise StopIteration if i == 0
+  #break if i >= 4
 end
 
-parser = MyParser.new
-parser.parse(%|{"a":{"b":{"c":{}}}}|)
+#{"records":[{"id":1,"name":"record_1"},{"id":2,"name":"record_2"},{"id":3,"name":"record_3"},{"id":4,"name":"record_4"},{"id":5,"name":"record_5"},{"id":6,"name":"record_6"},{"id":7,"name":"record_7"},{"id":8,"name":"record_8"},{"id":9,"name":"record_9"},{"id":10,"name":"record_10"},{"id":11,"name":"record_11"},{"id":12,"name":"record_12"},{"id":13,"name":"record_13"},{"id":14,"name":"record_14"},{"id":15,"name":"record_15"},{"id":16,"name":"record_16"},{"id":17,"name":"record_17"},{"id":18,"name":"record_18"},{"id":19,"name":"record_19"},{"id":20,"name":"record_20"},{"id":21,"name":"record_21"},{"id":22,"name":"record_22"},{"id":23,"name":"record_23"},{"id":24,"name":"record_24"},{"id":25,"name":"record_25"}]}

data/test/test_scp.rb

@@ -350,7 +350,7 @@ class ScpTest < Minitest::Test
     if '2.4.0' < RUBY_VERSION
       handler = AllHandler.new()
       json = %|{"big":-e123456789}|
-      assert_raises Oj::ParseError do
+      assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
 	Oj.sc_parse(handler, json)
       end
     end

data/test/test_various.rb

@@ -687,7 +687,9 @@ class Juice < Minitest::Test
 
   def test_bad_bignum
     if '2.4.0' < RUBY_VERSION
-      assert_raises(Oj::ParseError) { Oj.load(%|{ "big": -e123456789 }|) }
+      assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
+	Oj.load(%|{ "big": -e123456789 }|)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Modes.md
+- pages/Rails.md
+- pages/JsonGem.md
+- pages/Encoding.md
+- pages/WAB.md
+- pages/Custom.md
 - pages/Advanced.md
 - pages/Options.md
-- pages/Custom.md
 - pages/Compatibility.md
-- pages/WAB.md
+- pages/Modes.md
 - pages/Security.md
-- pages/Encoding.md
-- pages/JsonGem.md
-- pages/Rails.md
 files:
 - LICENSE
 - README.md
@@ -175,7 +175,7 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/big.rb
+- test/bar.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -198,7 +198,6 @@ files:
 - test/json_gem/json_parser_test.rb
 - test/json_gem/json_string_matching_test.rb
 - test/json_gem/test_helper.rb
-- test/mem.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -277,82 +276,81 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/perf_file.rb
-- test/test_hash.rb
-- test/perf.rb
-- test/test_object.rb
-- test/test_null.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/perf_scp.rb
+- test/foo.rb
 - test/test_integer_range.rb
-- test/test_gc.rb
-- test/sample.rb
-- test/json_gem/json_string_matching_test.rb
+- test/test_strict.rb
+- test/perf_strict.rb
+- test/tests.rb
+- test/perf_saj.rb
+- test/test_compat.rb
+- test/helper.rb
+- test/perf_file.rb
+- test/test_scp.rb
+- test/perf_compat.rb
+- test/json_gem/json_common_interface_test.rb
 - test/json_gem/json_addition_test.rb
-- test/json_gem/test_helper.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_generator_test.rb
-- test/json_gem/json_parser_test.rb
+- test/json_gem/test_helper.rb
 - test/json_gem/json_encoding_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/tests_mimic_addition.rb
-- test/test_wab.rb
+- test/json_gem/json_parser_test.rb
+- test/perf_wab.rb
+- test/test_file.rb
+- test/test_object.rb
+- test/sample.rb
+- test/perf_object.rb
+- test/test_hash.rb
+- test/test_custom.rb
+- test/bar.rb
+- test/activesupport4/encoding_test.rb
 - test/activesupport4/test_helper.rb
 - test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activerecord/result_test.rb
-- test/_test_active.rb
-- test/test_file.rb
+- test/sample_json.rb
 - test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/encoding_test.rb
 - test/activesupport5/time_zone_test_helpers.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
-- test/tests.rb
-- test/_test_active_mimic.rb
-- test/perf_object.rb
-- test/test_strict.rb
-- test/test_scp.rb
-- test/perf_wab.rb
 - test/test_saj.rb
-- test/mem.rb
-- test/perf_compat.rb
-- test/helper.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_before.rb
-- test/sample_json.rb
-- test/test_debian.rb
-- test/perf_fast.rb
-- test/test_writer.rb
+- test/perf_scp.rb
+- test/test_wab.rb
+- test/test_null.rb
+- test/_test_active.rb
+- test/_test_mimic_rails.rb
 - test/test_fast.rb
-- test/sample/line.rb
+- test/perf_fast.rb
 - test/sample/change.rb
-- test/sample/dir.rb
 - test/sample/text.rb
-- test/sample/layer.rb
-- test/sample/rect.rb
-- test/sample/group.rb
-- test/sample/oval.rb
 - test/sample/doc.rb
-- test/sample/hasprops.rb
 - test/sample/shape.rb
+- test/sample/layer.rb
+- test/sample/group.rb
 - test/sample/file.rb
-- test/files.rb
-- test/big.rb
-- test/perf_saj.rb
-- test/foo.rb
+- test/sample/rect.rb
+- test/sample/hasprops.rb
+- test/sample/line.rb
+- test/sample/dir.rb
+- test/sample/oval.rb
 - test/tests_mimic.rb
-- test/perf_strict.rb
-- test/test_various.rb
-- test/_test_mimic_rails.rb
 - test/perf_simple.rb
+- test/activerecord/result_test.rb
+- test/_test_active_mimic.rb
+- test/tests_mimic_addition.rb
+- test/test_writer.rb
+- test/perf.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_redefine.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/test_debian.rb
+- test/test_gc.rb
+- test/files.rb
+- test/test_various.rb

data/test/big.rb

@@ -1,15 +0,0 @@
-#require 'active_support'
-#require 'active_support/core_ext'
-#require 'active_support/json'
-require 'oj'
-
-#Oj.optimize_rails
-Oj.mimic_JSON
-
-h = {:type=>:record, :name=>:group, :namespace=>"com.salsify.identity", :fields=>[{:name=>"id", :type=>{:name=>:salsify_uuid, :type=>:fixed, :namespace=>"com.salsify", :size=>38}}, {:name=>"type", :type=>"string", :default=>"groups"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"name", :type=>"string"}, {:name=>"policy", :type=>[:null, {:type=>:record, :name=>:policy, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"policies"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"name", :type=>"string"}, {:name=>"statements", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:statement, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"statements"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"action", :type=>{:name=>"__statement_action_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:manage, :read]}}, {:name=>"resource", :type=>{:name=>"__statement_resource_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:product, :digital_asset]}}, {:name=>"conditions", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:condition, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"conditions"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"operator", :type=>{:name=>"__condition_operator_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:equals]}}, {:name=>"attribute_type", :type=>{:name=>"__condition_attribute_type_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:resource]}}, {:name=>"value", :type=>"string"}, {:name=>"attribute", :type=>[:null, {:type=>:record, :name=>:reference, :namespace=>"com.salsify", :fields=>[{:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :doc=>"snake_case, plural name for the resource type"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}]}], :default=>nil}, {:name=>"broken", :type=>[:null, "boolean"], :default=>nil}]}}}]}}}]}], :default=>nil}]}
-
-#Oj.dump(h)
-puts JSON.pretty_generate(h)
-#puts JSON.fast_generate(h)
-#puts JSON.generate(h)
-

data/test/mem.rb

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << '.'
-$: << '../lib'
-$: << '../ext'
-
-require 'objspace'
-require 'oj'
-require 'json'
-require 'get_process_mem'
-
-def record_allocation
-  GC.start
-  GC.start
-
-  mem = GetProcessMem.new
-  puts "Before - Process Memory: #{mem.mb} mb"
-  puts "Before - Objects count: #{ObjectSpace.each_object.count}"
-  puts "Before - Symbols count: #{Symbol.all_symbols.size}"
-
-  yield
-
-  GC.start
-  GC.start
-  GC.start
-
-  puts "After - Process Memory: #{mem.mb} mb"
-  puts "After - Objects count: #{ObjectSpace.each_object.count}"
-  puts "After - Symbols count: #{Symbol.all_symbols.size}"
-end
-
-record_allocation do
-  data = 1_000_000.times.map { |i| "string_number_#{i}".to_sym } # array of symbols
-  Oj.dump(data, mode: :rails)
-end