Use new MultiJson API

simplecov-ruby · Apr 18, 2012 · b496fd3 · b496fd3 · nirvdrum · May 10, 2012
1 parent 44d8115
commit b496fd3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/simplecov/result_merger.rb b/lib/simplecov/result_merger.rb
@@ -15,7 +15,7 @@ def resultset_path
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       if stored_data
-        MultiJson.decode(stored_data)
+        MultiJson.load(stored_data)
       else
         {}
       end
@@ -71,7 +71,7 @@ def store_result(result)
         if defined? ::JSON
           f.puts JSON.pretty_generate(new_set)
         else
-          f.puts MultiJson.encode(new_set)
+          f.puts MultiJson.dump(new_set)
         end
       end
       true

diff --git a/simplecov.gemspec b/simplecov.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
   gem.summary     = gem.description
 
-  gem.add_dependency 'multi_json', '~> 1.0'
+  gem.add_dependency 'multi_json', '~> 1.3'
   gem.add_dependency 'simplecov-html', '~> 0.5.3'
   gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'capybara'