Rewrite CookieAdapter to work with Rack::Request and Rack::Response directly (#490)

Author: andrehjr

lib/split/persistence/cookie_adapter.rb

@@ -6,20 +6,21 @@ module Persistence
     class CookieAdapter
 
       def initialize(context)
-        @cookies = context.send(:cookies)
+        @request, @response = context.request, context.response
+        @cookies = @request.cookies
         @expires = Time.now + cookie_length_config
       end
 
       def [](key)
-        hash[key]
+        hash[key.to_s]
       end
 
       def []=(key, value)
-        set_cookie(hash.merge(key => value))
+        set_cookie(hash.merge!(key.to_s => value))
       end
 
       def delete(key)
-        set_cookie(hash.tap { |h| h.delete(key) })
+        set_cookie(hash.tap { |h| h.delete(key.to_s) })
       end
 
       def keys
@@ -28,22 +29,25 @@ def keys
 
       private
 
-      def set_cookie(value)
-        @cookies[:split] = {
-          :value => JSON.generate(value),
-          :expires => @expires
-        }
+      def set_cookie(value = {})
+        @response.set_cookie :split.to_s, default_options.merge(value: JSON.generate(value))
+      end
+
+      def default_options
+        { expires: @expires, path: '/' }
       end
 
       def hash
-        if @cookies[:split]
-          begin
-            JSON.parse(@cookies[:split])
-          rescue JSON::ParserError
+        @hash ||= begin
+          if cookies = @cookies[:split.to_s]
+            begin
+              JSON.parse(cookies)
+            rescue JSON::ParserError
+              {}
+            end
+          else
             {}
           end
-        else
-          {}
         end
       end
 

spec/persistence/cookie_adapter_spec.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 require "spec_helper"
+require 'rack/test'
 
 describe Split::Persistence::CookieAdapter do
 
-  let(:context) { double(:cookies => CookiesMock.new) }
+  let(:env) { Rack::MockRequest.env_for("http://example.com:8080/") }
+  let(:request) { Rack::Request.new(env) }
+  let(:response) { Rack::MockResponse.new(200, {}, "") }
+  let(:context) { double(request: request, response: response) }
   subject { Split::Persistence::CookieAdapter.new(context) }
 
   describe "#[] and #[]=" do
@@ -30,7 +34,7 @@
   end
 
   it "handles invalid JSON" do
-    context.cookies[:split] = { :value => '{"foo":2,', :expires => Time.now }
+    context.request.cookies[:split] = { :value => '{"foo":2,', :expires => Time.now }
     expect(subject["my_key"]).to be_nil
     subject["my_key"] = "my_value"
     expect(subject["my_key"]).to eq("my_value")