flipper 0.2.1 → 0.3.0

data/lib/flipper/toggle.rb

@@ -13,16 +13,22 @@ module Flipper
     end
 
     def enable(thing)
-      raise 'Not implemented'
+      add_feature_to_set
     end
 
     def disable(thing)
-      raise 'Not implemented'
+      add_feature_to_set
     end
 
     def value
       raise 'Not implemented'
     end
+
+    private
+
+    def add_feature_to_set
+      adapter.feature_add key.prefix
+    end
   end
 end
 

data/lib/flipper/toggles/boolean.rb

@@ -2,15 +2,15 @@ module Flipper
   module Toggles
     class Boolean < Toggle
       def enable(thing)
-        adapter.write key, thing.enabled_value
+        super
+        adapter.write key, thing.value
       end
 
       def disable(thing)
-        adapter.delete key
-        adapter.delete "#{gate.key_prefix}#{Gate::Separator}#{Gates::Actor::Key}"
-        adapter.delete "#{gate.key_prefix}#{Gate::Separator}#{Gates::Group::Key}"
-        adapter.delete "#{gate.key_prefix}#{Gate::Separator}#{Gates::PercentageOfActors::Key}"
-        adapter.delete "#{gate.key_prefix}#{Gate::Separator}#{Gates::PercentageOfRandom::Key}"
+        super
+        feature.gates.each do |gate|
+          gate.adapter.delete gate.key
+        end
       end
 
       def value

data/lib/flipper/toggles/set.rb

@@ -2,11 +2,13 @@ module Flipper
   module Toggles
     class Set < Toggle
       def enable(thing)
-        adapter.set_add key, thing.enabled_value
+        super
+        adapter.set_add key, thing.value
       end
 
       def disable(thing)
-        adapter.set_delete key, thing.disabled_value
+        super
+        adapter.set_delete key, thing.value
       end
 
       def value

data/lib/flipper/toggles/value.rb

@@ -2,11 +2,13 @@ module Flipper
   module Toggles
     class Value < Toggle
       def enable(thing)
-        adapter.write key, thing.enabled_value
+        super
+        adapter.write key, thing.value
       end
 
       def disable(thing)
-        adapter.write key, thing.disabled_value
+        super
+        adapter.delete key
       end
 
       def value

data/lib/flipper/type.rb

@@ -1,10 +1,6 @@
 module Flipper
   class Type
-    def enabled_value
-      raise 'Not implemented'
-    end
-
-    def disabled_value
+    def value
       raise 'Not implemented'
     end
   end

data/lib/flipper/types/actor.rb

@@ -4,7 +4,6 @@ module Flipper
       def self.wrappable?(thing)
         thing.is_a?(Flipper::Types::Actor) ||
           thing.respond_to?(:identifier) ||
-          thing.respond_to?(:id) ||
           thing.respond_to?(:to_i)
       end
 
@@ -24,19 +23,15 @@ module Flipper
         @thing = thing
         @identifier = if thing.respond_to?(:identifier)
           thing.identifier
-        elsif thing.respond_to?(:id)
-          thing.id
         else
           thing
         end.to_i
       end
 
-      def enabled_value
+      def value
         @identifier
       end
 
-      alias_method :disabled_value, :enabled_value
-
       def respond_to?(*args)
         super || @thing.respond_to?(*args)
       end

data/lib/flipper/types/boolean.rb

@@ -1,13 +1,9 @@
 module Flipper
   module Types
     class Boolean < Type
-      def enabled_value
+      def value
         true
       end
-
-      def disabled_value
-        false
-      end
     end
   end
 end

data/lib/flipper/types/group.rb

@@ -12,11 +12,9 @@ module Flipper
         @block.call(*args) == true
       end
 
-      def enabled_value
+      def value
         @name
       end
-
-      alias_method :disabled_value, :enabled_value
     end
   end
 end

data/lib/flipper/types/percentage.rb

@@ -7,13 +7,10 @@ module Flipper
         @value = value.to_i
       end
 
-      def enabled_value
-        value
-      end
-
-      def disabled_value
-        0
+      def eql?(other)
+        self.class.eql?(other.class) && value == other.value
       end
+      alias :== :eql?
     end
   end
 end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/flipper/adapter_spec.rb

