Merge pull request #1542 from woodruffw/deprecate-utils-json

compat: deprecate Utils::JSON in favor of corelib JSON.

2 files changed, 6 insertions, 40 deletions

diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index 43a0e88a8..5f961974c 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -149,9 +149,9 @@ module GitHub
     data_tmpfile = nil
     if data
       begin
-        data = Utils::JSON.dump data
+        data = JSON.generate data
         data_tmpfile = Tempfile.new("github_api_post", HOMEBREW_TEMP)
-      rescue Utils::JSON::Error => e
+      rescue JSON::ParserError => e
         raise Error, "Failed to parse JSON request:\n#{e.message}\n#{data}", e.backtrace
       end
     end
@@ -183,13 +183,13 @@ module GitHub
       if !http_code.start_with?("2") && !status.success?
         raise_api_error(output, errors, http_code, headers, scopes)
       end
-      json = Utils::JSON.load output
+      json = JSON.parse output
       if block_given?
         yield json
       else
         json
       end
-    rescue Utils::JSON::Error => e
+    rescue JSON::ParserError => e
       raise Error, "Failed to parse JSON response\n#{e.message}", e.backtrace
     end
   end
@@ -205,7 +205,7 @@ module GitHub
 
     if meta.fetch("x-ratelimit-remaining", 1).to_i <= 0
       reset = meta.fetch("x-ratelimit-reset").to_i
-      error = Utils::JSON.load(output)["message"]
+      error = JSON.parse(output)["message"]
       raise RateLimitExceededError.new(reset, error)
     end
 
@@ -218,7 +218,7 @@ module GitHub
       raise HTTPNotFoundError, output
     else
       error = begin
-        Utils::JSON.load(output)["message"]
+        JSON.parse(output)["message"]
       rescue
         nil
       end
diff --git a/Library/Homebrew/utils/json.rb b/Library/Homebrew/utils/json.rb
deleted file mode 100644
index 21c5b52b0..000000000
--- a/Library/Homebrew/utils/json.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require "json"
-
-module Utils
-  module JSON
-    module_function
-
-    Error = Class.new(StandardError)
-
-    def load(str)
-      ::JSON.load(str)
-    rescue ::JSON::ParserError => e
-      raise Error, e.message
-    end
-
-    def dump(obj)
-      ::JSON.generate(obj)
-    end
-
-    def stringify_keys(obj)
-      case obj
-      when Array
-        obj.map { |val| stringify_keys(val) }
-      when Hash
-        obj.inject({}) do |result, (key, val)|
-          key = key.respond_to?(:to_s) ? key.to_s : key
-          val = stringify_keys(val)
-          result.merge!(key => val)
-        end
-      else
-        obj
-      end
-    end
-  end
-end