oj 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09deb70b3ba1d0eeac19e27fd57ef92437f44aff2bf1bcdc8d6c46f523da195e'
-  data.tar.gz: 0154fb4466a7f286428685e851029bb48e6d82ffb2b25cf34cf82541fd8b5c38
+  metadata.gz: c39b2eaf82ca583abb1636a96c5b68c87d870243f1857fb3901fa653f5699336
+  data.tar.gz: ad6b0824c146f26271c212fae1f27b359c692ca36f554e499b9a9b56c753c999
 SHA512:
-  metadata.gz: e6fe3ca939fae01ee40793c523a366bbb307db771ef26d4157c597e517610d6c627ab96ea9daa68cccd9c2c3054cc2cc46992f295e511cfb5388e664e3a3fa62
-  data.tar.gz: 6f013fa5478f633ee16c6f557ca565b25fa605d05d9d59ae373b78a7bd8dc216d2af938f98b249abc8df20729a33df1c5b8be85a18a50046235800007a44989d
+  metadata.gz: 6344b7a10952348c49e21d85779dd9a4fd25c81566594a34945f3e81785bab6449ad015ad4fe1f9bf8d0cb5acfe20ce6eba2f228dae6a76f085e2531b5b93f5a
+  data.tar.gz: 8f21dd978b252c74315f8988c0352d771c683dcddb340fbdbfa800a249c9187ec622d9e3bb7dfbd76d61b8c1ee1e8709494b69feecea50a97251ab5bfb5fdc52

data/ext/oj/rails.c

@@ -336,6 +336,11 @@ dump_to_s(VALUE obj, int depth, Out out, bool as_ok) {
 
 static ID	parameters_id = 0;
 
+typedef struct _StrLen {
+    const char	*str;
+    int		len;
+} *StrLen;
+
 static void
 dump_actioncontroller_parameters(VALUE obj, int depth, Out out, bool as_ok) {
     if (0 == parameters_id) {
@@ -345,6 +350,153 @@ dump_actioncontroller_parameters(VALUE obj, int depth, Out out, bool as_ok) {
     dump_rails_val(rb_ivar_get(obj, parameters_id), depth, out, true);
 }
 
+static StrLen
+columns_array(VALUE rcols, int *ccnt) {
+    volatile VALUE	v;
+    StrLen		cp;
+    StrLen		cols;
+    int			i;
+    int			cnt = (int)RARRAY_LEN(rcols);
+    
+    *ccnt = cnt;
+    cols = ALLOC_N(struct _StrLen, cnt);
+    for (i = 0, cp = cols; i < cnt; i++, cp++) {
+	v = rb_ary_entry(rcols, i);
+	if (T_STRING != rb_type(v)) {
+	    v = rb_funcall(v, oj_to_s_id, 0);
+	}
+	cp->str = StringValuePtr(v);
+	cp->len = (int)RSTRING_LEN(v);
+    }
+    return cols;
+}
+
+static void
+dump_row(VALUE row, StrLen cols, int ccnt, int depth, Out out) {
+    size_t	size;
+    int		d2 = depth + 1;
+    int		i;
+				   
+    assure_size(out, 2);
+    *out->cur++ = '{';
+    size = depth * out->indent + 3;
+    for (i = 0; i < ccnt; i++, cols++) {
+	assure_size(out, size);
+	if (out->opts->dump_opts.use) {
+	    if (0 < out->opts->dump_opts.array_size) {
+		strcpy(out->cur, out->opts->dump_opts.array_nl);
+		out->cur += out->opts->dump_opts.array_size;
+	    }
+	    if (0 < out->opts->dump_opts.indent_size) {
+		int	i;
+		for (i = d2; 0 < i; i--) {
+		    strcpy(out->cur, out->opts->dump_opts.indent_str);
+		    out->cur += out->opts->dump_opts.indent_size;
+		}
+	    }
+	} else {
+	    fill_indent(out, d2);
+	}
+	oj_dump_cstr(cols->str, cols->len, 0, 0, out);
+	*out->cur++ = ':';
+	dump_rails_val(rb_ary_entry(row, i), depth, out, true);
+	if (i < ccnt - 1) {
+	    *out->cur++ = ',';
+	}
+    }
+    size = depth * out->indent + 1;
+    assure_size(out, size);
+    if (out->opts->dump_opts.use) {
+	if (0 < out->opts->dump_opts.array_size) {
+	    strcpy(out->cur, out->opts->dump_opts.array_nl);
+	    out->cur += out->opts->dump_opts.array_size;
+	}
+	if (0 < out->opts->dump_opts.indent_size) {
+	    int	i;
+
+	    for (i = depth; 0 < i; i--) {
+		strcpy(out->cur, out->opts->dump_opts.indent_str);
+		out->cur += out->opts->dump_opts.indent_size;
+	    }
+	}
+    } else {
+	fill_indent(out, depth);
+    }
+    *out->cur++ = '}';
+}
+
+static ID	rows_id = 0;
+static ID	columns_id = 0;
+
+static void
+dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok) {
+    volatile VALUE	rows;
+    StrLen		cols;
+    int			ccnt = 0;
+    int			i, rcnt;
+    size_t		size;
+    int			d2 = depth + 1;
+    
+    if (0 == rows_id) {
+	rows_id = rb_intern("@rows");
+	columns_id = rb_intern("@columns");
+    }
+    out->argc = 0;
+    cols = columns_array(rb_ivar_get(obj, columns_id), &ccnt);
+    rows = rb_ivar_get(obj, rows_id);
+    rcnt = RARRAY_LEN(rows);
+    assure_size(out, 2);
+    *out->cur++ = '[';
+    if (out->opts->dump_opts.use) {
+	size = d2 * out->opts->dump_opts.indent_size + out->opts->dump_opts.array_size + 1;
+    } else {
+	size = d2 * out->indent + 2;
+    }
+    assure_size(out, 2);
+    for (i = 0; i < rcnt; i++) {
+	assure_size(out, size);
+	if (out->opts->dump_opts.use) {
+	    if (0 < out->opts->dump_opts.array_size) {
+		strcpy(out->cur, out->opts->dump_opts.array_nl);
+		out->cur += out->opts->dump_opts.array_size;
+	    }
+	    if (0 < out->opts->dump_opts.indent_size) {
+		int	i;
+		for (i = d2; 0 < i; i--) {
+		    strcpy(out->cur, out->opts->dump_opts.indent_str);
+		    out->cur += out->opts->dump_opts.indent_size;
+		}
+	    }
+	} else {
+	    fill_indent(out, d2);
+	}
+	dump_row(rb_ary_entry(rows, i), cols, ccnt, d2, out);
+	if (i < rcnt - 1) {
+	    *out->cur++ = ',';
+	}
+    }
+    xfree(cols);
+    size = depth * out->indent + 1;
+    assure_size(out, size);
+    if (out->opts->dump_opts.use) {
+	if (0 < out->opts->dump_opts.array_size) {
+	    strcpy(out->cur, out->opts->dump_opts.array_nl);
+	    out->cur += out->opts->dump_opts.array_size;
+	}
+	if (0 < out->opts->dump_opts.indent_size) {
+	    int	i;
+
+	    for (i = depth; 0 < i; i--) {
+		strcpy(out->cur, out->opts->dump_opts.indent_str);
+		out->cur += out->opts->dump_opts.indent_size;
+	    }
+	}
+    } else {
+	fill_indent(out, depth);
+    }
+    *out->cur++ = ']';
+}
+
 typedef struct _NamedFunc {
     const char	*name;
     DumpFunc	func;
@@ -352,6 +504,7 @@ typedef struct _NamedFunc {
 
 static struct _NamedFunc	dump_map[] = {
     { "ActionController::Parameters", dump_actioncontroller_parameters },
+    { "ActiveRecord::Result", dump_activerecord_result },
     { "ActiveSupport::TimeWithZone", dump_timewithzone },
     { "BigDecimal", dump_bigdecimal },
     { "Range", dump_to_s },

data/ext/oj/trace.c

@@ -36,7 +36,7 @@ void
 oj_trace_parse_call(const char *func, ParseInfo pi, const char *file, int line, VALUE obj) {
     char	fmt[64];
     char	indent[MAX_INDENT];
-    int		depth = stack_size(&pi->stack) * 2;
+    int		depth = (int)(stack_size(&pi->stack) * 2);
     
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:-:%%%ds %%s %%s\n", depth);
@@ -47,7 +47,7 @@ void
 oj_trace_parse_in(const char *func, ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
-    int		depth = stack_size(&pi->stack) * 2;
+    int		depth = (int)(stack_size(&pi->stack) * 2);
     
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:}:%%%ds %%s\n", depth);
@@ -58,7 +58,7 @@ void
 oj_trace_parse_hash_end(ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
-    int		depth = stack_size(&pi->stack) * 2 - 2;
+    int		depth = (int)(stack_size(&pi->stack) * 2 - 2);
     Val		v = stack_peek(&pi->stack);
     VALUE	obj = v->val;
     
@@ -71,7 +71,7 @@ void
 oj_trace_parse_array_end(ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
-    int		depth = stack_size(&pi->stack) * 2;
+    int		depth = (int)(stack_size(&pi->stack) * 2);
     
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds array_ned\n", depth);

data/lib/oj/version.rb

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

data/test/activerecord/result_test.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+$: << File.dirname(__FILE__)
+$: << File.dirname(File.dirname(__FILE__))
+
+require 'helper'
+require "rails/all"
+
+Oj::Rails.set_encoder()
+Oj::Rails.optimize()
+
+Oj.default_options = { mode: :rails }
+
+class ActiveRecordResultTest < Minitest::Test
+  def test_hash_rows
+
+    result = ActiveRecord::Result.new(["one", "two"],
+				      [
+					["row 1 col 1", "row 1 col 2"],
+					["row 2 col 1", "row 2 col 2"],
+					["row 3 col 1", "row 3 col 2"],
+				      ])
+    #puts "*** result: #{Oj.dump(result, indent: 2)}"
+   
+    assert_equal Oj.dump(result, mode: :rails), Oj.dump(result.to_hash)
+  end
+end

data/test/big.rb

@@ -0,0 +1,15 @@
+#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)
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -166,6 +166,7 @@ files:
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
+- test/activerecord/result_test.rb
 - test/activesupport4/decoding_test.rb
 - test/activesupport4/encoding_test.rb
 - test/activesupport4/test_helper.rb
@@ -174,6 +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/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -302,6 +304,7 @@ test_files:
 - test/test_object.rb
 - test/perf_wab.rb
 - test/tests_mimic.rb
+- test/activerecord/result_test.rb
 - test/perf_saj.rb
 - test/tests_mimic_addition.rb
 - test/test_saj.rb
@@ -314,6 +317,7 @@ test_files:
 - test/_test_active.rb
 - test/test_compat.rb
 - test/sample_json.rb
+- test/big.rb
 - test/json_gem/test_helper.rb
 - test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_common_interface_test.rb