@@ -3,8 +3,9 @@ require 'flipper/adapter'
 require 'flipper/adapters/memory'
 
 describe Flipper::Adapter do
-  let(:local_cache) { {} }
-  let(:adapter)     { Flipper::Adapters::Memory.new }
+  let(:local_cache)  { {} }
+  let(:adapter)      { Flipper::Adapters::Memory.new }
+  let(:features_key) { described_class::FeaturesKey }
 
   subject { described_class.new(adapter, local_cache) }
 
@@ -280,4 +281,47 @@ describe Flipper::Adapter do
       (subject == described_class.new(adapter)).should be_true
     end
   end
+
+  describe "#features" do
+    context "with no features enabled/disabled" do
+      it "defaults to empty set" do
+        subject.features.should eq(Set.new)
+      end
+    end
+
+    context "with features enabled and disabled" do
+      before do
+        subject.set_add(features_key, 'stats')
+        subject.set_add(features_key, 'cache')
+        subject.set_add(features_key, 'search')
+      end
+
+      it "returns set of feature names" do
+        subject.features.should be_instance_of(Set)
+        subject.features.sort.should eq(['cache', 'search', 'stats'])
+      end
+    end
+  end
+
+  describe "#feature_add" do
+    context "with string name" do
+      before do
+        subject.feature_add('search')
+      end
+
+      it "adds string to set" do
+        subject.set_members(features_key).should include('search')
+      end
+    end
+
+    context "with symbol name" do
+      before do
+        subject.feature_add(:search)
+      end
+
+      it "adds string to set" do
+        subject.set_members(features_key).should include('search')
+      end
+    end
+  end
 end

data/spec/flipper/adapters/memoized_spec.rb

@@ -11,11 +11,11 @@ describe Flipper::Adapters::Memoized do
   subject { described_class.new(adapter, cache) }
 
   def read_key(key)
-    source[key]
+    source[key.to_s]
   end
 
   def write_key(key, value)
-    source[key] = value
+    source[key.to_s] = value
   end
 
   it_should_behave_like 'a flipper adapter'

data/spec/flipper/adapters/memory_spec.rb

@@ -8,11 +8,11 @@ describe Flipper::Adapters::Memory do
   subject { described_class.new(source) }
 
   def read_key(key)
-    source[key]
+    source[key.to_s]
   end
 
   def write_key(key, value)
-    source[key] = value
+    source[key.to_s] = value
   end
 
   it_should_behave_like 'a flipper adapter'

data/spec/flipper/dsl_spec.rb

@@ -117,15 +117,6 @@ describe Flipper::DSL do
   end
 
   describe "#actor" do
-    context "for something that responds to id" do
-      it "returns actor instance with identifier set to id" do
-        user = Struct.new(:id).new(23)
-        actor = subject.actor(user)
-        actor.should be_instance_of(Flipper::Types::Actor)
-        actor.identifier.should eq(23)
-      end
-    end
-
     context "for something that responds to identifier" do
       it "returns actor instance with identifier set to id" do
         user = Struct.new(:identifier).new(45)
@@ -135,15 +126,6 @@ describe Flipper::DSL do
       end
     end
 
-    context "for something that responds to identifier and id" do
-      it "returns actor instance with identifier set to identifier" do
-        user = Struct.new(:id, :identifier).new(1, 50)
-        actor = subject.actor(user)
-        actor.should be_instance_of(Flipper::Types::Actor)
-        actor.identifier.should eq(50)
-      end
-    end
-
     context "for a number" do
       it "returns actor instance with identifer set to number" do
         actor = subject.actor(33)
@@ -173,6 +155,10 @@ describe Flipper::DSL do
     it "sets value" do
       @result.value.should eq(5)
     end
+
+    it "is aliased to percentage_of_random" do
+      @result.should eq(subject.percentage_of_random(@result.value))
+    end
   end
 
   describe "#actors" do
@@ -187,5 +173,33 @@ describe Flipper::DSL do
     it "sets value" do
       @result.value.should eq(17)
     end
