detour 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7115b71744ec2229a2d850f8b6a4efecd79d28
-  data.tar.gz: 0f5afa558a4412a10db629f0c448d4647c0959b3
+  metadata.gz: 80d487ed6d4c933fbf39a7743ae7f14583c58335
+  data.tar.gz: b07a8fd7a7e3d6d430c1e7708edf77eae200b2de
 SHA512:
-  metadata.gz: 8b37642c8dd68bd34f924dcc5438c847c9c4dde889a91e1d32afe5375b4de3aee2ff8d6c04c9b9fc34a892c7d79402cd5f7fdabb42bb4054ad15daa37152700e
-  data.tar.gz: a2f4afa256166f2f97b12f52bb0853c60a9e9674d2f83dd34b214caf30a7736042706ca9f2479b790f4fabb77219ba006778e38eeec72abe4374857497cd106a
+  metadata.gz: cf2629eb8e3d045326c69997e05f4a009918ead2a123ef903359d8ac8a39837dfa00d8984ea3205771b5a8edbb49ea4f4411c3b76d7045041df255e1f6b56ddc
+  data.tar.gz: b40978ca2f160e271bbb7495ab26e81378b4e4da3ce7cc0e2a7c84c196d6c0bb3c96a51425d8485ef4a558d66b2629fe3076a4b468977f3ffe4a2eb3aa84ee33

data/app/models/detour/feature.rb

@@ -1,8 +1,6 @@
 # Represents an individual feature that may be rolled out to a set of records
 # via individual flags, percentages, or defined groups.
 class Detour::Feature < ActiveRecord::Base
-  include Detour::Concerns::Matchers
-
   self.table_name = :detour_features
 
   serialize :flag_in_counts, JSON

data/app/models/detour/flag.rb

@@ -11,6 +11,17 @@ class Detour::Flag < ActiveRecord::Base
 
   attr_accessible :flaggable_type
 
+  scope :without_opt_outs, ->(record) {
+    where(flaggable_type: record.class.to_s).where <<-SQL
+      feature_id NOT IN (
+        SELECT feature_id FROM detour_flags
+          WHERE detour_flags.type = 'Detour::OptOutFlag'
+          AND   detour_flags.flaggable_type = '#{record.class.to_s}'
+          AND   detour_flags.flaggable_id   = '#{record.id}'
+      )
+    SQL
+  }
+
   private
 
   def flag_type

data/lib/detour/flaggable.rb

@@ -9,22 +9,18 @@ module Detour::Flaggable
   # @return [Array] An array of {Detour::Feature}s.
   def features
     @features ||= begin
-      @features = []
+      features = unfiltered_features
+      defined_group_flags = Detour::DefinedGroupFlag.without_opt_outs(self).where("feature_id IN (?)", features.map(&:id) << -1) # Prevents NOT IN (NULL)
 
-      opt_out_ids = opt_out_flags.map(&:feature_id) + [-1] # prevents "NOT IN (NULL)"
-      table_name = self.class.table_name
+      defined_group_flags.each do |defined_group_flag|
+        defined_group = Detour::DefinedGroup.by_type(self.class)[defined_group_flag.group_name]
 
-      database_group_features = Detour::Feature.joins(:"#{table_name}_database_group_flags" => :memberships).where("detour_memberships" => { member_id: self.id }).where("'detour_features'.id NOT IN (?)", opt_out_ids)
-      @features.concat database_group_features
+        unless defined_group && defined_group.test(self)
+          feeatures.delete defined_group_flag.feature
+        end
+      end
 
-      defined_group_features = Detour::Feature.joins(:"#{table_name}_defined_group_flags").where("'detour_features'.id NOT IN (?)", opt_out_ids)
-      @features.concat defined_group_features.select { |feature| feature.match_defined_groups?(self) }
-
-      percentage_group_features = Detour::Feature.joins(:"#{table_name}_percentage_flag").where("'detour_features'.id NOT IN (?)", opt_out_ids)
-      @features.concat percentage_group_features.select { |feature| feature.match_percentage?(self) }
-
-      flag_in_features = Detour::Feature.joins(:"#{table_name}_flag_ins").where("'detour_features'.id NOT IN (?)", opt_out_ids)
-      @features.concat flag_in_features
+      features
     end
   end
 
@@ -48,6 +44,50 @@ module Detour::Flaggable
     @detour_features ||= []
   end
 
