abongo 1.0.5 → 1.0.6

data/lib/abongo.rb

@@ -201,7 +201,9 @@ class Abongo
 
   def self.end_experiment!(test_name, final_alternative, conversion_name = nil)
     warn("conversion_name is deprecated") if conversion_name
+    test = get_test(test_name)
     Abongo.experiments.update({:name => test_name}, {'$set' => { :final => final_alternative}}, :upsert => true, :safe => true)
+    Abongo.conversions.update({'tests' => test['_id']}, {'$pull' => {'tests' => test['_id']}}, :multi => true)
   end
 
   protected

data/lib/abongo/sugar.rb

@@ -7,38 +7,41 @@ class Abongo
   module Sugar
 
     def ab_test(test_name, alternatives = nil, options = {})
-      if (Abongo.options[:enable_specification] && !params[test_name].nil?)
-        choice = params[test_name]
-      elsif (Abongo.options[:enable_override_in_session] && !session[test_name].nil?)
-        choice = session[test_name]
-      elsif (Abongo.options[:enable_selection] && !params[test_name].nil?)
-        choice = Abongo.parse_alternatives(alternatives)[params[test_name].to_i]
-      elsif (alternatives.nil?)
-        begin
-          choice = Abongo.flip(test_name, options)
-        rescue
-          if Abongo.options[:failsafe]
-            choice = true
-          else
-            raise
+      @choices ||= {}
+      unless @choices[test_name]
+        if (Abongo.options[:enable_specification] && !params[test_name].nil?)
+          @choices[test_name] = params[test_name]
+        elsif (Abongo.options[:enable_override_in_session] && !session[test_name].nil?)
+          @choices[test_name] = session[test_name]
+        elsif (Abongo.options[:enable_selection] && !params[test_name].nil?)
+          @choices[test_name] = Abongo.parse_alternatives(alternatives)[params[test_name].to_i]
+        elsif (alternatives.nil?)
+          begin
+            @choices[test_name] = Abongo.flip(test_name, options)
+          rescue
+            if Abongo.options[:failsafe]
+              @choices[test_name] = true
+            else
+              raise
+            end
           end
-        end
-      else
-        begin
-          choice = Abongo.test(test_name, alternatives, options)
-        rescue
-          if Abongo.options[:failsafe]
-            choice = Abongo.parse_alternatives(alternatives).first
-          else
-            raise
+        else
+          begin
+            @choice[test_name] = Abongo.test(test_name, alternatives, options)
+          rescue
+            if Abongo.options[:failsafe]
+              @choices[test_name] = Abongo.parse_alternatives(alternatives).first
+            else
+              raise
+            end
           end
         end
       end
-      
+
       if block_given?
-        yield(choice)
+        yield(@choices[test_name])
       else
-        choice
+        @choices[test_name]
       end
     end
     

data/lib/abongo/version.rb

@@ -1,4 +1,4 @@
 class Abongo
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
   MAJOR_VERSION = '1'
 end

data/lib/abongo/view_helper.rb

@@ -4,40 +4,42 @@ class Abongo
   module ViewHelper
 
     def ab_test(test_name, alternatives = nil, options = {}, &block)
-      
-      if (Abongo.options[:enable_specification] && !params[test_name].nil?)
-        choice = params[test_name]
-      elsif (Abongo.options[:enable_override_in_session] && !session[test_name].nil?)
-        choice = session[test_name]
-      elsif (Abongo.options[:enable_selection] && !params[test_name].nil?)
-        choice = Abongo.parse_alternatives(alternatives)[params[test_name].to_i]
-      elsif (alternatives.nil?)
-        begin
-          choice = Abongo.flip(test_name, options)
-        rescue
-          if Abongo.options[:failsafe]
-            choice = true
-          else
-            raise
+      @choices ||= {}
+      unless @choices[test_name]
+        if (Abongo.options[:enable_specification] && !params[test_name].nil?)
+          @choices[test_name] = params[test_name]
+        elsif (Abongo.options[:enable_override_in_session] && !session[test_name].nil?)
+          @choices[test_name] = session[test_name]
+        elsif (Abongo.options[:enable_selection] && !params[test_name].nil?)
+          @choices[test_name] = Abongo.parse_alternatives(alternatives)[params[test_name].to_i]
+        elsif (alternatives.nil?)
+          begin
+            @choices[test_name] = Abongo.flip(test_name, options)
+          rescue
+            if Abongo.options[:failsafe]
+              @choices[test_name] = true
+            else
+              raise
+            end
           end
-        end
-      else
-        begin
-          choice = Abongo.test(test_name, alternatives, options)
-        rescue
-          if Abongo.options[:failsafe]
-            choice = Abongo.parse_alternatives(alternatives).first
-          else
-            raise
+        else
+          begin
+            @choices[test_name] = Abongo.test(test_name, alternatives, options)
+          rescue
+            if Abongo.options[:failsafe]
+              @choices[test_name] = Abongo.parse_alternatives(alternatives).first
+            else
+              raise
+            end
           end
         end
       end
       
       if block
-        content_tag = capture(choice, &block)
-        Rails::VERSION::MAJOR <= 2 and block_called_from_erb?(block) ? concat(content_tag) : content_tag
+        content_tag = capture(@choices[test_name], &block)
+        Rails::VERSION::MAJOR <= 2 && block_called_from_erb?(block) ? concat(content_tag) : content_tag
       else
-        choice
+        @choices[test_name]
       end
     end
     

data/test/test_abongo.rb

@@ -132,6 +132,15 @@ class TestAbongo < Test::Unit::TestCase
     assert_equal('alt3', Abongo.test('test_test', ['alt1', 'alt2']))
   end
 
+  def test_ending_an_experiment_removes_conversion
+    Abongo.identity = 'ident'
+    assert_equal('alt1', Abongo.test('test_test', ['alt1', 'alt2']))
+    experiment = Abongo.get_test('test_test')
+    assert(Abongo.tests_listening_to_conversion('test_test').include?(experiment['_id']))
+    Abongo.end_experiment!('test_test', 'alt2')
+    assert(!Abongo.tests_listening_to_conversion('test_test').include?(experiment['_id']))
+  end
+
   def test_ensure_one_participation_per_participant
     Abongo.identity = 'ident'
     10.times do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Michael Fairley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2011-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency