oj 2.11.4 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b53b303c6deecb0860b8b962cb5e8bdc37c0c80
-  data.tar.gz: ece33a05b8cd4f63b323cbf34dfb3a3bad67dd24
+  metadata.gz: 8d1ef3e0a7644077283534c35c890016691f9592
+  data.tar.gz: 671cfd43d8f6b32f3d84a389326e090ca42fa2f2
 SHA512:
-  metadata.gz: 95e7432d06edccdc616488728fb49bfd65393cf3451fe40b869de89397e0820ab64f8f5d1b252ac435d86798efdbd057fece5877655a6f97e66890d1f676ce2e
-  data.tar.gz: 6edd99edb2d3160a221c168ce30d5779cbec202908c91135c763f57df2024e6a758b6f2ff6f40bfe0ae7c68937accab77af260b951266a9b2021e00096fbf8a8
+  metadata.gz: e443fc1c93a8399fa30e5bf48e10547bbf5baf7a5cd749a9e37b8fd234d4e8bb15dbc1942012f5c5cf7eff60064d5a37447e6a69f7beaea7bbdcb4dfea54bd0c
+  data.tar.gz: 323cb80c48f393bca6ffe4b11dae19af16ce88b2b6f2f5052264de1e3487fafd04ab61ce4daadb76eb1be5737a1fb13c47adec5572451f24ede11be8777be89a

data/README.md

@@ -26,11 +26,18 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-## Current Release 2.11.4
+## Release 2.11.5
+
+ - Fixed issue with rails as_json not being called for Structs.
+
+ - Added support for anonymous Structs with object mode encoding. Note that this
+   will result in a new anonymous Struct for each instance.
+
+## Release 2.11.4
 
  - DateTime second encoding is now always a Rational to preserve accuracy.
 
- - Fixed buf in the Oj.load() callback feature that caused an endless loop when
+ - Fixed bug in the Oj.load() callback feature that caused an endless loop when
    a StringIO was used with a JSON that was a number.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
@@ -71,9 +78,9 @@ Oj.default_options = {:mode => :compat }
 ## Compatibility
 
 ### Ruby
