Merge pull request #738 from Shopify/uk-fix-string-encoding

Revert the removal of UTF-8 force encoding in JSON loading

Author: tenderlove

lib/spring/json.rb

@@ -13,6 +13,7 @@
 module Spring
   module JSON
     def self.load(string)
+      string = string.dup.force_encoding("utf-8") unless string.encoding == Encoding::UTF_8
       OkJson.decode(string)
     end
 

test/unit/json_test.rb

@@ -6,7 +6,12 @@ class JsonTest < ActiveSupport::TestCase
     assert_equal({"unicode_example"=>"©"}, Spring::JSON.load('{"unicode_example": "\u00A9"}'))
   end
 
+  test 'can decode binary strings with valid UTF8 characters' do
+    string = "{\"PS1\":\"\xEF\x90\x98 main \xEE\x9E\x91 v3.4.2\"}".b
+    assert_equal({"PS1"=>" main  v3.4.2"}, Spring::JSON.load(string))
+  end
+
   test 'can encode' do
     assert_equal('{}', Spring::JSON.dump({}))
-  end 
+  end
 end