+  private
+
+  def unfiltered_features
+    Detour::Feature.where(%Q{
+      detour_features.id IN (
+        -- Get features the record has been individually flagged in to
+        SELECT feature_id FROM detour_flags
+          WHERE detour_flags.type = 'Detour::FlagInFlag'
+          AND   detour_flags.flaggable_type = '#{self.class.to_s}'
+          AND   detour_flags.flaggable_id   = '#{id}'
+      ) OR detour_features.id IN (
+        -- Get features the record has been flagged into via group membership
+        SELECT feature_id FROM detour_flags
+          INNER JOIN detour_groups
+            ON detour_groups.id = detour_flags.group_id
+          INNER JOIN detour_memberships
+            ON detour_memberships.group_id = detour_groups.id
+            AND detour_memberships.member_id = '#{id}'
+          WHERE detour_flags.type = 'Detour::DatabaseGroupFlag'
+          AND   detour_flags.flaggable_type = '#{self.class}'
+      ) OR detour_features.id IN (
+        -- Get features the record has been flagged into via defined membership
+        -- We'll test them later
+        SELECT feature_id FROM detour_flags
+          WHERE detour_flags.type = 'Detour::DefinedGroupFlag'
+          AND   detour_flags.flaggable_type = '#{self.class}'
+      ) OR detour_features.id IN (
+        -- Get features the record has been flagged into via percentage
+        SELECT feature_id FROM detour_flags
+          WHERE detour_flags.type = 'Detour::PercentageFlag'
+          AND   detour_flags.flaggable_type = '#{self.class}'
+          AND   '#{id}' % 10 < detour_flags.percentage / 10
+      )
+    }).where(%Q{
+      -- Exclude features the record has been opted out of.
+      detour_features.id NOT IN (
+        SELECT feature_id FROM detour_flags
+          WHERE detour_flags.type = 'Detour::OptOutFlag'
+          AND   detour_flags.flaggable_type = '#{self.class}'
+          AND   detour_flags.flaggable_id   = '#{id}'
+      )
+    })
+  end
+
   included do
     # Finds a record by the field set by the :find_by param in
     # `acts_as_flaggable`. If no :find_by param was provided, :id is used.

data/lib/detour/version.rb

@@ -1,3 +1,3 @@
 module Detour
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/integration/group_rollout_spec.rb

@@ -13,7 +13,7 @@ describe "group rollouts" do
     end
 
     it "sets the feature on the user" do
-      feature.match_defined_groups?(user).should be_true
+      user.features.should include feature
     end
   end
 end

data/spec/integration/percentage_rollout_spec.rb

@@ -7,7 +7,7 @@ describe "percentage rollouts" do
 
   describe "creating a percentage rollout" do
     it "makes the feature available to the given percentage of instances" do
-      users.select { |user| feature.match_percentage?(user) }.length.should eq users.length / 5
+      users.select { |user| user.features.include?(feature) }.length.should eq users.length / 5
     end
   end
 end

data/spec/models/detour/feature_spec.rb

@@ -132,84 +132,4 @@ describe Detour::Feature do
       end
     end
   end
-
-  describe "#match_percentage?" do
-    let(:user)    { create :user }
-    let(:feature) { create :feature }
-    let!(:flag)   { create :percentage_flag, feature: feature, flaggable_type: user.class.to_s, percentage: 50 }
-
-    context "when the user's ID matches `id % 10 < percentage / 10" do
-      it "returns true" do
-        user.stub(:id) { 1 }
-        feature.match_percentage?(user).should be_true
-      end
-    end
-
-    context "when the user's ID does not match `id % 10 < percentage / 10" do
-      it "returns false" do
-        user.stub(:id) { 5 }
-        feature.match_percentage?(user).should be_false
-      end
-    end
-  end
-
-  describe "#match_database_group?" do
-    let(:user)        { create :user, name: "foo" }
-    let(:user2)       { create :user }
-    let(:widget)      { create :widget }
-    let(:feature)     { create :feature }
-    let(:group)       { create :group }
-    let!(:membership) { create :membership, group: group, member: user }
-    let!(:flag)       { create :database_group_flag, feature: feature, flaggable_type: user.class.to_s, group: group }
-
-    context "when the instance is in the group" do
-      it "returns true" do
-        feature.match_database_groups?(user).should be_true
-      end
-    end
-
-    context "when the instance is not in the group" do
-      it "returns false" do
-        feature.match_database_groups?(user2).should be_false
-      end
-    end
-
-    context "when the instance is not of the type of the group" do
-      it "returns false" do
-        feature.match_database_groups?(widget).should be_false
-      end
-    end
-  end
-
-  describe "#match_defined_groups?" do
-    let(:user)    { create :user, name: "foo" }
-    let(:user2)   { create :user }
-    let(:widget)  { create :widget }
-    let(:feature) { create :feature }
-    let!(:flag)   { create :defined_group_flag, feature: feature, flaggable_type: user.class.to_s, group_name: "foo_users" }
-
-    before do
-      Detour.config.define_user_group "foo_users" do |user|
-        user.name == "foo"
-      end
-    end
-
-    context "when the instance matches the block" do
-      it "returns true" do
-        feature.match_defined_groups?(user).should be_true
-      end
-    end
-
-    context "when the instance does not match the block" do
-      it "returns false" do
-        feature.match_defined_groups?(user2).should be_false
-      end
-    end
-
-    context "when the instance is not of the type of the block" do
-      it "returns false" do
-        feature.match_defined_groups?(widget).should be_false
-      end
-    end
-  end
 end

