oj 3.16.1 → 3.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380409882636ecb1f8e3e54369f85dc11d7e167db741f5aec15bfadad2180601
-  data.tar.gz: 0c60d6f8a5b7d76904b84d378e41632f67c0e3fa2e61aeacfb680cadf15ef9dc
+  metadata.gz: ce6ddad603b9b5d9629791f6bc35dffa1d31b99a6fe4692c1683140122186266
+  data.tar.gz: e15140778fc3f002dfa8b88d2620c5b24011f62b26c283d3b4844a121ff3f312
 SHA512:
-  metadata.gz: 1cbb6d75ab0c495c8d40983970e8fca54aa846eedb4e031368a98874f1db4ca68f160076ac59c230186316dc686923bad86196fa09bf585f501cf11fe814f9bc
-  data.tar.gz: 9d521e53c4e5311eda8abb0f89b12ae2dd3f8007abb02f0b5ff7728311f6d0b64221a493f8df66a7f223dd12c2c2ba6d47b309867f99e2fe206d440d028368a6
+  metadata.gz: bbfca46d215dead1cd4941d77421163216d7bc87629619ea492fa9df2b9cf07fddb786fe1579a9916f30efe0a55ded53af0790f797cd1cd0e2205ef512ba5cc4
+  data.tar.gz: 22df787f55d70ec3766bd670e820fe54f1acaa8720534aaf50331b869542f252868a7875858c980fdfc29664c616d3f2cf8f8e5cde30d6ee5455e0728181035a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 3.16.2 - 2023-12-06
+
+- Fixed documentation formatting.
+
+- Added option to the "usual" parser to raise an error on an empty input string.
+
 ## 3.16.1 - 2023-09-01
 
 - Fixed exception type on number parsing. (thank you @jasonpenny)

data/ext/oj/cache.c

@@ -260,7 +260,8 @@ void cache_set_expunge_rate(Cache c, int rate) {
     c->xrate = (uint8_t)rate;
 }
 
