tidy_json 0.5.0 → 0.5.2

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')

data/tidy_json.gemspec

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 require_relative 'lib/tidy_json/version'
-require_relative 'lib/tidy_json/dedication'
 
 Gem::Specification.new do |spec|
   spec.name        = 'tidy_json'
   spec.version     = TidyJson::VERSION
-  spec.date        = Time.now.to_s[0..9]
   spec.summary     = 'Serialize any Ruby object as readable JSON'
   spec.description = 'A mixin providing (recursive) JSON serialization and pretty printing.'
   spec.authors     = ['Robert Di Pardo']
@@ -14,19 +12,16 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/rdipardo/tidy_json'
   spec.license     = 'MIT'
   spec.metadata    = {
-    'documentation_uri' => 'https://rubydoc.org/github/rdipardo/tidy_json',
+    'documentation_uri' => 'https://rubydoc.info/github/rdipardo/tidy_json',
     'bug_tracker_uri' => 'https://github.com/rdipardo/tidy_json/issues'
   }
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    ['.yardopts'].concat(`git ls-files -z`.split("\x0").reject { |f| f.match(/^(\.[\w+\.]+|test|spec|features|codecov)/) })
+    ['.yardopts'].concat(`git ls-files -z`.split("\x0").reject { |f| f.match(/^(\.[\w+.]+|test|spec|features|codecov)/) })
   end
   spec.test_files = Dir['test/*']
   spec.require_paths = ['lib']
   spec.executables = ['jtidy']
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3')
-  spec.add_runtime_dependency 'json', '~> 2.5'
-  spec.add_development_dependency 'test-unit', '~> 3.4'
-  spec.add_development_dependency 'yard', '~> 0.9'
+  spec.add_runtime_dependency 'json', '~> 2.6'
   spec.rdoc_options = ['-x test/*']
-  spec.post_install_message = TidyJson::DEDICATION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tidy_json
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Robert Di Pardo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,42 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.6'
 description: A mixin providing (recursive) JSON serialization and pretty printing.
 email: dipardo.r@gmail.com
 executables:
@@ -67,7 +39,6 @@ files:
 - bin/jtidy
 - bin/jtidy_info.rb
 - lib/tidy_json.rb
-- lib/tidy_json/dedication.rb
 - lib/tidy_json/formatter.rb
 - lib/tidy_json/serializer.rb
 - lib/tidy_json/version.rb
@@ -79,27 +50,9 @@ homepage: https://github.com/rdipardo/tidy_json
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.org/github/rdipardo/tidy_json
+  documentation_uri: https://rubydoc.info/github/rdipardo/tidy_json
   bug_tracker_uri: https://github.com/rdipardo/tidy_json/issues
-post_install_message: |2+
-
-  ....................................................
-  .............. This gem is dedicated ...............
-  ................. to the memory of .................
-  ....................................................
-  ................. MICHAEL DI PARDO .................
-  ....................................................
-  ............ Please consider supporting ............
-  ........... multiple sclerosis research: ...........
-  ....................................................
-  ....................... (US) .......................
-  ..... https://www.nationalmssociety.org/Donate .....
-  ..................... (Canada) .....................
-  ........ https://mssociety.ca/get-involved .........
-  ....................... (UK) .......................
-  .... https://www.mssociety.org.uk/get-involved .....
-  ....................................................
-
+post_install_message:
 rdoc_options:
 - "-x test/*"
 require_paths:
@@ -115,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Serialize any Ruby object as readable JSON
@@ -123,4 +76,3 @@ test_files:
 - test/JsonableObject.json
 - test/codecov_runner.rb
 - test/test_tidy_json.rb
-...

data/lib/tidy_json/dedication.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module TidyJson # :nodoc:
-  DEDICATION = "\n#{'.' * 52}\n" \
-               "#{'.' * 14} This gem is dedicated " \
-               "#{'.' * 15}\n" \
-               "#{'.' * 17} to the memory of #{'.' * 17}\n#{'.' * 52}\n" \
-               "#{'.' * 17} MICHAEL DI PARDO #{'.' * 17}\n#{'.' * 52}\n" \
-               "#{'.' * 12} Please consider supporting #{'.' * 12}\n" \
-               "#{'.' * 11} multiple sclerosis research: #{'.' * 11}\n" \
-               "#{'.' * 52}\n" \
-               "#{'.' * 23} (US) #{'.' * 23}\n" \
-               "#{'.' * 5} https://www.nationalmssociety.org/Donate " \
-               "#{'.' * 5}\n" \
-               "#{'.' * 21} (Canada) #{'.' * 21}\n" \
-               "#{'.' * 8} https://mssociety.ca/get-involved #{'.' * 9}\n" \
-               "#{'.' * 23} (UK) #{'.' * 23}\n" \
-               "#{'.' * 4} https://www.mssociety.org.uk/get-involved "\
-               "#{'.' * 5}\n#{'.' * 52}\n\n"
-end