Drop multi_json in favor of vanilla json, closes #1105

carrierwaveuploader · May 30, 2013 · 3d9f2cb · 3d9f2cb
1 parent e9b33e9
commit 3d9f2cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/carrierwave.gemspec b/carrierwave.gemspec
@@ -25,12 +25,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", ">= 3.2.0"
   s.add_dependency "activemodel", ">= 3.2.0"
-  s.add_dependency "multi_json", "~> 1"
+  s.add_dependency "json", ">= 1.7"
 
   s.add_development_dependency "mysql2"
   s.add_development_dependency "rails", ">= 3.2.0"
   s.add_development_dependency "cucumber", "~> 1.1.4"
-  s.add_development_dependency "json"
   s.add_development_dependency "rspec", "~> 2.13.0"
   s.add_development_dependency "sham_rack"
   s.add_development_dependency "timecop"

diff --git a/lib/carrierwave/uploader/serialization.rb b/lib/carrierwave/uploader/serialization.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require "multi_json"
+require "json"
 require "active_support/core_ext/hash"
 
 module CarrierWave
@@ -17,7 +17,7 @@ def as_json(options=nil)
       end
 
       def to_json(options=nil)
-        MultiJson.encode(as_json)
+        JSON.generate(as_json)
       end
 
       def to_xml(options={})