oj 3.8.1 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e31b61d33e83ce9e5e20148749717af84c4cc9f02a6faeb14383f7243095439
-  data.tar.gz: 700b0823f12722d2dd2028875abd2bf624a85422b42b5a1251632f63069358f5
+  metadata.gz: 4a9bfd0e254e8c30855238077fd24a8398fe6f51027d061865a4bae5b8843577
+  data.tar.gz: df12b305f11cae6ed49e002b64f02681df83b613674cec99baeaacc9e9308b27
 SHA512:
-  metadata.gz: 5daaaf6c3ac308e2cdca660804fc4ff2d87b1c724e49e3fd0a36bd223c7c2f64d0764d60a3d51d242ac4da370488d0f78db42214527f17afcccd9e950dc540c9
-  data.tar.gz: dd9d68dd43f073af2c16a87ac4725beff0592d1410296dbc06c862785a25f73ba1a4085beff9e2ecf73e7e5908f69f9de7be1ac3be9b725a99804db42130de17
+  metadata.gz: 69db529090d8152e069fab0bb18327ba9cb823817e6282aafeb3caf073a723964e7daf9bf40ffe4921306d8b0caf0fa71e1912bfa6c9c411ee7b87ba8aa4be60
+  data.tar.gz: c438cdbc8e9ecb36a47b09d88a8e8170a76b1cb04ca966586b8096dbf176503aa9e88da3d4d429f1ad3bc0aef696f58d6367620a35c0f93fc5fda3ec43caa4f9

data/ext/oj/custom.c

