split 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 861fb73c59529de9a24f3a78ddd0b5cbe257eb8b
-  data.tar.gz: dd67eac616dd9435c3a0ca448de504b3824bccb8
+SHA256:
+  metadata.gz: ac2527f0dab7b1f6c2de3e21b02fd933eef302046e7cdd4b8f42da20a3cdf1ba
+  data.tar.gz: 6332eabde240b1c408ff434850b7ac520b3081bfd5fe76f7343259a8eae039b6
 SHA512:
-  metadata.gz: d078b157629b473b654b751c18fe11ddae08486f38bce2fef2bdd71b7a8536ce048204adaf9b1e242e6cf76f1c33650db91994e34a23734ecaf4357663b750cf
-  data.tar.gz: aa994978184569f624b9d5bb3503b93b498ef4601bb1989fe2e16eabee07a0450adc9555c02c251d70d9a73dce65e40bac0e05bf071dc8d229e4ab87c0b817ec
+  metadata.gz: 331863e4c78e8dabf7eb23551608be301cdd33d4c14186ab47def00485b028c05784f70009fd66d1b3e240963d1cd45b61d2233b651fd0bcbcb79e2871d2a6ad
+  data.tar.gz: 2c8723105824b9dfc315f88de450be5c18aa32d20e2253a25ca9fcbb6b65b082697c0782719198a2f7b401e66824597a50c3f97dece30a3c9ceccb3fcd62fa95

data/.travis.yml

@@ -5,12 +5,15 @@ rvm:
   - 2.1
   - 2.2.0
   - 2.2.2
-  - 2.4.2
+  - 2.4.3
+  - 2.5.1
 
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
+
 
 matrix:
   exclude:
@@ -30,6 +33,15 @@ matrix:
     gemfile: gemfiles/5.0.gemfile
   - rvm: 2.2.0
     gemfile: gemfiles/5.1.gemfile
+  - rvm: 1.9.3
+    gemfile: gemfiles/5.2.gemfile
+  - rvm: 2.0
+    gemfile: gemfiles/5.2.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/5.2.gemfile
+  - rvm: 2.2.0
+    gemfile: gemfiles/5.2.gemfile
+
 
 before_install:
   - gem update --system && gem install bundler

data/Appraisals

@@ -4,10 +4,12 @@ end
 
 appraise "5.0" do
   gem "rails", "~> 5.0"
-  gem "sinatra", git: "https://github.com/sinatra/sinatra"
 end
 
 appraise "5.1" do
   gem "rails", "~> 5.1"
-  gem "sinatra", git: "https://github.com/sinatra/sinatra"
+end
+
+appraise "5.2" do
+  gem "rails", "~> 5.2"
 end

data/README.md

@@ -5,6 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/splitrb/split/badges/gpa.svg)](https://codeclimate.com/github/splitrb/split)
 [![Test Coverage](https://codeclimate.com/github/splitrb/split/badges/coverage.svg)](https://codeclimate.com/github/splitrb/split/coverage)
 [![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
+[![Open Source Helpers](https://www.codetriage.com/splitrb/split/badges/users.svg)](https://www.codetriage.com/splitrb/split)
 
 > 📈 The Rack Based A/B testing framework http://libraries.io/rubygems/split
 
@@ -388,7 +389,7 @@ run Rack::URLMap.new \
   "/split" => Split::Dashboard.new
 ```
 
-However, if you are using Rails 3: You can mount this inside your app routes by first adding this to the Gemfile:
+However, if you are using Rails 3 or higher: You can mount this inside your app routes by first adding this to the Gemfile:
 
 ```ruby
 gem 'split', require: 'split/dashboard'
@@ -475,7 +476,7 @@ Split.configure do |config|
   # IP config
   config.ignore_ip_addresses << '81.19.48.130' # or regex: /81\.19\.48\.[0-9]+/
 
-  # or provide your own filter functionality, the default is proc{ |request| is_robot? || is_ignored_ip_address? }
+  # or provide your own filter functionality, the default is proc{ |request| is_robot? || is_ignored_ip_address? || is_preview? }
   config.ignore_filter = -> (request) { CustomExcludeLogic.excludes?(request) }
 end
 ```
@@ -662,8 +663,8 @@ Once you finish one of the goals, the test is considered to be completed, and fi
 **Bad Example**: Test both how button color affects signup *and* how it affects login, at the same time. THIS WILL NOT WORK.
 
 #### Combined Experiments
-If you want to test how how button color affects signup *and* how it affects login, at the same time. Use combined tests
-Configure like so
+If you want to test how button color affects signup *and* how it affects login at the same time, use combined experiments.
+Configure like so:
 ```ruby
   Split.configuration.experiments = {
         :button_color_experiment => {
@@ -934,4 +935,4 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 
 ## Copyright
 
-[MIT License](LICENSE) © 2017 [Andrew Nesbitt](https://github.com/andrew).
+[MIT License](LICENSE) © 2018 [Andrew Nesbitt](https://github.com/andrew).

data/gemfiles/5.0.gemfile

@@ -5,6 +5,5 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "codeclimate-test-reporter"
 gem "rails", "~> 5.0"
-gem "sinatra", git: "https://github.com/sinatra/sinatra"
 
 gemspec path: "../"

data/gemfiles/5.1.gemfile

@@ -5,6 +5,5 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "codeclimate-test-reporter"
 gem "rails", "~> 5.1"
-gem "sinatra", git: "https://github.com/sinatra/sinatra"
 
 gemspec path: "../"

data/gemfiles/5.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "codeclimate-test-reporter"
+gem "rails", "~> 5.2"
+
+gemspec path: "../"

data/lib/split/configuration.rb

@@ -74,6 +74,7 @@ module Split
         'bitlybot' => 'bit.ly bot',
         'bot@linkfluence.net' => 'Linkfluence bot',
         'facebookexternalhit' => 'facebook bot',
+        'Facebot' => 'Facebook crawler',
         'Feedfetcher-Google' => 'Google Feedfetcher',
         'https://developers.google.com/+/web/snippet' => 'Google+ Snippet Fetcher',
         'LinkedInBot' => 'LinkedIn bot',

data/lib/split/dashboard.rb

@@ -3,6 +3,7 @@ require 'sinatra/base'
 require 'split'
 require 'bigdecimal'
 require 'split/dashboard/helpers'
+require 'split/dashboard/pagination_helpers'
 
 module Split
   class Dashboard < Sinatra::Base
@@ -14,6 +15,7 @@ module Split
     set :method_override, true
 
     helpers Split::DashboardHelpers
+    helpers Split::DashboardPaginationHelpers
 
     get '/' do
       # Display experiments without a winner at the top of the dashboard

data/lib/split/dashboard/pagination_helpers.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+require 'split/dashboard/paginator'
+
+module Split
+  module DashboardPaginationHelpers
+    DEFAULT_PER = 10
+
+    def pagination_per
+      @pagination_per ||= (params[:per] || DEFAULT_PER).to_i
+    end
+
+    def page_number
+      @page_number ||= (params[:page] || 1).to_i
+    end
+
+    def paginated(collection)
+      Split::DashboardPaginator.new(collection, page_number, pagination_per).paginate
+    end
+
+    def pagination(collection)
+      html = []
+      html << first_page_tag if show_first_page_tag?
+      html << ellipsis_tag if show_first_ellipsis_tag?
+      html << prev_page_tag if show_prev_page_tag?
+      html << current_page_tag
+      html << next_page_tag if show_next_page_tag?(collection)
+      html << ellipsis_tag if show_last_ellipsis_tag?(collection)
+      html << last_page_tagcollection if show_last_page_tag?(collection)
+      html.join
+    end
+
+    private
+
+    def show_first_page_tag?
+      page_number > 2
+    end
+
+    def first_page_tag
+      %Q(<a href="#{url.chop}?page=1&per=#{pagination_per}">1</a>)
+    end
+
+    def show_first_ellipsis_tag?
+      page_number >= 4
+    end
+
+    def ellipsis_tag
+      '<span>...</span>'
+    end
+
+    def show_prev_page_tag?
+      page_number > 1
+    end
+
+    def prev_page_tag
+      %Q(<a href="#{url.chop}?page=#{page_number - 1}&per=#{pagination_per}">#{page_number - 1}</a>)
+    end
+
+    def current_page_tag
+      "<span><b>#{page_number}</b></span>"
+    end
+
+    def show_next_page_tag?(collection)
+      (page_number * pagination_per) < collection.count
+    end
+
+    def next_page_tag
+      %Q(<a href="#{url.chop}?page=#{page_number + 1}&per=#{pagination_per}">#{page_number + 1}</a>)
+    end
+
+    def show_last_ellipsis_tag?(collection)
+      (total_pages(collection) - page_number) >= 3
+    end
+
+    def total_pages(collection)
+      collection.count / pagination_per + ((collection.count % pagination_per).zero? ? 0 : 1)
+    end
+
+    def show_last_page_tag?(collection)
+      page_number < (total_pages(collection) - 1)
+    end
+
+    def last_page_tag(collection)
+      total = total_pages(collection)
+      %Q(<a href="#{url.chop}?page=#{total}&per=#{pagination_per}">#{total}</a>)
+    end
+  end
+end

data/lib/split/dashboard/paginator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Split
+  class DashboardPaginator
+    def initialize(collection, page_number, per)
+      @collection = collection
+      @page_number = page_number
+      @per = per
+    end
+
+    def paginate
+      to = @page_number * @per
+      from = to - @per
+      @collection[from...to]
+    end
+  end
+end

data/lib/split/dashboard/public/style.css

@@ -317,3 +317,12 @@ a.button.green:focus, button.green:focus, input[type="submit"].green:focus {
 }
 
 
+.pagination {
+  text-align: center;
+  font-size: 15px;
+}
+
+.pagination a, .paginaton span {
+  display: inline-block;
+  padding: 5px;
+}

data/lib/split/dashboard/views/index.erb

@@ -6,7 +6,7 @@
   <input type="button" id="toggle-active" value="Hide active" />
   <input type="button" id="clear-filter" value="Clear filters" />
 
-  <% @experiments.each do |experiment| %>
+  <% paginated(@experiments).each do |experiment| %>
     <% if experiment.goals.empty? %>
       <%= erb :_experiment, :locals => {:goal => nil, :experiment => experiment} %>
     <% else %>
@@ -16,6 +16,10 @@
       <% end %>
     <% end %>
   <% end %>
+
+  <div class="pagination">
+    <%= pagination(@experiments) %>
+  </div>
 <% else %>
   <p class="intro">No experiments have started yet, you need to define them in your code and introduce them to your users.</p>
   <p class="intro">Check out the <a href='https://github.com/splitrb/split#readme'>Readme</a> for more help getting started.</p>

data/lib/split/helper.rb

@@ -122,13 +122,17 @@ module Split
     end
 
     def exclude_visitor?
-      instance_eval(&Split.configuration.ignore_filter) || is_ignored_ip_address? || is_robot?
+      instance_exec(request, &Split.configuration.ignore_filter) || is_ignored_ip_address? || is_robot? || is_preview?
     end
 
     def is_robot?
       defined?(request) && request.user_agent =~ Split.configuration.robot_regex
     end
 
+    def is_preview?
+      defined?(request) && defined?(request.headers) && request.headers['x-purpose'] == 'preview'
+    end
+
     def is_ignored_ip_address?
       return false if Split.configuration.ignore_ip_addresses.empty?
 

data/lib/split/persistence/cookie_adapter.rb

@@ -6,6 +6,7 @@ module Split
     class CookieAdapter
 
       def initialize(context)
+        @context = context
         @request, @response = context.request, context.response
         @cookies = @request.cookies
         @expires = Time.now + cookie_length_config
@@ -30,13 +31,43 @@ module Split
       private
 
       def set_cookie(value = {})
-        @response.set_cookie :split.to_s, default_options.merge(value: JSON.generate(value))
+        cookie_key = :split.to_s
+        cookie_value = default_options.merge(value: JSON.generate(value))
+        if action_dispatch?
+          # The "send" is necessary when we call ab_test from the controller
+          # and thus @context is a rails controller, because then "cookies" is
+          # a private method.
+          @context.send(:cookies)[cookie_key] = cookie_value
+        else
+          set_cookie_via_rack(cookie_key, cookie_value)
+        end
       end
 
       def default_options
         { expires: @expires, path: '/' }
       end
 
+      def set_cookie_via_rack(key, value)
+        delete_cookie_header!(@response.header, key, value)
+        Rack::Utils.set_cookie_header!(@response.header, key, value)
+      end
+
+      # Use Rack::Utils#make_delete_cookie_header after Rack 2.0.0
+      def delete_cookie_header!(header, key, value)
+        cookie_header = header['Set-Cookie']
+        case cookie_header
+        when nil, ''
+          cookies = []
+        when String
+          cookies = cookie_header.split("\n")
+        when Array
+          cookies = cookie_header
+        end
+
+        cookies.reject! { |cookie| cookie =~ /\A#{Rack::Utils.escape(key)}=/ }
+        header['Set-Cookie'] = cookies.join("\n")
+      end
+
       def hash
         @hash ||= begin
           if cookies = @cookies[:split.to_s]
@@ -55,6 +86,9 @@ module Split
         Split.configuration.persistence_cookie_length
       end
 
+      def action_dispatch?
+        defined?(Rails) && @response.is_a?(ActionDispatch::Response)
+      end
     end
   end
 end

data/lib/split/redis_interface.rb

@@ -35,9 +35,7 @@ module Split
     end
 
     def make_list_length(list_name, new_length)
-      while list_length(list_name) > new_length
-        remove_last_item_from_list(list_name)
-      end
+      redis.ltrim(list_name, 0, new_length - 1)
     end
 
     def add_to_set(set_name, value)

data/lib/split/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Split
   MAJOR   = 3
-  MINOR   = 2
+  MINOR   = 3
   PATCH   = 0
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/spec/dashboard/pagination_helpers_spec.rb

@@ -0,0 +1,198 @@
+require 'spec_helper'
+require 'split/dashboard/pagination_helpers'
+
+describe Split::DashboardPaginationHelpers do
+  include Split::DashboardPaginationHelpers
+
+  let(:url) { '/split/' }
+
+  describe '#pagination_per' do
+    context 'when params empty' do
+      let(:params) { Hash[] }
+
+      it 'returns 10' do
+        expect(pagination_per).to eql 10
+      end
+    end
+
+    context 'when params[:per] is 5' do
+      let(:params) { Hash[per: 5] }
+
+      it 'returns 5' do
+        expect(pagination_per).to eql 5
+      end
+    end
+  end
+
+  describe '#page_number' do
+    context 'when params empty' do
+      let(:params) { Hash[] }
+
+      it 'returns 1' do
+        expect(page_number).to eql 1
+      end
+    end
+
+    context 'when params[:page] is "2"' do
+      let(:params) { Hash[page: '2'] }
+
+      it 'returns 2' do
+        expect(page_number).to eql 2
+      end
+    end
+  end
+
+  describe '#paginated' do
+    let(:collection) { (1..20).to_a }
+    let(:params) { Hash[per: '5', page: '3'] }
+
+    it { expect(paginated(collection)).to eql [11, 12, 13, 14, 15] }
+  end
+
+  describe '#show_first_page_tag?' do
+    context 'when page is 1' do
+      it { expect(show_first_page_tag?).to be false }
+    end
+
+    context 'when page is 3' do
+      let(:params) { Hash[page: '3'] }
+      it { expect(show_first_page_tag?).to be true }
+    end
+  end
+
+  describe '#first_page_tag' do
+    it { expect(first_page_tag).to eql '<a href="/split?page=1&per=10">1</a>' }
+  end
+
+  describe '#show_first_ellipsis_tag?' do
+    context 'when page is 1' do
+      it { expect(show_first_ellipsis_tag?).to be false }
+    end
+
+    context 'when page is 4' do
+      let(:params) { Hash[page: '4'] }
+      it { expect(show_first_ellipsis_tag?).to be true }
+    end
+  end
+
+  describe '#ellipsis_tag' do
+    it { expect(ellipsis_tag).to eql '<span>...</span>' }
+  end
+
+  describe '#show_prev_page_tag?' do
+    context 'when page is 1' do
+      it { expect(show_prev_page_tag?).to be false }
+    end
+
+    context 'when page is 2' do
+      let(:params) { Hash[page: '2'] }
+      it { expect(show_prev_page_tag?).to be true }
+    end
+  end
+
+  describe '#prev_page_tag' do
+    context 'when page is 2' do
+      let(:params) { Hash[page: '2'] }
+
+      it do
+        expect(prev_page_tag).to eql '<a href="/split?page=1&per=10">1</a>'
+      end
+    end
+
+    context 'when page is 3' do
+      let(:params) { Hash[page: '3'] }
+
+      it do
+        expect(prev_page_tag).to eql '<a href="/split?page=2&per=10">2</a>'
+      end
+    end
+  end
+
+  describe '#show_prev_page_tag?' do
+    context 'when page is 1' do
+      it { expect(show_prev_page_tag?).to be false }
+    end
+
+    context 'when page is 2' do
+      let(:params) { Hash[page: '2'] }
+      it { expect(show_prev_page_tag?).to be true }
+    end
+  end
+
+  describe '#current_page_tag' do
+    context 'when page is 1' do
+      let(:params) { Hash[page: '1'] }
+      it { expect(current_page_tag).to eql '<span><b>1</b></span>' }
+    end
+
+    context 'when page is 2' do
+      let(:params) { Hash[page: '2'] }
+      it { expect(current_page_tag).to eql '<span><b>2</b></span>' }
+    end
+  end
+
+  describe '#show_next_page_tag?' do
+    context 'when page is 2' do
+      let(:params) { Hash[page: '2'] }
+
+      context 'when collection length is 20' do
+        let(:collection) { (1..20).to_a }
+        it { expect(show_next_page_tag?(collection)).to be false }
+      end
+
+      context 'when collection length is 25' do
+        let(:collection) { (1..25).to_a }
+        it { expect(show_next_page_tag?(collection)).to be true }
+      end
+    end
+  end
+
+  describe '#next_page_tag' do
+    context 'when page is 1' do
+      let(:params) { Hash[page: '1'] }
+      it { expect(next_page_tag).to eql '<a href="/split?page=2&per=10">2</a>' }
+    end
+
+    context 'when page is 2' do
+      let(:params) { Hash[page: '2'] }
+      it { expect(next_page_tag).to eql '<a href="/split?page=3&per=10">3</a>' }
+    end
+  end
+
+  describe '#total_pages' do
+    context 'when collection length is 30' do
+      let(:collection) { (1..30).to_a }
+      it { expect(total_pages(collection)).to eql 3 }
+    end
+
+    context 'when collection length is 35' do
+      let(:collection) { (1..35).to_a }
+      it { expect(total_pages(collection)).to eql 4 }
+    end
+  end
+
+  describe '#show_last_ellipsis_tag?' do
+    let(:collection) { (1..30).to_a }
+    let(:params) { Hash[per: '5', page: '2'] }
+    it { expect(show_last_ellipsis_tag?(collection)).to be true }
+  end
+
+  describe '#show_last_page_tag?' do
+    let(:collection) { (1..30).to_a }
+
+    context 'when page is 5/6' do
+      let(:params) { Hash[per: '5', page: '5'] }
+      it { expect(show_last_page_tag?(collection)).to be false }
+    end
+
+    context 'when page is 4/6' do
+      let(:params) { Hash[per: '5', page: '4'] }
+      it { expect(show_last_page_tag?(collection)).to be true }
+    end
+  end
+
+  describe '#last_page_tag' do
+    let(:collection) { (1..30).to_a }
+    it { expect(last_page_tag(collection)).to eql '<a href="/split?page=3&per=10">3</a>' }
+  end
+end

data/spec/dashboard/paginator_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'split/dashboard/paginator'
+
+describe Split::DashboardPaginator do
+  context 'when collection is 1..20' do
+    let(:collection) { (1..20).to_a }
+
+    context 'when per 5 for page' do
+      let(:per) { 5 }
+
+      it 'when page number is 1 result is [1, 2, 3, 4, 5]' do
+        result = Split::DashboardPaginator.new(collection, 1, per).paginate
+        expect(result).to eql [1, 2, 3, 4, 5]
+      end
+
+      it 'when page number is 2 result is [6, 7, 8, 9, 10]' do
+        result = Split::DashboardPaginator.new(collection, 2, per).paginate
+        expect(result).to eql [6, 7, 8, 9, 10]
+      end
+    end
+
+    context 'when per 10 for page' do
+      let(:per) { 10 }
+
+      it 'when page number is 1 result is [1..10]' do
+        result = Split::DashboardPaginator.new(collection, 1, per).paginate
+        expect(result).to eql [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+      end
+
+      it 'when page number is 2 result is [10..20]' do
+        result = Split::DashboardPaginator.new(collection, 2, per).paginate
+        expect(result).to eql [11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+      end
+    end
+  end
+end

data/spec/helper_spec.rb

@@ -699,6 +699,14 @@ describe Split::Helper do
     end
   end
 
+  describe 'when user is previewing' do
+    before(:each) do
+      @request = OpenStruct.new(headers: { 'x-purpose' => 'preview' })
+    end
+
+    it_behaves_like "a disabled test"
+  end
+
   describe 'versioned experiments' do
     it "should use version zero if no version is present" do
       alternative_name = ab_test('link_color', 'blue', 'red')

data/spec/persistence/cookie_adapter_spec.rb

@@ -3,41 +3,104 @@ require "spec_helper"
 require 'rack/test'
 
 describe Split::Persistence::CookieAdapter do
+  subject { described_class.new(context) }
 
-  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) }
+  shared_examples "sets cookies correctly" do
+    describe "#[] and #[]=" do
+      it "set and return the value for given key" do
+        subject["my_key"] = "my_value"
+        expect(subject["my_key"]).to eq("my_value")
+      end
 
-  describe "#[] and #[]=" do
-    it "should set and return the value for given key" do
-      subject["my_key"] = "my_value"
-      expect(subject["my_key"]).to eq("my_value")
+      it "handles invalid JSON" do
+        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")
+      end
     end
-  end
 
-  describe "#delete" do
-    it "should delete the given key" do
-      subject["my_key"] = "my_value"
-      subject.delete("my_key")
-      expect(subject["my_key"]).to be_nil
+    describe "#delete" do
+      it "should delete the given key" do
+        subject["my_key"] = "my_value"
+        subject.delete("my_key")
+        expect(subject["my_key"]).to be_nil
+      end
     end
-  end
 
-  describe "#keys" do
-    it "should return an array of the session's stored keys" do
-      subject["my_key"] = "my_value"
-      subject["my_second_key"] = "my_second_value"
-      expect(subject.keys).to match(["my_key", "my_second_key"])
+    describe "#keys" do
+      it "should return an array of the session's stored keys" do
+        subject["my_key"] = "my_value"
+        subject["my_second_key"] = "my_second_value"
+        expect(subject.keys).to match(["my_key", "my_second_key"])
+      end
     end
   end
 
-  it "handles invalid JSON" do
-    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")
+
+  context "when using Rack" do
+    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, cookies: CookiesMock.new) }
+
+    include_examples "sets cookies correctly"
+
+    it "puts multiple experiments in a single cookie" do
+      subject["foo"] = "FOO"
+      subject["bar"] = "BAR"
+      expect(context.response.headers["Set-Cookie"]).to match(/\Asplit=%7B%22foo%22%3A%22FOO%22%2C%22bar%22%3A%22BAR%22%7D; path=\/; expires=[a-zA-Z]{3}, \d{2} [a-zA-Z]{3} \d{4} \d{2}:\d{2}:\d{2} -0000\Z/)
+    end
+
+    it "ensure other added cookies are not overriden" do
+      context.response.set_cookie 'dummy', 'wow'
+      subject["foo"] = "FOO"
+      expect(context.response.headers["Set-Cookie"]).to include("dummy=wow")
+      expect(context.response.headers["Set-Cookie"]).to include("split=")
+    end
   end
 
+  context "when @context is an ActionController::Base" do
+    before :context do
+      require "rails"
+      require "action_controller/railtie"
+    end
+
+    let(:context) do
+      controller = controller_class.new
+      if controller.respond_to?(:set_request!)
+        controller.set_request!(ActionDispatch::Request.new({}))
+      else # Before rails 5.0
+        controller.send(:"request=", ActionDispatch::Request.new({}))
+      end
+
+      response = ActionDispatch::Response.new(200, {}, '').tap do |res|
+        res.request = controller.request
+      end
+
+      if controller.respond_to?(:set_response!)
+        controller.set_response!(response)
+      else # Before rails 5.0
+        controller.send(:set_response!, response)
+      end
+      controller
+    end
+
+    let(:controller_class) { Class.new(ActionController::Base) }
+
+    include_examples "sets cookies correctly"
+
+    it "puts multiple experiments in a single cookie" do
+      subject["foo"] = "FOO"
+      subject["bar"] = "BAR"
+      expect(subject.keys).to eq(["foo", "bar"])
+      expect(subject["foo"]).to eq("FOO")
+      expect(subject["bar"]).to eq("BAR")
+      cookie_jar = context.request.env["action_dispatch.cookies"]
+      expect(cookie_jar['split']).to eq("{\"foo\":\"FOO\",\"bar\":\"BAR\"}")
+    end
+  end
 end

data/spec/split_spec.rb

@@ -15,19 +15,19 @@ RSpec.describe Split do
       Split.redis = 'redis://localhost:6379'
       expect(Split.redis).to be_a(Redis)
 
-      client = Split.redis.client
-      expect(client.host).to eq("localhost")
-      expect(client.port).to eq(6379)
+      client = Split.redis.connection
+      expect(client[:host]).to eq("localhost")
+      expect(client[:port]).to eq(6379)
     end
 
     it 'accepts an options hash' do
       Split.redis = {host: 'localhost', port: 6379, db: 12}
       expect(Split.redis).to be_a(Redis)
 
-      client = Split.redis.client
-      expect(client.host).to eq("localhost")
-      expect(client.port).to eq(6379)
-      expect(client.db).to eq(12)
+      client = Split.redis.connection
+      expect(client[:host]).to eq("localhost")
+      expect(client[:port]).to eq(6379)
+      expect(client[:db]).to eq(12)
     end
 
     it 'accepts a valid Redis instance' do

data/split.gemspec

@@ -35,10 +35,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'simple-random',   '>= 0.9.3'
 
   s.add_development_dependency 'bundler',     '~> 1.14'
-  s.add_development_dependency 'simplecov',   '~> 0.12'
+  s.add_development_dependency 'simplecov',   '~> 0.15'
   s.add_development_dependency 'rack-test',   '~> 0.6'
   s.add_development_dependency 'rake',        '~> 12'
-  s.add_development_dependency 'rspec',       '~> 3.4'
+  s.add_development_dependency 'rspec',       '~> 3.7'
   s.add_development_dependency 'pry',         '~> 0.10'
-  s.add_development_dependency 'fakeredis',   '~> 0.6.0'
+  s.add_development_dependency 'fakeredis',   '~> 0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: split
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
 description: 
 email:
 - andrewnez@gmail.com
@@ -175,6 +175,7 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - lib/split.rb
 - lib/split/algorithms/block_randomization.rb
 - lib/split/algorithms/weighted_sample.rb
@@ -184,6 +185,8 @@ files:
 - lib/split/configuration.rb
 - lib/split/dashboard.rb
 - lib/split/dashboard/helpers.rb
+- lib/split/dashboard/pagination_helpers.rb
+- lib/split/dashboard/paginator.rb
 - lib/split/dashboard/public/dashboard-filtering.js
 - lib/split/dashboard/public/dashboard.js
 - lib/split/dashboard/public/jquery-1.11.1.min.js
@@ -219,6 +222,8 @@ files:
 - spec/alternative_spec.rb
 - spec/combined_experiments_helper_spec.rb
 - spec/configuration_spec.rb
+- spec/dashboard/pagination_helpers_spec.rb
+- spec/dashboard/paginator_spec.rb
 - spec/dashboard_helpers_spec.rb
 - spec/dashboard_spec.rb
 - spec/encapsulated_helper_spec.rb
@@ -265,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: split
-rubygems_version: 2.6.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Rack based split testing framework
@@ -276,6 +281,8 @@ test_files:
 - spec/alternative_spec.rb
 - spec/combined_experiments_helper_spec.rb
 - spec/configuration_spec.rb
+- spec/dashboard/pagination_helpers_spec.rb
+- spec/dashboard/paginator_spec.rb
 - spec/dashboard_helpers_spec.rb
 - spec/dashboard_spec.rb
 - spec/encapsulated_helper_spec.rb