split 0.3.2 → 0.3.3

data/CHANGELOG.mdown

@@ -1,3 +1,9 @@
+## 0.3.3 (February 16, 2012)
+
+Bugfixes:
+
+  - Fixed redis failover when a block was passed to ab_test (@layflags, #33)
+
 ## 0.3.2 (February 12, 2012)
 
 Features:

data/README.mdown

@@ -167,8 +167,20 @@ You can override the default configuration options of Split like so:
     Split.configure do |config|
       config.robot_regex = /my_custom_robot_regex/
       config.ignore_ip_addresses << '81.19.48.130'
+      config.db_failover = true # handle redis errors gracefully
+      config.db_failover_on_db_error = proc{|error| Rails.logger.error(error.message) }
     end
 
+### DB failover solution
+
+Due to the fact that Redis has no autom. failover mechanism, it's
+possible to switch on the `db_failover` config option, so that `ab_test`
+and `finished` will not crash in case of a db failure. `ab_test` always
+delivers alternative A (the first one) in that case.
+
+It's also possible to set a `db_failover_on_db_error` callback (proc)
+for example to log these errors via Rails.logger.
+
 ### Redis
 
 You may want to change the Redis host and port Split connects to, or
@@ -251,4 +263,4 @@ Tests can be ran with `rake spec`
 
 ## Copyright
 
-Copyright (c) 2012 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/helper.rb

@@ -1,26 +1,31 @@
 module Split
   module Helper
     def ab_test(experiment_name, *alternatives)
-      experiment = Split::Experiment.find_or_create(experiment_name, *alternatives)
-      if experiment.winner
-        ret = experiment.winner.name
-      else
-        if forced_alternative = override(experiment.name, alternatives)
-          ret = forced_alternative
+      begin
+        experiment = Split::Experiment.find_or_create(experiment_name, *alternatives)
+        if experiment.winner
+          ret = experiment.winner.name
         else
-          begin_experiment(experiment, experiment.control.name) if exclude_visitor?
-
-          if ab_user[experiment.key]
-            ret = ab_user[experiment.key]
+          if forced_alternative = override(experiment.name, alternatives)
+            ret = forced_alternative
           else
-            alternative = experiment.next_alternative
-            alternative.increment_participation
-            begin_experiment(experiment, alternative.name)
-            ret = alternative.name
+            begin_experiment(experiment, experiment.control.name) if exclude_visitor?
+
+            if ab_user[experiment.key]
+              ret = ab_user[experiment.key]
+            else
+              alternative = experiment.next_alternative
+              alternative.increment_participation
+              begin_experiment(experiment, alternative.name)
+              ret = alternative.name
+            end
           end
         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
       end
-
       if block_given?
         if defined?(capture) # a block in a rails view
           block = Proc.new { yield(ret) }
@@ -32,12 +37,6 @@ 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})

data/lib/split/version.rb

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

data/spec/helper_spec.rb

@@ -281,6 +281,12 @@ describe Split::Helper do
 
     context 'and db_failover config option is turned off' do
 
+      before(:each) do
+        Split.configure do |config|
+          config.db_failover = false
+        end
+      end
+
       describe 'ab_test' do
         it 'should raise an exception' do
           lambda {
@@ -327,9 +333,9 @@ describe Split::Helper 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
+            ab_test('link_color', 'blue', 'red') do |alternative|
+              "shared/#{alternative}"
+            end.should eq('shared/blue')
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: split
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000Z
+date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70251262594940 !ruby/object:Gem::Requirement
+  requirement: &70173932070820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70251262594940
+  version_requirements: *70173932070820
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70251262594280 !ruby/object:Gem::Requirement
+  requirement: &70173932070060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70251262594280
+  version_requirements: *70173932070060
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70251262592740 !ruby/object:Gem::Requirement
+  requirement: &70173932069160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70251262592740
+  version_requirements: *70173932069160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70251262591720 !ruby/object:Gem::Requirement
+  requirement: &70173932068040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251262591720
+  version_requirements: *70173932068040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70251262589960 !ruby/object:Gem::Requirement
+  requirement: &70173932066460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70251262589960
+  version_requirements: *70173932066460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251262588940 !ruby/object:Gem::Requirement
+  requirement: &70173932065340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70251262588940
+  version_requirements: *70173932065340
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70251262585780 !ruby/object:Gem::Requirement
+  requirement: &70173932064500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70251262585780
+  version_requirements: *70173932064500
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70251262579760 !ruby/object:Gem::Requirement
+  requirement: &70173932062500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70251262579760
+  version_requirements: *70173932062500
 description: 
 email:
 - andrewnez@gmail.com