oj 3.13.23 → 3.16.9

data/ext/oj/stream_writer.c

@@ -5,6 +5,7 @@
 #include <ruby.h>
 
 #include "encode.h"
+#include "mem.h"
 
 extern VALUE Oj;
 
@@ -15,11 +16,22 @@ static void stream_writer_free(void *ptr) {
         return;
     }
     sw = (StreamWriter)ptr;
-    xfree(sw->sw.out.buf);
-    xfree(sw->sw.types);
-    xfree(ptr);
+    OJ_R_FREE(sw->sw.out.buf);
+    OJ_R_FREE(sw->sw.types);
+    OJ_R_FREE(ptr);
 }
 
+static const rb_data_type_t oj_stream_writer_type = {
+    "Oj/stream_writer",
+    {
+        NULL,
+        stream_writer_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
 static void stream_writer_reset_buf(StreamWriter sw) {
     sw->sw.out.cur  = sw->sw.out.buf;
     *sw->sw.out.cur = '\0';
@@ -30,7 +42,8 @@ static void stream_writer_write(StreamWriter sw) {
 
     switch (sw->type) {
     case STRING_IO:
-    case STREAM_IO: {
+    case STREAM_IO:
+    case FILE_IO: {
         volatile VALUE rs = rb_str_new(sw->sw.out.buf, size);
 
         // Oddly enough, when pushing ASCII characters with UTF-8 encoding or
@@ -41,11 +54,6 @@ static void stream_writer_write(StreamWriter sw) {
         rb_funcall(sw->stream, oj_write_id, 1, rs);
         break;
     }
-    case FILE_IO:
-        if (size != write(sw->fd, sw->sw.out.buf, size)) {
-            rb_raise(rb_eIOError, "Write failed. [_%d_:%s]\n", errno, strerror(errno));
-        }
-        break;
     default: rb_raise(rb_eArgError, "expected an IO Object.");
     }
     stream_writer_reset_buf(sw);
@@ -82,8 +90,8 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
     if (oj_stringio_class == clas) {
         type = STRING_IO;
 #if !IS_WINDOWS
-    } else if (rb_respond_to(stream, oj_fileno_id) &&
-               Qnil != (s = rb_funcall(stream, oj_fileno_id, 0)) && 0 != (fd = FIX2INT(s))) {
+    } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0)) &&
+               0 != (fd = FIX2INT(s))) {
         type = FILE_IO;
 #endif
     } else if (rb_respond_to(stream, oj_write_id)) {
@@ -91,7 +99,7 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
     } else {
         rb_raise(rb_eArgError, "expected an IO Object.");
     }
-    sw = ALLOC(struct _streamWriter);
+    sw = OJ_R_ALLOC(struct _streamWriter);
     if (2 == argc && T_HASH == rb_type(argv[1])) {
         volatile VALUE v;
         int            buf_size = 0;
@@ -101,15 +109,10 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
             rb_gc_register_address(&buffer_size_sym);
         }
         if (Qnil != (v = rb_hash_lookup(argv[1], buffer_size_sym))) {
-#ifdef RUBY_INTEGER_UNIFICATION
             if (rb_cInteger != rb_obj_class(v)) {
+                OJ_R_FREE(sw);
                 rb_raise(rb_eArgError, ":buffer size must be a Integer.");
             }
-#else
-            if (T_FIXNUM != rb_type(v)) {
-                rb_raise(rb_eArgError, ":buffer size must be a Integer.");
-            }
-#endif
             buf_size = FIX2INT(v);
         }
         oj_str_writer_init(&sw->sw, buf_size);
@@ -124,7 +127,7 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
     sw->type          = type;
     sw->fd            = fd;
 
-    return Data_Wrap_Struct(oj_stream_writer_class, 0, stream_writer_free, sw);
+    return TypedData_Wrap_Struct(oj_stream_writer_class, &oj_stream_writer_type, sw);
 }
 
 /* Document-method: push_key
@@ -137,9 +140,9 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key pending for the next push
  */
 static VALUE stream_writer_push_key(VALUE self, VALUE key) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
-    rb_check_type(key, T_STRING);
     oj_str_writer_push_key(&sw->sw, StringValuePtr(key));
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
         stream_writer_write(sw);
@@ -156,7 +159,8 @@ static VALUE stream_writer_push_key(VALUE self, VALUE key) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     switch (argc) {
     case 0: oj_str_writer_push_object(&sw->sw, 0); break;
@@ -164,7 +168,6 @@ static VALUE stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_object(&sw->sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_object(&sw->sw, StringValuePtr(argv[0]));
         }
         break;
@@ -185,7 +188,8 @@ static VALUE stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     switch (argc) {
     case 0: oj_str_writer_push_array(&sw->sw, 0); break;
@@ -193,7 +197,6 @@ static VALUE stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_array(&sw->sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_array(&sw->sw, StringValuePtr(argv[0]));
         }
         break;
@@ -213,16 +216,16 @@ static VALUE stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     switch (argc) {
-    case 1: oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0); break;
+    case 1: oj_str_writer_push_value((StrWriter)sw, *argv, 0); break;
     case 2:
         if (Qnil == argv[1]) {
-            oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
+            oj_str_writer_push_value((StrWriter)sw, *argv, 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
+            oj_str_writer_push_value((StrWriter)sw, *argv, StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'."); break;
@@ -243,19 +246,16 @@ static VALUE stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
-    rb_check_type(argv[0], T_STRING);
     switch (argc) {
-    case 1: oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0); break;
+    case 1: oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), 0); break;
     case 2:
         if (Qnil == argv[1]) {
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+            oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self),
-                                    StringValuePtr(*argv),
-                                    StringValuePtr(argv[1]));
+            oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;
@@ -273,7 +273,8 @@ static VALUE stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
  * currently open.
  */
 static VALUE stream_writer_pop(VALUE self) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     oj_str_writer_pop(&sw->sw);
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
@@ -289,7 +290,8 @@ static VALUE stream_writer_pop(VALUE self) {
  * currently open.
  */
 static VALUE stream_writer_pop_all(VALUE self) {
-    StreamWriter sw = (StreamWriter)DATA_PTR(self);
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
 
     oj_str_writer_pop_all(&sw->sw);
     stream_writer_write(sw);
@@ -303,7 +305,9 @@ static VALUE stream_writer_pop_all(VALUE self) {
  * Flush any remaining characters in the buffer.
  */
 static VALUE stream_writer_flush(VALUE self) {
-    stream_writer_write((StreamWriter)DATA_PTR(self));
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+    stream_writer_write(sw);
 
     return Qnil;
 }

data/ext/oj/strict.c

@@ -17,7 +17,7 @@ VALUE oj_cstr_to_value(const char *str, size_t len, size_t cache_str) {
     volatile VALUE rstr = Qnil;
 
     if (len < cache_str) {
-	rstr = oj_str_intern(str, len);
+        rstr = oj_str_intern(str, len);
     } else {
         rstr = rb_str_new(str, len);
         rstr = oj_encode(rstr);
@@ -37,28 +37,24 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
         } else {
             rkey = rb_str_new(parent->key, parent->klen);
             rkey = oj_encode(rkey);
-	    OBJ_FREEZE(rkey); // frozen when used as a Hash key anyway
+            OBJ_FREEZE(rkey);  // frozen when used as a Hash key anyway
         }
         return rkey;
     }
     if (Yes == pi->options.sym_key) {
-	rkey = oj_sym_intern(parent->key, parent->klen);
+        rkey = oj_sym_intern(parent->key, parent->klen);
     } else {
-	rkey = oj_str_intern(parent->key, parent->klen);
+        rkey = oj_str_intern(parent->key, parent->klen);
     }
     return rkey;
 }
 
 static void hash_end(ParseInfo pi) {
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
-    }
+    TRACE_PARSE_HASH_END(pi->options.trace, pi);
 }
 
 static void array_end(ParseInfo pi) {
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_array_end(pi, __FILE__, __LINE__);
-    }
+    TRACE_PARSE_ARRAY_END(pi->options.trace, pi);
 }
 
 static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
@@ -66,9 +62,7 @@ static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
 }
 
 static void add_value(ParseInfo pi, VALUE val) {
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
-    }
+    TRACE_PARSE_CALL(pi->options.trace, "add_value", pi, val);
     pi->stack.head->val = val;
 }
 
@@ -76,9 +70,7 @@ static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig
     volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
     pi->stack.head->val = rstr;
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, rstr);
-    }
+    TRACE_PARSE_CALL(pi->options.trace, "add_string", pi, rstr);
 }
 
 static void add_num(ParseInfo pi, NumInfo ni) {
@@ -86,30 +78,22 @@ static void add_num(ParseInfo pi, NumInfo ni) {
         oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     pi->stack.head->val = oj_num_as_value(ni);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
-    }
+    TRACE_PARSE_CALL(pi->options.trace, "add_number", pi, pi->stack.head->val);
 }
 
 static VALUE start_hash(ParseInfo pi) {
     if (Qnil != pi->options.hash_class) {
         return rb_class_new_instance(0, NULL, pi->options.hash_class);
     }
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
-    }
+    TRACE_PARSE_IN(pi->options.trace, "start_hash", pi);
     return rb_hash_new();
 }
 
 static void hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char *orig) {
     volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
-    rb_hash_aset(stack_peek(&pi->stack)->val,
-                 oj_calc_hash_key(pi, parent),
-                 rstr);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
-    }
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), rstr);
+    TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rstr);
 }
 
 static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