-void cache_free(Cache c) {
+void cache_free(void *data) {
+    Cache    c = (Cache)data;
     uint64_t i;
 
     for (i = 0; i < c->size; i++) {
@@ -276,7 +277,8 @@ void cache_free(Cache c) {
     OJ_FREE(c);
 }
 
-void cache_mark(Cache c) {
+void cache_mark(void *data) {
+    Cache    c = (Cache)data;
     uint64_t i;
 
 #if !HAVE_PTHREAD_MUTEX_INIT

data/ext/oj/cache.h

@@ -10,10 +10,11 @@
 #define CACHE_MAX_KEY 35
 
 struct _cache;
+typedef struct _cache *Cache;
 
 extern struct _cache *cache_create(size_t size, VALUE (*form)(const char *str, size_t len), bool mark, bool locking);
-extern void           cache_free(struct _cache *c);
-extern void           cache_mark(struct _cache *c);
+extern void           cache_free(void *data);
+extern void           cache_mark(void *data);
 extern void           cache_set_form(struct _cache *c, VALUE (*form)(const char *str, size_t len));
 extern VALUE          cache_intern(struct _cache *c, const char *key, size_t len);
 extern void           cache_set_expunge_rate(struct _cache *c, int rate);

data/ext/oj/dump.c

@@ -727,8 +727,11 @@ static void debug_raise(const char *orig, size_t cnt, int line) {
 
 void oj_dump_raw_json(VALUE obj, int depth, Out out) {
     if (oj_string_writer_class == rb_obj_class(obj)) {
-        StrWriter sw  = (StrWriter)DATA_PTR(obj);
-        size_t    len = sw->out.cur - sw->out.buf;
+        StrWriter sw;
+        size_t    len;
+
+        sw  = oj_str_writer_unwrap(obj);
+        len = sw->out.cur - sw->out.buf;
 
         if (0 < len) {
             len--;

data/ext/oj/fast.c

@@ -780,11 +780,10 @@ static VALUE parse_json(VALUE clas, char *json, bool given) {
         }
     }
 #endif
-    doc->json           = json;
-    self                = TypedData_Wrap_Struct(clas, &oj_doc_type, doc);
-    doc->self           = self;
-    DATA_PTR(doc->self) = doc;
-    result              = rb_protect(protect_open_proc, (VALUE)&pi, &ex);
+    doc->json = json;
+    self      = TypedData_Wrap_Struct(clas, &oj_doc_type, doc);
+    doc->self = self;
+    result    = rb_protect(protect_open_proc, (VALUE)&pi, &ex);
     if (given || 0 != ex) {
         DATA_PTR(doc->self) = NULL;
         // TBD is this needed?
@@ -1609,7 +1608,9 @@ static VALUE doc_dump(int argc, VALUE *argv, VALUE self) {
  *   Oj::Doc.open('[1,2,3]') { |doc| doc.size() }  #=> 4
  */
 static VALUE doc_size(VALUE self) {
-    return ULONG2NUM(((Doc)DATA_PTR(self))->size);
+    Doc d;
+    TypedData_Get_Struct(self, struct _doc, &oj_doc_type, d);
+    return ULONG2NUM(d->size);
 }
 
 /* @overload close() => nil

data/ext/oj/intern.c

@@ -85,20 +85,31 @@ static VALUE form_attr(const char *str, size_t len) {
     return (VALUE)rb_intern3(buf, len + 1, oj_utf8_encoding);
 }
 
+static const rb_data_type_t oj_cache_type = {
+    "Oj/cache",
+    {
+        cache_mark,
+        cache_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
 void oj_hash_init(void) {
     VALUE cache_class = rb_define_class_under(Oj, "Cache", rb_cObject);
     rb_undef_alloc_func(cache_class);
 
     struct _cache *str_cache = cache_create(0, form_str, true, true);
-    str_cache_obj            = Data_Wrap_Struct(cache_class, cache_mark, cache_free, str_cache);
+    str_cache_obj            = TypedData_Wrap_Struct(cache_class, &oj_cache_type, str_cache);
     rb_gc_register_address(&str_cache_obj);
 
     struct _cache *sym_cache = cache_create(0, form_sym, true, true);
-    sym_cache_obj            = Data_Wrap_Struct(cache_class, cache_mark, cache_free, sym_cache);
+    sym_cache_obj            = TypedData_Wrap_Struct(cache_class, &oj_cache_type, sym_cache);
     rb_gc_register_address(&sym_cache_obj);
 
     struct _cache *attr_cache = cache_create(0, form_attr, false, true);
-    attr_cache_obj            = Data_Wrap_Struct(cache_class, cache_mark, cache_free, attr_cache);
+    attr_cache_obj            = TypedData_Wrap_Struct(cache_class, &oj_cache_type, attr_cache);
     rb_gc_register_address(&attr_cache_obj);
 
     memset(class_hash.slots, 0, sizeof(class_hash.slots));
@@ -118,17 +129,23 @@ oj_str_intern(const char *key, size_t len) {
 #if HAVE_RB_ENC_INTERNED_STR && 0
     return rb_enc_interned_str(key, len, rb_utf8_encoding());
 #else
-    return cache_intern(DATA_PTR(str_cache_obj), key, len);
+    Cache c;
+    TypedData_Get_Struct(str_cache_obj, struct _cache, &oj_cache_type, c);
+    return cache_intern(c, key, len);
 #endif
 }
 
 VALUE
 oj_sym_intern(const char *key, size_t len) {
-    return cache_intern(DATA_PTR(sym_cache_obj), key, len);
+    Cache c;
+    TypedData_Get_Struct(sym_cache_obj, struct _cache, &oj_cache_type, c);
+    return cache_intern(c, key, len);
 }
 
 ID oj_attr_intern(const char *key, size_t len) {
-    return cache_intern(DATA_PTR(attr_cache_obj), key, len);
+    Cache c;
+    TypedData_Get_Struct(attr_cache_obj, struct _cache, &oj_cache_type, c);
+    return cache_intern(c, key, len);
 }
 
 static uint64_t hash_calc(const uint8_t *key, size_t len) {

data/ext/oj/mimic_json.c

@@ -425,7 +425,7 @@ static VALUE mimic_generate_core(int argc, VALUE *argv, Options copts) {
  *   - *:object_nl* [_String_] String placed after a JSON object
  *   - *:array_nl* [_String_] String placed after a JSON array
  *   - *:ascii_only* [_Boolean_] if not nil or false then use only ascii characters in the output.
- * Note JSON.generate does support this even if it is not documented.
+ *     Note JSON.generate does support this even if it is not documented.
  *
  * Returns [_String_] generated JSON.
  */
@@ -605,9 +605,9 @@ static VALUE mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
  * - *source* [_String_|IO] source to parse
  * - *opts* [_Hash_] options
  *   - *:symbolize* [Boolean] _names flag indicating JSON object keys should be Symbols instead of
- * Strings
+ *     Strings
  *   - *:create_additions* [Boolean] flag indicating a key matching +create_id+ in a JSON object
- * should trigger the creation of Ruby Object
+ *     should trigger the creation of Ruby Object
  *
  * Returns [Object]
  * @see create_id=

data/ext/oj/object.c

@@ -83,8 +83,9 @@ static int parse_num(const char *str, const char *end, int cnt) {
 
 VALUE
 oj_parse_xml_time(const char *str, int len) {
-    VALUE       args[8];
-    const char *end = str + len;
+    VALUE       args[7];
+    const char *end  = str + len;
+    const char *orig = str;
     int         n;
 
     // year
@@ -144,7 +145,9 @@ oj_parse_xml_time(const char *str, int len) {
         char c = *str++;
 
         if ('.' == c) {
-            long long nsec = 0;
+            unsigned long long       num            = 0;
+            unsigned long long       den            = 1;
+            const unsigned long long last_den_limit = ULLONG_MAX / 10;
 
             for (; str < end; str++) {
                 c = *str;
@@ -152,9 +155,14 @@ oj_parse_xml_time(const char *str, int len) {
                     str++;
                     break;
                 }
-                nsec = nsec * 10 + (c - '0');
+                if (den > last_den_limit) {
+                    // bail to Time.parse if there are more fractional digits than a ULLONG rational can hold
+                    return rb_funcall(rb_cTime, oj_parse_id, 1, rb_str_new(orig, len));
+                }
+                num = num * 10 + (c - '0');
+                den *= 10;
             }
-            args[5] = rb_float_new((double)n + ((double)nsec + 0.5) / 1000000000.0);
+            args[5] = rb_funcall(INT2NUM(n), oj_plus_id, 1, rb_rational_new(ULL2NUM(num), ULL2NUM(den)));
         } else {
             args[5] = rb_ll2inum(n);
         }

data/ext/oj/oj.c

@@ -33,7 +33,6 @@ ID oj_array_append_id;
 ID oj_array_end_id;
 ID oj_array_start_id;
 ID oj_as_json_id;
-ID oj_at_id;
 ID oj_begin_id;
 ID oj_bigdecimal_id;
 ID oj_end_id;
@@ -51,6 +50,7 @@ ID oj_json_create_id;
 ID oj_length_id;
 ID oj_new_id;
 ID oj_parse_id;
+ID oj_plus_id;
 ID oj_pos_id;
 ID oj_raw_json_id;
 ID oj_read_id;
@@ -91,9 +91,7 @@ VALUE oj_array_class_sym;
 VALUE oj_create_additions_sym;
 VALUE oj_decimal_class_sym;
 VALUE oj_hash_class_sym;
-VALUE oj_in_sym;
 VALUE oj_indent_sym;
-VALUE oj_nanosecond_sym;
 VALUE oj_object_class_sym;
 VALUE oj_quirks_mode_sym;
 VALUE oj_safe_sym;
@@ -240,72 +238,82 @@ struct _options oj_default_options = {
  *	call-seq: default_options()
  *
  * Returns the default load and dump options as a Hash. The options are
- * - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element in an JSON
- *document, zero or nil is no newline between JSON elements, negative indicates no newline between
- *top level JSON elements in a stream, a String indicates the string should be used for indentation
- * - *:circular* [_Boolean_|_nil_] support circular references while dumping as well as shared
- *references
+ * - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element
+ *   in an JSON document, zero or nil is no newline between JSON elements,
+ *   negative indicates no newline between top level JSON elements in a stream,
+ *   a String indicates the string should be used for indentation
+ * - *:circular* [_Boolean_|_nil_] support circular references while dumping as
+ *   well as shared references
  * - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist
  * - *:symbol_keys* [_Boolean_|_nil_] use symbols instead of strings for hash keys
- * - *:escape_mode* [_:newline_|_:json_|_:slash_|_:xss_safe_|_:ascii_|_:unicode_xss_|_nil_] determines the
- *characters to escape
- * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically modifying
- *classes or reloading classes then don't use this)
- * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump modes
- *to use for JSON
+ * - *:escape_mode* [_:newline_|_:json_|_:slash_|_:xss_safe_|_:ascii_|_:unicode_xss_|_nil_]
+ *   determines the characters to escape
+ * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically
+ *   modifying classes or reloading classes then don't use this)
+ * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and
+ *   dump modes to use for JSON
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
- * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
- * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_|_:ruby_] load decimals as BigDecimal instead
- *of as a Float. :auto pick the most precise for the number of digits. :float should be the same as
- *ruby. :fast may require rounding but is must faster.
- * - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float when in
- *compat or rails mode.
- * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is
- *'json_class'
- * - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on
- *load.
- * - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the
- *seconds portion of time
- * - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0
- *indicates use Ruby
- * - *:float_format* [_String_] the C printf format string for printing floats. Default follows
- * the float_precision and will be changed if float_precision is changed. The string can be no more than 6 bytes.
+ * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or
+ *   as a String
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_|_:ruby_] load decimals
+ *   as BigDecimal instead of as a Float. :auto pick the most precise for the number
+ *   of digits. :float should be the same as ruby. :fast may require rounding but is
+ *   must faster.
+ * - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as
+ *   a Float when in compat or rails mode.
+ * - *:create_id* [_String_|_nil_] create id for json compatible object encoding,
+ *   default is 'json_class'
+ * - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using
+ *   create_id on load.
+ * - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when
+ *   dumping the seconds portion of time
+ * - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping
+ *   floats, 0 indicates use Ruby
+ * - *:float_format* [_String_] the C printf format string for printing floats.
+ *   Default follows the float_precision and will be changed if float_precision is
+ *   changed. The string can be no more than 6 bytes.
  * - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false
  * - *:use_as_json* [_Boolean_|_nil_] call as_json() methods on dump, default is false
  * - *:use_raw_json* [_Boolean_|_nil_] call raw_json() methods on dump, default is false
- * - *:nilnil* [_Boolean_|_nil_] if true a nil input to load will return nil and not raise an
- *Exception
+ * - *:nilnil* [_Boolean_|_nil_] if true a nil input to load will return nil and
+ *   not raise an Exception
  * - *:empty_string* [_Boolean_|_nil_] if true an empty input will not raise an Exception
  * - *:allow_gc* [_Boolean_|_nil_] allow or prohibit GC during parsing, default is true (allow)
- * - *:quirks_mode* [_true,_|_false_|_nil_] Allow single JSON values instead of documents, default
- *is true (allow)
- * - *:allow_invalid_unicode* [_true,_|_false_|_nil_] Allow invalid unicode, default is false (don't
- *allow)
- * - *:allow_nan* [_true,_|_false_|_nil_] Allow Nan, Infinity, and -Infinity to be parsed, default
- *is true (allow)
- * - *:indent_str* [_String_|_nil_] String to use for indentation, overriding the indent option is
- *not nil
- * - *:space* [_String_|_nil_] String to use for the space after the colon in JSON object fields
- * - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields
+ * - *:quirks_mode* [_true,_|_false_|_nil_] Allow single JSON values instead of
+ *   documents, default is true (allow)
+ * - *:allow_invalid_unicode* [_true,_|_false_|_nil_] Allow invalid unicode,
+ *   default is false (don't allow)
+ * - *:allow_nan* [_true,_|_false_|_nil_] Allow Nan, Infinity, and -Infinity to
+ *   be parsed, default is true (allow)
+ * - *:indent_str* [_String_|_nil_] String to use for indentation, overriding the
+ *   indent option is not nil
+ * - *:space* [_String_|_nil_] String to use for the space after the colon in JSON
+ *   object fields
+ * - *:space_before* [_String_|_nil_] String to use before the colon separator in
+ *   JSON object fields
  * - *:object_nl* [_String_|_nil_] String to use after a JSON object field value
  * - *:array_nl* [_String_|_nil_] String to use after a JSON array value
- * - *:nan* [_:null_|_:huge_|_:word_|_:raise_|_:auto_] how to dump Infinity and NaN. :null places a
- *null, :huge places a huge number, :word places Infinity or NaN, :raise raises and exception, :auto
- *uses default for each mode.
- * - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be
- *used
+ * - *:nan* [_:null_|_:huge_|_:word_|_:raise_|_:auto_] how to dump Infinity and
+ *   NaN. :null places a null, :huge places a huge number, :word places Infinity
+ *   or NaN, :raise raises and exception, :auto uses default for each mode.
+ * - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load,
+ *   :object_class can also be used
  * - *:array_class* [_Class_|_nil_] Class to use instead of Array on load
- * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted
- * - *:omit_null_byte* [_true_|_false_] if true null bytes in strings will be omitted when dumping
+ * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil
+ *   values are omitted
+ * - *:omit_null_byte* [_true_|_false_] if true null bytes in strings will be
+ *   omitted when dumping
  * - *:ignore* [_nil_|_Array_] either nil or an Array of classes to ignore when dumping
- * - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when dumping in
- *object or custom mode.
+ * - *:ignore_under* [_Boolean_] if true then attributes that start with _ are
+ *   ignored when dumping in object or custom mode.
  * - *:cache_keys* [_Boolean_] if true then hash keys are cached if less than 35 bytes.
- * - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less than this are cached)
+ * - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less
+ *   than this are cached)
  * - *:integer_range* [_Range_] Dump integers outside range as strings.
- * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false (trace is off)
- * - *:safe* [_true,_|_false_] Safe mimic breaks JSON mimic to be safer, default is false (safe is
- *off)
+ * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false
+ *   (trace is off)
+ * - *:safe* [_true,_|_false_] Safe mimic breaks JSON mimic to be safer, default
+ *   is false (safe is off)
  *
  * Return [_Hash_] all current option settings.
  */
@@ -490,70 +498,67 @@ static VALUE get_def_opts(VALUE self) {
  *
  * Sets the default options for load and dump.
  * - *opts* [_Hash_] options to change
- *   - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element in a JSON
- *document or the String to use for indentation.
+ *   - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element
+ *     in a JSON document or the String to use for indentation.
  *   - :circular [_Boolean_|_nil_] support circular references while dumping.
  *   - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist.
  *   - *:symbol_keys* [_Boolean_|_nil_] convert hash keys to symbols.
  *   - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing.
- *   - *:escape* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_] mode encodes all
- *high-bit characters as escaped sequences if :ascii, :json is standand UTF-8 JSON encoding,
- *:newline is the same as :json but newlines are not escaped, :unicode_xss allows unicode but
- *escapes &, <, and >, and any \u20xx characters along with some others, and :xss_safe escapes &, <,
- *and >, and some others.
- *   - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a
- *String.
- *   - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_nil_] load decimals as BigDecimal instead
- *of as a Float. :auto pick the most precise for the number of digits.
- *   - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float in
- *compat mode.
- *   - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump mode
- *to use for JSON :strict raises an exception when a non-supported Object is encountered. :compat
- *attempts to extract variable values from an Object using to_json() or to_hash() then it walks the
- *Object's variables if neither is found. The :object mode ignores to_hash() and to_json() methods
- *and encodes variables using code internal to the Oj gem. The :null mode ignores non-supported
- *Objects and replaces them with a null. The :custom mode honors all dump options. The :rails more
- *mimics rails and Active behavior.
- *   - *:time_format* [_:unix_|_:xmlschema_|_:ruby_] time format when dumping in :compat mode :unix
- *decimal number denoting the number of seconds since 1/1/1970, :unix_zone decimal number denoting
- *the number of seconds since 1/1/1970 plus the utc_offset in the exponent, :xmlschema date-time
- *format taken from XML Schema as a String, :ruby Time.to_s formatted String.
+ *   - *:escape* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_]
+ *     mode encodes all high-bit characters as escaped sequences if :ascii, :json
+ *     is standand UTF-8 JSON encoding, :newline is the same as :json but newlines
+ *     are not escaped, :unicode_xss allows unicode but escapes &, <, and >, and
+ *     any \u20xx characters along with some others, and :xss_safe escapes &, <,
+ *     and >, and some others.
+ *   - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal
+ *     number or as a String.
+ *   - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_nil_] load decimals as
+ *     BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
+ *   - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead
+ *     of as a Float in compat mode.
+ *   - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load
+ *     and dump mode to use for JSON :strict raises an exception when a non-supported
+ *     Object is encountered. :compat attempts to extract variable values from an
+ *     Object using to_json() or to_hash() then it walks the Object's variables if
+ *     neither is found. The :object mode ignores to_hash() and to_json() methods
+ *     and encodes variables using code internal to the Oj gem. The :null mode
+ *     ignores non-supported Objects and replaces them with a null. The :custom
+ *     mode honors all dump options. The :rails more mimics rails and Active behavior.
+ *   - *:time_format* [_:unix_|_:xmlschema_|_:ruby_] time format when dumping in :compat
+ *     mode :unix decimal number denoting the number of seconds since 1/1/1970,
+ *     :unix_zone decimal number denoting the number of seconds since 1/1/1970
+ *     plus the utc_offset in the exponent, :xmlschema date-time format taken
+ *     from XML Schema as a String, :ruby Time.to_s formatted String.
  *   - *:create_id* [_String_|_nil_] create id for json compatible object encoding
- *   - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on
- *load.
- *   - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the
- *seconds portion of time.
- *   - *:float_format* [_String_] the C printf format string for printing floats. Default follows
- * the float_precision and will be changed if float_precision is changed. The string can be no more than 6 bytes.
- *   - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0
- *indicates use Ruby.
+ *   - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on load.
+ *   - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal
+ *     when dumping the seconds portion of time.
+ *   - *:float_format* [_String_] the C printf format string for printing floats.
+ *     Default follows the float_precision and will be changed if float_precision
+ *     is changed. The string can be no more than 6 bytes.
+ *   - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0 indicates use Ruby.
  *   - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false.
  *   - *:use_as_json* [_Boolean_|_nil_] call as_json() methods on dump, default is false.
  *   - *:use_to_hash* [_Boolean_|_nil_] call to_hash() methods on dump, default is false.
  *   - *:use_raw_json* [_Boolean_|_nil_] call raw_json() methods on dump, default is false.
- *   - *:nilnil* [_Boolean_|_nil_] if true a nil input to load will return nil and not raise an
- *Exception.
+ *   - *:nilnil* [_Boolean_|_nil_] if true a nil input to load will return nil and not raise an Exception.
  *   - *:allow_gc* [_Boolean_|_nil_] allow or prohibit GC during parsing, default is true (allow).
- *   - *:quirks_mode* [_Boolean_|_nil_] allow single JSON values instead of documents, default is
- *true (allow).
- *   - *:allow_invalid_unicode* [_Boolean_|_nil_] allow invalid unicode, default is false (don't
- *allow).
+ *   - *:quirks_mode* [_Boolean_|_nil_] allow single JSON values instead of documents, default is true (allow).
+ *   - *:allow_invalid_unicode* [_Boolean_|_nil_] allow invalid unicode, default is false (don't allow).
  *   - *:allow_nan* [_Boolean_|_nil_] allow Nan, Infinity, and -Infinity, default is true (allow).
  *   - *:space* [_String_|_nil_] String to use for the space after the colon in JSON object fields.
- *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object
- *fields.
+ *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields.
  *   - *:object_nl* [_String_|_nil_] String to use after a JSON object field value.
  *   - *:array_nl* [_String_|_nil_] String to use after a JSON array value
- *   - *:nan* [_:null_|_:huge_|_:word_|_:raise_] how to dump Infinity and NaN in null, strict, and
- *compat mode. :null places a null, :huge places a huge number, :word places Infinity or NaN, :raise
- *raises and exception, :auto uses default for each mode.
- *   - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be
- *used.
+ *   - *:nan* [_:null_|_:huge_|_:word_|_:raise_] how to dump Infinity and NaN in null,
+ *     strict, and compat mode. :null places a null, :huge places a huge number, :word
+ *     places Infinity or NaN, :raise raises and exception, :auto uses default for each mode.
+ *   - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be used.
  *   - *:array_class* [_Class_|_nil_] Class to use instead of Array on load.
  *   - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted.
  *   - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
- *   - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when
- *dumping in object or custom mode.
+ *   - *:ignore_under* [_Boolean_] if true then attributes that start with _ are
+ *     ignored when dumping in object or custom mode.
  *   - *:cache_keys* [_Boolean_] if true then hash keys are cached
  *   - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less than this are cached)
  *   - *:integer_range* [_Range_] Dump integers outside range as strings.
@@ -1329,18 +1334,16 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
  * will be called. The mode is set to :compat.
  * - *obj* [_Object_] Object to serialize as an JSON document String
  * - *options* [_Hash_]
- *   - *:max_nesting* [_Fixnum_|_boolean_] It true nesting is limited to 100. If a Fixnum nesting
- * is set to the provided value. The option to detect circular references is available but is not
- * compatible with the json gem., default is false or unlimited.
- *   - *:allow_nan* [_boolean_] If true non JSON compliant words such as Nan and Infinity will be
- * used as appropriate, default is true.
- *   - *:quirks_mode* [_boolean_] Allow single JSON values instead of documents, default is true
- * (allow).
- *   - *:indent* [_String_|_nil_] String to use for indentation, overriding the indent option if not
- * nil.
+ *   - *:max_nesting* [_Fixnum_|_boolean_] It true nesting is limited to 100.
+ *     If a Fixnum nesting is set to the provided value. The option to detect
+ *     circular references is available but is not compatible with the json gem.,
+ *     default is false or unlimited.
+ *   - *:allow_nan* [_boolean_] If true non JSON compliant words such as Nan and
+ *     Infinity will be used as appropriate, default is true.
+ *   - *:quirks_mode* [_boolean_] Allow single JSON values instead of documents, default is true (allow).
+ *   - *:indent* [_String_|_nil_] String to use for indentation, overriding the indent option if not nil.
  *   - *:space* [_String_|_nil_] String to use for the space after the colon in JSON object fields.
- *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object
- * fields.
+ *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields.
  *   - *:object_nl* [_String_|_nil_] String to use after a JSON object field value.
  *   - *:array_nl* [_String_|_nil_] String to use after a JSON array value.
  *   - *:trace* [_Boolean_] If true trace is turned on.
@@ -1435,10 +1438,10 @@ static VALUE to_stream(int argc, VALUE *argv, VALUE self) {
  *
  * - *clas* [_Class__|_Module_] Class or Module to be made special
  * - *create_object* [_Object_]  object to call the create method on
- * - *create_method* [_Symbol_] method on the clas that will create a new instance of the clas when
- * given all the member values in the order specified.
- * - *members* [_Symbol__|_String_] methods used to get the member values from instances of the
- * clas.
+ * - *create_method* [_Symbol_] method on the clas that will create a new instance
+ *   of the clas when given all the member values in the order specified.
+ * - *members* [_Symbol__|_String_] methods used to get the member values from
+ *   instances of the clas.
  */
 static VALUE register_odd(int argc, VALUE *argv, VALUE self) {
     if (3 > argc) {
@@ -1471,10 +1474,10 @@ static VALUE register_odd(int argc, VALUE *argv, VALUE self) {
  *
  * - *clas* [_Class_|_Module_] Class or Module to be made special
  * - *create_object* [_Object_] object to call the create method on
- * - *create_method* [_Symbol_] method on the clas that will create a new instance of the clas when
- *given all the member values in the order specified.
- * - *dump_method* [_Symbol_|_String_] method to call on the object being serialized to generate the
- *raw JSON.
+ * - *create_method* [_Symbol_] method on the clas that will create a new instance
+ *   of the clas when given all the member values in the order specified.
+ * - *dump_method* [_Symbol_|_String_] method to call on the object being
+ *   serialized to generate the raw JSON.
  */
 static VALUE register_odd_raw(int argc, VALUE *argv, VALUE self) {
     if (3 > argc) {
@@ -1700,8 +1703,8 @@ extern VALUE oj_define_mimic_json(int argc, VALUE *argv, VALUE self);
  *   - *:space_before* [_String_] String placed before a : delimiter
  *   - *:object_nl* [_String_] String placed after a JSON object
  *   - *:array_nl* [_String_] String placed after a JSON array
- *   - *:ascii_only* [_Boolean_] if not nil or false then use only ascii characters in the output.
- * Note JSON.generate does support this even if it is not documented.
+ *   - *:ascii_only* [_Boolean_] if not nil or false then use only ascii characters
+ *     in the output. Note JSON.generate does support this even if it is not documented.
  *
  * Returns [_String_]generated JSON.
  */
@@ -1758,8 +1761,8 @@ static VALUE mem_report(VALUE self) {
  * global and options to methods allow additional behavior modifications. The
  * modes are:
  *
- * - *:strict* mode will only allow the 7 basic JSON types to be serialized. Any other Object
- *   will raise an Exception.
+ * - *:strict* mode will only allow the 7 basic JSON types to be serialized.
+ *   Any other Object will raise an Exception.
  *
  * - *:null* mode is similar to the :strict mode except any Object that is not
  *   one of the JSON base types is replaced by a JSON null.
@@ -1843,7 +1846,6 @@ void Init_oj(void) {
     oj_array_end_id    = rb_intern("array_end");
     oj_array_start_id  = rb_intern("array_start");
     oj_as_json_id      = rb_intern("as_json");
-    oj_at_id           = rb_intern("at");
     oj_begin_id        = rb_intern("begin");
     oj_bigdecimal_id   = rb_intern("BigDecimal");
     oj_end_id          = rb_intern("end");
@@ -1861,6 +1863,7 @@ void Init_oj(void) {
     oj_length_id       = rb_intern("length");
     oj_new_id          = rb_intern("new");
     oj_parse_id        = rb_intern("parse");
+    oj_plus_id         = rb_intern("+");
     oj_pos_id          = rb_intern("pos");
     oj_raw_json_id     = rb_intern("raw_json");
     oj_read_id         = rb_intern("read");
@@ -1993,14 +1996,10 @@ void Init_oj(void) {
     rb_gc_register_address(&oj_decimal_class_sym);
     oj_hash_class_sym = ID2SYM(rb_intern("hash_class"));
     rb_gc_register_address(&oj_hash_class_sym);
-    oj_in_sym = ID2SYM(rb_intern("in"));
-    rb_gc_register_address(&oj_in_sym);
     oj_indent_sym = ID2SYM(rb_intern("indent"));
     rb_gc_register_address(&oj_indent_sym);
     oj_max_nesting_sym = ID2SYM(rb_intern("max_nesting"));
     rb_gc_register_address(&oj_max_nesting_sym);
-    oj_nanosecond_sym = ID2SYM(rb_intern("nanosecond"));
-    rb_gc_register_address(&oj_nanosecond_sym);
     oj_object_class_sym = ID2SYM(rb_intern("object_class"));
     rb_gc_register_address(&oj_object_class_sym);
     oj_object_nl_sym = ID2SYM(rb_intern("object_nl"));