Fix an issue with generate_pretty and empty objects in the Ruby and J…

…ava implementations
flori · Oct 7, 2020 · b8c1c64 · b8c1c64
1 parent 07c3404
commit b8c1c64
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/java/src/json/ext/Generator.java b/java/src/json/ext/Generator.java
@@ -334,13 +334,13 @@ void generate(final Session session, RubyHash object,
 
                 buffer.append((byte)'{');
                 buffer.append(objectNl);
-                object.visitAll(new RubyHash.Visitor() {
-                    private boolean firstPair = true;
 
+                final boolean[] firstPair = new boolean[]{true};
+                object.visitAll(new RubyHash.Visitor() {
                     @Override
                     public void visit(IRubyObject key, IRubyObject value) {
-                        if (firstPair) {
-                            firstPair = false;
+                        if (firstPair[0]) {
+                            firstPair[0] = false;
                         } else {
                             buffer.append((byte)',');
                             buffer.append(objectNl);
@@ -360,7 +360,7 @@ public void visit(IRubyObject key, IRubyObject value) {
                     }
                 });
                 state.decreaseDepth();
-                if (objectNl.length() != 0) {
+                if (!firstPair[0] && objectNl.length() != 0) {
                     buffer.append(objectNl);
                     buffer.append(Utils.repeat(state.getIndent(), state.getDepth()));
                 }

diff --git a/lib/json/pure/generator.rb b/lib/json/pure/generator.rb
@@ -332,8 +332,10 @@ def json_transform(state)
               first = false
             }
             depth = state.depth -= 1
-            result << state.object_nl
-            result << state.indent * depth if indent
+            unless first
+              result << state.object_nl
+              result << state.indent * depth if indent
+            end
             result << '}'
             result
           end

diff --git a/tests/json_generator_test.rb b/tests/json_generator_test.rb
@@ -92,6 +92,11 @@ def test_generate
   end
 
   def test_generate_pretty
+    json = pretty_generate({})
+    assert_equal(<<'EOT'.chomp, json)
+{
+}
+EOT
     json = pretty_generate(@hash)
     # hashes aren't (insertion) ordered on every ruby implementation
     # assert_equal(@json3, json)