@@ -119,27 +103,17 @@ static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
         oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     v = oj_num_as_value(ni);
-    rb_hash_aset(stack_peek(&pi->stack)->val,
-                 oj_calc_hash_key(pi, parent),
-                 v);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, v);
-    }
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), v);
+    TRACE_PARSE_CALL(pi->options.trace, "set_number", pi, v);
 }
 
 static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
-    rb_hash_aset(stack_peek(&pi->stack)->val,
-                 oj_calc_hash_key(pi, parent),
-                 value);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
-    }
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), value);
+    TRACE_PARSE_CALL(pi->options.trace, "set_value", pi, value);
 }
 
 static VALUE start_array(ParseInfo pi) {
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_in("start_array", pi, __FILE__, __LINE__);
-    }
+    TRACE_PARSE_IN(pi->options.trace, "start_array", pi);
     return rb_ary_new();
 }
 
@@ -147,9 +121,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
     volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
     rb_ary_push(stack_peek(&pi->stack)->val, rstr);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
-    }
+    TRACE_PARSE_CALL(pi->options.trace, "append_string", pi, rstr);
 }
 
 static void array_append_num(ParseInfo pi, NumInfo ni) {
@@ -160,16 +132,12 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
     }
     v = oj_num_as_value(ni);
     rb_ary_push(stack_peek(&pi->stack)->val, v);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, v);