@@ -32,6 +32,13 @@ dump_obj_str(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
+static void
+dump_obj_as_str(VALUE obj, int depth, Out out) {
+    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+    const char		*str = rb_string_value_ptr((VALUE*)&rstr);
+
+    oj_dump_cstr(str, RSTRING_LEN(rstr), 0, 0, out);
+}
 
 static void
 bigdecimal_dump(VALUE obj, int depth, Out out) {
@@ -57,19 +64,23 @@ static ID	imag_id = 0;
 
 static void
 complex_dump(VALUE obj, int depth, Out out) {
-    struct _attr	attrs[] = {
-	{ "real", 4, Qnil },
-	{ "imag", 4, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    if (0 == real_id) {
-	real_id = rb_intern("real");
-	imag_id = rb_intern("imag");
-    }
-    attrs[0].value = rb_funcall(obj, real_id, 0);
-    attrs[1].value = rb_funcall(obj, imag_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "real", 4, Qnil },
+	    { "imag", 4, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	if (0 == real_id) {
+	    real_id = rb_intern("real");
+	    imag_id = rb_intern("imag");
+	}
+	attrs[0].value = rb_funcall(obj, real_id, 0);
+	attrs[1].value = rb_funcall(obj, imag_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -193,17 +204,21 @@ openstruct_load(VALUE clas, VALUE args) {
 
 static void
 range_dump(VALUE obj, int depth, Out out) {
-    struct _attr	attrs[] = {
-	{ "begin", 5, Qnil },
-	{ "end", 3, Qnil },
-	{ "exclude", 7, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    attrs[0].value = rb_funcall(obj, oj_begin_id, 0);
-    attrs[1].value = rb_funcall(obj, oj_end_id, 0);
-    attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "begin", 5, Qnil },
+	    { "end", 3, Qnil },
+	    { "exclude", 7, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	attrs[0].value = rb_funcall(obj, oj_begin_id, 0);
+	attrs[1].value = rb_funcall(obj, oj_end_id, 0);
+	attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -222,19 +237,23 @@ static ID	denominator_id = 0;
 
 static void
 rational_dump(VALUE obj, int depth, Out out) {
-    struct _attr	attrs[] = {
-	{ "numerator", 9, Qnil },
-	{ "denominator", 11, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    if (0 == numerator_id) {
-	numerator_id = rb_intern("numerator");
-	denominator_id = rb_intern("denominator");
-    }
-    attrs[0].value = rb_funcall(obj, numerator_id, 0);
-    attrs[1].value = rb_funcall(obj, denominator_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "numerator", 9, Qnil },
+	    { "denominator", 11, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	if (0 == numerator_id) {
+	    numerator_id = rb_intern("numerator");
+	    denominator_id = rb_intern("denominator");
+	}
+	attrs[0].value = rb_funcall(obj, numerator_id, 0);
+	attrs[1].value = rb_funcall(obj, denominator_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -874,7 +893,11 @@ dump_data(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_regexp(VALUE obj, int depth, Out out, bool as_ok) {
-    dump_obj_str(obj, depth, out);
+    if (NULL != out->opts->create_id) {
+	dump_obj_str(obj, depth, out);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static void
@@ -1046,7 +1069,7 @@ hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
 	oj_set_obj_ivar(parent, kval, rval);
 	break;
     case T_HASH:
-	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 == strncmp("time", parent->key, 4)) {
+	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 != ni->div && 0 == strncmp("time", parent->key, 4)) {
 	    int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 	    if (ni->neg) {

data/ext/oj/extconf.rb

@@ -28,6 +28,7 @@ have_func('rb_ivar_count')
 have_func('rb_ivar_foreach')
 have_func('stpcpy')
 have_func('rb_data_object_wrap')
+have_func('pthread_mutex_init')
 
 dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
 

data/ext/oj/object.c

@@ -276,7 +276,10 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
     if (2 == kval->klen) {
 	switch (kval->key[1]) {
 	case 't': // time as a float
-	    {
+	    if (0 == ni->div || 9 < ni->di) {
+		rb_raise(rb_eArgError, "Invalid time decimal representation.");
+		//parent->val = rb_time_nano_new(0, 0);
+	    } else {
 		int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 		if (ni->neg) {
@@ -407,7 +410,7 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
     ID		var_id;
     ID		*slot;
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&oj_cache_mutex);
 #else
     rb_mutex_lock(oj_cache_mutex);
@@ -441,7 +444,7 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
 	}
 	*slot = var_id;
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&oj_cache_mutex);
 #else
     rb_mutex_unlock(oj_cache_mutex);
@@ -665,7 +668,7 @@ end_hash(ParseInfo pi) {
 static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rval = Qnil;
-    
+
     if (3 <= len && 0 != pi->circ_array) {
 	if ('i' == str[1]) {
 	    long	i = read_long(str + 2, len - 2);
@@ -694,7 +697,7 @@ array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);

data/ext/oj/oj.c

@@ -149,7 +149,7 @@ static VALUE	xss_safe_sym;
 
 rb_encoding	*oj_utf8_encoding = 0;
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 pthread_mutex_t	oj_cache_mutex;
 #else
 VALUE oj_cache_mutex = Qnil;
@@ -329,7 +329,7 @@ get_def_opts(VALUE self) {
     case AutoDec:
     default:		rb_hash_aset(opts, bigdecimal_load_sym, auto_sym);	break;
     }
-    rb_hash_aset(opts, create_id_sym, (0 == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
+    rb_hash_aset(opts, create_id_sym, (NULL == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
     rb_hash_aset(opts, oj_space_sym, (0 == oj_default_options.dump_opts.after_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.after_sep));
     rb_hash_aset(opts, oj_space_before_sym, (0 == oj_default_options.dump_opts.before_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.before_sep));
     rb_hash_aset(opts, oj_object_nl_sym, (0 == oj_default_options.dump_opts.hash_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.hash_nl));
@@ -1692,7 +1692,7 @@ Init_oj() {
     oj_odd_init();
     oj_mimic_rails_init();
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     if (0 != (err = pthread_mutex_init(&oj_cache_mutex, 0))) {
 	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
     }

data/ext/oj/oj.h

@@ -21,7 +21,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 #include "cache8.h"
@@ -370,7 +370,7 @@ extern bool	oj_use_hash_alt;
 extern bool	oj_use_array_alt;
 extern bool	string_writer_optimized;
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 extern pthread_mutex_t	oj_cache_mutex;
 #else
 extern VALUE	oj_cache_mutex;

data/ext/oj/rails.c

@@ -1071,6 +1071,8 @@ rails_set_encoder(VALUE self) {
     rb_undef_method(encoding, "use_standard_json_time_format=");
     rb_define_module_function(encoding, "use_standard_json_time_format=", rails_use_standard_json_time_format, 1);
 
+    pv = rb_iv_get(encoding, "@escape_html_entities_in_json");
+    escape_html = Qtrue == pv;
     rb_undef_method(encoding, "escape_html_entities_in_json=");
     rb_define_module_function(encoding, "escape_html_entities_in_json=", rails_escape_html_entities_in_json, 1);
 

data/ext/oj/resolve.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 
@@ -75,7 +75,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
     if (No == pi->options.class_cache) {
 	return resolve_classpath(pi, name, len, auto_define, error_class);
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&oj_cache_mutex);
 #else
     rb_mutex_lock(oj_cache_mutex);
@@ -85,7 +85,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
 	    *slot = clas;
 	}
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&oj_cache_mutex);
 #else
     rb_mutex_unlock(oj_cache_mutex);

data/ext/oj/val_stack.c

@@ -1,21 +1,21 @@
 /* val_stack.c
  * Copyright (c) 2011, Peter Ohler
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  *  - Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  *  - Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  *  - Neither the name of Peter Ohler nor the names of its contributors may be
  *    used to endorse or promote products derived from this software without
  *    specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -42,7 +42,7 @@ mark(void *ptr) {
     if (0 == ptr) {
 	return;
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&stack->mutex);
 #else
     rb_mutex_lock(stack->mutex);
@@ -66,7 +66,7 @@ mark(void *ptr) {
 	    }
 	}
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&stack->mutex);
 #else
     rb_mutex_unlock(stack->mutex);
@@ -75,9 +75,9 @@ mark(void *ptr) {
 
 VALUE
 oj_stack_init(ValStack stack) {
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     int	err;
-    
+
     if (0 != (err = pthread_mutex_init(&stack->mutex, 0))) {
 	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
     }

data/ext/oj/val_stack.h

@@ -1,21 +1,21 @@
 /* val_stack.h
  * Copyright (c) 2011, Peter Ohler
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  *  - Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  *  - Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  *  - Neither the name of Peter Ohler nor the names of its contributors may be
  *    used to endorse or promote products derived from this software without
  *    specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -34,7 +34,7 @@
 #include "ruby.h"
 #include "odd.h"
 #include <stdint.h>
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 
@@ -72,7 +72,7 @@ typedef struct _valStack {
     Val			head;	// current stack
     Val			end;	// stack end
     Val			tail;	// pointer to one past last element name on stack
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_t	mutex;
 #else
     VALUE		mutex;
@@ -110,7 +110,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	} else {
 	    REALLOC_N(head, struct _val, len + STACK_INC);
 	}
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 	pthread_mutex_lock(&stack->mutex);
 #else
 	rb_mutex_lock(stack->mutex);
@@ -118,7 +118,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	stack->head = head;
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 	pthread_mutex_unlock(&stack->mutex);
 #else
 	rb_mutex_unlock(stack->mutex);

data/lib/oj/version.rb

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

data/pages/Options.md

@@ -89,6 +89,10 @@ with the key.
 The :create_id option specifies that key is used for dumping and loading when
 specifying the class for an encoded object. The default is `json_create`.
 
+In the `:custom` mode setting the `:create_id` to nil will cause Complex,
+Rational, Range, and Regexp to be output as strings instead of as JSON
+objects.
+
 ### :empty_string [Boolean]
 
 If true an empty or all whitespace input will not raise an Exception. The

data/test/foo.rb

@@ -7,161 +7,15 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << File.join($oj_dir, dir)
 end
 
-#require 'json'
 require 'oj'
+require 'active_support'
+require 'active_support/json'
+#require 'tracer'
 
-Oj.mimic_JSON
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+Oj::Rails.optimize()
 
-obj = {
-  ab: {
-    cbbb: {
-      tilbeb: [
-        {
-          coob: {
-            uijwts: [
-              {
-                prrrrr: {
-                  yakj: "pvebbx",
-                  lbhqy: {
-                    uhyw: {
-                      uijwts: [
-                        {
-                          jangi: {
-                            ubentg7haineued8atnr8w: {
-                              abc: "uejdncbncnamnasdasdasdasd",
-                              cde: "skfjskdfjskdfjsdkfjsdkfjs"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                kdncg: {
-                  lvbnt8b9ounv: {
-                    qk: 9
-                  }
-                }
-              }
-            ],
-            jenfjbhe: {}
-          }
-        }
-      ]
-    }
-  },
-  ijbh: {
-    jsnbrpbnunt: {
-      b88dibalbvp: {
-        mnbvd: "9uhbqlpiev"
-      }
-    },
-    ncnwkl: {
-      ksdfsf: {
-        mjln: "mnklkn"
-      },
-      kbrh: {
-        sdfn83nnalbmgnansdd: {
-          uijwts: {
-            ibha: {
-              uijwts: [
-                {
-                  lnrbf: {
-                    nbvtmqbhap9ebeb7btnnaw: {
-                      ksb: "sdfksdfjsdfsb39242dnasddd",
-                      mnm: "1293dsfnsdmfnsdfsd,fmnsd,"
-                    }
-                  }
-                }
-              ]
-            }
-          },
-          kbrh: {
-            bo8libts: {
-              nag40n: {
-                kyen: "sdfasnc92nsn"
-              },
-              kbrh: {
-                nbwyu26snfcbajsdkj8: {
-                  uijwts: {
-                    mdfnkjsdd: {}
-                  },
-                  kbrh: {
-                    kneahce: {
-                      uijwts: {
-                        kwnb: {
-                          uijwts: [
-                            {
-                              fhfd: {
-                                sfasdnfmasndfamsdnfajsmdf: false
-                              }
-                            }
-                          ],
-                          asdfsdff: [
-                            {
-                              cwdf: {
-                                sddlkfajsdkfjabskdfjalsdkfjansdkfjf: ""
-                              }
-                            },
-                            {
-                              bsdj: {
-                                sdfsjdlfkasy8kljsfsdf83jlkjfals: true
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      kbrh: {
-                        sdfsdfsddfk: {
-                          uijwts: {
-                            sdfsd: {
-                              sdfsadf89mnlrrrqurqwvdnff: {
-                                "kj": 8
-                              }
-                            }
-                          },
-                          kbrh: {
-                            dkdjd: {
-                              dfeteu: {
-                                sdfd: "sdfasdfjlkjslrsdbb"
-                              },
-                              kbrh: {
-                                sdfskjdfldk: {
-                                  buqpen: {
-                                    kjlkj: {
-                                      sdflskdjfalsdkrjalwkjfsrlfjasdf: {
-                                        sd: 0
-                                      }
-                                    }
-                                  },
-                                  kbrh: {
-                                    sdfksljdlfksdfl: {
-                                      sdfsdkfjssd: {
-                                        ksdjf: "sdflsdkfjasdkaufs;ldkfjsdlf",
-                                        sdfsdfsl: [5]
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
+#Oj::mimic_JSON
 
-#Oj.dump(obj)
-JSON.pretty_generate(obj)
-#JSON.generate(obj)
+puts JSON.parse('{"a":1}', symbolize_names: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.9.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler