ar_rollout 0.0.17 → 0.0.18

data/README.md

@@ -118,6 +118,9 @@ List known features with:
 - Merge ArRollout and Rollout class methods
 - Autodetection of new features from code, before rollout begins
 
+## Version 0.0.18 - 04 Dec 2012
+- Add Group, Membership, OptOut
+
 ## Version 0.0.17 - 29 Nov 2012
 - ArRollout caches groups
 

data/lib/ar_rollout/group.rb

@@ -0,0 +1,20 @@
+class Group < ActiveRecord::Base
+  after_destroy :destroy_rollouts
+
+  has_many :memberships, dependent: :destroy
+  validates :name, presence: true, uniqueness: true
+  validate :validate_not_defined
+  attr_accessible :name
+
+  private
+
+  def destroy_rollouts
+    Rollout.where(group: name).each(&:destroy)
+  end
+
+  def validate_not_defined
+    if ArRollout.defined_groups.include?(name.intern)
+      errors.add(:name, "can't be a defined group name")
+    end
+  end
+end

data/lib/ar_rollout/membership.rb

@@ -0,0 +1,10 @@
+class Membership < ActiveRecord::Base
+  self.table_name = :groups_users
+
+  attr_accessible :group_id, :user_id
+
+  belongs_to :group
+  belongs_to :user
+
+  validates :user_id, :group_id, presence: true
+end

data/lib/ar_rollout/opt_out.rb

@@ -0,0 +1,5 @@
+class OptOut < ActiveRecord::Base
+  validates_uniqueness_of :user_id, scope: :feature
+  validates :user_id, :feature, presence: true
+  attr_accessible :user_id, :feature
+end

data/lib/ar_rollout/rollout.rb

@@ -13,6 +13,8 @@ class Rollout < ActiveRecord::Base
   def match_group?(user)
     if Rollout.method_defined? "match_#{group}?"
       send "match_#{group}?", user
+    elsif group = Group.find_by_name(group) && group.memberships.where('user_id = ?', user.id).any?
+      true
     else
       false
     end

data/lib/ar_rollout/version.rb

@@ -1,3 +1,3 @@
 module ArRollout
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/ar_rollout.rb

@@ -1,18 +1,25 @@
 require 'ar_rollout/rollout.rb'
+require 'ar_rollout/group.rb'
+require 'ar_rollout/membership.rb'
+require 'ar_rollout/opt_out.rb'
 require 'ar_rollout/helper.rb'
 module ArRollout
-  @@groups = []
+  @@defined_groups = []
 
   def self.configure
     yield self
   end
 
+  def self.defined_groups
+    @@defined_groups
+  end
+
   def self.groups
-    @@groups
+    (@@defined_groups + Group.select(:name).collect(&:name).collect(&:intern)).uniq.sort
   end
 
   def self.define_group(name, &block)
-    @@groups << name
+    @@defined_groups << name
 
     Rollout.send :define_method, "match_#{name}?" do |b|
       block.call(b)
@@ -30,8 +37,16 @@ module ArRollout
     Rollout.find_all_by_name_and_user_id(feature, res_id).map(&:destroy)
   end
 
+  def self.exclude_user(feature, user)
+    res_id = [Fixnum, String].include?(user.class) ? user : user.id
+    OptOut.create(feature: feature, user_id: res_id)
+  end
+
   def self.activate_group(feature, group)
     return false if feature.nil? || group.nil?
+    unless defined_groups.include? group
+      get_group(group)
+    end
     Rollout.find_or_create_by_name_and_group(feature, group)
   end
 
@@ -44,6 +59,15 @@ module ArRollout
     Rollout.create(name: feature, percentage: percentage)
   end
 
+  def self.get_group(group)
+    Group.find_or_create_by_name(group)
+  end
+
+  def self.activate_user_in_group(group, user)
+    res_id = [Fixnum, String].include?(user.class) ? user : user.id
+    Membership.find_or_create_by_group_id_and_user_id(get_group(group).id, res_id)
+  end
+
   def self.deactivate_all(feature)
     Rollout.find_all_by_name(feature).map(&:destroy)
   end
