detour 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d487ed6d4c933fbf39a7743ae7f14583c58335
-  data.tar.gz: b07a8fd7a7e3d6d430c1e7708edf77eae200b2de
+  metadata.gz: e523669f071b4f7fafbedabf9f38352bb33cc014
+  data.tar.gz: d8a1cdbcec53f6c854db8626e47bab1037dcdbcf
 SHA512:
-  metadata.gz: cf2629eb8e3d045326c69997e05f4a009918ead2a123ef903359d8ac8a39837dfa00d8984ea3205771b5a8edbb49ea4f4411c3b76d7045041df255e1f6b56ddc
-  data.tar.gz: b40978ca2f160e271bbb7495ab26e81378b4e4da3ce7cc0e2a7c84c196d6c0bb3c96a51425d8485ef4a558d66b2629fe3076a4b468977f3ffe4a2eb3aa84ee33
+  metadata.gz: fa7e64b13cbee206eef6b6f458ffb8a3e8dd9552e8ad157c77a81a68bb8715cfc974c393baadd01610c6d4eb49add4852e0fd2e39c9716c8e24e66445d931a44
+  data.tar.gz: bafb4b8f3fe1105dc4f71d7ba3a1093933bf273f7c0e921ed426ef4c86e596958ed311dd17e5a16eab15d1e5010be6c8729d96f4a51ce984232756e520552ea5

data/app/models/detour/group.rb

@@ -2,6 +2,7 @@ class Detour::Group < ActiveRecord::Base
   validates :name,           presence: true, uniqueness: { scope: :flaggable_type }
   validates :flaggable_type, presence: true, inclusion: { in: Detour.config.flaggable_types }
   has_many :memberships, dependent: :destroy
+  has_many :database_group_flags, dependent: :destroy
 
   accepts_nested_attributes_for :memberships, allow_destroy: true
 

data/lib/detour/acts_as_flaggable.rb

@@ -67,6 +67,18 @@ module Detour::ActsAsFlaggable
         as: :flaggable,
         class_name: "Detour::FlagInFlag"
 
+      has_many :memberships,
+        as: :member,
+        class_name: "Detour::Membership"
+
+      has_many :groups,
+        through: :memberships,
+        class_name: "Detour::Group"
+
+      has_many :database_group_flags,
+        through: :groups,
+        class_name: "Detour::DatabaseGroupFlag"
+
       has_many :opt_out_flags,
         as: :flaggable,
         class_name: "Detour::OptOutFlag"
@@ -75,6 +87,16 @@ module Detour::ActsAsFlaggable
         @detour_flaggable_find_by = options[:find_by]
       end
 
+      def defined_group_flags
+        @defined_group_flags ||= Detour::DefinedGroupFlag.where(flaggable_type: self.class.to_s)
+      end
+
+      def percentage_flags
+        @percentage_flags ||= Detour::PercentageFlag
+          .where(flaggable_type: self.class.to_s)
+          .where("? % 10 < detour_flags.percentage / 10", id)
+      end
+
       def self.detour_flaggable_find_by
         @detour_flaggable_find_by
       end

data/lib/detour/flaggable.rb

@@ -16,7 +16,7 @@ module Detour::Flaggable
         defined_group = Detour::DefinedGroup.by_type(self.class)[defined_group_flag.group_name]
 
         unless defined_group && defined_group.test(self)
-          feeatures.delete defined_group_flag.feature
+          features.delete defined_group_flag.feature
         end
       end
 
@@ -47,45 +47,14 @@ module Detour::Flaggable
   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}'
-      )
-    })
+    table = Detour::Feature.arel_table
+    query = table[:id].in(flag_in_flags.select(:feature_id).arel)
+      .or(table[:id].in(database_group_flags.select(:feature_id).arel))
+      .or(table[:id].in(defined_group_flags.select(:feature_id).arel))
+      .or(table[:id].in(percentage_flags.select(:feature_id).arel))
+      .and(table[:id].not_in(opt_out_flags.select(:feature_id).arel))
+
+    Detour::Feature.where(query)
   end
 
   included do

data/lib/detour/version.rb

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

data/spec/lib/detour/acts_as_flaggable_spec.rb

@@ -5,6 +5,31 @@ describe Detour::ActsAsFlaggable do
 
   it { should have_many :flag_in_flags }
   it { should have_many :opt_out_flags }
+  it { should have_many(:memberships).class_name("Detour::Membership") }
+  it { should have_many(:groups).through(:memberships).class_name("Detour::Group") }
+  it { should have_many(:database_group_flags).through(:groups).class_name("Detour::DatabaseGroupFlag") }
+
+  describe "#defined_group_flags" do
+    it "returns the defined group flags for the class" do
+      Detour::DefinedGroupFlag.should_receive(:where).with(flaggable_type: "User")
+      subject.defined_group_flags
+    end
+  end
+
+  describe "#percentage_flags" do
+    it "returns the percentage flags for the class" do
+      Detour::PercentageFlag.should_receive(:where).with(flaggable_type: "User").and_call_original
+      subject.percentage_flags
+    end
+
+    it "returns the percentage flags with the correct formula" do
+      subject.save!
+      where_double = double(where: true)
+      Detour::PercentageFlag.stub(:where) { where_double }
+      where_double.should_receive(:where).with("? % 10 < detour_flags.percentage / 10", subject.id)
+      subject.percentage_flags
+    end
+  end
 
   it "includes Detour::Flaggable" do
     subject.class.ancestors.should include Detour::Flaggable

data/spec/lib/detour/flaggable_spec.rb

@@ -4,13 +4,14 @@ describe Detour::Flaggable do
   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} }
+    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} }
+    let(:defined_group2) { Detour::DefinedGroup.new "foo2", ->(user){false} }
 
     before do
       Detour.config.defined_groups["User"] = { foo: defined_group }
@@ -20,6 +21,7 @@ describe Detour::Flaggable do
       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"
+      create :defined_group_flag, flaggable_type: "User", feature: feature5, group_name: "foo2"
     end
 
     it "finds every feature for a record" do

data/spec/models/detour/{defined_group_spec.rb → group_spec.rb}

@@ -9,6 +9,7 @@ describe Detour::Group do
   it { should accept_nested_attributes_for :memberships }
 
   it { should have_many(:memberships).dependent(:destroy) }
+  it { should have_many(:database_group_flags).dependent(:destroy) }
   it { should allow_mass_assignment_of :name }
   it { should allow_mass_assignment_of :flaggable_type }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: detour
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Jonathan Clem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -363,12 +363,12 @@ files:
 - spec/lib/detour/flag_form_spec.rb
 - spec/lib/detour/flaggable_spec.rb
 - spec/models/detour/database_group_flag_spec.rb
-- spec/models/detour/defined_group_spec.rb
 - spec/models/detour/feature_spec.rb
 - spec/models/detour/flag_in_flag_spec.rb
 - spec/models/detour/flag_spec.rb
 - spec/models/detour/flaggable_flag_spec.rb
 - spec/models/detour/group_flag_spec.rb
+- spec/models/detour/group_spec.rb
 - spec/models/detour/membership_spec.rb
 - spec/models/detour/opt_out_flag_spec.rb
 - spec/models/detour/percentage_flag_spec.rb
@@ -471,12 +471,12 @@ test_files:
 - spec/lib/detour/flag_form_spec.rb
 - spec/lib/detour/flaggable_spec.rb
 - spec/models/detour/database_group_flag_spec.rb
-- spec/models/detour/defined_group_spec.rb
 - spec/models/detour/feature_spec.rb
 - spec/models/detour/flag_in_flag_spec.rb
 - spec/models/detour/flag_spec.rb
 - spec/models/detour/flaggable_flag_spec.rb
 - spec/models/detour/group_flag_spec.rb
+- spec/models/detour/group_spec.rb
 - spec/models/detour/membership_spec.rb
 - spec/models/detour/opt_out_flag_spec.rb
 - spec/models/detour/percentage_flag_spec.rb