Use standard library for JSON parsing/serialization

spohlenz · May 4, 2015 · b8e7811 · b8e7811
1 parent e619b39
commit b8e7811
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/tinymce/rails/asset_manifest.rb b/lib/tinymce/rails/asset_manifest.rb
@@ -1,5 +1,3 @@
-require "multi_json"
-
 module TinyMCE
   module Rails
     class AssetManifest
@@ -81,7 +79,7 @@ def self.try(manifest_path)
 
       def initialize(file)
         @file = file
-        @manifest = MultiJson.load(File.read(file))
+        @manifest = JSON.parse(File.read(file))
       end
 
       def append(logical_path, file)
@@ -120,7 +118,7 @@ def files
       end
 
       def dump
-        MultiJson.dump(@manifest)
+        JSON.generate(@manifest)
       end
 
       def write

diff --git a/spec/lib/asset_manifest_spec.rb b/spec/lib/asset_manifest_spec.rb
@@ -1,5 +1,4 @@
 require "tinymce/rails/asset_manifest"
-require "multi_json"
 
 module TinyMCE
   module Rails
@@ -94,7 +93,7 @@ def reload_manifest(manifest)
         subject(:manifest) { JsonManifest.new(fixture("json_manifest/manifest-18802ea98f713a419dac90694dd5b6c4.json")) }
 
         def reload_manifest(manifest)
-          MultiJson.load(manifest.to_s)
+          JSON.parse(manifest.to_s)
         end
 
         it "keeps existing manifest data" do