Update HashFormatter

Author: HarlemSquirrel

lib/amazing_print/formatters/hash_formatter.rb

@@ -85,7 +85,7 @@ def left_width(keys)
       end
 
       def max_key_width(keys)
-        keys.map { |key, _value| colorless_size(key) }.max || 0
+        keys.map { |key, _value| colorless_size(key.to_s) }.max || 0
       end
 
       def printable_keys
@@ -95,7 +95,10 @@ def printable_keys
 
         keys.map! do |key|
           plain_single_line do
-            [inspector.awesome(key), hash[key]]
+            [
+              json_format? ? key : inspector.awesome(key),
+              hash[key]
+            ]
           end
         end
       end
@@ -108,20 +111,12 @@ def symbol?(key)
         key[0] == ':'
       end
 
-      def json_syntax(key, value, width)
-        formatted_key = if symbol?(key)
-                          # Symbols should have a colon we need to remove
-                          # Strings should have surrounding double quotes we need to remove
-                          # symbol?(key) ? key[1..-1] : key[1..-2]
-                          key[1..-1].to_json
-                        elsif string?(key)
-                          key
-                        elsif key.respond_to?(:to_json)
-                          key.to_json
-                        else
-                          key
-                        end
+      def json_format?
+        options[:hash_format] == :json
+      end
 
+      def json_syntax(key, value, width)
+        formatted_key = json_awesome(key, is_key: true)
         formatted_value = json_awesome(value)
 
         "#{align(formatted_key, width)}#{colorize(': ', :hash)}#{formatted_value}"

lib/amazing_print/json_helper.rb

@@ -5,13 +5,16 @@
 #
 module AmazingPrint
   module JSONHelper
-    def json_awesome(object)
+    def json_awesome(object, is_key: false)
       return inspector.awesome(object) unless options[:hash_format] == :json
 
       if object.nil?
         # Color null like we do nil
         colorize(object.to_json, :nilclass)
-      elsif [Array, Float, Hash, Integer, String].include?(object.class) || !object.respond_to?(:to_json)
+      elsif is_key && %w[BigDecimal Float Integer].include?(object.class.name)
+        # JSON keys should be a string
+        inspector.awesome(object.to_s)
+      elsif %w[Array BigDecimal Float Hash Integer String].include?(object.class.name) || !object.respond_to?(:to_json)
         # These objects should not be converted to strings with #to_json so we can treat them normally
         inspector.awesome(object)
       else