split 0.3.1 → 0.3.2

data/CHANGELOG.mdown

@@ -1,3 +1,9 @@
+## 0.3.2 (February 12, 2012)
+
+Features:
+
+  - Handle redis errors gracefully (@layflags, #32)
+
 ## 0.3.1 (November 19, 2011)
 
 Features:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Andrew Nesbitt
+Copyright (c) 2012 Andrew Nesbitt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.mdown

@@ -81,14 +81,14 @@ Example: Controller
 
     def register_new_user
       # See what level of free points maximizes users' decision to buy replacement points.
-      @starter_points = ab_test("new_user_free_points", 100, 200, 300)
+      @starter_points = ab_test("new_user_free_points", '100', '200', '300')
     end
 
 Example: Conversion tracking (in a controller!)
 
     def buy_new_points
       # some business logic
-      finished("buy_new_points")
+      finished("new_user_free_points")
     end
 
 Example: Conversion tracking (in a view)
@@ -251,4 +251,4 @@ Tests can be ran with `rake spec`
 
 ## Copyright
 
-Copyright (c) 2011 Andrew Nesbitt. See [LICENSE](https://github.com/andrew/split/blob/master/LICENSE) for details.
+Copyright (c) 2012 Andrew Nesbitt. See [LICENSE](https://github.com/andrew/split/blob/master/LICENSE) for details.

data/lib/split/configuration.rb

@@ -2,10 +2,14 @@ module Split
   class Configuration
     attr_accessor :robot_regex
     attr_accessor :ignore_ip_addresses
+    attr_accessor :db_failover
+    attr_accessor :db_failover_on_db_error
 
     def initialize
       @robot_regex = /\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg)\b/i
       @ignore_ip_addresses = []
+      @db_failover = false
+      @db_failover_on_db_error = proc{|error|} # e.g. use Rails logger here
     end
   end
 end

data/lib/split/helper.rb

@@ -32,6 +32,12 @@ module Split
       else
         ret
       end
+    rescue Errno::ECONNREFUSED => e
+      raise unless Split.configuration.db_failover
+      Split.configuration.db_failover_on_db_error.call(e)
+      ret = Hash === (a0 = alternatives.first) ? a0.keys.first : a0
+      yield(ret) if block_given?
+      ret
     end
 
     def finished(experiment_name, options = {:reset => true})
@@ -42,6 +48,9 @@ module Split
         alternative.increment_completion
         session[:split].delete(experiment_name) if options[:reset]
       end
+    rescue Errno::ECONNREFUSED => e
+      raise unless Split.configuration.db_failover
+      Split.configuration.db_failover_on_db_error.call(e)
     end
 
     def override(experiment_name, alternatives)

data/lib/split/version.rb

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

data/spec/configuration_spec.rb

@@ -6,5 +6,7 @@ describe Split::Configuration do
 
     config.ignore_ip_addresses.should eql([])
     config.robot_regex.should eql(/\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg)\b/i)
+    config.db_failover.should be_false
+    config.db_failover_on_db_error.should be_a Proc
   end
-end
+end

data/spec/helper_spec.rb

@@ -68,6 +68,7 @@ describe Split::Helper do
       experiment = Split::Experiment.find('link_color')
       experiment.alternative_names.should eql(['blue', 'red'])
     end
+
   end
 
   describe 'finished' do
@@ -271,4 +272,87 @@ describe Split::Helper do
       alternative.completed_count.should eql(0)
     end
   end
-end
+
+  context 'when redis is not available' do
+
+    before(:each) do
+      Split.stub(:redis).and_raise(Errno::ECONNREFUSED)
+    end
+
+    context 'and db_failover config option is turned off' do
+
+      describe 'ab_test' do
+        it 'should raise an exception' do
+          lambda {
+            ab_test('link_color', 'blue', 'red')
+          }.should raise_error(Errno::ECONNREFUSED)
+        end
+      end
+
+      describe 'finished' do
+        it 'should raise an exception' do
+          lambda {
+            finished('link_color')
+          }.should raise_error(Errno::ECONNREFUSED)
+        end
+      end
+
+    end
+
+    context 'and db_failover config option is turned on' do
+
+      before(:each) do
+        Split.configure do |config|
+          config.db_failover = true
+        end
+      end
+
+      describe 'ab_test' do
+        it 'should not raise an exception' do
+          lambda {
+            ab_test('link_color', 'blue', 'red')
+          }.should_not raise_error(Errno::ECONNREFUSED)
+        end
+        it 'should call db_failover_on_db_error proc with error as parameter' do
+          Split.configure do |config|
+            config.db_failover_on_db_error = proc do |error|
+              error.should be_a(Errno::ECONNREFUSED)
+            end
+          end
+          Split.configuration.db_failover_on_db_error.should_receive(:call)
+          ab_test('link_color', 'blue', 'red')
+        end
+        it 'should always use first alternative' do
+          10.times do
+            ab_test('link_color', 'blue', 'red').should eq('blue')
+            ab_test('link_color', 'blue' => 0.01, 'red' => 0.2).should eq('blue')
+            ab_test('link_color', {'blue' => 0.8}, {'red' => 20}).should eq('blue')
+            ab_test('link_color', 'blue', 'red') do |link_color|
+              link_color.should eq('blue')
+            end
+          end
+        end
+      end
+
+      describe 'finished' do
+        it 'should not raise an exception' do
+          lambda {
+            finished('link_color')
+          }.should_not raise_error(Errno::ECONNREFUSED)
+        end
+        it 'should call db_failover_on_db_error proc with error as parameter' do
+          Split.configure do |config|
+            config.db_failover_on_db_error = proc do |error|
+              error.should be_a(Errno::ECONNREFUSED)
+            end
+          end
+          Split.configuration.db_failover_on_db_error.should_receive(:call)
+          finished('link_color')
+        end
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: split
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2012-02-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70308912822720 !ruby/object:Gem::Requirement
+  requirement: &70251262594940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70308912822720
+  version_requirements: *70251262594940
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70308912821980 !ruby/object:Gem::Requirement
+  requirement: &70251262594280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70308912821980
+  version_requirements: *70251262594280
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70308912821300 !ruby/object:Gem::Requirement
+  requirement: &70251262592740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70308912821300
+  version_requirements: *70251262592740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70308912820460 !ruby/object:Gem::Requirement
+  requirement: &70251262591720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308912820460
+  version_requirements: *70251262591720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70308912819780 !ruby/object:Gem::Requirement
+  requirement: &70251262589960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70308912819780
+  version_requirements: *70251262589960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70308912819060 !ruby/object:Gem::Requirement
+  requirement: &70251262588940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70308912819060
+  version_requirements: *70251262588940
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70308912818400 !ruby/object:Gem::Requirement
+  requirement: &70251262585780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70308912818400
+  version_requirements: *70251262585780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70308912817760 !ruby/object:Gem::Requirement
+  requirement: &70251262579760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70308912817760
+  version_requirements: *70251262579760
 description: 
 email:
 - andrewnez@gmail.com
@@ -145,18 +145,12 @@ 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