data/spec/models/detour/flag_spec.rb

@@ -5,4 +5,25 @@ describe Detour::Flag do
   it { should validate_presence_of :feature }
   it { should validate_presence_of :flaggable_type }
   it { should allow_mass_assignment_of :flaggable_type }
+
+  describe ".without_opt_outs" do
+    let(:feature)  { create :feature }
+    let(:feature2) { create :feature }
+    let(:user)    { create :user }
+
+    before do
+      Detour.config.define_user_group("foo") { true }
+      Detour.config.define_user_group("bar") { true }
+      Detour.config.define_widget_group("baz") { true }
+
+      @flag1 = create :defined_group_flag, feature: feature, flaggable_type: "User", group_name: "foo"
+      @flag2 = create :defined_group_flag, feature: feature2, flaggable_type: "User", group_name: "bar"
+      @flag3 = create :defined_group_flag, feature: feature, flaggable_type: "Widget", group_name: "bar"
+      create :opt_out_flag, feature: feature2, flaggable: user
+    end
+
+    it "returns flags without opt outs" do
+      Detour::DefinedGroupFlag.without_opt_outs(user).should eq [@flag1]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: detour
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jonathan Clem
@@ -245,7 +245,6 @@ files:
 - app/helpers/detour/flags_helper.rb
 - app/models/detour/concerns/countable_flag.rb
 - app/models/detour/concerns/keepable.rb
-- app/models/detour/concerns/matchers.rb
 - app/models/detour/database_group_flag.rb
 - app/models/detour/defined_group.rb
 - app/models/detour/defined_group_flag.rb

data/app/models/detour/concerns/matchers.rb

@@ -1,59 +0,0 @@
-module Detour::Concerns
-  module Matchers
-    # Determines whether or not the given instance has had the feature rolled out
-    # to it via percentage.
-    #
-    # @example
-    #   feature.match_percentage?(current_user)
-    #
-    # @param [ActiveRecord::Base] instance A record to be tested for feature
-    #   rollout.
-    #
-    # @return Whether or not the given instance has the feature rolled out to it
-    #   via direct percentage.
-    def match_percentage?(instance)
-      flag = percentage_flags.find(:first, conditions: ["flaggable_type = ?", instance.class.to_s])
-      percentage = flag ? flag.percentage : 0
-
-      instance.id % 10 < percentage / 10
-    end
-
-    # Determines whether or not the given instance has had the feature rolled out
-    # to it via database group membership.
-    #
-    # @example
-    #   feature.match_database_groups?(current_user)
-    #
-    # @param [ActiveRecord::Base] instance A record to be tested for feature
-    #   rollout.
-    #
-    # @return Whether or not the given instance has the feature rolled out to it
-    #   via direct database group membership.
-    def match_database_groups?(instance)
-      database_group_flags.where(flaggable_type: instance.class).map(&:members).flatten.uniq.include? instance
-    end
-
-    # Determines whether or not the given instance has had the feature rolled out
-    # to it via defined group membership.
-    #
-    # @example
-    #   feature.match_defined_groups?(current_user)
-    #
-    # @param [ActiveRecord::Base] instance A record to be tested for feature
-    #   rollout.
-    #
-    # @return Whether or not the given instance has the feature rolled out to it
-    #   via direct group membership.
-    def match_defined_groups?(instance)
-      klass = instance.class.to_s
-
-      return unless Detour::DefinedGroup.by_type(klass).any?
-
-      group_names = defined_group_flags.find_all_by_flaggable_type(klass).collect(&:group_name)
-
-      Detour::DefinedGroup.by_type(klass).collect { |name, group|
-        group.test(instance) if group_names.include? group.name
-      }.any?
-    end
-  end
-end