use JSON in favor of MultiJson

Author: Ben Fritsch

example/lib/example-client/client.rb

@@ -200,7 +200,7 @@ def list()
     end
   end
 
-  SCHEMA = Heroics::Schema.new(MultiJson.load(<<-'HEROICS_SCHEMA'))
+  SCHEMA = Heroics::Schema.new(JSON.parse(<<-'HEROICS_SCHEMA'))
 {
   "description":"Sample schema for use in tests.",
   "definitions":{

heroics.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'base64'
   spec.add_dependency 'erubis', '~> 2.0'
   spec.add_dependency 'excon'
+  spec.add_dependency 'json'
   spec.add_dependency 'moneta'
-  spec.add_dependency 'multi_json', '>= 1.9.2'
   spec.add_dependency 'webrick'
 end

lib/heroics.rb

@@ -2,7 +2,7 @@
 require 'base64'
 require 'erubis'
 require 'excon'
-require 'multi_json'
+require 'json'
 require 'uri'
 require 'webrick'
 require 'zlib'

lib/heroics/client_generator.rb

@@ -37,7 +37,7 @@ def self.build_context(module_name, schema, base_url, options)
       default_headers: options.fetch(:default_headers, {}),
       cache: options.fetch(:cache, {}),
       description: schema.description,
-      schema: MultiJson.dump(schema.schema, pretty:true),
+      schema: JSON.pretty_generate(schema.schema),
       resources: resources
     }
   end

lib/heroics/command.rb

@@ -38,7 +38,7 @@ def usage
   #{description}
 USAGE
       if example_body
-        example_body = MultiJson.dump(example_body, pretty: true)
+        example_body = JSON.pretty_generate(example_body)
         example_body = example_body.lines.map do |line|
           "  #{line}"
         end.join
@@ -60,7 +60,7 @@ def run(*parameters)
       result = @client.send(resource_name).send(name, *parameters)
       result = result.to_a if result.instance_of?(Enumerator)
       if result && !result.instance_of?(String)
-        result = MultiJson.dump(result, pretty: true)
+        result = JSON.pretty_generate(result)
       end
       @output.puts(result) unless result.nil?
     end

lib/heroics/configuration.rb

@@ -40,7 +40,7 @@ def schema=(schema)
     end
 
     def schema_filepath=(schema_filepath)
-      @schema = Heroics::Schema.new(MultiJson.decode(open(schema_filepath).read))
+      @schema = Heroics::Schema.new(JSON.parse(open(schema_filepath).read))
     end
 
     def module_name=(module_name)

lib/heroics/link.rb

@@ -58,7 +58,7 @@ def run(*parameters)
           if body.is_a?(Hash)
             query = body
           else
-            query = MultiJson.load(body)
+            query = JSON.parse(body)
           end
           body = nil
         end
@@ -71,7 +71,7 @@ def run(*parameters)
                                     expects: [200, 201, 202, 204, 206])
       content_type = response.headers['Content-Type']
       if content_type && content_type =~ /application\/.*json/
-        body = MultiJson.load(response.body)
+        body = JSON.parse(response.body)
         if response.status == 206
           next_range = response.headers['Next-Range']
           Enumerator.new do |yielder|
@@ -89,7 +89,7 @@ def run(*parameters)
                                             method: @link_schema.method,
                                             path: path, headers: headers,
                                             expects: [200, 201, 206])
-              body = MultiJson.load(response.body)
+              body = JSON.parse(response.body)
               next_range = response.headers['Next-Range']
             end
           end

lib/heroics/schema.rb

@@ -150,7 +150,7 @@ def encode(body)
       when 'application/x-www-form-urlencoded'
         URI.encode_www_form(body)
       when /application\/.*json/
-        MultiJson.dump(body)
+        JSON.generate(body)
       end
     end
 
@@ -356,7 +356,7 @@ def iso_format(time)
   def self.download_schema(url, options={})
     default_headers = options.fetch(:default_headers, {})
     response = Excon.get(url, headers: default_headers, expects: [200, 201])
-    Schema.new(MultiJson.load(response.body))
+    Schema.new(JSON.parse(response.body))
   end
 
   # A representation of a parameter.

lib/heroics/views/client.erb

@@ -132,7 +132,7 @@ module <%= @module_name %>
   end
   <% end %>
 
-  SCHEMA = Heroics::Schema.new(MultiJson.load(<<-'HEROICS_SCHEMA'))
+  SCHEMA = Heroics::Schema.new(JSON.parse(<<-'HEROICS_SCHEMA'))
 <%= @schema %>
 HEROICS_SCHEMA
 end

