rollout 2.0.0b → 2.0.0c

data/lib/rollout/version.rb

@@ -1,3 +1,3 @@
 class Rollout
-  VERSION = "2.0.0b"
+  VERSION = "2.0.0c"
 end

data/lib/rollout.rb

@@ -1,4 +1,5 @@
 require "rollout/legacy"
+require "zlib"
 
 class Rollout
   class Feature
@@ -10,7 +11,7 @@ class Rollout
       if string
         raw_percentage,raw_users,raw_groups = string.split("|")
         @percentage = raw_percentage.to_i
-        @users = (raw_users || "").split(",").map(&:to_i)
+        @users = (raw_users || "").split(",").map(&:to_s)
         @groups = (raw_groups || "").split(",").map(&:to_sym)
       else
         clear
@@ -22,15 +23,15 @@ class Rollout
     end
 
     def add_user(user)
-      @users << user.id unless @users.include?(user.id)
+      @users << user.id.to_s unless @users.include?(user.id.to_s)
     end
 
     def remove_user(user)
-      @users.delete(user.id.to_i)
+      @users.delete(user.id.to_s)
     end
 
     def add_group(group)
-      @groups << group unless @groups.include?(group)
+      @groups << group.to_sym unless @groups.include?(group.to_sym)
     end
 
     def remove_group(group)
@@ -61,11 +62,11 @@ class Rollout
 
     private
       def user_in_percentage?(user)
-        user.id % 100 < @percentage
+        Zlib.crc32(user.id.to_s) % 100 < @percentage
       end
 
       def user_in_active_users?(user)
-        @users.include?(user.id)
+        @users.include?(user.id.to_s)
       end
 
       def user_in_active_group?(user, rollout)
@@ -118,7 +119,7 @@ class Rollout
   end
 
   def define_group(group, &block)
-    @groups[group] = block
+    @groups[group.to_sym] = block
   end
 
   def active?(feature, user = nil)
@@ -139,7 +140,7 @@ class Rollout
   end
 
   def active_in_group?(group, user)
-    f = @groups[group]
+    f = @groups[group.to_sym]
     f && f.call(user)
   end
 
@@ -151,8 +152,8 @@ class Rollout
       info = @legacy.info(feature)
       f = Feature.new(feature)
       f.percentage = info[:percentage]
-      f.groups = info[:groups]
-      f.users = info[:users]
+      f.groups = info[:groups].map { |g| g.to_sym }
+      f.users = info[:users].map { |u| u.to_s }
       save(f)
       f
     end

data/spec/rollout_spec.rb

@@ -97,6 +97,20 @@ describe "Rollout" do
     end
   end
 
+  describe "activating a specific user with a string id" do
+    before do
+      @rollout.activate_user(:chat, stub(:id => 'user-72'))
+    end
+
+    it "is active for that user" do
+      @rollout.should be_active(:chat, stub(:id => 'user-72'))
+    end
+
+    it "remains inactive for other users" do
+      @rollout.should_not be_active(:chat, stub(:id => 'user-12'))
+    end
+  end
+
   describe "deactivating a specific user" do
     before do
       @rollout.activate_user(:chat, stub(:id => 42))
@@ -111,7 +125,7 @@ describe "Rollout" do
     end
 
     it "remains active for other active users" do
-      @rollout.get(:chat).users.should == [24]
+      @rollout.get(:chat).users.should == %w(24)
     end
   end
 
@@ -131,7 +145,7 @@ describe "Rollout" do
     end
 
     it "activates the feature for that percentage of the users" do
-      (1..120).select { |id| @rollout.active?(:chat, stub(:id => id)) }.length.should == 39
+      (1..120).select { |id| @rollout.active?(:chat, stub(:id => id)) }.length.should be_within(1).of(20)
     end
   end
 
@@ -141,7 +155,7 @@ describe "Rollout" do
     end
 
     it "activates the feature for that percentage of the users" do
-      (1..200).select { |id| @rollout.active?(:chat, stub(:id => id)) }.length.should == 40
+      (1..200).select { |id| @rollout.active?(:chat, stub(:id => id)) }.length.should be_within(5).of(40)
     end
   end
 
@@ -151,10 +165,24 @@ describe "Rollout" do
     end
 
     it "activates the feature for that percentage of the users" do
-      (1..100).select { |id| @rollout.active?(:chat, stub(:id => id)) }.length.should == 5
+      (1..100).select { |id| @rollout.active?(:chat, stub(:id => id)) }.length.should be_within(2).of(5)
     end
   end
 
+  describe "activating a feature for a group as a string" do
+    before do
+      @rollout.define_group(:admins) { |user| user.id == 5 }
+      @rollout.activate_group(:chat, 'admins')
+    end
+
+    it "the feature is active for users for which the block evaluates to true" do
+      @rollout.should be_active(:chat, stub(:id => 5))
+    end
+
+    it "is not active for users for which the block evaluates to false" do
+      @rollout.should_not be_active(:chat, stub(:id => 1))
+    end
+  end
 
   describe "deactivating the percentage of users" do
     before do
@@ -196,11 +224,11 @@ describe "Rollout" do
       feature = @rollout.get(:chat)
       feature.groups.should == [:caretakers, :greeters]
       feature.percentage.should == 10
-      feature.users.should == [42]
+      feature.users.should == %w(42)
       feature.to_hash.should == {
         :groups => [:caretakers, :greeters],
         :percentage => 10,
-        :users => [42]
+        :users => %w(42)
       }
 
       feature = @rollout.get(:signup)
@@ -223,13 +251,13 @@ describe "Rollout" do
     it "imports the settings from the legacy rollout once" do
       @rollout.get(:chat).to_hash.should == {
         :percentage => 12,
-        :users => [24, 42],
+        :users => %w(24 42),
         :groups => [:dope_people]
       }
       @legacy.deactivate_all(:chat)
       @rollout.get(:chat).to_hash.should == {
         :percentage => 12,
-        :users => [24, 42],
+        :users => %w(24 42),
         :groups => [:dope_people]
       }
       @redis.get("feature:chat").should_not be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollout
 version: !ruby/object:Gem::Version
-  version: 2.0.0b
+  version: 2.0.0c
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70157179413940 !ruby/object:Gem::Requirement
+  requirement: &70164526697800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70157179413940
+  version_requirements: *70164526697800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70157179413360 !ruby/object:Gem::Requirement
+  requirement: &70164526697160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70157179413360
+  version_requirements: *70164526697160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70157179412840 !ruby/object:Gem::Requirement
+  requirement: &70164526696700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70157179412840
+  version_requirements: *70164526696700
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70157179412320 !ruby/object:Gem::Requirement
+  requirement: &70164526696240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70157179412320
+  version_requirements: *70164526696240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70157179411820 !ruby/object:Gem::Requirement
+  requirement: &70164526695780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70157179411820
+  version_requirements: *70164526695780
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70157179411400 !ruby/object:Gem::Requirement
+  requirement: &70164526695380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157179411400
+  version_requirements: *70164526695380
 description: Feature flippers with redis.
 email:
 - jamesgolick@gmail.com