From bfae063af849e9aa81eb4c980217dce2a5802918 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Fri, 27 Oct 2017 13:06:21 -0400 Subject: [PATCH] Drop MultiJson dependency --- .rubocop_todo.yml | 2 +- CHANGELOG.md | 2 +- grape-roar.gemspec | 1 - lib/grape/roar/formatter.rb | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c9c035c..93e86c9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -10,7 +10,7 @@ # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Metrics/LineLength: - Max: 108 + Max: 110 # Offense count: 14 Style/Documentation: diff --git a/CHANGELOG.md b/CHANGELOG.md index d4a95bf..e801247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ Next ---- +* [#24](https://github.com/ruby-grape/grape-roar/pull/24): Drop the `multi_json` dependency. * Your contribution here. - 0.4.1 (07/14/2017) ---- diff --git a/grape-roar.gemspec b/grape-roar.gemspec index ce8b357..87b32b5 100644 --- a/grape-roar.gemspec +++ b/grape-roar.gemspec @@ -19,7 +19,6 @@ Gem::Specification.new do |gem| gem.version = Grape::Roar::VERSION gem.add_dependency 'grape' - gem.add_dependency 'multi_json' gem.add_dependency 'roar', '~> 1.1.0' gem.required_ruby_version = '>= 2.1.0' end diff --git a/lib/grape/roar/formatter.rb b/lib/grape/roar/formatter.rb index 5abeebc..e082307 100644 --- a/lib/grape/roar/formatter.rb +++ b/lib/grape/roar/formatter.rb @@ -5,7 +5,7 @@ module Formatter module Roar class << self def call(object, env) - object.respond_to?(:to_json) ? object.to_json(user_options: { env: env }) : MultiJson.dump(object) + object.respond_to?(:to_json) ? object.to_json(user_options: { env: env }) : Grape::Json.dump(object) end end end