flipper 0.7.0.beta5 → 0.7.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21326996e956e478ea5268d560e374601bf14552
-  data.tar.gz: a689bd8f70d6bb8f4dfd466b09c8140541f882d1
+  metadata.gz: fbc4122278d701b4a97828cb9fbfe1f66328ff48
+  data.tar.gz: 87a4ad6f4b5da8b4a3c9d61fae53231a156f10c3
 SHA512:
-  metadata.gz: 8ebf9a133a5c1d940557f5bed521541ff7952d8ec8ce0d9277cbf3721595bf5ae2a03946f1d3e22850f29469ace8d1d08d72b940b8e48064c9157a48cfe581e2
-  data.tar.gz: 0746cac8cd3ed19daf90cecdf105537fc1e9fc841a9f31411603c0f463cd30a5717d563a3f5b8cf18a7a847213245fcc3961f1248b06fc0aade0c23e507e0c74
+  metadata.gz: 0f870e8966135ca803eb0aabe97dce999cd710db15720d67374a8b81e1fc13f608e7ba0ec082b079075b6b8c2a6509bc37db5b8b5af1e27f758b5de4a31de7db
+  data.tar.gz: b5f89715dcb5e10989f1e2fd2f63cc19d62854011d1f08aee29f1d3e7cc17d7280638c12d98576dcf099f5960cbc0f6e25d7f3868fac0a942f6259d6a8eb92a3

data/lib/flipper/feature.rb

@@ -43,13 +43,15 @@ module Flipper
     #
     # Returns the result of Adapter#enable.
     def enable(thing = true)
-      instrument(:enable, thing) { |payload|
+      instrument(:enable) { |payload|
         adapter.add self
 
         gate = gate_for(thing)
+        wrapped_thing = gate.wrap(thing)
         payload[:gate_name] = gate.name
+        payload[:thing] = wrapped_thing
 
-        adapter.enable self, gate, gate.wrap(thing)
+        adapter.enable self, gate, wrapped_thing
       }
     end
 
@@ -57,16 +59,18 @@ module Flipper
     #
     # Returns the result of Adapter#disable.
     def disable(thing = false)
-      instrument(:disable, thing) { |payload|
+      instrument(:disable) { |payload|
         adapter.add self
 
         gate = gate_for(thing)
+        wrapped_thing = gate.wrap(thing)
         payload[:gate_name] = gate.name
+        payload[:thing] = wrapped_thing
 
         if gate.is_a?(Gates::Boolean)
           adapter.clear self
         else
-          adapter.disable self, gate, gate.wrap(thing)
+          adapter.disable self, gate, wrapped_thing
         end
       }
     end
@@ -75,9 +79,11 @@ module Flipper
     #
     # Returns true if enabled, false if not.
     def enabled?(thing = nil)
-      instrument(:enabled?, thing) { |payload|
+      instrument(:enabled?) { |payload|
         values = gate_values
 
+        payload[:thing] = gate(:actor).wrap(thing) unless thing.nil?
+
         open_gate = gates.detect { |gate|
           instrument_gate(gate, :open?, thing) { |gate_payload|
             gate.open?(thing, values[gate.key], feature_name: @name)
@@ -343,14 +349,10 @@ module Flipper
     private
 
     # Private: Instrument a feature operation.
-    def instrument(operation, thing)
-      payload = {
-        :feature_name => name,
-        :operation => operation,
-        :thing => thing,
-      }
-
-      @instrumenter.instrument(InstrumentationName, payload) { |payload|
+    def instrument(operation)
+      @instrumenter.instrument(InstrumentationName) { |payload|
+        payload[:feature_name] = name
+        payload[:operation] = operation
         payload[:result] = yield(payload) if block_given?
       }
     end

data/lib/flipper/gates/group.rb

@@ -37,8 +37,12 @@ module Flipper
         end
       end
 
+      def wrap(thing)
+        Types::Group.wrap(thing)
+      end
+
       def protects?(thing)
-        thing.is_a?(Types::Group)
+        thing.is_a?(Types::Group) || thing.is_a?(Symbol)
       end
     end
   end

data/lib/flipper/types/actor.rb

@@ -6,6 +6,8 @@ module Flipper
         thing.respond_to?(:flipper_id)
       end
 
+      attr_reader :thing
+
       def initialize(thing)
         if thing.nil?
           raise ArgumentError.new("thing cannot be nil")

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.7.0.beta5"
+  VERSION = "0.7.0.beta6"
 end

data/spec/flipper/feature_spec.rb

@@ -115,7 +115,7 @@ describe Flipper::Feature do
     }
 
     it "is recorded for enable" do
-      thing = Flipper::Types::Boolean.new
+      thing = Flipper::Types::Actor.new(Struct.new(:flipper_id).new("1"))
       gate = subject.gate_for(thing)
 
       subject.enable(thing)
@@ -129,6 +129,17 @@ describe Flipper::Feature do
       event.payload[:result].should_not be_nil
     end
 
+    it "always instruments flipper type instance for enable" do
+      thing = Struct.new(:flipper_id).new("1")
+      gate = subject.gate_for(thing)
+
+      subject.enable(thing)
+
+      event = instrumenter.events.last
+      event.should_not be_nil
+      event.payload[:thing].should eq(Flipper::Types::Actor.new(thing))
+    end
+
     it "is recorded for disable" do
       thing = Flipper::Types::Boolean.new
       gate = subject.gate_for(thing)
@@ -144,8 +155,50 @@ describe Flipper::Feature do
       event.payload[:result].should_not be_nil
     end
 
+    user = Struct.new(:flipper_id).new("1")
+    actor = Flipper::Types::Actor.new(user)
+    boolean_true = Flipper::Types::Boolean.new(true)
+    boolean_false = Flipper::Types::Boolean.new(false)
+    group = Flipper::Types::Group.new(:admins)
+    percentage_of_time = Flipper::Types::PercentageOfTime.new(10)
+    percentage_of_actors = Flipper::Types::PercentageOfActors.new(10)
+    {
+      user => actor,
+      actor => actor,
+      true => boolean_true,
+      false => boolean_false,
+      boolean_true => boolean_true,
+      boolean_false => boolean_false,
+      :admins => group,
+      group => group,
+      percentage_of_time => percentage_of_time,
+      percentage_of_actors => percentage_of_actors,
+    }.each do |thing, wrapped_thing|
+      it "always instruments #{thing.inspect} as #{wrapped_thing.class} for enable" do
+        Flipper.register(:admins) {}
+        subject.enable(thing)
+
+        event = instrumenter.events.last
+        event.should_not be_nil
+        event.payload[:operation].should eq(:enable)
+        event.payload[:thing].should eq(wrapped_thing)
+      end
+    end
+
+    it "always instruments flipper type instance for disable" do
+      thing = Struct.new(:flipper_id).new("1")
+      gate = subject.gate_for(thing)
+
+      subject.disable(thing)
+
+      event = instrumenter.events.last
+      event.should_not be_nil
+      event.payload[:operation].should eq(:disable)
+      event.payload[:thing].should eq(Flipper::Types::Actor.new(thing))
+    end
+
     it "is recorded for enabled?" do
-      thing = Flipper::Types::Boolean.new
+      thing = Flipper::Types::Actor.new(Struct.new(:flipper_id).new("1"))
       gate = subject.gate_for(thing)
 
       subject.enabled?(thing)
@@ -158,6 +211,23 @@ describe Flipper::Feature do
       event.payload[:thing].should eq(thing)
       event.payload[:result].should eq(false)
     end
+
+    user = Struct.new(:flipper_id).new("1")
+    actor = Flipper::Types::Actor.new(user)
+    {
+      nil => nil,
+      user => actor,
+      actor => actor,
+    }.each do |thing, wrapped_thing|
+      it "always instruments #{thing.inspect} as #{wrapped_thing.class} for enabled?" do
+        subject.enabled?(thing)
+
+        event = instrumenter.events.last
+        event.should_not be_nil
+        event.payload[:operation].should eq(:enabled?)
+        event.payload[:thing].should eq(wrapped_thing)
+      end
+    end
   end
 
   describe "#state" do

data/spec/flipper/gates/group_spec.rb

@@ -31,4 +31,27 @@ describe Flipper::Gates::Group do
       end
     end
   end
+
+  describe "#wrap" do
+    it "returns group instance for symbol" do
+      group = Flipper.register(:admins) {}
+      subject.wrap(:admins).should eq(group)
+    end
+
+    it "returns group instance for group instance" do
+      group = Flipper.register(:admins) {}
+      subject.wrap(group).should eq(group)
+    end
+  end
+
+  describe "#protects?" do
+    it "returns true for group" do
+      group = Flipper.register(:admins) {}
+      subject.protects?(group).should be(true)
+    end
+
+    it "returns true for symbol" do
+      subject.protects?(:admins).should be(true)
+    end
+  end
 end

data/spec/flipper/instrumentation/log_subscriber_spec.rb

@@ -50,7 +50,7 @@ describe Flipper::Instrumentation::LogSubscriber do
   end
 
   context "feature enabled checks with a thing" do
-    let(:user) { Struct.new(:flipper_id).new('1') }
+    let(:user) { Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1')) }
 
     before do
       clear_logs
@@ -69,7 +69,7 @@ describe Flipper::Instrumentation::LogSubscriber do
   end
 
   context "changing feature enabled state" do
-    let(:user) { Struct.new(:flipper_id).new('1') }
+    let(:user) { Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1')) }
 
     before do
       clear_logs

data/spec/flipper/types/actor_spec.rb

@@ -87,6 +87,12 @@ describe Flipper::Types::Actor do
     actor.admin?.should eq(true)
   end
 
+  it "exposes thing" do
+    thing = thing_class.new(10)
+    actor = described_class.new(thing)
+    actor.thing.should be(thing)
+  end
+
   describe "#respond_to?" do
     it "returns true if responds to method" do
       thing = thing_class.new('1')

data/spec/support/spec_helpers.rb

@@ -10,7 +10,7 @@ module SpecHelpers
 
   def build_app(flipper)
     Flipper::UI.app(flipper) { |builder|
-      builder.use Rack::Session::Cookie
+      builder.use Rack::Session::Cookie, secret: "test"
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta5
+  version: 0.7.0.beta6
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies: []
 description: Feature flipper is the act of enabling/disabling features in your application,
   ideally without re-deploying or changing anything in your code base. Flipper makes
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Feature flipper for ANYTHING