@@ -52,10 +76,16 @@ module ArRollout
     Rollout.select("distinct(name)").order(:name).map(&:name)
   end
 
+  def self.active_groups
+    Rollout.where("'group' is NOT NULL").map(&:group).uniq
+  end
+
   def self.active?(name, user)
     return false unless user
-    Rollout.where(name: name).where("user_id = ? or user_id is NULL", user.id.to_i).any? do |rollout|
-      rollout.match?(user)
+    unless OptOut.where(feature: name, user_id: user.id).any?
+      Rollout.where(name: name).where("user_id = ? or user_id is NULL", user.id.to_i).any? do |rollout|
+        rollout.match?(user)
+      end
     end
   end
 
@@ -79,22 +109,22 @@ module ArRollout
 
   def self.info(feature)
     {
-      :percentage => (active_percentage(feature) || 0).to_i,
-      :groups => active_groups(feature).map { |g| g.to_sym },
-      :users => active_user_ids(feature)
+      :percentage => (_active_percentage(feature) || 0).to_i,
+      :groups => _active_groups(feature).map { |g| g.to_sym },
+      :users => _active_user_ids(feature)
     }
   end
 
 private
-   def self.active_groups(feature)
+   def self._active_groups(feature)
     Rollout.where('"name" = ? and "group" is not null', feature).map(&:group)
   end
 
-  def self.active_user_ids(feature)
+  def self._active_user_ids(feature)
     Rollout.where('"name" = ? and "user_id" is not null', feature).map(&:user_id)
   end
 
-  def self.active_percentage(feature)
+  def self._active_percentage(feature)
     Rollout.select("percentage").where('"name" = ? and "percentage" is not null', feature).first
   end
 

data/lib/generators/ar_rollout_generator.rb

@@ -11,8 +11,9 @@ class ArRolloutGenerator < Rails::Generators::Base
   def copy_initializer_file
     copy_file "ar_rollout.rb", "config/initializers/ar_rollout.rb"
     migration_template "migration.rb", "db/migrate/create_rollout"
+    migration_template "groups_migration.rb", "db/migrate/create_groups_and_groups_users"
+    migration_template "opt_outs_migration.rb", "db/migrate/create_opt_outs"
   end
-
 end
 
 

data/lib/generators/templates/groups_migration.rb

@@ -0,0 +1,19 @@
+class CreateGroupsAndGroupsUsers < ActiveRecord::Migration
+  def up
+    create_table :groups do |t|
+      t.string :name
+    end
+
+    create_table :groups_users do |t|
+      t.references :group
+      t.references :user
+    end
+
+    add_index :groups_users, [:group_id, :user_id], unique: true
+  end
+
+  def down
+    drop_table :groups
+    drop_table :groups_users
+  end
+end

data/lib/generators/templates/opt_outs_migration.rb

@@ -0,0 +1,15 @@
+class CreateOptOuts < ActiveRecord::Migration
+  def up
+    create_table :opt_outs do |t|
+      t.integer :user_id
+      t.string :feature
+      t.timestamps
+    end
+
+    add_index :opt_outs, [:user_id, :feature], unique: true
+  end
+
+  def down
+    drop_table :opt_outs
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_rollout
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,13 +86,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ar_rollout/group.rb
 - lib/ar_rollout/helper.rb
+- lib/ar_rollout/membership.rb
+- lib/ar_rollout/opt_out.rb
 - lib/ar_rollout/rollout.rb
 - lib/ar_rollout/version.rb
 - lib/ar_rollout.rb
 - lib/generators/ar_rollout_generator.rb
 - lib/generators/templates/ar_rollout.rb
+- lib/generators/templates/groups_migration.rb
 - lib/generators/templates/migration.rb
+- lib/generators/templates/opt_outs_migration.rb
 - lib/tasks/ar_rollout_tasks.rake
 - MIT-LICENSE
 - Rakefile