Merge pull request #697 from knarewski/stop-crashing-on-non-hash-json

Stop crashing on non-hash json

Author: andrehjr

lib/split/persistence/cookie_adapter.rb

@@ -70,7 +70,8 @@ def delete_cookie_header!(header, key, value)
         def hash
           @hash ||= if cookies = @cookies[:split.to_s]
             begin
-              JSON.parse(cookies)
+              parsed = JSON.parse(cookies)
+              parsed.is_a?(Hash) ? parsed : {}
             rescue JSON::ParserError
               {}
             end

spec/persistence/cookie_adapter_spec.rb

@@ -14,10 +14,24 @@
       end
 
       it "handles invalid JSON" do
-        context.request.cookies[:split] = {
-          value: '{"foo":2,',
-          expires: Time.now
-        }
+        context.request.cookies["split"] = "{\"foo\":2,"
+
+        expect(subject["my_key"]).to be_nil
+        subject["my_key"] = "my_value"
+        expect(subject["my_key"]).to eq("my_value")
+      end
+
+      it "ignores valid JSON of invalid type (integer)" do
+        context.request.cookies["split"] = "2"
+
+        expect(subject["my_key"]).to be_nil
+        subject["my_key"] = "my_value"
+        expect(subject["my_key"]).to eq("my_value")
+      end
+
+      it "ignores valid JSON of invalid type (array)" do
+        context.request.cookies["split"] = "[\"foo\", \"bar\"]"
+
         expect(subject["my_key"]).to be_nil
         subject["my_key"] = "my_value"
         expect(subject["my_key"]).to eq("my_value")