split 0.3.0 → 0.3.1

data/CHANGELOG.mdown

@@ -1,3 +1,16 @@
+## 0.3.1 (November 19, 2011)
+
+Features:
+
+  - General code tidy up (@ryanlecompte, #22, @mocoso, #28)
+  - Lazy loading data from Redis (@lautis, #25)
+
+Bugfixes:
+
+  - Handle unstarted experiments (@mocoso, #27)
+  - Relaxed Sinatra version requirement (@martinclu, #24)
+
+
 ## 0.3.0 (October 9, 2011)
 
 Features:

data/lib/split/alternative.rb

@@ -1,16 +1,12 @@
 module Split
   class Alternative
     attr_accessor :name
-    attr_accessor :participant_count
-    attr_accessor :completed_count
     attr_accessor :experiment_name
     attr_accessor :weight
 
-    def initialize(name, experiment_name, counters = {})
+    def initialize(name, experiment_name)
       @experiment_name = experiment_name
-      @participant_count = counters['participant_count'].to_i
-      @completed_count = counters['completed_count'].to_i
-      if name.class == Hash
+      if Hash === name
         @name = name.keys.first
         @weight = name.values.first
       else
@@ -23,14 +19,28 @@ module Split
       name
     end
 
+    def participant_count
+      Split.redis.hget(key, 'participant_count').to_i
+    end
+
+    def participant_count=(count)
+      Split.redis.hset(key, 'participant_count', count.to_i)
+    end
+
+    def completed_count
+      Split.redis.hget(key, 'completed_count').to_i
+    end
+
+    def completed_count=(count)
+      Split.redis.hset(key, 'completed_count', count.to_i)
+    end
+
     def increment_participation
-      @participant_count +=1
-      Split.redis.hincrby "#{experiment_name}:#{name}", 'participant_count', 1
+      Split.redis.hincrby key, 'participant_count', 1
     end
 
     def increment_completion
-      @completed_count +=1
-      Split.redis.hincrby "#{experiment_name}:#{name}", 'completed_count', 1
+      Split.redis.hincrby key, 'completed_count', 1
     end
 
     def control?
@@ -72,49 +82,30 @@ module Split
     end
 
     def save
-      if Split.redis.hgetall("#{experiment_name}:#{name}")
-        Split.redis.hset "#{experiment_name}:#{name}", 'participant_count', @participant_count
-        Split.redis.hset "#{experiment_name}:#{name}", 'completed_count', @completed_count
-      else
-        Split.redis.hmset "#{experiment_name}:#{name}", 'participant_count', 'completed_count', @participant_count, @completed_count
-      end
+      Split.redis.hsetnx key, 'participant_count', 0
+      Split.redis.hsetnx key, 'completed_count', 0
     end
 
     def reset
-      @participant_count = 0
-      @completed_count = 0
-      save
+      Split.redis.hmset key, 'participant_count', 0, 'completed_count', 0
     end
 
     def delete
-      Split.redis.del("#{experiment_name}:#{name}")
-    end
-
-    def self.find(name, experiment_name)
-      counters = Split.redis.hgetall "#{experiment_name}:#{name}"
-      self.new(name, experiment_name, counters)
-    end
-
-    def self.find_or_create(name, experiment_name)
-      self.find(name, experiment_name) || self.create(name, experiment_name)
-    end
-
-    def self.create(name, experiment_name)
-      alt = self.new(name, experiment_name)
-      alt.save
-      alt
+      Split.redis.del(key)
     end
 
     def self.valid?(name)
-       string?(name) or hash_with_correct_values?(name)
+      String === name || hash_with_correct_values?(name)
     end
 
-    def self.string?(name)
-      name.class == String
+    def self.hash_with_correct_values?(name)
+      Hash === name && String === name.keys.first && Float(name.values.first) rescue false
     end
 
-    def self.hash_with_correct_values?(name)
-      name.class == Hash && name.keys.first.class == String && Float(name.values.first) rescue false
+    private
+
+    def key
+      "#{experiment_name}:#{name}"
     end
   end
 end

data/lib/split/configuration.rb

@@ -3,7 +3,7 @@ module Split
     attr_accessor :robot_regex
     attr_accessor :ignore_ip_addresses
 
-    def initialize()
+    def initialize
       @robot_regex = /\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg)\b/i
       @ignore_ip_addresses = []
     end

data/lib/split/dashboard.rb

@@ -7,7 +7,7 @@ module Split
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :views,  "#{dir}/dashboard/views"
-    set :public, "#{dir}/dashboard/public"
+    set :public_folder, "#{dir}/dashboard/public"
     set :static, true
     set :method_override, true
 
@@ -63,7 +63,7 @@ module Split
 
     post '/:experiment' do
       @experiment = Split::Experiment.find(params[:experiment])
-      @alternative = Split::Alternative.find(params[:alternative], params[:experiment])
+      @alternative = Split::Alternative.new(params[:alternative], params[:experiment])
       @experiment.winner = @alternative.name
       redirect url('/')
     end

data/lib/split/experiment.rb

@@ -1,22 +1,18 @@
 module Split
   class Experiment
     attr_accessor :name
-    attr_accessor :alternative_names
     attr_accessor :winner
-    attr_accessor :version
 
     def initialize(name, *alternative_names)
       @name = name.to_s
-      @alternative_names = alternative_names.map do |alternative|
-                             Split::Alternative.new(alternative, name)
-                           end.map(&:name)
-
-      @version = (Split.redis.get("#{name.to_s}:version").to_i || 0)
+      @alternatives = alternative_names.map do |alternative|
+                        Split::Alternative.new(alternative, name)
+                      end
     end
 
     def winner
       if w = Split.redis.hget(:experiment_winner, name)
-        return Split::Alternative.find(w, name)
+        Split::Alternative.new(w, name)
       else
         nil
       end
@@ -30,12 +26,17 @@ module Split
       Split.redis.hdel(:experiment_winner, name)
     end
 
+
     def winner=(winner_name)
       Split.redis.hset(:experiment_winner, name, winner_name.to_s)
     end
 
     def alternatives
-      @alternative_names.map {|a| Split::Alternative.find_or_create(a, name)}
+      @alternatives.dup
+    end
+
+    def alternative_names
+      @alternatives.map(&:name)
     end
 
     def next_alternative
@@ -45,7 +46,7 @@ module Split
     def random_alternative
       weights = alternatives.map(&:weight)
 
-      total = weights.inject(0.0) {|t,w| t+w}
+      total = weights.inject(:+)
       point = rand * total
 
       alternatives.zip(weights).each do |n,w|
@@ -55,12 +56,11 @@ module Split
     end
 
     def version
-      @version ||= 0
+      @version ||= (Split.redis.get("#{name.to_s}:version").to_i || 0)
     end
 
     def increment_version
-      @version += 1
-      Split.redis.set("#{name}:version", @version)
+      @version = Split.redis.incr("#{name}:version")
     end
 
     def key
@@ -92,7 +92,7 @@ module Split
     def save
       if new_record?
         Split.redis.sadd(:experiments, name)
-        @alternative_names.reverse.each {|a| Split.redis.lpush(name, a) }
+        @alternatives.reverse.each {|a| Split.redis.lpush(name, a.name) }
       end
     end
 
@@ -115,8 +115,6 @@ module Split
     def self.find(name)
       if Split.redis.exists(name)
         self.new(name, *load_alternatives_for(name))
-      else
-        raise 'Experiment not found'
       end
     end
 
@@ -148,12 +146,12 @@ module Split
         experiment.save
       end
       return experiment
-      
+
     end
 
     def self.initialize_alternatives(alternatives, name)
 
-      if alternatives.reject {|a| Split::Alternative.valid? a}.any?
+      unless alternatives.all? { |a| Split::Alternative.valid?(a) }
         raise InvalidArgument, 'Alternatives must be strings'
       end
 

data/lib/split/helper.rb

@@ -27,7 +27,7 @@ module Split
           concat(capture(ret, &block))
           false
         else
-           yield(ret)
+          yield(ret)
         end
       else
         ret
@@ -36,16 +36,16 @@ module Split
 
     def finished(experiment_name, options = {:reset => true})
       return if exclude_visitor?
-      experiment = Split::Experiment.find(experiment_name)
+      return unless (experiment = Split::Experiment.find(experiment_name))
       if alternative_name = ab_user[experiment.key]
-        alternative = Split::Alternative.find(alternative_name, experiment_name)
+        alternative = Split::Alternative.new(alternative_name, experiment_name)
         alternative.increment_completion
         session[:split].delete(experiment_name) if options[:reset]
       end
     end
 
     def override(experiment_name, alternatives)
-      return params[experiment_name] if defined?(params) && alternatives.include?(params[experiment_name])
+      params[experiment_name] if defined?(params) && alternatives.include?(params[experiment_name])
     end
 
     def begin_experiment(experiment, alternative_name)

data/lib/split/version.rb

@@ -1,3 +1,3 @@
 module Split
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/alternative_spec.rb

@@ -9,7 +9,7 @@ describe Split::Alternative do
     alternative = Split::Alternative.new('Basket', 'basket_text')
     alternative.name.should eql('Basket')
   end
-  
+
   it "return only the name" do
     experiment = Split::Experiment.new('basket_text', {'Basket' => 0.6}, {"Cart" => 0.4})
     alternative = Split::Alternative.new('Basket', 'basket_text')
@@ -29,7 +29,7 @@ describe Split::Alternative do
   it "should belong to an experiment" do
     experiment = Split::Experiment.new('basket_text', 'Basket', "Cart")
     experiment.save
-    alternative = Split::Alternative.find('Basket', 'basket_text')
+    alternative = Split::Alternative.new('Basket', 'basket_text')
     alternative.experiment.name.should eql(experiment.name)
   end
 
@@ -42,28 +42,29 @@ describe Split::Alternative do
   it "should increment participation count" do
     experiment = Split::Experiment.new('basket_text', 'Basket', "Cart")
     experiment.save
-    alternative = Split::Alternative.find('Basket', 'basket_text')
+    alternative = Split::Alternative.new('Basket', 'basket_text')
     old_participant_count = alternative.participant_count
     alternative.increment_participation
     alternative.participant_count.should eql(old_participant_count+1)
 
-    Split::Alternative.find('Basket', 'basket_text').participant_count.should eql(old_participant_count+1)
+    Split::Alternative.new('Basket', 'basket_text').participant_count.should eql(old_participant_count+1)
   end
 
   it "should increment completed count" do
     experiment = Split::Experiment.new('basket_text', 'Basket', "Cart")
     experiment.save
-    alternative = Split::Alternative.find('Basket', 'basket_text')
+    alternative = Split::Alternative.new('Basket', 'basket_text')
     old_completed_count = alternative.participant_count
     alternative.increment_completion
     alternative.completed_count.should eql(old_completed_count+1)
 
-    Split::Alternative.find('Basket', 'basket_text').completed_count.should eql(old_completed_count+1)
+    Split::Alternative.new('Basket', 'basket_text').completed_count.should eql(old_completed_count+1)
   end
 
   it "can be reset" do
-    alternative = Split::Alternative.new('Basket', 'basket_text', {'participant_count' => 10, 'completed_count' =>4})
-    alternative.save
+    alternative = Split::Alternative.new('Basket', 'basket_text')
+    alternative.participant_count = 10
+    alternative.completed_count = 4
     alternative.reset
     alternative.participant_count.should eql(0)
     alternative.completed_count.should eql(0)
@@ -72,9 +73,9 @@ describe Split::Alternative do
   it "should know if it is the control of an experiment" do
     experiment = Split::Experiment.new('basket_text', 'Basket', "Cart")
     experiment.save
-    alternative = Split::Alternative.find('Basket', 'basket_text')
+    alternative = Split::Alternative.new('Basket', 'basket_text')
     alternative.control?.should be_true
-    alternative = Split::Alternative.find('Cart', 'basket_text')
+    alternative = Split::Alternative.new('Cart', 'basket_text')
     alternative.control?.should be_false
   end
 
@@ -86,21 +87,18 @@ describe Split::Alternative do
     end
 
     it "does something" do
-      alternative = Split::Alternative.new('Basket', 'basket_text', {'participant_count' => 10, 'completed_count' =>4})
+      alternative = Split::Alternative.new('Basket', 'basket_text')
+      alternative.stub(:participant_count).and_return(10)
+      alternative.stub(:completed_count).and_return(4)
       alternative.conversion_rate.should eql(0.4)
     end
   end
 
-  it "should return an existing alternative" do
-    alternative = Split::Alternative.create('Basket', 'basket_text')
-    Split::Alternative.find('Basket', 'basket_text').name.should eql('Basket')
-  end
-
   describe 'z score' do
     it 'should be zero when the control has no conversions' do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
 
-      alternative = Split::Alternative.find('red', 'link_color')
+      alternative = Split::Alternative.new('red', 'link_color')
       alternative.z_score.should eql(0)
     end
 

data/spec/dashboard_spec.rb

@@ -18,21 +18,18 @@ describe Split::Dashboard do
 
   it "should reset an experiment" do
     experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
-    red = Split::Alternative.find('red', 'link_color').participant_count
 
-    red = Split::Alternative.find('red', 'link_color')
-    blue = Split::Alternative.find('blue', 'link_color')
+    red = Split::Alternative.new('red', 'link_color')
+    blue = Split::Alternative.new('blue', 'link_color')
     red.participant_count = 5
-    red.save
     blue.participant_count = 6
-    blue.save
 
     post '/reset/link_color'
 
     last_response.should be_redirect
 
-    new_red_count = Split::Alternative.find('red', 'link_color').participant_count
-    new_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+    new_red_count = Split::Alternative.new('red', 'link_color').participant_count
+    new_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
     new_blue_count.should eql(0)
     new_red_count.should eql(0)
@@ -42,7 +39,7 @@ describe Split::Dashboard do
     experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
     delete '/link_color'
     last_response.should be_redirect
-    lambda { Split::Experiment.find('link_color') }.should raise_error
+    Split::Experiment.find('link_color').should be_nil
   end
 
   it "should mark an alternative as the winner" do

data/spec/experiment_spec.rb

@@ -35,7 +35,7 @@ describe Split::Experiment do
 
       experiment.delete
       Split.redis.exists('basket_text').should be false
-      lambda { Split::Experiment.find('link_color') }.should raise_error
+      Split::Experiment.find('link_color').should be_nil
     end
 
     it "should increment the version" do
@@ -59,10 +59,16 @@ describe Split::Experiment do
     end
   end
 
-  it "should return an existing experiment" do
-    experiment = Split::Experiment.new('basket_text', 'Basket', "Cart")
-    experiment.save
-    Split::Experiment.find('basket_text').name.should eql('basket_text')
+  describe 'find' do
+    it "should return an existing experiment" do
+      experiment = Split::Experiment.new('basket_text', 'Basket', "Cart")
+      experiment.save
+      Split::Experiment.find('basket_text').name.should eql('basket_text')
+    end
+
+    it "should return an existing experiment" do
+      Split::Experiment.find('non_existent_experiment').should be_nil
+    end
   end
 
   describe 'control' do
@@ -91,7 +97,7 @@ describe Split::Experiment do
   describe 'reset' do
     it 'should reset all alternatives' do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red', 'green')
-      green = Split::Alternative.find('green', 'link_color')
+      green = Split::Alternative.new('green', 'link_color')
       experiment.winner = 'green'
 
       experiment.next_alternative.name.should eql('green')
@@ -99,14 +105,14 @@ describe Split::Experiment do
 
       experiment.reset
 
-      reset_green = Split::Alternative.find('green', 'link_color')
+      reset_green = Split::Alternative.new('green', 'link_color')
       reset_green.participant_count.should eql(0)
       reset_green.completed_count.should eql(0)
     end
 
     it 'should reset the winner' do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red', 'green')
-      green = Split::Alternative.find('green', 'link_color')
+      green = Split::Alternative.new('green', 'link_color')
       experiment.winner = 'green'
 
       experiment.next_alternative.name.should eql('green')
@@ -128,7 +134,7 @@ describe Split::Experiment do
   describe 'next_alternative' do
     it "should always return the winner if one exists" do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red', 'green')
-      green = Split::Alternative.find('green', 'link_color')
+      green = Split::Alternative.new('green', 'link_color')
       experiment.winner = 'green'
 
       experiment.next_alternative.name.should eql('green')
@@ -142,12 +148,12 @@ describe Split::Experiment do
   describe 'changing an existing experiment' do
     it "should reset an experiment if it is loaded with different alternatives" do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red', 'green')
-      blue = Split::Alternative.find('blue', 'link_color')
+      blue = Split::Alternative.new('blue', 'link_color')
       blue.participant_count = 5
       blue.save
       same_experiment = Split::Experiment.find_or_create('link_color', 'blue', 'yellow', 'orange')
       same_experiment.alternatives.map(&:name).should eql(['blue', 'yellow', 'orange'])
-      new_blue = Split::Alternative.find('blue', 'link_color')
+      new_blue = Split::Alternative.new('blue', 'link_color')
       new_blue.participant_count.should eql(0)
     end
   end

data/spec/helper_spec.rb

@@ -20,13 +20,13 @@ describe Split::Helper do
     it "should increment the participation counter after assignment to a new user" do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
 
-      previous_red_count = Split::Alternative.find('red', 'link_color').participant_count
-      previous_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+      previous_red_count = Split::Alternative.new('red', 'link_color').participant_count
+      previous_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
       ab_test('link_color', 'blue', 'red')
 
-      new_red_count = Split::Alternative.find('red', 'link_color').participant_count
-      new_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+      new_red_count = Split::Alternative.new('red', 'link_color').participant_count
+      new_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
       (new_red_count + new_blue_count).should eql(previous_red_count + previous_blue_count + 1)
     end
@@ -57,12 +57,12 @@ describe Split::Helper do
       ret = ab_test('link_color', 'blue', 'red') { |alternative| "shared/#{alternative}" }
       ret.should eql("shared/#{alt}")
     end
-    
+
     it  "should allow the share of visitors see an alternative to be specificed" do
       ab_test('link_color', {'blue' => 0.8}, {'red' => 20})
       ['red', 'blue'].should include(ab_user['link_color'])
     end
-    
+
     it  "should allow alternative weighting interface as a single hash" do
       ab_test('link_color', 'blue' => 0.01, 'red' => 0.2)
       experiment = Split::Experiment.find('link_color')
@@ -75,11 +75,11 @@ describe Split::Helper do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
       alternative_name = ab_test('link_color', 'blue', 'red')
 
-      previous_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+      previous_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
       finished('link_color')
 
-      new_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+      new_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
       new_completion_count.should eql(previous_completion_count + 1)
     end
@@ -88,7 +88,7 @@ describe Split::Helper do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
       alternative_name = ab_test('link_color', 'blue', 'red')
 
-      previous_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+      previous_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
       session[:split].should eql("link_color" => alternative_name)
       finished('link_color')
@@ -99,12 +99,17 @@ describe Split::Helper do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
       alternative_name = ab_test('link_color', 'blue', 'red')
 
-      previous_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+      previous_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
       session[:split].should eql("link_color" => alternative_name)
       finished('link_color', :reset => false)
       session[:split].should eql("link_color" => alternative_name)
     end
+
+    it "should do nothing where the experiment was not started by this user" do
+      session[:split] = nil
+      lambda { finished('some_experiment_not_started_by_the_user') }.should_not raise_exception
+    end
   end
 
   describe 'conversions' do
@@ -112,12 +117,12 @@ describe Split::Helper do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
       alternative_name = ab_test('link_color', 'blue', 'red')
 
-      previous_convertion_rate = Split::Alternative.find(alternative_name, 'link_color').conversion_rate
+      previous_convertion_rate = Split::Alternative.new(alternative_name, 'link_color').conversion_rate
       previous_convertion_rate.should eql(0.0)
 
       finished('link_color')
 
-      new_convertion_rate = Split::Alternative.find(alternative_name, 'link_color').conversion_rate
+      new_convertion_rate = Split::Alternative.new(alternative_name, 'link_color').conversion_rate
       new_convertion_rate.should eql(1.0)
     end
   end
@@ -137,13 +142,13 @@ describe Split::Helper do
       it "should not increment the participation count" do
         experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
 
-        previous_red_count = Split::Alternative.find('red', 'link_color').participant_count
-        previous_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+        previous_red_count = Split::Alternative.new('red', 'link_color').participant_count
+        previous_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
         ab_test('link_color', 'blue', 'red')
 
-        new_red_count = Split::Alternative.find('red', 'link_color').participant_count
-        new_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+        new_red_count = Split::Alternative.new('red', 'link_color').participant_count
+        new_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
         (new_red_count + new_blue_count).should eql(previous_red_count + previous_blue_count)
       end
@@ -153,11 +158,11 @@ describe Split::Helper do
         experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
         alternative_name = ab_test('link_color', 'blue', 'red')
 
-        previous_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+        previous_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
         finished('link_color')
 
-        new_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+        new_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
         new_completion_count.should eql(previous_completion_count)
       end
@@ -181,13 +186,13 @@ describe Split::Helper do
       it "should not increment the participation count" do
         experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
 
-        previous_red_count = Split::Alternative.find('red', 'link_color').participant_count
-        previous_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+        previous_red_count = Split::Alternative.new('red', 'link_color').participant_count
+        previous_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
         ab_test('link_color', 'blue', 'red')
 
-        new_red_count = Split::Alternative.find('red', 'link_color').participant_count
-        new_blue_count = Split::Alternative.find('blue', 'link_color').participant_count
+        new_red_count = Split::Alternative.new('red', 'link_color').participant_count
+        new_blue_count = Split::Alternative.new('blue', 'link_color').participant_count
 
         (new_red_count + new_blue_count).should eql(previous_red_count + previous_blue_count)
       end
@@ -197,11 +202,11 @@ describe Split::Helper do
         experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
         alternative_name = ab_test('link_color', 'blue', 'red')
 
-        previous_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+        previous_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
         finished('link_color')
 
-        new_completion_count = Split::Alternative.find(alternative_name, 'link_color').completed_count
+        new_completion_count = Split::Alternative.new(alternative_name, 'link_color').completed_count
 
         new_completion_count.should eql(previous_completion_count)
       end
@@ -238,17 +243,17 @@ describe Split::Helper do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
       alternative_name = ab_test('link_color', 'blue', 'red')
       session[:split].should eql({'link_color' => alternative_name})
-      alternative = Split::Alternative.find(alternative_name, 'link_color')
+      alternative = Split::Alternative.new(alternative_name, 'link_color')
       alternative.participant_count.should eql(1)
 
       experiment.reset
       experiment.version.should eql(1)
-      alternative = Split::Alternative.find(alternative_name, 'link_color')
+      alternative = Split::Alternative.new(alternative_name, 'link_color')
       alternative.participant_count.should eql(0)
 
       new_alternative_name = ab_test('link_color', 'blue', 'red')
       session[:split]['link_color:1'].should eql(new_alternative_name)
-      new_alternative = Split::Alternative.find(new_alternative_name, 'link_color')
+      new_alternative = Split::Alternative.new(new_alternative_name, 'link_color')
       new_alternative.participant_count.should eql(1)
     end
 
@@ -256,13 +261,13 @@ describe Split::Helper do
       experiment = Split::Experiment.find_or_create('link_color', 'blue', 'red')
       alternative_name = ab_test('link_color', 'blue', 'red')
       session[:split].should eql({'link_color' => alternative_name})
-      alternative = Split::Alternative.find(alternative_name, 'link_color')
+      alternative = Split::Alternative.new(alternative_name, 'link_color')
 
       experiment.reset
       experiment.version.should eql(1)
 
       finished('link_color')
-      alternative = Split::Alternative.find(alternative_name, 'link_color')
+      alternative = Split::Alternative.new(alternative_name, 'link_color')
       alternative.completed_count.should eql(0)
     end
   end

data/split.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'redis',           '~> 2.1'
   s.add_dependency 'redis-namespace', '~> 1.0.3'
-  s.add_dependency 'sinatra',         '~> 1.2.6'
+  s.add_dependency 'sinatra',         '>= 1.2.6'
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler',     '~> 1.0'
   s.add_development_dependency 'rspec',       '~> 2.6'
   s.add_development_dependency 'rack-test',   '~> 0.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: split
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70155561576500 !ruby/object:Gem::Requirement
+  requirement: &70308912822720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70155561576500
+  version_requirements: *70308912822720
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70155561575180 !ruby/object:Gem::Requirement
+  requirement: &70308912821980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,32 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70155561575180
+  version_requirements: *70308912821980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70155561564480 !ruby/object:Gem::Requirement
+  requirement: &70308912821300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70155561564480
+  version_requirements: *70308912821300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70308912820460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70308912820460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70155561563360 !ruby/object:Gem::Requirement
+  requirement: &70308912819780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70155561563360
+  version_requirements: *70308912819780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155561562780 !ruby/object:Gem::Requirement
+  requirement: &70308912819060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70155561562780
+  version_requirements: *70308912819060
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70155561562200 !ruby/object:Gem::Requirement
+  requirement: &70308912818400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70155561562200
+  version_requirements: *70308912818400
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70155561561580 !ruby/object:Gem::Requirement
+  requirement: &70308912817760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +98,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70155561561580
+  version_requirements: *70308912817760
 description: 
 email:
 - andrewnez@gmail.com
@@ -134,12 +145,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3943651241702022185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3943651241702022185
 requirements: []
 rubyforge_project: split
 rubygems_version: 1.8.6