ablab 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8125e2a869a953786f4b1bcacab2ac1752d00c
-  data.tar.gz: c661d695bcad5f817801b42aa1e4ffc99920d346
+  metadata.gz: 286428614a6e48db6263c90b9d93e6b21f135d1d
+  data.tar.gz: e09c47ce77cd92c10e795f104fdd4b8396711438
 SHA512:
-  metadata.gz: 7f459d5d133435d8c828d0626c0846575c3eb49d941fb21bb430cb1c91853162f5ff82fe89c2c49df0e2ace5eafcc1eba65adcd05865e6e84fcb875de792848d
-  data.tar.gz: 2a9e3c91a04cec5ee3691604b806dce7b53c4cf3871ee1dea791033326f16f0be0f13475ac507f4ece116e858adedf0537fbbb645baaaf671e33a8204587ca88
+  metadata.gz: fd4c37fd7af9a3ca1296bb22b54566e0e9b13e76e50e3eb04d07a9621e9d37e25cbcccbd548b8f27ec90493d2ebd326312072746c197be99886332fe54461f6b
+  data.tar.gz: 9d04f20ea5dd676cd71a07aed0cb76648fa1a38ff84407d89b8d91e191daa96df569911f4f3e447cfe7db884cd948cc7c81ad598d31944a35ae7c436e22c72b8

data/lib/ablab.rb

@@ -76,7 +76,7 @@ module Ablab
 
     def initialize(name, &block)
       @name      = name.to_sym
-      @control   = Group.control
+      @control   = Group.new(:control, 'control group')
       @groups    = [@control]
       @callbacks = []
       instance_exec(&block)
@@ -147,7 +147,7 @@ module Ablab
         t += group.weight / tot_weight
         break group if d < t
         t
-      end
+      end.try(:name)
     end
 
     def draw
@@ -171,7 +171,7 @@ module Ablab
       return nil unless request && request.respond_to?(:params)
       groups = parse_groups(request.params[:ablab_group])
       group  = groups[experiment.name.to_s]
-      experiment.groups.find { |g| g == group }
+      group.to_sym if group && experiment.groups.map { |g| g.name.to_s }.include?(group)
     end
 
     private def parse_groups(str)
@@ -202,39 +202,11 @@ module Ablab
 
   class Group
     attr_reader :name, :description, :weight
-    alias_method :eql?, :==
+
     def initialize(name, description = nil, weight = nil)
       @name, @description = name.to_sym, description
       @weight = weight || 1
     end
-
-    def control?
-      name == :control
-    end
-
-    def experimental?
-      !control?
-    end
-
-    def ==(o)
-      if o.is_a?(Symbol)
-        name == o
-      elsif o.is_a?(String)
-        name.to_s == o
-      elsif o.is_a?(self.class)
-        name == o.name && description == o.description
-      else
-        false
-      end
-    end
-
-    def hash
-      name.hash
-    end
-
-    def self.control
-      new(:control, 'control group')
-    end
   end
 
   class Result

data/lib/ablab/version.rb

@@ -1,3 +1,3 @@
 module Ablab
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/ablab_spec.rb

@@ -248,14 +248,13 @@ describe Ablab do
 
     describe "#group" do
       it "returns one of the groups" do
-        expect([:a, :b, :control]).to include(Ablab::Run.new(experiment, rand(12345).to_s, request).group)
+        expect(Ablab::Run.new(experiment, rand(12345).to_s, request).group).to be_in([:a, :b, :control])
       end
 
       it "returns the forced group, if set with the 'ablab_group' param" do
         params = { ablab_group: 'bar:baz,foo:a' }
         allow(request).to receive(:params).and_return(params)
         run = Ablab::Run.new(experiment, '6q5wed', request)
-        expect(run.group).to be_a(Ablab::Group)
         expect(run.group).to eq(:a)
       end
     end
@@ -358,51 +357,4 @@ describe Ablab do
       end
     end
   end
-
-  describe Ablab::Group do
-    let(:control_group) { Ablab::Group.new(:control, "control group") }
-    let(:experimental_group) { Ablab::Group.new(:foo, "foo group") }
-
-    describe "#control?" do
-      it 'is true for the control group' do
-        expect(control_group.control?).to be true
-      end
-
-      it 'is false for other groups' do
-        expect(experimental_group.control?).to be false
-      end
-    end
-
-    describe "#experimental?" do
-      it 'is false for the control group' do
-        expect(control_group.experimental?).to be false
-      end
-
-      it 'is true for other groups' do
-        expect(experimental_group.experimental?).to be true
-      end
-    end
-
-    describe "#==" do
-      it 'accepts comparison to Symbol instances' do
-        expect(control_group).to eq(:control)
-        expect(control_group).not_to eq(:foo)
-      end
-
-      it 'accepts comparison to String instances' do
-        expect(control_group).to eq('control')
-        expect(control_group).not_to eq('foo')
-      end
-
-      it 'accepts comparison to Ablab::Group instances' do
-        expect(control_group).to eq(control_group)
-        expect(control_group).to eq(Ablab::Group.new(:control, "control group"))
-        expect(control_group).not_to eq(experimental_group)
-      end
-
-      it 'is false for everyhing else' do
-        expect(control_group).not_to eq(Object.new)
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ablab
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Luca Ongaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails