detour 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424e1945f8aaf1315085953f1795186ee0c7caf4
-  data.tar.gz: 3415e4788d0c2ed9802532212a74a1b87837d888
+  metadata.gz: cf7115b71744ec2229a2d850f8b6a4efecd79d28
+  data.tar.gz: 0f5afa558a4412a10db629f0c448d4647c0959b3
 SHA512:
-  metadata.gz: cdb2d36abb5bc62777410cb7d97043f8271537d224182081c4d6e0db4a2b8d774c030ddd33a1a3d27fe37ef21125f66ded5a77a00fb08d86599835eb37a136a3
-  data.tar.gz: 2770754f7379de39c788f626c441869477905bb6e90ebcefe007efc596f48e5b4d543d7b2403688f93e4eac3b6a88e7dcdfc36f458c4fe3f21063b333d4609b5
+  metadata.gz: 8b37642c8dd68bd34f924dcc5438c847c9c4dde889a91e1d32afe5375b4de3aee2ff8d6c04c9b9fc34a892c7d79402cd5f7fdabb42bb4054ad15daa37152700e
+  data.tar.gz: a2f4afa256166f2f97b12f52bb0853c60a9e9674d2f83dd34b214caf30a7736042706ca9f2479b790f4fabb77219ba006778e38eeec72abe4374857497cd106a

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

@@ -1,38 +1,5 @@
 module Detour::Concerns
   module Matchers
-    # Determines whether or not the given instance has had the feature rolled out
-    # to it either via direct flagging-in, percentage, or by database or defined
-    # group membership.
-    #
-    # @example
-    #   feature.match?(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.
-    def match?(instance)
-      match_id?(instance)                ||
-        match_percentage?(instance)      ||
-        match_database_groups?(instance) ||
-        match_defined_groups?(instance)
-    end
-
-    # Determines whether or not the given instance has had the feature rolled out
-    # to it via direct flagging-in.
-    #
-    # @example
-    #   feature.match_id?(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 flagging-in.
-    def match_id?(instance)
-      flag_in_flags.where(flaggable_type: instance.class.to_s, flaggable_id: instance.id).any?
-    end
-
     # Determines whether or not the given instance has had the feature rolled out
     # to it via percentage.
     #

data/lib/detour/acts_as_flaggable.rb

@@ -71,10 +71,6 @@ module Detour::ActsAsFlaggable
         as: :flaggable,
         class_name: "Detour::OptOutFlag"
 
-      has_many :features,
-        through: :flag_in_flags,
-        class_name: "Detour::Feature"
-
       if options[:find_by]
         @detour_flaggable_find_by = options[:find_by]
       end
@@ -83,7 +79,6 @@ module Detour::ActsAsFlaggable
         @detour_flaggable_find_by
       end
 
-      extend  Detour::Flaggable::ClassMethods
       include Detour::Flaggable
     end
   end

data/lib/detour/flaggable.rb

@@ -1,11 +1,30 @@
 module Detour::Flaggable
-  module ClassMethods
-    # 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.
-    #
-    # @param [String,Integer] value The value to find the record by.
-    def flaggable_find!(value)
-      send("find_by_#{@detour_flaggable_find_by}!", value)
+  extend ActiveSupport::Concern
+
+  # Returns an array of all features rolled out to the given record.
+  #
+  # @example
+  #   user.features
+  #
+  # @return [Array] An array of {Detour::Feature}s.
+  def features
+    @features ||= begin
+      @features = []
+
+      opt_out_ids = opt_out_flags.map(&:feature_id) + [-1] # prevents "NOT IN (NULL)"
+      table_name = self.class.table_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
+
+      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
     end
   end
 
@@ -22,26 +41,20 @@ module Detour::Flaggable
   # @param [Proc] &block A block to be called if the user is flagged in to the
   #   feature.
   def has_feature?(feature_name, &block)
-    if detour_features.include? feature_name.to_s
-      match = true
-    else
-      feature = Detour::Feature.find_by_name(feature_name)
-      return false unless feature
-
-      opt_out = opt_out_flags.find_by_feature_id(feature.id)
-      return false if opt_out
-
-      match = feature.match? self
-
-      if match
-        detour_features << feature.name.to_s
-      end
-    end
-
-    match
+    features.map(&:name).include? feature_name.to_s
   end
 
   def detour_features
     @detour_features ||= []
   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.
+    #
+    # @param [String,Integer] value The value to find the record by.
+    def self.flaggable_find!(value)
+      send("find_by_#{@detour_flaggable_find_by}!", value)
+    end
+  end
 end

data/lib/detour/version.rb

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

data/spec/factories/feature.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
+
   factory :feature, class: "Detour::Feature" do
-    name "foo_feature"
+    sequence(:name) { |n| "#{n}_feature" }
   end
 end

data/spec/lib/detour/acts_as_flaggable_spec.rb

@@ -5,7 +5,6 @@ describe Detour::ActsAsFlaggable do
 
   it { should have_many :flag_in_flags }
   it { should have_many :opt_out_flags }
-  it { should have_many(:features).through(:flag_in_flags) }
 
   it "includes Detour::Flaggable" do
     subject.class.ancestors.should include Detour::Flaggable

data/spec/lib/detour/flaggable_spec.rb

@@ -1,7 +1,37 @@
 require "spec_helper"
 
 describe Detour::Flaggable do
-  subject { User.new }
+  subject { create :user }
+
+  describe "#features" do
+    let(:feature1)      { create :feature }
+    let(:feature2)      { create :feature }
+    let(:feature3)      { create :feature }
+    let(:feature4)      { create :feature }
+    let(:feature5)      { create :feature }
+    let(:membership)    { create :membership, member: subject }
+    let(:defined_group) { Detour::DefinedGroup.new "foo", ->(user){true} }
+
+    before do
+      Detour.config.defined_groups["User"] = { foo: defined_group }
+      create :flag_in_flag, flaggable: subject, feature: feature1
+      create :percentage_flag, flaggable_type: "User", feature: feature2
+      create :database_group_flag, flaggable_type: "User", feature: feature3, group: membership.group
+      create :database_group_flag, flaggable_type: "User", feature: feature4, group: membership.group
+      create :opt_out_flag, flaggable: subject, feature: feature4
+      create :defined_group_flag, flaggable_type: "User", feature: feature5, group_name: "foo"
+    end
+
+    it "finds every feature for a record" do
+      subject.features.sort.should eq [feature1, feature2, feature3, feature5].sort
+    end
+
+    it "is memoized" do
+      subject.features
+      Detour::Feature.stub(:joins) { raise "I was called" }
+      subject.features
+    end
+  end
 
   describe "#flaggable_find!" do
     context "when a non-default find_by is not specified" do
@@ -27,17 +57,6 @@ describe Detour::Flaggable do
     let(:user)    { create :user }
     let(:feature) { create :feature }
 
-    it "memoizes found features" do
-      Detour::Feature.stub(:find_by_name) { feature }
-      feature.flag_in_flags.create(flaggable: user)
-
-      feature.should_receive(:match?).with(user).and_return(true)
-      user.has_feature?(feature.name)
-
-      feature.should_not_receive(:match?).with(user)
-      user.has_feature?(feature.name)
-    end
-
     context "when the user is not flagged in" do
       it "returns false" do
         user.has_feature?(feature.name).should be_false

data/spec/models/detour/feature_spec.rb

@@ -97,31 +97,6 @@ describe Detour::Feature do
     end
   end
 
-  describe "#match?" do
-    let(:user)    { create :user }
-    let(:feature) { create :feature }
-
-    it "checks if the user is flagged individually" do
-      feature.should_receive(:match_id?).with(user)
-      feature.match?(user)
-    end
-
-    it "checks if the user is flagged as part of a percentage" do
-      feature.should_receive(:match_percentage?).with(user)
-      feature.match?(user)
-    end
-
-    it "checks if the user is flagged as part of a database group" do
-      feature.should_receive(:match_database_groups?).with(user)
-      feature.match?(user)
-    end
-
-    it "checks if the user is flagged as part of a defined group" do
-      feature.should_receive(:match_defined_groups?).with(user)
-      feature.match?(user)
-    end
-  end
-
   describe "#flag_in_count_for" do
     context "when a value does not exist" do
       let(:feature) { create :feature }
@@ -158,29 +133,6 @@ describe Detour::Feature do
     end
   end
 
-
-  describe "#match_id?" do
-    let(:user)    { create :user }
-    let(:user2)   { create :user }
-    let(:feature) { create :feature }
-
-    before do
-      create(:flag_in_flag, flaggable: user, feature: feature)
-    end
-
-    context "when the feature exists for the instance" do
-      it "returns true" do
-        feature.match_id?(user).should be_true
-      end
-    end
-
-    context "when the feature does not exist for the instance" do
-      it "returns false" do
-        feature.match_id?(user2).should be_false
-      end
-    end
-  end
-
   describe "#match_percentage?" do
     let(:user)    { create :user }
     let(:feature) { create :feature }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: detour
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jonathan Clem