+
+    it "is aliased to percentage_of_actors" do
+      @result.should eq(subject.percentage_of_actors(@result.value))
+    end
+  end
+
+  describe "#features" do
+    context "with no features enabled/disabled" do
+      it "defaults to empty set" do
+        subject.features.should eq(Set.new)
+      end
+    end
+
+    context "with features enabled and disabled" do
+      before do
+        subject[:stats].enable
+        subject[:cache].enable
+        subject[:search].disable
+      end
+
+      it "returns set of feature instances" do
+        subject.features.should be_instance_of(Set)
+        subject.features.each do |feature|
+          feature.should be_instance_of(Flipper::Feature)
+        end
+        subject.features.map(&:name).map(&:to_s).sort.should eq(['cache', 'search', 'stats'])
+      end
+    end
   end
 end

data/spec/flipper/feature_spec.rb

@@ -8,388 +8,19 @@ describe Flipper::Feature do
   let(:source)      { {} }
   let(:adapter)     { Flipper::Adapters::Memory.new(source) }
 
-  let(:actor_key)   { Flipper::Gates::Actor::Key }
-  let(:boolean_key) { Flipper::Gates::Boolean::Key }
-  let(:group_key)   { Flipper::Gates::Group::Key }
-
-  let(:admin_group) { Flipper.group(:admins) }
-  let(:dev_group)   { Flipper.group(:devs) }
-
-  let(:admin_thing) { double 'Non Flipper Thing', :identifier => 1,  :admin? => true, :dev? => false }
-  let(:dev_thing)   { double 'Non Flipper Thing', :identifier => 10, :admin? => false, :dev? => true }
-
-  let(:pitt)        { Flipper::Types::Actor.new(1) }
-  let(:clooney)     { Flipper::Types::Actor.new(10) }
-
-  let(:five_percent_of_actors)   { Flipper::Types::PercentageOfActors.new(5) }
-  let(:percentage_of_actors_key) { Flipper::Gates::PercentageOfActors::Key }
-
-  let(:five_percent_of_random)     { Flipper::Types::PercentageOfRandom.new(5) }
-  let(:percentage_of_random_key)   { Flipper::Gates::PercentageOfRandom::Key }
-
-  before do
-    Flipper.register(:admins) { |thing| thing.admin? }
-    Flipper.register(:devs)   { |thing| thing.dev? }
-  end
-
   it "initializes with name and adapter" do
     feature = described_class.new(:search, adapter)
     feature.name.should eq(:search)
     feature.adapter.should eq(Flipper::Adapter.wrap(adapter))
   end
 
-  describe "#enable" do
-    context "with no arguments" do
-      before do
-        subject.enable
-      end
-
-      it "enables feature for all" do
-        subject.enabled?.should be_true
-      end
-    end
-
-    context "with a group" do
-      before do
-        subject.enable(admin_group)
-      end
-
-      it "enables feature for non flipper thing in group" do
-        subject.enabled?(admin_thing).should be_true
-      end
-
-      it "does not enable feature for non flipper thing in other group" do
-        subject.enabled?(dev_thing).should be_false
-      end
-
-      it "enables feature for flipper actor in group" do
-        subject.enabled?(Flipper::Types::Actor.new(admin_thing)).should be_true
-      end
-
-      it "does not enable for flipper actor not in group" do
-        subject.enabled?(Flipper::Types::Actor.new(dev_thing)).should be_false
-      end
-
-      it "does not enable feature for all" do
-        subject.enabled?.should be_false
-      end
-    end
-
-    context "with an actor" do
-      before do
-        subject.enable(pitt)
-      end
-
-      it "enables feature for actor" do
-        subject.enabled?(pitt).should be_true
-      end
-
-      it "does not enable feature for other actors" do
-        subject.enabled?(clooney).should be_false
-      end
-    end
-
-    context "with a percentage of actors" do
-      before do
-        subject.enable(five_percent_of_actors)
-      end
-
-      it "enables feature for actor within percentage" do
-        subject.enabled?(pitt).should be_true
-      end
-
-      it "does not enable feature for actors not within percentage" do
-        subject.enabled?(clooney).should be_false
-      end
-    end
-
-    context "with a percentage of time" do
-      before do
-        @gate = Flipper::Gates::PercentageOfRandom.new(subject)
-        Flipper::Gates::PercentageOfRandom.should_receive(:new).and_return(@gate)
-        subject.enable(five_percent_of_random)
-      end
-
-      it "enables feature for time within percentage" do
-        @gate.stub(:rand => 0.04)
-        subject.enabled?.should be_true
-      end
-
-      it "does not enable feature for time not within percentage" do
-        @gate.stub(:rand => 0.10)
-        subject.enabled?.should be_false
-      end
-    end
-
-    context "with argument that has no gate" do
-      it "raises error" do
-        thing = Object.new
-        expect {
-          subject.enable(thing)
-        }.to raise_error(Flipper::GateNotFound, "Could not find gate for #{thing.inspect}")
-      end
-    end
-  end
-
-  describe "#disable" do
-    context "with no arguments" do
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", admin_group.name)
-        subject.disable
-      end
-
-      it "disables feature" do
-        subject.enabled?.should be_false
-      end
-
-      it "disables feature for non flipper thing in previously enabled groups" do
-        subject.enabled?(admin_thing).should be_false
-      end
-    end
-
-    context "with a group" do
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", dev_group.name)
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", admin_group.name)
-        subject.disable(admin_group)
-      end
-
-      it "disables the feature for non flipper thing in the group" do
-        subject.enabled?(admin_thing).should be_false
-      end
-
-      it "does not disable feature for non flipper thing in other groups" do
-        subject.enabled?(dev_thing).should be_true
-      end
-
-      it "disables feature for flipper actor in group" do
-        subject.enabled?(Flipper::Types::Actor.new(admin_thing)).should be_false
-      end
-
-      it "does not disable feature for flipper actor in other groups" do
-        subject.enabled?(Flipper::Types::Actor.new(dev_thing)).should be_true
-      end
-    end
-
-    context "with an actor" do
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{actor_key}", pitt.identifier)
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{actor_key}", clooney.identifier)
-        subject.disable(pitt)
-      end
-
-      it "disables feature for actor" do
-        subject.enabled?(pitt).should be_false
-      end
-
-      it "does not disable feature for other actors" do
-        subject.enabled?(clooney).should be_true
-      end
-    end
-
-    context "with a percentage of actors" do
-      before do
-        subject.disable(five_percent_of_actors)
-      end
-
-      it "disables feature for actor within percentage" do
-        subject.enabled?(pitt).should be_false
-      end
-
-      it "disables feature for actors not within percentage" do
-        subject.enabled?(clooney).should be_false
-      end
-    end
-
-    context "with a percentage of time" do
-      before do
-        @gate = Flipper::Gates::PercentageOfRandom.new(subject)
-        Flipper::Gates::PercentageOfRandom.should_receive(:new).and_return(@gate)
-        subject.disable(five_percent_of_random)
-      end
-
-      it "disables feature for time within percentage" do
-        @gate.stub(:rand => 0.04)
-        subject.enabled?.should be_false
-      end
-
-      it "disables feature for time not within percentage" do
-        @gate.stub(:rand => 0.10)
-        subject.enabled?.should be_false
-      end
-    end
-
-    context "with argument that has no gate" do
-      it "raises error" do
-        thing = Object.new
-        expect {
-          subject.disable(thing)
-        }.to raise_error(Flipper::GateNotFound, "Could not find gate for #{thing.inspect}")
-      end
-    end
-  end
-
-  describe "#enabled?" do
-    context "with no arguments" do
-      it "defaults to false" do
-        subject.enabled?.should be_false
-      end
-    end
-
-    context "with no arguments, but boolean enabled" do
-      before do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{boolean_key}", true)
-      end
-
-      it "returns true" do
-        subject.enabled?.should be_true
-      end
-    end
-
-    context "for actor in enabled group" do
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", admin_group.name)
-      end
-
-      it "returns true" do
-        subject.enabled?(Flipper::Types::Actor.new(admin_thing)).should be_true
-      end
-    end
-
-    context "for actor in disbled group" do
-      it "returns false" do
-        subject.enabled?(Flipper::Types::Actor.new(dev_thing)).should be_false
-      end
-    end
-
-    context "for enabled actor" do
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{actor_key}", pitt.identifier)
-      end
-
-      it "returns true" do
-        subject.enabled?(pitt).should be_true
-      end
-    end
-
-    context "for not enabled actor" do
-      it "returns false" do
-        subject.enabled?(clooney).should be_false
-      end
-
-      it "returns true if boolean enabled" do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{boolean_key}", true)
-        subject.enabled?(clooney).should be_true
-      end
-    end
-
-    context "for actor in percentage of actors enabled" do
-      before do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{percentage_of_actors_key}", five_percent_of_actors.value)
-      end
-
-      it "returns true" do
-        subject.enabled?(pitt).should be_true
-      end
-    end
-
-    context "for actor not in percentage of actors enabled" do
-      before do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{percentage_of_actors_key}", five_percent_of_actors.value)
-      end
-
-      it "returns false" do
-        subject.enabled?(clooney).should be_false
-      end
-
-      it "returns true if boolean enabled" do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{boolean_key}", true)
-        subject.enabled?(clooney).should be_true
-      end
-    end
-
-    context "during enabled percentage of time" do
-      before do
-        @gate = Flipper::Gates::PercentageOfRandom.new(subject)
-        @gate.stub(:rand => 0.04)
-        Flipper::Gates::PercentageOfRandom.should_receive(:new).and_return(@gate)
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{percentage_of_random_key}", five_percent_of_random.value)
-      end
-
-      it "returns true" do
-        subject.enabled?.should be_true
-        subject.enabled?(nil).should be_true
-        subject.enabled?(pitt).should be_true
-        subject.enabled?(admin_thing).should be_true
-      end
-    end
-
-    context "during not enabled percentage of time" do
-      before do
-        @gate = Flipper::Gates::PercentageOfRandom.new(subject)
-        @gate.stub(:rand => 0.10)
-        Flipper::Gates::PercentageOfRandom.should_receive(:new).and_return(@gate)
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{percentage_of_random_key}", five_percent_of_random.value)
-      end
-
-      it "returns false" do
-        subject.enabled?.should be_false
-        subject.enabled?(nil).should be_false
-        subject.enabled?(pitt).should be_false
-        subject.enabled?(admin_thing).should be_false
-      end
-
-      it "returns true if boolean enabled" do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{boolean_key}", true)
-        subject.enabled?.should be_true
-        subject.enabled?(nil).should be_true
-        subject.enabled?(pitt).should be_true
-        subject.enabled?(admin_thing).should be_true
-      end
-    end
-
-    context "for a non flipper thing" do
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", admin_group.name)
-      end
-
-      it "returns true if in enabled group" do
-        subject.enabled?(admin_thing).should be_true
-      end
-
-      it "returns false if not in enabled group" do
-        subject.enabled?(dev_thing).should be_false
-      end
-
-      it "returns true if boolean enabled" do
-        adapter.write("#{subject.name}#{Flipper::Gate::Separator}#{boolean_key}", true)
-        subject.enabled?(admin_thing).should be_true
-        subject.enabled?(dev_thing).should be_true
-      end
-    end
-
-    context "for a non flipper thing that does not respond to something in group block" do
-      let(:actor) { double('Actor') }
-
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", admin_group.name)
-      end
-
-      it "returns false" do
-        expect { subject.enabled?(actor) }.to raise_error
-      end
-    end
-
-    context "for a non flipper thing when group in adapter, but not defined in code" do
-      let(:actor) { double('Actor') }
-
-      before do
-        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", :support)
-      end
-
-      it "returns false" do
-        subject.enabled?(actor).should be_false
+  describe "#gates" do
+    it "returns array of gates" do
+      subject.gates.should be_instance_of(Array)
+      subject.gates.each do |gate|
+        gate.should be_a(Flipper::Gate)
       end
+      subject.gates.size.should be(5)
     end
   end
 
@@ -402,21 +33,4 @@ describe Flipper::Feature do
       subject.disabled?.should be_true
     end
   end
-
-  context "enabling multiple groups, disabling everything, then enabling one group" do
-    before do
-      subject.enable(admin_group)
-      subject.enable(dev_group)
-      subject.disable
-      subject.enable(admin_group)
-    end
-
-    it "enables feature for object in enabled group" do
-      subject.enabled?(admin_thing).should be_true
-    end
-
-    it "does not enable feature for object in not enabled group" do
-      subject.enabled?(dev_thing).should be_false
-    end
-  end
 end