oj 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a372edadce1968a9ad2d8f63e6a3ddb59f7452a9
-  data.tar.gz: 7fde017753c41e55117a5959d20ca5cb42bad830
+  metadata.gz: 220d1012a368e139d601519ae2bde0835b574a44
+  data.tar.gz: e792b43ad00c9d8c592221e136b433d2ac1525cf
 SHA512:
-  metadata.gz: 4024b5e1a5e33530cf5a714c62495bb06fc88225ae169ec429ac409b7f552637ffdcdfcb6f7d806a7fc4bc24d459ab8585d8f149044d7efb1eca23fc8320734b
-  data.tar.gz: 880b75ee95588c1da932492cdf0ae086f63061dc3ced0c87fe544a068e3b3f32de7b4c91c9c3a94da19b26843b629fe6a1757e2a10ad89b12c433dc326a8e601
+  metadata.gz: 105d031b3ed97c598a828537304adbd344c43aafaf1a79793cdabe51823a6a1d3a1bb7aafce6022ffa732f355141a4061ca6f8bc33dc00b9be584ad5baf51270
+  data.tar.gz: 3ff635338d57dd897511bbabe746fcde5db77629f8ffd10d4441f1e81e5a24a22ff64f386cd6da0e8410d3c25fc504b4fffb29f57a313339eb9daa6397abcf9a

data/README.md

@@ -20,13 +20,13 @@ 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.5.0
+### Current Release 2.5.2
 
- - Added push_json() to the StringWriter and StreamWriter to allow raw JSON to be added to a JSON document being constructed.
+ - Fixed indent problem with StringWriter so it now indents properly
 
-### Current Release 2.4.3
+### Current Release 2.5.1
 
- - Made include pthread.h conditional for Windows.
+ - Added push_json() to the StringWriter and StreamWriter to allow raw JSON to be added to a JSON document being constructed.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -2078,7 +2078,9 @@ oj_str_writer_push_object(StrWriter sw, const char *key) {
 	grow(&sw->out, size);
     }
     maybe_comma(sw);
-    fill_indent(&sw->out, sw->depth);
+    if (0 < sw->depth) {
+	fill_indent(&sw->out, sw->depth);
+    }
     if (0 != key) {
 	dump_cstr(key, strlen(key), 0, 0, &sw->out);
 	*sw->out.cur++ = ':';
@@ -2097,6 +2099,9 @@ oj_str_writer_push_array(StrWriter sw, const char *key) {
 	grow(&sw->out, size);
     }
     maybe_comma(sw);
+    if (0 < sw->depth) {
+	fill_indent(&sw->out, sw->depth);
+    }
     if (0 != key) {
 	dump_cstr(key, strlen(key), 0, 0, &sw->out);
 	*sw->out.cur++ = ':';
@@ -2115,6 +2120,9 @@ oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
 	grow(&sw->out, size);
     }
     maybe_comma(sw);
+    if (0 < sw->depth) {
+	fill_indent(&sw->out, sw->depth);
+    }
     if (0 != key) {
 	dump_cstr(key, strlen(key), 0, 0, &sw->out);
 	*sw->out.cur++ = ':';
@@ -2132,6 +2140,9 @@ oj_str_writer_push_json(StrWriter sw, const char *json, const char *key) {
 	grow(&sw->out, size);
     }
     maybe_comma(sw);
+    if (0 < sw->depth) {
+	fill_indent(&sw->out, sw->depth);
+    }
     if (0 != key) {
 	dump_cstr(key, strlen(key), 0, 0, &sw->out);
 	*sw->out.cur++ = ':';
@@ -2163,6 +2174,9 @@ oj_str_writer_pop(StrWriter sw) {
 	*sw->out.cur++ = ']';
 	break;
     }
+    if (0 == sw->depth && 0 < sw->out.indent) {
+	*sw->out.cur++ = '\n';
+    }
 }
 
 void

data/ext/oj/oj.c

@@ -866,6 +866,7 @@ str_writer_init(StrWriter sw) {
     sw->out.hash_cnt = 0;
     sw->out.opts = &sw->opts;
     sw->out.indent = sw->opts.indent;
+    sw->out.depth = 0;
 }
 
 /* call-seq: new(options)
@@ -881,6 +882,8 @@ str_writer_new(int argc, VALUE *argv, VALUE self) {
     if (1 == argc) {
 	oj_parse_options(argv[0], &sw->opts);
     }
+    sw->out.indent = sw->opts.indent;
+
     return Data_Wrap_Struct(oj_string_writer_class, 0, str_writer_free, sw);
 }
 

data/lib/oj/version.rb

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

data/test/test_writer.rb

@@ -63,7 +63,7 @@ class OjWriter < ::Test::Unit::TestCase
   end
 
   def test_string_writer_value_array
-    w = Oj::StringWriter.new(:indent => 0)
+    w = Oj::StringWriter.new(:indent => 2)
     w.push_array()
     w.push_value(7)
     w.push_value(7.3)
@@ -73,7 +73,21 @@ class OjWriter < ::Test::Unit::TestCase
     w.push_value({'a' => 65})
     w.push_value([1,2])
     w.pop()
-    assert_equal('[7,7.3,true,null,"a string",{"a":65},[1,2]]', w.to_s)
+    assert_equal(%|[
+  7,
+  7.3,
+  true,
+  null,
+  "a string",
+  {
+    "a":65
+  },
+  [
+    1,
+    2
+  ]
+]
+|, w.to_s)
   end
 
   def test_string_writer_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -18,42 +18,44 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- lib/oj/bag.rb
-- lib/oj/error.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/schandler.rb
-- lib/oj/version.rb
-- lib/oj.rb
-- ext/oj/extconf.rb
+- LICENSE
+- README.md
 - ext/oj/buf.h
-- ext/oj/cache8.h
-- ext/oj/circarray.h
-- ext/oj/encode.h
-- ext/oj/err.h
-- ext/oj/hash.h
-- ext/oj/odd.h
-- ext/oj/oj.h
-- ext/oj/parse.h
-- ext/oj/resolve.h
-- ext/oj/val_stack.h
 - ext/oj/cache8.c
+- ext/oj/cache8.h
 - ext/oj/circarray.c
+- ext/oj/circarray.h
 - ext/oj/compat.c
 - ext/oj/dump.c
+- ext/oj/encode.h
 - ext/oj/err.c
+- ext/oj/err.h
+- ext/oj/extconf.rb
 - ext/oj/fast.c
 - ext/oj/hash.c
+- ext/oj/hash.h
 - ext/oj/hash_test.c
 - ext/oj/object.c
 - ext/oj/odd.c
+- ext/oj/odd.h
 - ext/oj/oj.c
+- ext/oj/oj.h
 - ext/oj/parse.c
+- ext/oj/parse.h
 - ext/oj/resolve.c
+- ext/oj/resolve.h
 - ext/oj/saj.c
 - ext/oj/scp.c
 - ext/oj/strict.c
 - ext/oj/val_stack.c
+- ext/oj/val_stack.h
+- lib/oj.rb
+- lib/oj/bag.rb
+- lib/oj/error.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/version.rb
 - test/a.rb
 - test/bug.rb
 - test/debian_test.rb
@@ -70,6 +72,7 @@ files:
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
+- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -82,7 +85,6 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
 - test/sample_json.rb
 - test/struct.rb
 - test/test_compat.rb
@@ -97,8 +99,6 @@ files:
 - test/test_writer.rb
 - test/tests.rb
 - test/x.rb
-- LICENSE
-- README.md
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -106,24 +106,24 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.