diff --git a/berkshelf-api.gemspec b/berkshelf-api.gemspec index 8e00bd5c..fa315ba0 100644 --- a/berkshelf-api.gemspec +++ b/berkshelf-api.gemspec @@ -23,8 +23,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'celluloid', '~> 0.14.0' spec.add_dependency 'reel', '= 0.4.0.pre' spec.add_dependency 'grape', '>= 0.3.2' - spec.add_dependency 'multi_json', '>= 1.0.4' - spec.add_dependency 'json', '~> 1.7.7' spec.add_dependency 'hashie', '>= 2.0.4' spec.add_dependency 'faraday' spec.add_dependency 'faraday_middleware' diff --git a/lib/berkshelf/api.rb b/lib/berkshelf/api.rb index 72f7e627..1743f746 100644 --- a/lib/berkshelf/api.rb +++ b/lib/berkshelf/api.rb @@ -1,9 +1,9 @@ require 'grape' require 'celluloid' -require 'multi_json' require 'hashie' require 'faraday' require 'faraday_middleware' +require 'json' require 'zlib' require 'rubygems/package' require 'ridley' diff --git a/lib/berkshelf/api/dependency_cache.rb b/lib/berkshelf/api/dependency_cache.rb index 899fb915..74dc2f2a 100644 --- a/lib/berkshelf/api/dependency_cache.rb +++ b/lib/berkshelf/api/dependency_cache.rb @@ -23,11 +23,11 @@ class << self # # @return [DependencyCache] def from_file(filepath) - contents = MultiJson.decode(File.read(filepath.to_s)) + contents = JSON.parse(File.read(filepath.to_s)) new(contents) rescue Errno::ENOENT => ex raise Berkshelf::SaveNotFoundError.new(ex) - rescue MultiJson::LoadError => ex + rescue JSON::ParserError => ex raise Berkshelf::InvalidSaveError.new(ex) end end @@ -52,7 +52,7 @@ def to_hash # @return [String] def to_json(options = {}) - MultiJson.encode(to_hash, options) + JSON.generate(to_hash, options) end # @return [Array] diff --git a/lib/berkshelf/api/endpoint/v1.rb b/lib/berkshelf/api/endpoint/v1.rb index a01dd792..e2cfda3e 100644 --- a/lib/berkshelf/api/endpoint/v1.rb +++ b/lib/berkshelf/api/endpoint/v1.rb @@ -6,7 +6,7 @@ class V1 < Endpoint::Base format :json rescue_from Grape::Exceptions::Validation do |e| - body = MultiJson.encode(status: e.status, message: e.message, param: e.param) + body = JSON.generate({status: e.status, message: e.message, param: e.param}) rack_response(body, e.status, "Content-type" => "application/json") end diff --git a/spec/unit/berkshelf/api/dependency_cache_spec.rb b/spec/unit/berkshelf/api/dependency_cache_spec.rb index 7c0feba7..0a19b0b7 100644 --- a/spec/unit/berkshelf/api/dependency_cache_spec.rb +++ b/spec/unit/berkshelf/api/dependency_cache_spec.rb @@ -11,7 +11,7 @@ context "when the file contains valid json" do before do - @tempfile.write(MultiJson.encode(brooke: "winsor")) + @tempfile.write(JSON.generate({brooke: "winsor"})) @tempfile.flush end @@ -43,14 +43,14 @@ end let(:chicken) do - { "1.0" => + { "1.0" => { :dependencies => { "tuna" => "= 3.0.0" }, :platforms => { "centos" => ">= 0.0.0" } } } end let(:tuna) do - { "3.0.0" => + { "3.0.0" => { :dependencies => { }, :platforms => { "centos" => ">= 0.0.0" } }