-Oj is compatible with Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.1 and RBX. Support for
-JRuby has been removed as JRuby no longer supports C extensions and there are
-bugs in the older versions that are not being fixed.
+Oj is compatible with Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1, 2.2 and RBX.
+Support for JRuby has been removed as JRuby no longer supports C extensions and
+there are bugs in the older versions that are not being fixed.
 
 ### Rails
 Although up until 4.1 Rails uses [multi_json](https://github.com/intridea/multi_json), an [issue in Rails](https://github.com/rails/rails/issues/9212) causes ActiveSupport to fail to make use Oj for JSON handling.
@@ -109,7 +116,7 @@ they are not more than `String`s. Always check inputs from untrusted sources.
 
 ```ruby
 require 'oj'
-    
+
 h = { 'one' => 1, 'array' => [ true, false ] }
 json = Oj.dump(h)
 

data/ext/oj/dump.c

@@ -1212,7 +1212,6 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	} else {
 	    dump_val(aj, depth, out);
 	}
-
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
 	const char	*s;
@@ -1628,6 +1627,17 @@ dump_struct_comp(VALUE obj, int depth, Out out) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
+    } else if (rb_respond_to(obj, oj_as_json_id)) {
+	volatile VALUE	aj = rb_funcall(obj, oj_as_json_id, 0);
+
+	// Catch the obvious brain damaged recursive dumping.
+	if (aj == obj) {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+	} else {
+	    dump_val(aj, depth, out);
+	}
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs = rb_funcall(obj, oj_to_json_id, 0);
 	const char	*s;
@@ -1668,11 +1678,35 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
     *out->cur++ = '"';
     *out->cur++ = ':';
     *out->cur++ = '[';
-    fill_indent(out, d3);
-    *out->cur++ = '"';
-    memcpy(out->cur, class_name, len);
-    out->cur += len;
-    *out->cur++ = '"';
+    if ('#' == *class_name) {
+	VALUE		ma = rb_struct_s_members(clas);
+	const char	*name;
+	int		cnt = (int)RARRAY_LEN(ma);
+
+	*out->cur++ = '[';
+	for (i = 0; i < cnt; i++) {
+	    name = rb_id2name(SYM2ID(rb_ary_entry(ma, i)));
+	    len = strlen(name);
+	    size = len + 3;
+	    if (out->end - out->cur <= (long)size) {
+		grow(out, size);
+	    }
+	    if (0 < i) {
+		*out->cur++ = ',';
+	    }
+	    *out->cur++ = '"';
+	    memcpy(out->cur, name, len);
+	    out->cur += len;
+	    *out->cur++ = '"';
+	}
+	*out->cur++ = ']';
+    } else {
+	fill_indent(out, d3);
+	*out->cur++ = '"';
+	memcpy(out->cur, class_name, len);
+	out->cur += len;
+	*out->cur++ = '"';
+    }
     *out->cur++ = ',';
     size = d3 * out->indent + 2;
 #ifdef RSTRUCT_LEN

data/ext/oj/object.c

@@ -192,15 +192,28 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE
 
 	if (2 == klen && 'u' == key[1]) {
             VALUE	sc;
+	    VALUE	e1;
 
 	    if (0 == len) {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Invalid struct data");
 		return 1;
 	    }
-
-	    // If struct is not defined then we let this fail and raise an exception.
-	    sc = oj_name2struct(pi, *RARRAY_PTR(value));
-
+	    e1 = *RARRAY_PTR(value);
+	    // check for anonymous Struct
+	    if (T_ARRAY == rb_type(e1)) {
+		VALUE	args[1024];
+		VALUE	rstr;
+		int	i, cnt = (int)RARRAY_LEN(e1);
+
+		for (i = 0; i < cnt; i++) {
+		    rstr = rb_ary_entry(e1, i);
+		    args[i] = rb_funcall(rstr, oj_to_sym_id, 0);
+		}
+		sc = rb_funcall2(rb_cStruct, oj_new_id, cnt, args);
+	    } else {
+		// If struct is not defined then we let this fail and raise an exception.
+		sc = oj_name2struct(pi, *RARRAY_PTR(value));
+	    }
             // Create a properly initialized struct instance without calling the initialize method.
             parent->val = rb_obj_alloc(sc);
             // If the JSON array has more entries than the struct class allows, we record an error.

data/ext/oj/oj.c

@@ -1231,6 +1231,14 @@ str_writer_to_s(VALUE self) {
 
 // StreamWriter
 
+/* Document-class: Oj::StreamWriter
+ * 
+ * Supports building a JSON document one element at a time. Build the IO stream
+ * document by pushing values into the document. Pushing an array or an object
+ * will create that element in the JSON document and subsequent pushes will add
+ * the elements to that array or object until a pop() is called.
+ */
+
 static void
 stream_writer_free(void *ptr) {
     StreamWriter	sw;
@@ -1271,14 +1279,10 @@ stream_writer_reset_buf(StreamWriter sw) {
     *sw->sw.out.cur = '\0';
 }
 
-/* call-seq: new(options)
- *
- * Creates a new StreamWriter.
- * @param [Hash] options formating options
- */
-/* call-seq: new(options)
+/* call-seq: new(io, options)
  *
  * Creates a new StreamWriter.
+ * @param [IO] io stream to write to
  * @param [Hash] options formating options
  */
 static VALUE

data/lib/oj/version.rb

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

data/test/isolated/shared.rb

@@ -79,6 +79,20 @@ class SharedMimicTest < Minitest::Test
   end
   # TBD options
 
+  def test_dump_struct
+    # anonymous Struct
+    s = Struct.new(:a, :b, :c)
+    o = s.new(1, 'two', [true, false])
+    json = JSON.dump(o)
+    # Rails add the as_json method and changes the behavior.
+    if o.respond_to?(:as_json)
+      assert_equal(%|{"a":1,"b":"two","c":[true,false]}|, json)
+    else
+      j = '"' + o.to_s.gsub('"', '\\"') + '"'
+      assert_equal(j, json)
+    end
+  end
+
 # load
   def test_load_string
     json = %{{"a":1,"b":[true,false]}}

data/test/isolated/test_mimic_rails_after.rb

@@ -7,8 +7,9 @@ require 'helper'
 
 begin
   require 'rails/all'
-rescue Exception
-  Process.exit!(true)
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+  Process.exit!(false)
 end
 
 Oj.mimic_JSON

data/test/isolated/test_mimic_rails_before.rb

@@ -9,6 +9,7 @@ Oj.mimic_JSON
 begin
   require 'rails/all'
 rescue Exception
+  puts "*** require of rails failed"
   Process.exit!(true)
 end
 

data/test/test_object.rb

@@ -185,15 +185,11 @@ class ObjectJuice < Minitest::Test
   def test_encode
     opts = Oj.default_options
     Oj.default_options = { :ascii_only => false }
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
+    dump_and_load("ぴーたー", false)
     Oj.default_options = { :ascii_only => true }
     json = Oj.dump("ぴーたー")
     assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
+    dump_and_load("ぴーたー", false)
     Oj.default_options = opts
   end
 
@@ -410,17 +406,23 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_json_struct
-    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
-      obj = Stuck.new(false, 7)
-      dump_and_load(obj, false)
-    end
+    obj = Stuck.new(false, 7)
+    dump_and_load(obj, false)
   end
 
   def test_json_struct2
-    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
-      obj = One::Stuck2.new(false, 7)
-      dump_and_load(obj, false)
-    end
+    obj = One::Stuck2.new(false, 7)
+    dump_and_load(obj, false)
+  end
+
+  def test_json_anonymous_struct
+    s = Struct.new(:x, :y)
+    obj = s.new(1, 2)
+    json = Oj.dump(obj, :indent => 2, :mode => :object)
+    #puts json
+    loaded = Oj.object_load(json);
+    assert_equal(obj.members, loaded.members)
+    assert_equal(obj.values, loaded.values)
   end
 
   def test_json_non_str_hash

data/test/test_scp.rb

@@ -352,12 +352,12 @@ class ScpTest < Minitest::Test
   def test_socket_close
     json = %{{"one":true,"two":false}}
     Thread.start(json) do |j|
-      server = TCPServer.new(6969)
+      server = TCPServer.new(8080)
       c = server.accept()
       c.puts json
       c.close
     end
-    sock = TCPSocket.new('localhost', 6969)
+    sock = TCPSocket.new('localhost', 8080)
     handler = Closer.new(sock)
     err = nil
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -177,9 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true