-    }
+    TRACE_PARSE_CALL(pi->options.trace, "append_number", pi, v);
 }
 
 static void array_append_value(ParseInfo pi, VALUE value) {
     rb_ary_push(stack_peek(&pi->stack)->val, value);
-    if (RB_UNLIKELY(Yes == pi->options.trace)) {
-        oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
-    }
+    TRACE_PARSE_CALL(pi->options.trace, "append_value", pi, value);
 }
 
 void oj_set_strict_callbacks(ParseInfo pi) {

data/ext/oj/string_writer.c

@@ -3,6 +3,7 @@
 
 #include "dump.h"
 #include "encode.h"
+#include "mem.h"
 
 extern VALUE Oj;
 
@@ -20,7 +21,7 @@ static void push_type(StrWriter sw, DumpType type) {
     if (sw->types_end <= sw->types + sw->depth + 1) {
         size_t size = (sw->types_end - sw->types) * 2;
 
-        REALLOC_N(sw->types, char, size);
+        OJ_R_REALLOC_N(sw->types, char, size);
         sw->types_end = sw->types + size;
     }
     sw->depth++;
@@ -43,7 +44,7 @@ static void maybe_comma(StrWriter sw) {
 void oj_str_writer_init(StrWriter sw, int buf_size) {
     sw->opts       = oj_default_options;
     sw->depth      = 0;
-    sw->types      = ALLOC_N(char, 256);
+    sw->types      = OJ_R_ALLOC_N(char, 256);
     sw->types_end  = sw->types + 256;
     *sw->types     = '\0';
     sw->keyWritten = 0;
@@ -55,10 +56,10 @@ void oj_str_writer_init(StrWriter sw, int buf_size) {
     }
     // Must be allocated. Using the out.stack_buffer results in double frees
     // and I haven't figured out why yet.
-    sw->out.buf        = ALLOC_N(char, buf_size);
-    sw->out.cur        = sw->out.buf;
-    sw->out.end        = sw->out.buf + buf_size - BUFFER_EXTRA;
-    sw->out.allocated  = true;
+    sw->out.buf       = OJ_R_ALLOC_N(char, buf_size);
+    sw->out.cur       = sw->out.buf;
+    sw->out.end       = sw->out.buf + buf_size - BUFFER_EXTRA;
+    sw->out.allocated = true;
 
     *sw->out.cur       = '\0';
     sw->out.circ_cache = NULL;
@@ -69,7 +70,6 @@ void oj_str_writer_init(StrWriter sw, int buf_size) {
     sw->out.depth      = 0;
     sw->out.argc       = 0;
     sw->out.argv       = NULL;
-    sw->out.caller     = 0;
     sw->out.ropts      = NULL;
     sw->out.omit_nil   = oj_default_options.dump_opts.omit_nil;
 }
@@ -225,7 +225,7 @@ void oj_str_writer_pop_all(StrWriter sw) {
     }
 }
 
-static void str_writer_free(void *ptr) {
+static void string_writer_free(void *ptr) {
     StrWriter sw;
 
     if (0 == ptr) {
@@ -235,8 +235,25 @@ static void str_writer_free(void *ptr) {
 
     oj_out_free(&sw->out);
 
-    xfree(sw->types);
-    xfree(ptr);
+    OJ_R_FREE(sw->types);
+    OJ_R_FREE(ptr);
+}
+
+static const rb_data_type_t oj_string_writer_type = {
+    "Oj/string_writer",
+    {
+        NULL,
+        string_writer_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
+StrWriter oj_str_writer_unwrap(VALUE writer) {
+    StrWriter sw;
+    TypedData_Get_Struct(writer, struct _strWriter, &oj_string_writer_type, sw);
+    return sw;
 }
 
 /* Document-method: new
@@ -256,7 +273,7 @@ static void str_writer_free(void *ptr) {
  * - *options* [_Hash_] formatting options
  */
 static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
-    StrWriter sw = ALLOC(struct _strWriter);
+    StrWriter sw = OJ_R_ALLOC(struct _strWriter);
 
     oj_str_writer_init(sw, 0);
     if (1 == argc) {
@@ -266,7 +283,7 @@ static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
     sw->out.argv   = argv + 1;
     sw->out.indent = sw->opts.indent;
 
-    return Data_Wrap_Struct(oj_string_writer_class, 0, str_writer_free, sw);
+    return TypedData_Wrap_Struct(oj_string_writer_class, &oj_string_writer_type, sw);
 }
 
 /* Document-method: push_key
@@ -278,9 +295,9 @@ static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key pending for the next push
  */
 static VALUE str_writer_push_key(VALUE self, VALUE key) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
-    rb_check_type(key, T_STRING);
     oj_str_writer_push_key(sw, StringValuePtr(key));
 
     return Qnil;
@@ -294,7 +311,8 @@ static VALUE str_writer_push_key(VALUE self, VALUE key) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
     switch (argc) {
     case 0: oj_str_writer_push_object(sw, 0); break;
@@ -302,7 +320,6 @@ static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_object(sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_object(sw, StringValuePtr(argv[0]));
         }
         break;
@@ -323,7 +340,8 @@ static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
     switch (argc) {
     case 0: oj_str_writer_push_array(sw, 0); break;
@@ -331,7 +349,6 @@ static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_array(sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_array(sw, StringValuePtr(argv[0]));
         }
         break;
@@ -352,14 +369,16 @@ static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_value(int argc, VALUE *argv, VALUE self) {
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
     switch (argc) {
-    case 1: oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0); break;
+    case 1: oj_str_writer_push_value(sw, *argv, 0); break;
     case 2:
         if (Qnil == argv[1]) {
-            oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
+            oj_str_writer_push_value(sw, *argv, 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
+            oj_str_writer_push_value(sw, *argv, StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'."); break;
@@ -377,17 +396,16 @@ static VALUE str_writer_push_value(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_json(int argc, VALUE *argv, VALUE self) {
-    rb_check_type(argv[0], T_STRING);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
     switch (argc) {
-    case 1: oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0); break;
+    case 1: oj_str_writer_push_json(sw, StringValuePtr(*argv), 0); break;
     case 2:
         if (Qnil == argv[1]) {
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+            oj_str_writer_push_json(sw, StringValuePtr(*argv), 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self),
-                                    StringValuePtr(*argv),
-                                    StringValuePtr(argv[1]));
+            oj_str_writer_push_json(sw, StringValuePtr(*argv), StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;
@@ -401,7 +419,10 @@ static VALUE str_writer_push_json(int argc, VALUE *argv, VALUE self) {
  * currently open.
  */
 static VALUE str_writer_pop(VALUE self) {
-    oj_str_writer_pop((StrWriter)DATA_PTR(self));
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
+    oj_str_writer_pop(sw);
     return Qnil;
 }
 
@@ -412,7 +433,10 @@ static VALUE str_writer_pop(VALUE self) {
  * currently open.
  */
 static VALUE str_writer_pop_all(VALUE self) {
-    oj_str_writer_pop_all((StrWriter)DATA_PTR(self));
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
+    oj_str_writer_pop_all(sw);
 
     return Qnil;
 }
@@ -423,7 +447,8 @@ static VALUE str_writer_pop_all(VALUE self) {
  * Reset the writer back to the empty state.
  */
 static VALUE str_writer_reset(VALUE self) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
     sw->depth      = 0;
     *sw->types     = '\0';
@@ -442,23 +467,24 @@ static VALUE str_writer_reset(VALUE self) {
  * *return* [_String_]
  */
 static VALUE str_writer_to_s(VALUE self) {
-    StrWriter sw   = (StrWriter)DATA_PTR(self);
-    VALUE     rstr = rb_str_new(sw->out.buf, sw->out.cur - sw->out.buf);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+    VALUE rstr = rb_str_new(sw->out.buf, sw->out.cur - sw->out.buf);
 
     return oj_encode(rstr);
 }
 
 /* Document-method: as_json
- * call-seq: as_json()
+ * call-seq: as_json(*)
  *
  * Returns the contents of the writer as a JSON element. If called from inside
  * an array or hash by Oj the raw buffer will be used othersize a more
  * inefficient parse of the contents and a return of the result is
- * completed. The parse uses the strict mode.
+ * completed. The parse uses the strict mode. Optional arguments are ignored.
  *
  * *return* [_Hash_|_Array_|_String_|_Integer_|_Float_|_True_|_False_|_nil|)
  */
-static VALUE str_writer_as_json(VALUE self) {
+static VALUE str_writer_as_json(int argc, VALUE *argv, VALUE self) {
     if (string_writer_optimized) {
         return self;
     }
@@ -489,5 +515,5 @@ void oj_string_writer_init(void) {
     rb_define_method(oj_string_writer_class, "reset", str_writer_reset, 0);
     rb_define_method(oj_string_writer_class, "to_s", str_writer_to_s, 0);
     rb_define_method(oj_string_writer_class, "raw_json", str_writer_to_s, 0);
-    rb_define_method(oj_string_writer_class, "as_json", str_writer_as_json, 0);
+    rb_define_method(oj_string_writer_class, "as_json", str_writer_as_json, -1);
 }