ablab 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d558894e13e626caa2bd6375a6eea7b30f32769f
-  data.tar.gz: 095902b47a9baf06fd1a98c61fd5c4e3aa4540b3
+  metadata.gz: 2a5e004cc3855d75784fb6725f3593f7aef46bae
+  data.tar.gz: 884592f7d393d1a5c0609b72ce2b3d43d6fb514a
 SHA512:
-  metadata.gz: 4b9fc6b731810bfc862ec838cc823e06672da11ad25972a2af3fce833314f49ecd15f5b7806b5f56c8bf2ad61bc1ad1a1fe79cb8d4a4db7d20e092165319971e
-  data.tar.gz: e443c648d9bbb7b9e5674ef69c8a9557edc07c3e911fbc5a43ead35cafff2de87d19f27e7738211b6f2ef5a2673ceba4e563ed20248da939e6a0d13f8bc362fe
+  metadata.gz: 5b35e42099d1eea2f4e92f5a295dedcf04dcb1a3e49e0b923b02fe321569266fc86703a9c23d0a5d5cf454db1d15e968be650aa1c390cbabfb74f420a0eca567
+  data.tar.gz: d2ccb3dcec40eecc47889db8ed08277b7b1fda33fafa45c1dc332045e874406a5b368a2cb72e9e408487c41f76e73660137b08d8650cfeed27f69db1a0f77301

data/lib/ablab.rb

@@ -39,6 +39,14 @@ module Ablab
       end
       @dashboard_credentials
     end
+
+    def on_track(&block)
+      (@callbacks ||= []) << block
+    end
+
+    def callbacks
+      @callbacks || []
+    end
   end
 
   class InvalidCredentials < ArgumentError; end
@@ -85,16 +93,16 @@ module Ablab
       @result.data
     end
 
-    def run(session_id)
-      Run.new(self, session_id)
+    def run(session_id, request)
+      Run.new(self, session_id, request)
     end
   end
 
   class Run
-    attr_reader :experiment, :session_id
+    attr_reader :experiment, :session_id, :request
 
-    def initialize(experiment, session_id)
-      @experiment, @session_id = experiment, session_id
+    def initialize(experiment, session_id, request)
+      @experiment, @session_id, @request = experiment, session_id, request
     end
 
     def in_group?(name)
@@ -126,7 +134,10 @@ module Ablab
 
     def perform_callbacks!(event)
       experiment.callbacks.each do |cbk|
-        cbk.call(event, experiment.name, group, session_id)
+        cbk.call(event, experiment.name, group, session_id, request)
+      end
+      Ablab.callbacks.each do |cbk|
+        cbk.call(event, experiment.name, group, session_id, request)
       end
     end
   end

data/lib/ablab/helper.rb

@@ -17,7 +17,7 @@ module Ablab
         raise "No experiment with name #{name}"
       end
       @experiments[name] ||=
-        Ablab.experiments[name].run(ablab_session_id)
+        Ablab.experiments[name].run(ablab_session_id, request)
     end
 
     def ablab_session_id

data/lib/ablab/version.rb

@@ -1,3 +1,3 @@
 module Ablab
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/ablab/helper_spec.rb

@@ -4,6 +4,8 @@ require 'ostruct'
 describe Ablab::Helper do
   let(:cookies) { Hash.new }
 
+  let(:request) { double(:request) }
+
   let(:controller) do
     Class.new do
       include Ablab::Helper
@@ -23,6 +25,10 @@ describe Ablab::Helper do
     end
   end
 
+  before do
+    allow(controller).to receive(:request).and_return(request)
+  end
+
   it 'calls helper_method if the including class implements it' do
     klass = Class.new do
       def self.helper_method(_); end

data/spec/ablab_spec.rb

@@ -53,6 +53,14 @@ describe Ablab do
     end
   end
 
+  describe ".on_track" do
+    it "adds a tracking callback" do
+      block = Proc.new {}
+      ab.on_track(&block)
+      expect(ab.callbacks).to eq([block])
+    end
+  end
+
   describe Ablab::Experiment do
     let(:experiment) do
       Ablab::Experiment.new('foo') do; end
@@ -150,62 +158,64 @@ describe Ablab do
       end
     end
 
+    let(:request) { double(:request) }
+
     let(:run) do
-      Ablab::Run.new(experiment, '86wfd8w6df')
+      Ablab::Run.new(experiment, '86wfd8w6df', request)
     end
 
     it 'gets assigned to the right group' do
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 0
       expect(run).to be_in_group(:control)
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 334
       expect(run).to be_in_group(:a)
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 999
       expect(run).to be_in_group(:b)
     end
 
     it 'assigns the same session ID to the same group' do
-      run1 = Ablab::Run.new(experiment, 'foobar')
-      run2 = Ablab::Run.new(experiment, 'foobar')
+      run1 = Ablab::Run.new(experiment, 'abc', request)
+      run2 = Ablab::Run.new(experiment, 'abc', request)
       expect(run1.group).to eq(run2.group)
     end
 
     it 'selects only the given percentage of users' do
       experiment.percentage_of_visitors 30
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 0
       expect(run).to be_in_group(:control)
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 100
       expect(run).to be_in_group(:a)
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 200
       expect(run).to be_in_group(:b)
-      run = Ablab::Run.new(experiment, 0)
+      run = Ablab::Run.new(experiment, 'abc', request)
       allow(run).to receive(:draw).and_return 300
       expect(run.group).to be_nil
     end
 
     describe "#draw" do
       it "is stable across ruby processes" do
-        d1 = Ablab::Run.new(experiment, '8asd7f8asf7').draw
+        d1 = Ablab::Run.new(experiment, '8asd7f8asf7', request).draw
         dir = File.expand_path(File.dirname(__FILE__), '../lib')
-        d2 = `bundle exec ruby -I#{dir} -e "require 'ablab'; require 'ostruct'; puts Ablab::Run.new(OpenStruct.new(name: :foo), '8asd7f8asf7').draw"`
+        d2 = `bundle exec ruby -I#{dir} -e "require 'ablab'; require 'ostruct'; puts Ablab::Run.new(OpenStruct.new(name: :foo), '8asd7f8asf7', nil).draw"`
         expect(d1).to eq(d2.to_i)
       end
 
       it "returns an integer number < 1000" do
         expect(
-          (0..100).map { |i| Ablab::Run.new(experiment, "#{i}").draw }.all? { |x| x.is_a?(Integer) && x < 1000 }
+          (0..100).map { |i| Ablab::Run.new(experiment, "#{i}", request).draw }.all? { |x| x.is_a?(Integer) && x < 1000 }
         ).to be(true)
       end
     end
 
     describe "#group" do
       it "returns one of the groups" do
-        expect(Ablab::Run.new(experiment, rand(12345).to_s).group).to be_in([:a, :b, :control])
+        expect(Ablab::Run.new(experiment, rand(12345).to_s, request).group).to be_in([:a, :b, :control])
       end
     end
 
@@ -218,11 +228,16 @@ describe Ablab do
 
       it "performs callbacks" do
         x = nil
-        experiment.on_track do |event, experiment, group, session|
-          x = [event, experiment, group, session]
+        y = nil
+        allow(Ablab).to receive(:callbacks) {
+          [ -> (*args) { y = args } ]
+        }
+        experiment.on_track do |event, experiment, group, session, request|
+          x = [event, experiment, group, session, request]
         end
         run.track_view!
-        expect(x).to eq([:view, :foo, run.group, run.session_id])
+        expect(x).to eq([:view, :foo, run.group, run.session_id, request])
+        expect(y).to eq([:view, :foo, run.group, run.session_id, request])
       end
     end
 
@@ -235,11 +250,16 @@ describe Ablab do
 
       it "performs callbacks" do
         x = nil
-        experiment.on_track do |event, experiment, group, session|
-          x = [event, experiment, group, session]
+        y = nil
+        allow(Ablab).to receive(:callbacks) {
+          [ -> (*args) { y = args } ]
+        }
+        experiment.on_track do |event, experiment, group, session, request|
+          x = [event, experiment, group, session, request]
         end
         run.track_success!
-        expect(x).to eq([:success, :foo, run.group, run.session_id])
+        expect(x).to eq([:success, :foo, run.group, run.session_id, request])
+        expect(y).to eq([:success, :foo, run.group, run.session_id, request])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ablab
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Luca Ongaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails