tidy_json 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e286aa3b914d96b71dc8e32904e0ca0514deb1159bf9a8ef40978f7b2a2ea0
-  data.tar.gz: f7f30ca7fab2e95b93b4aa385d5e2a4752899b273a160e8a64151c68248fb0d5
+  metadata.gz: 3074ee12d1a54599a8c9160fc353c5b7969655296769ddf8c43a6ed0a731af77
+  data.tar.gz: 8c5b373ec10867f9b2b3c66c8ee1e14e7973cdd7e21fc0c1de6e832affebf600
 SHA512:
-  metadata.gz: 7a55fad57a8ffd7d303bb19cbd2f89665faad9089650d7324809fb7c4f1553c27b7783d6e608d0c284b3e91617801ae100a391bb11d142d023d3f037914ed8a0
-  data.tar.gz: 612e14c4480664a0ddb64cc8caac22915a60ca3709e3b1f5cae974eae050333104c5066ba513f70c1c5686dbc096f8c2663853126d4df2bd74d62860d4375ee3
+  metadata.gz: fe1e81b90fb55da164698cb56b45232b64d1fcea274beb64f0ea1762e5eea0728904a3c487172d6bf266755b9f962126277d54b185ea6baf81b7029769bcc894
+  data.tar.gz: 0a84a04ba5440f12df61b45cbdc86cef16ce5c3dd2b866eacf5249999873e0c204344c20488c3857fd0aa288fedb388e5c195d2aed8b4c1aa53e52f105df362a

data/.yardopts

@@ -1,3 +1,2 @@
---exclude lib/tidy_json/dedication.rb
 --private lib/**/*.rb
 --files README.md,LICENSE

data/Gemfile

@@ -7,3 +7,10 @@ gemspec
 group :test do
   gem 'rake'
 end
+
+group :development do
+  install_if -> { ENV['COVERAGE'] } do
+    gem 'simplecov'
+    gem 'simplecov-cobertura'
+  end
+end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2021 Robert Di Pardo
+Copyright (c) 2019-2022 Robert Di Pardo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
 # tidy_json
 
-![Gem Version][gem_version_badge]  ![Downloads][gem_downloads]  [![Travis CI][travis_build_status_badge]][travis_build_status]  [![Circle CI][cci_build_status_badge]][cci_build_status]  [![codecov][codecov_badge]][codecov_status]
+![Gem Version][gem_version_badge]  ![Downloads][gem_downloads]  [![Travis CI][travis_build_status_badge]][travis_build_status]  [![codecov][codecov_badge]][codecov_status]
 
 A mixin providing (recursive) JSON serialization and pretty printing.
 
@@ -100,21 +100,51 @@ puts my_jsonable.to_tidy_json(indent: 4, sort: true, space_before: 2, ascii_only
 # => nil
 ```
 
+### Command Line Usage
+
+After [installing the gem][], pass the name of a file containing JSON to `jtidy`
+(with or without a file extension). Run `jtidy -h` for a complete list of
+formatting options:
+
+```
+jtidy FILE[.json] [-d out[.json]] [-i [2,4,6,8,10,12]] [-p [1..8]] [-v [1..8]] [-o D] [-a D] [-m N] [-e] [-A] [-N] [-s] [-f] [-P]
+    -d, --dest out[.json]            Name of output file
+    -i, --indent [2,4,6,8,10,12]     The number of spaces to indent each object member [2]
+    -p, --prop-name-space [1..8]     The number of spaces to put after property names [0]
+    -v, --value-space [1..8]         The number of spaces to put before property values [1]
+    -o, --object-delim D             A string of whitespace to delimit object members [\n]
+    -a, --array-delim D              A string of whitespace to delimit array elements [\n]
+    -m, --max-nesting N              The maximum level of data structure nesting in the generated JSON; 0 == "no depth checking" [100]
+    -e, --escape                     Escape /'s [false]
+    -A, --ascii                      Generate ASCII characters only [false]
+    -N, --nan                        Allow NaN, Infinity and -Infinity [false]
+    -s, --sort                       Sort property names [false]
+    -f, --force                      Overwrite source file [false]
+    -P, --preview                    Show preview of output [false]
+    -V, --version                    Show version
+    -h, --help                       Show this help message
+```
+
+### Notice
+The `jtidy` executable bundled with this gem is in no way affiliated with, nor based on,
+the HTML parser and pretty printer [of the same name](https://github.com/jtidy/jtidy).
+
+The JTidy source code and binaries are licensed under the terms of the Zlib-Libpng License.
+More information is available [here](https://raw.githubusercontent.com/jtidy/jtidy/master/LICENSE.txt).
+
 ### License
 Distributed under the terms of the [MIT License][].
 
 
-[travis_build_status]: https://travis-ci.com/rdipardo/tidy_json
-[cci_build_status]: https://circleci.com/gh/rdipardo/tidy_json/tree/master
-[cci_build_status_badge]: https://circleci.com/gh/rdipardo/tidy_json.svg?style=svg
-[travis_build_status_badge]: https://travis-ci.com/rdipardo/tidy_json.svg?branch=master
+[travis_build_status]: https://app.travis-ci.com/github/rdipardo/tidy_json
+[travis_build_status_badge]: https://app.travis-ci.com/rdipardo/tidy_json.svg?branch=master
 [codecov_status]: https://codecov.io/gh/rdipardo/tidy_json/branch/master
 [codecov_badge]: https://codecov.io/gh/rdipardo/tidy_json/branch/master/graph/badge.svg
 [gem_version_badge]: https://img.shields.io/gem/v/tidy_json?color=%234ec820&label=gem%20version&logo=ruby&logoColor=%23e9573f
 [gem_downloads]: https://img.shields.io/gem/dt/tidy_json?logo=ruby&logoColor=%23e9573f
-[MIT License]: https://github.com/rdipardo/tidy_json/blob/master/LICENSE
-
+[MIT License]: https://raw.githubusercontent.com/rdipardo/tidy_json/master/LICENSE
+[installing the gem]: https://github.com/rdipardo/tidy_json#installation
 <!-- API spec -->
 [`JSON.generate`]: https://github.com/flori/json/blob/d49c5de49e54a5ad3f6fcf587f98d63266ef9439/lib/json/pure/generator.rb#L111
 [the docs]: https://rubydoc.org/github/rdipardo/tidy_json/TidyJson/Formatter#initialize-instance_method
-[0.3.0]: https://github.com/rdipardo/tidy_json/releases/tag/v0.3.0
+[0.3.0]: https://github.com/rdipardo/tidy_json/releases/tag/v0.3.0

data/bin/jtidy

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optparse'
+require 'tidy_json'
+require_relative 'jtidy_info'
+
+class Jtidy # :nodoc:
+  OPTIONS = {
+    '-d out[.json]': [:dest, String, '--dest', 'Name of output file'],
+    '-i [2,4,6,8,10,12]': [:indent, Integer, '--indent [2,4,6,8,10,12]',
+                           'The number of spaces to indent each object member [2]'],
+    '-p [1..8]': [:space_before, Integer, '--prop-name-space [1..8]',
+                  'The number of spaces to put after property names [0]'],
+    '-v [1..8]': [:space, Integer, '--value-space [1..8]',
+                  'The number of spaces to put before property values [1]'],
+    '-o D': [:object_nl, String, '--object-delim D',
+             'A string of whitespace to delimit object members [\n]'],
+    '-a D': [:array_nl, String, '--array-delim D',
+             'A string of whitespace to delimit array elements [\n]'],
+    '-m N': [:max_nesting, Integer, '--max-nesting N',
+             'The maximum level of data structure nesting in the generated ' \
+             'JSON; 0 == "no depth checking" [100]'],
+    '-e': [:escape_slash, nil, '--escape', 'Escape /\'s [false]'],
+    '-A': [:ascii_only, nil, '--ascii', 'Generate ASCII characters only [false]'],
+    '-N': [:allow_nan, nil, '--nan', 'Allow NaN, Infinity and -Infinity [false]'],
+    '-s': [:sort, nil, '--sort', 'Sort property names [false]'],
+    '-f': [:force, nil, '--force', 'Overwrite source file [false]'],
+    # script-only options
+    '-P': [:preview, nil, '--preview', 'Show preview of output [false]']
+  }.freeze
+
+  def self.unescape(str)
+    str.gsub(/\\b|\\h|\\n|\\r|\\s|\\t|\\v/,
+             {
+               '\\b': "\b",
+               '\\h': "\h",
+               '\\n': "\n",
+               '\\r': "\r",
+               '\\s': "\s",
+               '\\t': "\t",
+               '\\v': "\v"
+             })
+  end
+
+  def self.show_unused(opts)
+    return if opts.empty?
+
+    ignored = opts.keys.map do |key|
+      (OPTIONS.keys.select do |k|
+        OPTIONS[k][0].eql? key
+      end.first || '')[0..1]
+    end
+    warn "Ignoring options: #{ignored.join ', '}"
+  end
+
+  def self.parse(options)
+    format_options = {}
+    OptionParser.new do |opts|
+      opts.banner = \
+        "#{File.basename __FILE__} FILE[.json] " \
+        "#{(OPTIONS.keys.map { |k| "[#{k}]" }).join ' '}"
+      OPTIONS.each_key do |k|
+        opt, type, long_name, desc = OPTIONS[k]
+        opts.on(k, long_name, type, desc) do |v|
+          format_options[opt] = (type == String ? unescape(v) : v)
+        end
+      end
+
+      opts.on_tail('-V', '--version', 'Show version') do
+        show_unused format_options
+        puts ::JtidyInfo.new.to_s
+        exit 0
+      end
+
+      opts.on_tail('-h', '--help', 'Show this help message') do
+        show_unused format_options
+        puts opts
+        exit 0
+      end
+    end.parse! options
+
+    format_options
+  end
+
+  private_class_method :unescape, :show_unused
+end
+
+begin
+  begin
+    OPTS = Jtidy.parse(ARGV).freeze
+    INPUT_FILE = ARGV[0].freeze
+  rescue OptionParser::InvalidOption => e
+    warn e.message.capitalize
+    raise OptionParser::InvalidArgument
+  end
+
+  if INPUT_FILE.nil? || INPUT_FILE.strip.empty?
+    Jtidy.parse %w[--help]
+
+  else
+    tidy = ''
+    fname = INPUT_FILE.strip.gsub('\\', '/')
+    ext = File.extname(fname)
+    input = File.join(
+      File.expand_path(File.dirname(fname)), File.basename(fname, ext)
+    ).to_s
+    outfile = unless OPTS[:dest].nil? || OPTS[:dest].strip.empty?
+                fname = OPTS[:dest].strip.gsub('\\', '/')
+                ext = File.extname(fname)
+                File.join(
+                  File.expand_path(File.dirname(fname)), File.basename(fname, ext)
+                ).to_s
+              end
+
+    begin
+      File.open("#{input}.json", 'r') do |json|
+        begin
+          tidy = TidyJson.tidy(JSON.parse(json.read.strip), OPTS)
+        rescue JSON::JSONError => e
+          warn "#{__FILE__}.#{__LINE__}: #{e.message}"
+        end
+      end
+
+      if tidy.length.positive?
+        output = (if OPTS[:force]
+                    outfile.nil? ? input : outfile
+                  elsif Regexp.new("(#{outfile})", Regexp::IGNORECASE) =~ input
+                    warn "Can't overwrite #{input}.json without '--force' option"
+                    "#{input}-tidy"
+                  else outfile
+                  end) + '.json'
+        File.write(output, tidy)
+        puts "\nWrote: #{output}"
+        puts "#{tidy[0..1024]}\n . . ." if OPTS[:preview]
+      end
+    rescue Errno::ENOENT, Errno::EACCES, IOError => e
+      warn "#{__FILE__}.#{__LINE__}: #{e.message}"
+    end
+  end
+rescue OptionParser::InvalidArgument, OptionParser::MissingArgument
+  Jtidy.parse %w[--help]
+end

data/bin/jtidy_info.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module TidyJson
+  class JtidyInfo # :nodoc:
+    NOTICE = [
+      '#',
+      '# jtidy is in no way affiliated with, nor based on, ',
+      '# the HTML parser and pretty printer of the same name.',
+      '#',
+      '# More information is available here:',
+      '# https://github.com/rdipardo/tidy_json#command-line-usage',
+      '#'
+    ].join("\n").freeze
+
+    attr_reader :meta
+
+    def initialize
+      gem = Gem::Specification.find_by_name('tidy_json')
+      @meta = {
+        name: "# jtidy #{gem.version}",
+        license: "# License: #{gem.license}",
+        bugs: "# Bugs: #{gem.metadata['bug_tracker_uri']}",
+        notice: NOTICE
+      }
+    end
+
+    def to_s
+      (@meta.values.join "\n").freeze
+    end
+  end
+end

data/lib/tidy_json/formatter.rb

@@ -14,16 +14,16 @@ module TidyJson
     # Returns a new instance of +Formatter+.
     #
     # @param opts [Hash] Formatting options.
-    # @option opts [[2,4,6,8,10,12]] :indent (2) An even number of spaces to
-    #   indent each object member.
-    # @option opts [[2..8]] :space_before (0) The number of spaces to put
-    #   before each +:+ delimiter.
-    # @option opts [[2..8]] :space (1) The number of spaces to put after
-    #   each +:+ delimiter.
-    # @option opts [String] :object_nl ("\n") A string to put at the end of
+    # @option opts [[2,4,6,8,10,12]] :indent (2) The number of spaces to indent
     #   each object member.
-    # @option opts [String] :array_nl ("\n") A string to put at the end of
-    #   each array member.
+    # @option opts [[1..8]] :space_before (0) The number of spaces to put after
+    #   property names.
+    # @option opts [[1..8]] :space (1) The number of spaces to put before
+    #   property values.
+    # @option opts [String] :object_nl ("\n") A string of whitespace to delimit
+    #   object members.
+    # @option opts [String] :array_nl ("\n") A string of whitespace to delimit
+    #   array elements.
     # @option opts [Numeric] :max_nesting (100) The maximum level of data
     #   structure nesting in the generated JSON. Disable depth checking by
     #   passing +max_nesting: 0+.
@@ -31,12 +31,12 @@ module TidyJson
     #   slash (/) should be escaped.
     # @option opts [Boolean] :ascii_only (false) Whether or not only ASCII
     #   characters should be generated.
-    # @option opts [Boolean] :allow_nan (false) Whether or not +NaN+,
-    #   +Infinity+ and +-Infinity+ should be generated. If +false+, an
-    #   exception is thrown if these values are encountered.
+    # @option opts [Boolean] :allow_nan (false) Whether or not to allow +NaN+,
+    #   +Infinity+ and +-Infinity+. If +false+, an exception is thrown if one
+    #   of these values is encountered.
     # @option opts [Boolean] :sort (false) Whether or not object members should
-    #   be sorted by key.
-    # @see https://github.com/flori/json/blob/d49c5de49e54a5ad3f6fcf587f98d63266ef9439/lib/json/pure/generator.rb#L111 JSON::Pure::Generator
+    #   be sorted by property name.
+    # @see https://github.com/flori/json/blob/b8c1c640cd375f2e2ccca1b18bf943f80ad04816/lib/json/pure/generator.rb#L111 JSON::Pure::Generator
     def initialize(opts = {})
       # The number of times to reduce the left indent of a nested array's
       # opening bracket
@@ -46,18 +46,19 @@ module TidyJson
       @need_offset = false
 
       valid_indent = (2..12).step(2).include?(opts[:indent])
-      valid_space_before = (2..8).include?(opts[:space_before])
-      valid_space_after = (2..8).include?(opts[:space])
+      valid_space_before = (1..8).include?(opts[:space_before])
+      valid_space_after = (1..8).include?(opts[:space])
       # don't test for the more explicit :integer? method because it's defined
       # for floating point numbers also
       valid_depth = opts[:max_nesting] >= 0 \
                     if opts[:max_nesting].respond_to?(:times)
+      valid_newline = ->(str) { str.respond_to?(:strip) && str.strip.empty? }
       @format = {
         indent: "\s" * (valid_indent ? opts[:indent] : 2),
         space_before: "\s" * (valid_space_before ? opts[:space_before] : 0),
         space: "\s" * (valid_space_after ? opts[:space] : 1),
-        object_nl: opts[:object_nl] || "\n",
-        array_nl: opts[:array_nl] || "\n",
+        object_nl: (valid_newline.call(opts[:object_nl]) ? opts[:object_nl] : "\n"),
+        array_nl: (valid_newline.call(opts[:array_nl]) ? opts[:array_nl] : "\n"),
         max_nesting: valid_depth ? opts[:max_nesting] : 100,
         escape_slash: opts[:escape_slash] || false,
         ascii_only: opts[:ascii_only] || false,
@@ -79,10 +80,8 @@ module TidyJson
       indent = @format[:indent]
 
       is_last = (obj.length <= 1) ||
-                (obj.length > 1 &&
-                  (obj.instance_of?(Array) &&
-                    !(node === obj.first) &&
-                      (obj.size.pred == obj.rindex(node))))
+                (obj.instance_of?(Array) &&
+                  (obj.size.pred == obj.rindex(node)))
 
       if node.instance_of?(Array)
         str << '['
@@ -131,12 +130,7 @@ module TidyJson
         node.each_with_index do |h, idx|
           # format values which are hashes themselves
           if h.last.instance_of?(Hash)
-            key = if h.first.eql? ''
-                    "#{indent * 2}\"<##{h.last.class.name.downcase}>\": "
-                  else
-                    "#{indent * 2}\"#{h.first}\": "
-                  end
-
+            key = "#{indent * 2}\"#{h.first || "<##{h.last.class.name.downcase}>"}\": "
             str << key << '{'
             str << "\n" unless h.last.empty?
 
@@ -170,8 +164,8 @@ module TidyJson
       end
 
       trim str.gsub(/(#{indent})+[\n\r]+/, '')
-              .gsub(/\}\,+/, '},')
-              .gsub(/\]\,+/, '],')
+              .gsub(/\},+/, '},')
+              .gsub(/\],+/, '],')
     end
     # ~Formatter#format_node
 
@@ -209,7 +203,7 @@ module TidyJson
 
       elsif !node.instance_of?(String) then graft << node.to_s
 
-      else graft << "\"#{node.gsub(/\"/, '\\"')}\""
+      else graft << "\"#{node.gsub(/"/, '\\"')}\""
       end
 
       graft.strip
@@ -222,7 +216,7 @@ module TidyJson
     # @param node [String] A serialized object member.
     # @return [String] A copy of +node+ without a trailing comma.
     def trim(node)
-      if (extra_comma = /(?<trail>,\s*[\]\}]\s*)$/.match(node))
+      if (extra_comma = /(?<trail>,\s*[\]}]\s*)$/.match(node))
         node.sub(extra_comma[:trail],
                  extra_comma[:trail]
                  .slice(1, node.length.pred)

data/lib/tidy_json/serializer.rb

@@ -7,15 +7,93 @@ module TidyJson
   # @api private
   class Serializer
     ##
-    # Searches +obj+ to a maximum depth of 2 for readable attributes, storing
-    # them as key-value pairs in +json_hash+.
+    # Searches +obj+ for readable attributes, storing them as key-value pairs in
+    # +json_hash+.
     #
     # @param obj [Object] A Ruby object that can be parsed as JSON.
     # @param json_hash [{String,Symbol => #to_s}] Accumulator.
     # @return [{String => #to_s}] A hash mapping of +obj+'s visible attributes.
+    # @note Hashes will be searched for nested objects to a maximum depth of 2;
+    #   arrays to a maximum depth of 3.
+    # @example
+    #   class Obj
+    #     class Child
+    #       def initialize; @a = { a: 1 } end
+    #        attr_reader :a
+    #     end
+    #     def initialize; @a = { b: Child.new } end
+    #     attr_accessor :a
+    #   end
+    #
+    #   o = Obj.new
+    #   puts o.to_tidy_json
+    #   <<JSON
+    #   {
+    #      "class": "Obj",
+    #      "a": {
+    #         "b": {
+    #           "class": "Obj::Child",
+    #            "a": {
+    #              "a": 1
+    #          }
+    #        }
+    #      }
+    #   }
+    #   JSON
+    #
+    #   # depth > 2: unreachable objects are not serialized
+    #   o.a = { b: { c: { d: Obj::Child.new } } }
+    #   puts o.to_tidy_json
+    #   <<JSON
+    #   {
+    #      "class": "Obj",
+    #      "a": {
+    #         "b": {
+    #           "c": {
+    #             "d": "#<Obj::Child:0x0000559d4da865c0>"
+    #          }
+    #        }
+    #      }
+    #   }
+    #   JSON
+    #
+    #   # object arrays can be nested up to 3 levels deep
+    #   o.a = [ [ Obj::Child.new, [ Obj::Child.new, [ Obj::Child.new ] ] ] ]
+    #   puts o.to_tidy_json
+    #   <<JSON
+    #   {
+    #     "class": "Obj",
+    #     "a": [
+    #       {
+    #         "class": "Obj::Child",
+    #         "a": {
+    #           "a": 1
+    #         }
+    #       },
+    #       [
+    #         [
+    #           {
+    #             "class": "Obj::Child",
+    #             "a": {
+    #               "a": 1
+    #             }
+    #           },
+    #           [
+    #             {
+    #               "class": "Obj::Child",
+    #               "a": {
+    #                 "a": 1
+    #               }
+    #             }
+    #           ]
+    #         ]
+    #       ]
+    #     ]
+    #   }
+    #   JSON
     def self.serialize(obj, json_hash)
       obj.instance_variables.each do |m|
-        key = m.to_s[/[^\@]\w*/].to_sym
+        key = m.to_s[/[^@]\w*/].to_sym
 
         next unless key && !key.eql?('')
 
@@ -28,24 +106,10 @@ module TidyJson
         begin
           # process class members of Hash type
           if val.instance_of?(Hash)
-            nested_key = ''
-            nested = nil
-
-            val.each.any? do |k, v|
-              unless v.instance_variables.empty?
-                nested_key = k
-                nested = v
-              end
-            end
-
             json_hash[key] = val
 
-            if nested
-              pos = val.keys.select { |k| k === nested_key }.first.to_sym
-              nested.instance_variables.each do
-                json_hash[key][pos] = serialize(nested,
-                                                class: nested.class.name)
-              end
+            val.each.any? do |k, v|
+              json_hash[key][k.to_sym] = serialize(v, class: v.class.name) unless v.instance_variables.empty?
             end
 
           # process class members of Array type
@@ -75,6 +139,11 @@ module TidyJson
                   elsif e.respond_to?(:each)
                     temp = []
                     e.each do |el|
+                      if el.respond_to?(:each)
+                        el.each_with_index do |ell, idx|
+                          el[idx] = serialize(ell, class: ell.class.name) unless ell.instance_variables.empty?
+                        end
+                      end
                       temp << if el.instance_variables.empty? then el
                               else JSON.parse(el.stringify)
                               end

data/lib/tidy_json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TidyJson
-  VERSION = '0.3.0'
+  VERSION = '0.5.1'
 end

data/test/codecov_runner.rb

@@ -7,8 +7,8 @@ if ENV['COVERAGE']
     SimpleCov.command_name 'Unit Tests'
 
     if ENV['CI']
-      require 'codecov'
-      SimpleCov.formatter = SimpleCov::Formatter::Codecov
+      require 'simplecov-cobertura'
+      SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
     end
   rescue LoadError
     warn "Can't locate coverage drivers! Try running: `bundle install` first."

data/test/test_tidy_json.rb

@@ -11,11 +11,11 @@ class Nested
   attr_accessor :a, :b, :c, :d, :e
 
   def initialize
-    @a = [[], [[5, 6, 7]], [1, 2, { 'three': 3, 'four': [5, 6] }, [4]], { 'inner': 1 }]
-    @b = { 'a': [5], 'b': [1, 2, 3, [4]], 'c': [5], 'd': { 'inner': 1 }, 'e': [6] }
-    @c = [[1, 2, 3, [4]], { 'inner': 1 }, {}]
-    @d = [{}, [], [1, 2, 3, [4]], { 'inner': 1 }, []]
-    @e = [[1, 2, 3, [4]], { 'inner': 1 }, {}]
+    @a = [[], [[5, 6, 7]], [1, 2, { three: 3, four: [5, 6] }, [4]], { inner: 1 }]
+    @b = { a: [5], b: [1, 2, 3, [4]], c: [5], d: { inner: 1 }, e: [6] }
+    @c = [[1, 2, 3, [4]], { inner: 1 }, {}]
+    @d = [{}, [], [1, 2, 3, [4]], { inner: 1 }, []]
+    @e = [[1, 2, 3, [4]], { inner: 1 }, {}]
   end
 end
 
@@ -25,8 +25,8 @@ class JsonableObject
   def initialize
     @h = { one: 'uno', two: 'dos', three: %w[eine zwei drei], cuatro: ['I', 'II', 'III', ['i.', 'ii.', 'iii.', 'iv.']] }
     @a = ['k', 'l', %w[M N O P], 'q', 'r', 's', [10, 456, ['<abbr title="Reel 2, Dialog Track 2">R2D2</abbr>', 'R', 2, 'D', ['two']]], 'u', 'v', 'x', 'y', %w[Z AB]]
-    @b = [{ 'uno': Nested.new }, [Nested.new, [Nested.new, Nested.new], [Nested.new]]]
-    @c = [[Nested.new, [Nested.new], [Nested.new]]]
+    @b = [{ uno: Nested.new }, [Nested.new, [[Nested.new], Nested.new, Nested.new], [Nested.new]]]
+    @c = [[Nested.new, [Nested.new, [Nested.new]], [Nested.new]]]
     @d = []
     @f = {}
   end
@@ -64,13 +64,13 @@ class TidyJsonTest < Test::Unit::TestCase
     assert_equal([{ a: 1 }, { b: 2 }, { c: 3, d: { a: 9, f: 56, i: '34', ii: '35' } }],
                  TidyJson.sort_keys(hash_array))
     assert_equal({ a: 'one', b: 'two', c: 3 },
-                 TidyJson.sort_keys('b': 'two', 'c': 3, 'a': 'one'))
+                 TidyJson.sort_keys(b: 'two', c: 3, a: 'one'))
     assert_equal([], TidyJson.sort_keys([]), 'return empty arrays unchanged')
     assert_equal({}, TidyJson.sort_keys({}), 'return empty hashes unchanged')
     assert_equal([3, 2, 1], TidyJson.sort_keys([3, 2, 1]),
                  'return arrays of keyless objects unchanged')
     assert_equal([{ b: 'two' }, 'one'],
-                 TidyJson.sort_keys([{ 'b': 'two' }, 'one']),
+                 TidyJson.sort_keys([{ b: 'two' }, 'one']),
                  'arrays with any keyless objects should be returned unchanged')
   end
 
@@ -82,25 +82,29 @@ class TidyJsonTest < Test::Unit::TestCase
     assert_equal("[\n        {\n                \"a\": 1\n        },\n        {\n                \"b\": 2\n        },\n        {\n                \"c\": 3,\n                \"d\": {\n                        \"a\": 9,\n                        \"f\": 56,\n                        \"i\": \"34\",\n                        \"ii\": \"35\"\n                }\n        }\n]\n",
                  nested_hash_array.to_tidy_json(indent: 8, sort: true))
     assert_equal("{\n      \"a\": \"one\",\n      \"b\": \"two\",\n      \"c\": 3\n}\n",
-                 { 'b': 'two', 'c': 3, 'a': 'one' }.to_tidy_json(indent: 6, sort: true))
+                 { b: 'two', c: 3, a: 'one' }.to_tidy_json(indent: 6, sort: true))
     assert_equal("[]\n", [].to_tidy_json(sort: true))
     assert_equal("{}\n", {}.to_tidy_json(sort: true))
     assert_equal("[\n        3,\n        2,\n        1\n]\n",
                  [3, 2, 1].to_tidy_json(indent: 8, sort: true))
     assert_equal("[\n    {\n        \"b\": \"two\"\n    },\n    \"one\"\n]\n",
-                 [{ 'b': 'two' }, 'one'].to_tidy_json(indent: 4, sort: true))
+                 [{ b: 'two' }, 'one'].to_tidy_json(indent: 4, sort: true))
   end
 
   def test_tidy_instance
     assert_equal({}.to_tidy_json, "{}\n")
     assert_equal([].to_tidy_json, "[]\n")
     assert_equal(String.new.to_tidy_json, "\"\"\n")
-    assert_equal(JsonableObject.new.to_tidy_json.length, 13_410)
+    assert_equal(JsonableObject.new.to_tidy_json.length, 17_774)
   end
 
   def test_stringify_instance
-    File.open("#{__dir__}/JsonableObject.json", 'r') do |json|
-      assert_equal(@t.stringify, json.read.strip)
+    output = @t.write_json(File.join(__dir__, @t.class.name))
+    assert(File.exist?(output))
+    File.open(output, 'r:UTF-8') do |json|
+      text = json.read.strip
+      assert_equal(@t.stringify, text)
+      assert_no_match(/(#<Nested:0x)[a-z0-9]+>/, text, 'Some objects were not serialized!')
     end
   rescue Errno::ENOENT, Errno::EACCES, IOError => e
     flunk "#{__FILE__}.#{__LINE__}: #{e.message}"
@@ -132,7 +136,7 @@ class TidyJsonTest < Test::Unit::TestCase
 
   def test_indent_bounds_checking
     assert_equal("{\n  \"a\": \"one\",\n  \"b\": \"two\",\n  \"c\": 3\n}\n",
-                 { 'b': 'two', 'c': 3, 'a': 'one' }.to_tidy_json(indent: 5, sort: true),
+                 { b: 'two', c: 3, a: 'one' }.to_tidy_json(indent: 5, sort: true),
                  'odd values should fall back to default of 2')
     assert_equal([].to_tidy_json(indent: '16'), "[]\n",
                  'values > 12 should fall back to default of 2')