split 0.7.2 → 0.7.3

data/spec/metric_spec.rb

@@ -5,7 +5,7 @@ describe Split::Metric do
   describe 'possible experiments' do
     it "should load the experiment if there is one, but no metric" do
       experiment = Split::Experiment.find_or_create('color', 'red', 'blue')
-      Split::Metric.possible_experiments('color').should == [experiment]
+      expect(Split::Metric.possible_experiments('color')).to eq([experiment])
     end
 
     it "should load the experiments in a metric" do
@@ -14,7 +14,7 @@ describe Split::Metric do
 
       metric = Split::Metric.new(:name => 'purchase', :experiments => [experiment1, experiment2])
       metric.save
-      Split::Metric.possible_experiments('purchase').should include(experiment1, experiment2)
+      expect(Split::Metric.possible_experiments('purchase')).to include(experiment1, experiment2)
     end
 
     it "should load both the metric experiments and an experiment with the same name" do
@@ -23,7 +23,7 @@ describe Split::Metric do
 
       metric = Split::Metric.new(:name => 'purchase', :experiments => [experiment2])
       metric.save
-      Split::Metric.possible_experiments('purchase').should include(experiment1, experiment2)
+      expect(Split::Metric.possible_experiments('purchase')).to include(experiment1, experiment2)
     end
   end
 

data/spec/persistence/cookie_adapter_spec.rb

@@ -8,7 +8,7 @@ describe Split::Persistence::CookieAdapter do
   describe "#[] and #[]=" do
     it "should set and return the value for given key" do
       subject["my_key"] = "my_value"
-      subject["my_key"].should eq("my_value")
+      expect(subject["my_key"]).to eq("my_value")
     end
   end
 
@@ -16,7 +16,7 @@ describe Split::Persistence::CookieAdapter do
     it "should delete the given key" do
       subject["my_key"] = "my_value"
       subject.delete("my_key")
-      subject["my_key"].should be_nil
+      expect(subject["my_key"]).to be_nil
     end
   end
 
@@ -24,15 +24,15 @@ describe Split::Persistence::CookieAdapter 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"
-      subject.keys.should =~ ["my_key", "my_second_key"]
+      expect(subject.keys).to match(["my_key", "my_second_key"])
     end
   end
 
   it "handles invalid JSON" do
     context.cookies[:split] = { :value => '{"foo":2,', :expires => Time.now }
-    subject["my_key"].should be_nil
+    expect(subject["my_key"]).to be_nil
     subject["my_key"] = "my_value"
-    subject["my_key"].should eq("my_value")
+    expect(subject["my_key"]).to eq("my_value")
   end
 
 end

data/spec/persistence/redis_adapter_spec.rb

@@ -20,7 +20,7 @@ describe Split::Persistence::RedisAdapter do
       before { Split::Persistence::RedisAdapter.with_config(:lookup_by => proc{'block'}) }
 
       it 'should be "persistence:block"' do
-        subject.redis_key.should == 'persistence:block'
+        expect(subject.redis_key).to eq('persistence:block')
       end
     end
 
@@ -29,7 +29,7 @@ describe Split::Persistence::RedisAdapter do
       let(:context) { double(:test => 'block') }
 
       it 'should be "persistence:block"' do
-        subject.redis_key.should == 'persistence:block'
+        expect(subject.redis_key).to eq('persistence:block')
       end
     end
 
@@ -38,7 +38,7 @@ describe Split::Persistence::RedisAdapter do
       let(:context) { double(:method_name => 'val') }
 
       it 'should be "persistence:bar"' do
-        subject.redis_key.should == 'persistence:val'
+        expect(subject.redis_key).to eq('persistence:val')
       end
     end
 
@@ -46,7 +46,7 @@ describe Split::Persistence::RedisAdapter do
       before { Split::Persistence::RedisAdapter.with_config(:lookup_by => proc{'frag'}, :namespace => 'namer') }
 
       it 'should be "namer"' do
-        subject.redis_key.should == 'namer:frag'
+        expect(subject.redis_key).to eq('namer:frag')
       end
     end
   end
@@ -57,7 +57,7 @@ describe Split::Persistence::RedisAdapter do
     describe "#[] and #[]=" do
       it "should set and return the value for given key" do
         subject["my_key"] = "my_value"
-        subject["my_key"].should eq("my_value")
+        expect(subject["my_key"]).to eq("my_value")
       end
     end
 
@@ -65,7 +65,7 @@ describe Split::Persistence::RedisAdapter do
       it "should delete the given key" do
         subject["my_key"] = "my_value"
         subject.delete("my_key")
-        subject["my_key"].should be_nil
+        expect(subject["my_key"]).to be_nil
       end
     end
 
@@ -73,7 +73,7 @@ describe Split::Persistence::RedisAdapter do
       it "should return an array of the user's stored keys" do
         subject["my_key"] = "my_value"
         subject["my_second_key"] = "my_second_value"
-        subject.keys.should =~ ["my_key", "my_second_key"]
+        expect(subject.keys).to match(["my_key", "my_second_key"])
       end
     end
 

data/spec/persistence/session_adapter_spec.rb

@@ -8,7 +8,7 @@ describe Split::Persistence::SessionAdapter do
   describe "#[] and #[]=" do
     it "should set and return the value for given key" do
       subject["my_key"] = "my_value"
-      subject["my_key"].should eq("my_value")
+      expect(subject["my_key"]).to eq("my_value")
     end
   end
 
@@ -16,7 +16,7 @@ describe Split::Persistence::SessionAdapter do
     it "should delete the given key" do
       subject["my_key"] = "my_value"
       subject.delete("my_key")
-      subject["my_key"].should be_nil
+      expect(subject["my_key"]).to be_nil
     end
   end
 
@@ -24,8 +24,8 @@ describe Split::Persistence::SessionAdapter 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"
-      subject.keys.should =~ ["my_key", "my_second_key"]
+      expect(subject.keys).to match(["my_key", "my_second_key"])
     end
   end
 
-end
+end

data/spec/persistence_spec.rb

@@ -7,27 +7,27 @@ describe Split::Persistence do
   describe ".adapter" do
     context "when the persistence config is a symbol" do
       it "should return the appropriate adapter for the symbol" do
-        Split.configuration.stub(:persistence).and_return(:cookie)
-        subject.adapter.should eq(Split::Persistence::CookieAdapter)
+        expect(Split.configuration).to receive(:persistence).twice.and_return(:cookie)
+        expect(subject.adapter).to eq(Split::Persistence::CookieAdapter)
       end
 
       it "should return an adapter whose class is present in Split::Persistence::ADAPTERS" do
-        Split.configuration.stub(:persistence).and_return(:cookie)
-        Split::Persistence::ADAPTERS.values.should include(subject.adapter)
+        expect(Split.configuration).to receive(:persistence).twice.and_return(:cookie)
+        expect(Split::Persistence::ADAPTERS.values).to include(subject.adapter)
       end
 
       it "should raise if the adapter cannot be found" do
-        Split.configuration.stub(:persistence).and_return(:something_weird)
+        expect(Split.configuration).to receive(:persistence).twice.and_return(:something_weird)
         expect { subject.adapter }.to raise_error
       end
     end
     context "when the persistence config is a class" do
       let(:custom_adapter_class) { MyCustomAdapterClass = Class.new }
       it "should return that class" do
-        Split.configuration.stub(:persistence).and_return(custom_adapter_class)
-        subject.adapter.should eq(MyCustomAdapterClass)
+        expect(Split.configuration).to receive(:persistence).twice.and_return(custom_adapter_class)
+        expect(subject.adapter).to eq(MyCustomAdapterClass)
       end
     end
   end
 
-end
+end

data/spec/trial_spec.rb

@@ -6,17 +6,17 @@ describe Split::Trial do
     experiment  = double('experiment')
     alternative = double('alternative', :kind_of? => Split::Alternative)
     trial = Split::Trial.new(:experiment => experiment, :alternative => alternative)
-    trial.experiment.should == experiment
-    trial.alternative.should == alternative
-    trial.goals.should == []
+    expect(trial.experiment).to eq(experiment)
+    expect(trial.alternative).to eq(alternative)
+    expect(trial.goals).to eq([])
   end
 
   describe "alternative" do
     it "should use the alternative if specified" do
       alternative = double('alternative', :kind_of? => Split::Alternative)
       trial = Split::Trial.new(:experiment => experiment = double('experiment'), :alternative => alternative)
-      trial.should_not_receive(:choose)
-      trial.alternative.should == alternative
+      expect(trial).not_to receive(:choose)
+      expect(trial.alternative).to eq(alternative)
     end
 
     it "should populate alternative with a full alternative object after calling choose" do
@@ -24,8 +24,8 @@ describe Split::Trial do
       experiment.save
       trial = Split::Trial.new(:experiment => experiment)
       trial.choose
-      trial.alternative.class.should == Split::Alternative
-      ['basket', 'cart'].should include(trial.alternative.name)
+      expect(trial.alternative.class).to eq(Split::Alternative)
+      expect(['basket', 'cart']).to include(trial.alternative.name)
     end
 
     it "should populate an alternative when only one option is offerred" do
@@ -33,20 +33,20 @@ describe Split::Trial do
       experiment.save
       trial = Split::Trial.new(:experiment => experiment)
       trial.choose
-      trial.alternative.class.should == Split::Alternative
-      trial.alternative.name.should == 'basket'
+      expect(trial.alternative.class).to eq(Split::Alternative)
+      expect(trial.alternative.name).to eq('basket')
     end
 
 
     it "should choose from the available alternatives" do
       trial = Split::Trial.new(:experiment => experiment = double('experiment'))
       alternative = double('alternative', :kind_of? => Split::Alternative)
-      experiment.should_receive(:next_alternative).and_return(alternative)
-      alternative.should_receive(:increment_participation)
-      experiment.stub(:winner).and_return nil
+      expect(experiment).to receive(:next_alternative).and_return(alternative)
+      expect(alternative).to receive(:increment_participation)
+      expect(experiment).to receive(:winner).at_most(1).times.and_return(nil)
       trial.choose!
 
-      trial.alternative.should == alternative
+      expect(trial.alternative).to eq(alternative)
     end
   end
 
@@ -56,7 +56,7 @@ describe Split::Trial do
       experiment.save
 
       trial = Split::Trial.new(:experiment => experiment, :alternative => 'basket')
-      trial.alternative.name.should == 'basket'
+      expect(trial.alternative.name).to eq('basket')
     end
   end
 end

data/split.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'bundler',     '~> 1.3'
-  s.add_development_dependency 'rspec',       '~> 2.14'
-  s.add_development_dependency 'rack-test',   '>= 0.5.7'
+  s.add_development_dependency 'bundler',     '~> 1.6'
+  s.add_development_dependency 'rspec',       '~> 3.0'
+  s.add_development_dependency 'rack-test'
   s.add_development_dependency 'coveralls'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: split
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +157,7 @@ files:
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
 - gemfiles/4.0.gemfile
-- gemfiles/4.0.gemfile.lock
 - lib/split.rb
 - lib/split/algorithms.rb
 - lib/split/algorithms/weighted_sample.rb

data/gemfiles/3.2.gemfile.lock

@@ -1,123 +0,0 @@
-PATH
-  remote: /Users/andrew/code/split
-  specs:
-    split (0.6.1)
-      redis (>= 2.1)
-      redis-namespace (>= 1.1.0)
-      simple-random
-      sinatra (>= 1.2.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.4)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.2)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.5.0)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
-      redis (~> 3.0.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simple-random (0.9.3)
-    sinatra (1.3.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.4.0)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler (~> 1.3)
-  rack-test (>= 0.5.7)
-  rails (~> 3.2.13)
-  rake
-  rspec (~> 2.12)
-  split!