test/cli_test.rb

@@ -131,11 +131,11 @@ def test_run_with_dashed_resource_name
       assert_equal("/another-resource", request[:path])
       Excon.stubs.pop
       {status: 200, headers: {'Content-Type' => 'application/json'},
-       body: MultiJson.dump(result)}
+       body: JSON.generate(result)}
     end
 
     cli.run('another-resource:list')
-    assert_equal(MultiJson.dump(result, pretty: true) + "\n", output.string)
+    assert_equal(JSON.pretty_generate(result) + "\n", output.string)
   end
 
   # CLI.run runs the command matching the specified name and passes parameters
@@ -154,14 +154,14 @@ def test_run_with_parameters
     Excon.stub(method: :patch) do |request|
       assert_equal("/resource/#{uuid}", request[:path])
       assert_equal('application/json', request[:headers]['Content-Type'])
-      assert_equal(body, MultiJson.load(request[:body]))
+      assert_equal(body, JSON.parse(request[:body]))
       Excon.stubs.pop
       {status: 200, headers: {'Content-Type' => 'application/json'},
-       body: MultiJson.dump(result)}
+       body: JSON.generate(result)}
     end
 
     cli.run('resource:update', uuid, body)
-    assert_equal(MultiJson.dump(result, pretty: true) + "\n", output.string)
+    assert_equal(JSON.pretty_generate(result) + "\n", output.string)
   end
 end
 
@@ -176,17 +176,17 @@ def test_cli_from_schema
     Excon.stub(method: :patch) do |request|
       assert_equal("/resource/#{uuid}", request[:path])
       assert_equal('application/json', request[:headers]['Content-Type'])
-      assert_equal(body, MultiJson.load(request[:body]))
+      assert_equal(body, JSON.parse(request[:body]))
       Excon.stubs.pop
       {status: 200, headers: {'Content-Type' => 'application/json'},
-       body: MultiJson.dump(result)}
+       body: JSON.generate(result)}
     end
 
     schema = Heroics::Schema.new(SAMPLE_SCHEMA)
     output = StringIO.new
     cli = Heroics.cli_from_schema('cli', output, schema, 'https://example.com')
     cli.run('resource:update', uuid, body)
-    assert_equal(MultiJson.dump(result, pretty: true) + "\n", output.string)
+    assert_equal(JSON.pretty_generate(result) + "\n", output.string)
   end
 
   # cli_from_schema returns a CLI that can make requests to APIs mounted under
@@ -198,18 +198,18 @@ def test_client_from_schema_with_url_prefix
     Excon.stub(method: :patch) do |request|
       assert_equal("/api/resource/#{uuid}", request[:path])
       assert_equal('application/json', request[:headers]['Content-Type'])
-      assert_equal(body, MultiJson.load(request[:body]))
+      assert_equal(body, JSON.parse(request[:body]))
       Excon.stubs.pop
       {status: 200, headers: {'Content-Type' => 'application/json'},
-       body: MultiJson.dump(result)}
+       body: JSON.generate(result)}
     end
 
     schema = Heroics::Schema.new(SAMPLE_SCHEMA)
     output = StringIO.new
     cli = Heroics.cli_from_schema('cli', output, schema,
                                   'https://example.com/api')
     cli.run('resource:update', uuid, body)
-    assert_equal(MultiJson.dump(result, pretty: true) + "\n", output.string)
+    assert_equal(JSON.pretty_generate(result) + "\n", output.string)
   end
 
   # cli_from_schema optionally accepts custom headers to pass with every
@@ -223,7 +223,7 @@ def test_cli_from_schema_with_custom_headers
                    request[:headers]['Accept'])
       Excon.stubs.pop
       {status: 200, headers: {'Content-Type' => 'application/json'},
-       body: MultiJson.dump(result)}
+       body: JSON.generate(result)}
     end
 
     schema = Heroics::Schema.new(SAMPLE_SCHEMA)
@@ -232,6 +232,6 @@ def test_cli_from_schema_with_custom_headers
       'cli', output, schema, 'https://example.com',
       default_headers: {'Accept' => 'application/vnd.heroku+json; version=3'})
     cli.run('resource:update', uuid, body)
-    assert_equal(MultiJson.dump(result, pretty: true) + "\n", output.string)
+    assert_equal(JSON.pretty_generate(result) + "\n", output.string)
   end
 end