oj 1.0.2 → 1.0.3

data/README.md

@@ -24,9 +24,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.0.2
+### Release 1.0.3
 
- - Added RSTRING_NOT_MODIFIED for Rubinius optimization.
+ - Added :symbol_keys option to convert String hash keys into Symbols.
+
+ - The load() method now supports IO Objects as input as well as Strings.
 
 ## <a name="description">Description</a>
 

data/ext/oj/load.c

@@ -452,7 +452,11 @@ read_obj(ParseInfo pi) {
 		    }
 		    rb_ivar_set(obj, var_id, val);
 		} else if (T_HASH == obj_type) {
-		    rb_hash_aset(obj, key, val);
+		    if (Yes == pi->options->sym_key) {
+			rb_hash_aset(obj, rb_str_intern(key), val);
+		    } else {
+			rb_hash_aset(obj, key, val);
+		    }
 		    if ((CompatMode == pi->options->mode || ObjectMode == pi->options->mode) &&
 			0 == json_class_name &&
 			0 != ks && 'j' == *ks && 0 == strcmp("json_class", ks) &&

data/ext/oj/oj.c

@@ -49,6 +49,8 @@ ID	oj_as_json_id;
 ID	oj_at_id;
 ID	oj_instance_variables_id;
 ID	oj_json_create_id;
+ID	oj_read_id;
+ID	oj_string_id;
 ID	oj_to_hash_id;
 ID	oj_to_json_id;
 ID	oj_to_sym_id;
@@ -57,6 +59,8 @@ ID	oj_tv_sec_id;
 ID	oj_tv_usec_id;
 
 VALUE	oj_bag_class;
+VALUE	oj_date_class;
+VALUE	oj_stringio_class;
 VALUE	oj_struct_class;
 VALUE	oj_time_class;
 
@@ -71,6 +75,7 @@ static VALUE	mode_sym;
 static VALUE	null_sym;
 static VALUE	object_sym;
 static VALUE	strict_sym;
+static VALUE	symbol_keys_sym;
 
 Cache   oj_class_cache = 0;
 Cache   oj_attr_cache = 0;
@@ -80,6 +85,7 @@ struct _Options	oj_default_options = {
     0,			// indent
     No,			// circular
     Yes,		// auto_define
+    No,			// sym_key
     ObjectMode,		// mode
 };
 
@@ -90,6 +96,7 @@ struct _Options	oj_default_options = {
  * - encoding: [String] character encoding for the JSON file
  * - circular: [true|false|nil] support circular references while dumping
  * - auto_define: [true|false|nil] automatically define classes if they do not exist
+ * - symbol_keys: [true|false|nil] use symbols instead of strings for hash keys
  * - mode: [:object|:strict|:compat|:null] load and dump modes to use for JSON
  * @return [Hash] all current option settings.
  */
@@ -102,6 +109,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, indent_sym, INT2FIX(oj_default_options.indent));
     rb_hash_aset(opts, circular_sym, (Yes == oj_default_options.circular) ? Qtrue : ((No == oj_default_options.circular) ? Qfalse : Qnil));
     rb_hash_aset(opts, auto_define_sym, (Yes == oj_default_options.auto_define) ? Qtrue : ((No == oj_default_options.auto_define) ? Qfalse : Qnil));
+    rb_hash_aset(opts, symbol_keys_sym, (Yes == oj_default_options.sym_key) ? Qtrue : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode:	rb_hash_aset(opts, mode_sym, strict_sym);	break;
     case CompatMode:	rb_hash_aset(opts, mode_sym, compat_sym);	break;
@@ -120,6 +128,7 @@ get_def_opts(VALUE self) {
  * @param [String] :encoding character encoding for the JSON file
  * @param [true|false|nil] :circular support circular references while dumping
  * @param [true|false|nil] :auto_define automatically define classes if they do not exist
+ * @param [true|false|nil] :symbol_keys convert hash keys to symbols
  * @param [:object|:strict|:compat|:null] 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
@@ -134,6 +143,7 @@ set_def_opts(VALUE self, VALUE opts) {
     struct _YesNoOpt    ynos[] = {
         { circular_sym, &oj_default_options.circular },
         { auto_define_sym, &oj_default_options.auto_define },
+        { symbol_keys_sym, &oj_default_options.sym_key },
         { Qnil, 0 }
     };
     YesNoOpt    o;
@@ -194,6 +204,7 @@ parse_options(VALUE ropts, Options copts) {
     struct _YesNoOpt    ynos[] = {
         { circular_sym, &copts->circular },
         { auto_define_sym, &copts->auto_define },
+        { symbol_keys_sym, &copts->sym_key },
         { Qnil, 0 }
     };
     YesNoOpt    o;
@@ -268,13 +279,38 @@ static VALUE
 load_str(int argc, VALUE *argv, VALUE self) {
     char        *json;
     size_t	len;
+    VALUE	input;
     
-    Check_Type(*argv, T_STRING);
-    // the json string gets modified so make a copy of it
-    len = RSTRING_LEN(*argv) + 1;
-    json = ALLOCA_N(char, len);
-    strcpy(json, StringValuePtr(*argv));
-
+    if (1 > argc) {
+	rb_raise(rb_eArgError, "Wrong number of arguments to load().\n");
+    }
+    input = *argv;
+    if (rb_type(input) == T_STRING) {
+	// the json string gets modified so make a copy of it
+	len = RSTRING_LEN(*argv) + 1;
+	json = ALLOCA_N(char, len);
+	strcpy(json, StringValuePtr(*argv));
+    } else {
+	VALUE	clas = rb_obj_class(input);
+	VALUE	s;
+
+	if (oj_stringio_class == clas) {
+	    s = rb_funcall2(input, oj_string_id, 0, 0);
+	    len = RSTRING_LEN(s) + 1;
+	    json = ALLOCA_N(char, len);
+	    strcpy(json, StringValuePtr(s));
+
+	    // TBD else responds to fileno
+
+	} else if (rb_respond_to(input, oj_read_id)) {
+	    s = rb_funcall2(input, oj_read_id, 0, 0);
+	    len = RSTRING_LEN(s) + 1;
+	    json = ALLOCA_N(char, len);
+	    strcpy(json, StringValuePtr(s));
+	} else {
+	    rb_raise(rb_eArgError, "load() expected a String or IO Object.\n");
+	}
+    }
     return load(json, argc - 1, argv + 1, self);
 }
 
@@ -365,6 +401,10 @@ void Init_oj() {
     Oj = rb_define_module("Oj");
     keep = rb_cv_get(Oj, "@@keep"); // needed to stop GC from deleting and reusing VALUEs
 
+    rb_require("time");
+    rb_require("date");
+    rb_require("stringio");
+
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);
 
@@ -377,16 +417,20 @@ void Init_oj() {
     oj_at_id = rb_intern("at");
     oj_instance_variables_id = rb_intern("instance_variables");
     oj_json_create_id = rb_intern("json_create");
+    oj_read_id = rb_intern("read");
+    oj_string_id = rb_intern("string");
     oj_to_hash_id = rb_intern("to_hash");
     oj_to_json_id = rb_intern("to_json");
     oj_to_sym_id = rb_intern("to_sym");
     oj_tv_nsec_id = rb_intern("tv_nsec");
     oj_tv_sec_id = rb_intern("tv_sec");
     oj_tv_usec_id = rb_intern("tv_usec");
-    
+
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));
     oj_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
     oj_time_class = rb_const_get(rb_cObject, rb_intern("Time"));
+    oj_date_class = rb_const_get(rb_cObject, rb_intern("Date"));
+    oj_stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
 
     auto_define_sym = ID2SYM(rb_intern("auto_define"));	rb_ary_push(keep, auto_define_sym);
     circular_sym = ID2SYM(rb_intern("circular"));	rb_ary_push(keep, circular_sym);
@@ -394,6 +438,7 @@ void Init_oj() {
     encoding_sym = ID2SYM(rb_intern("encoding"));	rb_ary_push(keep, encoding_sym);
     indent_sym = ID2SYM(rb_intern("indent"));		rb_ary_push(keep, indent_sym);
     mode_sym = ID2SYM(rb_intern("mode"));		rb_ary_push(keep, mode_sym);
+    symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));	rb_ary_push(keep, symbol_keys_sym);
     null_sym = ID2SYM(rb_intern("null"));		rb_ary_push(keep, null_sym);
     object_sym = ID2SYM(rb_intern("object"));		rb_ary_push(keep, object_sym);
     strict_sym = ID2SYM(rb_intern("strict"));		rb_ary_push(keep, strict_sym);

data/ext/oj/oj.h

@@ -84,6 +84,7 @@ typedef struct _Options {
     int         indent;		// indention for dump, default 2
     char        circular;	// YesNo
     char        auto_define;	// YesNo
+    char        sym_key;	// YesNo
     char        mode;		// Mode
 } *Options;
 
@@ -99,7 +100,9 @@ extern VALUE    Oj;
 extern struct _Options	oj_default_options;
 
 extern VALUE	oj_bag_class;
+extern VALUE	oj_date_class;
 extern VALUE	oj_doc_class;
+extern VALUE	oj_stringio_class;
 extern VALUE	oj_struct_class;
 extern VALUE	oj_time_class;
 
@@ -109,6 +112,7 @@ extern ID	oj_as_json_id;
 extern ID	oj_at_id;
 extern ID	oj_instance_variables_id;
 extern ID	oj_json_create_id;
+extern ID	oj_string_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;
 extern ID	oj_to_sym_id;

data/lib/oj/version.rb

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

data/test/perf.rb

@@ -54,7 +54,7 @@ class Perf
       end
     end
     puts
-    puts "Comparison Matrix\n(performance factor, 2.0 row is means twice as fast as column)"
+    puts "Comparison Matrix\n(performance factor, 2.0 means row is twice as fast as column)"
     puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
     puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
     iva.each do |i|

data/test/tests.rb

@@ -5,6 +5,7 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'test/unit'
+require 'stringio'
 require 'oj'
 
 def hash_eql(h1, h2)
@@ -70,6 +71,7 @@ class Juice < ::Test::Unit::TestCase
                    :indent=>0,
                    :circular=>false,
                    :auto_define=>true,
+                   :symbol_keys=>false,
                    :mode=>:object}, opts)
   end
 
@@ -79,12 +81,14 @@ class Juice < ::Test::Unit::TestCase
       :indent=>0,
       :circular=>false,
       :auto_define=>true,
+      :symbol_keys=>false,
       :mode=>:object}
     o2 = {
       :encoding=>"UTF-8",
       :indent=>4,
       :circular=>true,
       :auto_define=>false,
+      :symbol_keys=>false,
       :mode=>:compat}
     o3 = { :indent => 4 }
     Oj.default_options = o2
@@ -471,6 +475,30 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(h['b'].__id__, obj.__id__)
   end
 
+# Stream IO
+  def test_string_io
+    json = %{{
+  "x":true,
+  "y":58,
+  "z": [1,2,3]
+}
+}
+    input = StringIO.new(json)
+    obj = Oj.load(input, :mode => :strict)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def test_symbol_keys
+    json = %{{
+  "x":true,
+  "y":58,
+  "z": [1,2,3]
+}
+}
+    obj = Oj.load(json, :mode => :strict, :symbol_keys => true)
+    assert_equal({ :x => true, :y => 58, :z => [1, 2, 3]}, obj)
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: