flipper 0.10.2 → 0.11.0.beta1

data/spec/flipper/instrumentation/log_subscriber_spec.rb

@@ -5,22 +5,22 @@ require 'flipper/adapters/memory'
 require 'flipper/instrumentation/log_subscriber'
 
 RSpec.describe Flipper::Instrumentation::LogSubscriber do
-  let(:adapter) {
+  let(:adapter) do
     memory = Flipper::Adapters::Memory.new
-    Flipper::Adapters::Instrumented.new(memory, :instrumenter => ActiveSupport::Notifications)
-  }
-  let(:flipper) {
-    Flipper.new(adapter, :instrumenter => ActiveSupport::Notifications)
-  }
+    Flipper::Adapters::Instrumented.new(memory, instrumenter: ActiveSupport::Notifications)
+  end
+  let(:flipper) do
+    Flipper.new(adapter, instrumenter: ActiveSupport::Notifications)
+  end
 
   before do
-    Flipper.register(:admins) { |thing|
+    Flipper.register(:admins) do |thing|
       thing.respond_to?(:admin?) && thing.admin?
-    }
+    end
 
     @io = StringIO.new
     logger = Logger.new(@io)
-    logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
+    logger.formatter = proc { |_severity, _datetime, _progname, msg| "#{msg}\n" }
     described_class.logger = logger
   end
 
@@ -30,25 +30,25 @@ RSpec.describe Flipper::Instrumentation::LogSubscriber do
 
   let(:log) { @io.string }
 
-  context "feature enabled checks" do
+  context 'feature enabled checks' do
     before do
       clear_logs
       flipper[:search].enabled?
     end
 
-    it "logs feature calls with result after operation" do
+    it 'logs feature calls with result after operation' do
       feature_line = find_line('Flipper feature(search) enabled? false')
       expect(feature_line).to include('[ thing=nil ]')
     end
 
-    it "logs adapter calls" do
+    it 'logs adapter calls' do
       adapter_line = find_line('Flipper feature(search) adapter(memory) get')
       expect(adapter_line).to include('[ result={')
       expect(adapter_line).to include('} ]')
     end
   end
 
-  context "feature enabled checks with a thing" do
+  context 'feature enabled checks with a thing' do
     let(:user) { Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1')) }
 
     before do
@@ -56,13 +56,13 @@ RSpec.describe Flipper::Instrumentation::LogSubscriber do
       flipper[:search].enabled?(user)
     end
 
-    it "logs thing for feature" do
+    it 'logs thing for feature' do
       feature_line = find_line('Flipper feature(search) enabled?')
       expect(feature_line).to include(user.inspect)
     end
   end
 
-  context "changing feature enabled state" do
+  context 'changing feature enabled state' do
     let(:user) { Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1')) }
 
     before do
@@ -70,24 +70,24 @@ RSpec.describe Flipper::Instrumentation::LogSubscriber do
       flipper[:search].enable(user)
     end
 
-    it "logs feature calls with result in brackets" do
+    it 'logs feature calls with result in brackets' do
       feature_line = find_line('Flipper feature(search) enable true')
       expect(feature_line).to include("[ thing=#{user.inspect} gate_name=actor ]")
     end
 
-    it "logs adapter value" do
+    it 'logs adapter value' do
       adapter_line = find_line('Flipper feature(search) adapter(memory) enable')
-      expect(adapter_line).to include("[ result=")
+      expect(adapter_line).to include('[ result=')
     end
   end
 
-  context "getting all the features from the adapter" do
+  context 'getting all the features from the adapter' do
     before do
       clear_logs
       flipper.features
     end
 
-    it "logs adapter calls" do
+    it 'logs adapter calls' do
       adapter_line = find_line('Flipper adapter(memory) features')
       expect(adapter_line).to include('[ result=')
     end

data/spec/flipper/instrumentation/metriks_subscriber_spec.rb

@@ -3,13 +3,13 @@ require 'flipper/adapters/memory'
 require 'flipper/instrumentation/metriks'
 
 RSpec.describe Flipper::Instrumentation::MetriksSubscriber do
-  let(:adapter) {
+  let(:adapter) do
     memory = Flipper::Adapters::Memory.new
-    Flipper::Adapters::Instrumented.new(memory, :instrumenter => ActiveSupport::Notifications)
-  }
-  let(:flipper) {
-    Flipper.new(adapter, :instrumenter => ActiveSupport::Notifications)
-  }
+    Flipper::Adapters::Instrumented.new(memory, instrumenter: ActiveSupport::Notifications)
+  end
+  let(:flipper) do
+    Flipper.new(adapter, instrumenter: ActiveSupport::Notifications)
+  end
 
   let(:user) { user = Struct.new(:flipper_id).new('1') }
 
@@ -17,36 +17,36 @@ RSpec.describe Flipper::Instrumentation::MetriksSubscriber do
     Metriks::Registry.default.clear
   end
 
-  context "for enabled feature" do
-    it "updates feature metrics when calls happen" do
+  context 'for enabled feature' do
+    it 'updates feature metrics when calls happen' do
       flipper[:stats].enable(user)
-      expect(Metriks.timer("flipper.feature_operation.enable").count).to be(1)
+      expect(Metriks.timer('flipper.feature_operation.enable').count).to be(1)
 
       flipper[:stats].enabled?(user)
-      expect(Metriks.timer("flipper.feature_operation.enabled").count).to be(1)
-      expect(Metriks.meter("flipper.feature.stats.enabled").count).to be(1)
+      expect(Metriks.timer('flipper.feature_operation.enabled').count).to be(1)
+      expect(Metriks.meter('flipper.feature.stats.enabled').count).to be(1)
     end
   end
 
-  context "for disabled feature" do
-    it "updates feature metrics when calls happen" do
+  context 'for disabled feature' do
+    it 'updates feature metrics when calls happen' do
       flipper[:stats].disable(user)
-      expect(Metriks.timer("flipper.feature_operation.disable").count).to be(1)
+      expect(Metriks.timer('flipper.feature_operation.disable').count).to be(1)
 
       flipper[:stats].enabled?(user)
-      expect(Metriks.timer("flipper.feature_operation.enabled").count).to be(1)
-      expect(Metriks.meter("flipper.feature.stats.disabled").count).to be(1)
+      expect(Metriks.timer('flipper.feature_operation.enabled').count).to be(1)
+      expect(Metriks.meter('flipper.feature.stats.disabled').count).to be(1)
     end
   end
 
-  it "updates adapter metrics when calls happen" do
+  it 'updates adapter metrics when calls happen' do
     flipper[:stats].enable(user)
-    expect(Metriks.timer("flipper.adapter.memory.enable").count).to be(1)
+    expect(Metriks.timer('flipper.adapter.memory.enable').count).to be(1)
 
     flipper[:stats].enabled?(user)
-    expect(Metriks.timer("flipper.adapter.memory.get").count).to be(1)
+    expect(Metriks.timer('flipper.adapter.memory.get').count).to be(1)
 
     flipper[:stats].disable(user)
-    expect(Metriks.timer("flipper.adapter.memory.disable").count).to be(1)
+    expect(Metriks.timer('flipper.adapter.memory.disable').count).to be(1)
   end
 end

data/spec/flipper/instrumentation/statsd_subscriber_spec.rb

@@ -7,13 +7,13 @@ require 'statsd'
 RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
   let(:statsd_client) { Statsd.new }
   let(:socket) { FakeUDPSocket.new }
-  let(:adapter) {
+  let(:adapter) do
     memory = Flipper::Adapters::Memory.new
-    Flipper::Adapters::Instrumented.new(memory, :instrumenter => ActiveSupport::Notifications)
-  }
-  let(:flipper) {
-    Flipper.new(adapter, :instrumenter => ActiveSupport::Notifications)
-  }
+    Flipper::Adapters::Instrumented.new(memory, instrumenter: ActiveSupport::Notifications)
+  end
+  let(:flipper) do
+    Flipper.new(adapter, instrumenter: ActiveSupport::Notifications)
+  end
 
   let(:user) { user = Struct.new(:flipper_id).new('1') }
 
@@ -38,8 +38,8 @@ RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
     expect(result).not_to be_nil
   end
 
-  context "for enabled feature" do
-    it "updates feature metrics when calls happen" do
+  context 'for enabled feature' do
+    it 'updates feature metrics when calls happen' do
       flipper[:stats].enable(user)
       assert_timer 'flipper.feature_operation.enable'
 
@@ -49,8 +49,8 @@ RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
     end
   end
 
-  context "for disabled feature" do
-    it "updates feature metrics when calls happen" do
+  context 'for disabled feature' do
+    it 'updates feature metrics when calls happen' do
       flipper[:stats].disable(user)
       assert_timer 'flipper.feature_operation.disable'
 
@@ -60,7 +60,7 @@ RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
     end
   end
 
-  it "updates adapter metrics when calls happen" do
+  it 'updates adapter metrics when calls happen' do
     flipper[:stats].enable(user)
     assert_timer 'flipper.adapter.memory.enable'
 

data/spec/flipper/instrumenters/memory_spec.rb

@@ -2,18 +2,18 @@ require 'helper'
 require 'flipper/instrumenters/memory'
 
 RSpec.describe Flipper::Instrumenters::Memory do
-  describe "#initialize" do
-    it "sets events to empty array" do
+  describe '#initialize' do
+    it 'sets events to empty array' do
       instrumenter = described_class.new
       expect(instrumenter.events).to eq([])
     end
   end
 
-  describe "#instrument" do
-    it "adds to events" do
+  describe '#instrument' do
+    it 'adds to events' do
       instrumenter = described_class.new
       name         = 'user.signup'
-      payload      = {:email => 'john@doe.com'}
+      payload      = { email: 'john@doe.com' }
       block_result = :yielded
 
       result = instrumenter.instrument(name, payload) { block_result }

data/spec/flipper/instrumenters/noop_spec.rb

@@ -2,19 +2,19 @@ require 'helper'
 require 'flipper/instrumenters/noop'
 
 RSpec.describe Flipper::Instrumenters::Noop do
-  describe ".instrument" do
-    context "with name" do
-      it "yields block" do
+  describe '.instrument' do
+    context 'with name' do
+      it 'yields block' do
         yielded = false
         described_class.instrument(:foo) { yielded = true }
         expect(yielded).to eq(true)
       end
     end
 
-    context "with name and payload" do
-      it "yields block" do
+    context 'with name and payload' do
+      it 'yields block' do
         yielded = false
-        described_class.instrument(:foo, {:pay => :load}) { yielded = true }
+        described_class.instrument(:foo, pay: :load) { yielded = true }
         expect(yielded).to eq(true)
       end
     end

data/spec/flipper/middleware/memoizer_spec.rb

@@ -8,66 +8,71 @@ RSpec.describe Flipper::Middleware::Memoizer do
   include Rack::Test::Methods
 
   let(:memory_adapter) { Flipper::Adapters::Memory.new }
-  let(:adapter)        {
+  let(:adapter)        do
     Flipper::Adapters::OperationLogger.new(memory_adapter)
-  }
-  let(:flipper)        { Flipper.new(adapter) }
+  end
+  let(:flipper) { Flipper.new(adapter) }
+  let(:env) { { 'flipper' => flipper } }
 
   after do
     flipper.adapter.memoize = nil
   end
 
-  RSpec.shared_examples_for "flipper middleware" do
-    it "delegates" do
+  RSpec.shared_examples_for 'flipper middleware' do
+    it 'delegates' do
       called = false
-      app = lambda { |env|
+      app = lambda do |_env|
         called = true
         [200, {}, nil]
-      }
-      middleware = described_class.new app, flipper
-      middleware.call({})
+      end
+      middleware = described_class.new(app)
+      middleware.call(env)
       expect(called).to eq(true)
     end
 
-    it "disables local cache after body close" do
-      app = lambda { |env| [200, {}, []] }
-      middleware = described_class.new app, flipper
-      body = middleware.call({}).last
+    it 'disables local cache after body close' do
+      app = ->(_env) { [200, {}, []] }
+      middleware = described_class.new(app)
+      body = middleware.call(env).last
 
       expect(flipper.adapter.memoizing?).to eq(true)
       body.close
       expect(flipper.adapter.memoizing?).to eq(false)
     end
 
-    it "clears local cache after body close" do
-      app = lambda { |env| [200, {}, []] }
-      middleware = described_class.new app, flipper
-      body = middleware.call({}).last
+    it 'clears local cache after body close' do
+      app = ->(_env) { [200, {}, []] }
+      middleware = described_class.new(app)
+      body = middleware.call(env).last
 
       flipper.adapter.cache['hello'] = 'world'
       body.close
       expect(flipper.adapter.cache).to be_empty
     end
 
-    it "clears the local cache with a successful request" do
+    it 'clears the local cache with a successful request' do
       flipper.adapter.cache['hello'] = 'world'
-      get '/'
+      get '/', {}, 'flipper' => flipper
       expect(flipper.adapter.cache).to be_empty
     end
 
-    it "clears the local cache even when the request raises an error" do
+    it 'clears the local cache even when the request raises an error' do
       flipper.adapter.cache['hello'] = 'world'
-      get '/fail' rescue nil
+      begin
+        get '/fail', {}, 'flipper' => flipper
+      rescue
+        nil
+      end
       expect(flipper.adapter.cache).to be_empty
     end
 
-    it "caches getting a feature for duration of request" do
+    it 'caches getting a feature for duration of request' do
       flipper[:stats].enable
 
       # clear the log of operations
       adapter.reset
 
-      app = lambda { |env|
+      app = lambda do |_env|
         flipper[:stats].enabled?
         flipper[:stats].enabled?
         flipper[:stats].enabled?
@@ -75,188 +80,166 @@ RSpec.describe Flipper::Middleware::Memoizer do
         flipper[:stats].enabled?
         flipper[:stats].enabled?
         [200, {}, []]
-      }
+      end
 
-      middleware = described_class.new app, flipper
-      middleware.call({})
+      middleware = described_class.new(app)
+      middleware.call(env)
 
       expect(adapter.count(:get)).to be(1)
     end
   end
 
-  context "with flipper instance" do
-    let(:app) {
+  context 'with preload_all' do
+    let(:app) do
       # ensure scoped for builder block, annoying...
       instance = flipper
       middleware = described_class
 
       Rack::Builder.new do
-        use middleware, instance
+        use middleware, preload_all: true
 
-        map "/" do
-          run lambda {|env| [200, {}, []] }
+        map '/' do
+          run ->(_env) { [200, {}, []] }
         end
 
-        map "/fail" do
-          run lambda {|env| raise "FAIL!" }
+        map '/fail' do
+          run ->(_env) { raise 'FAIL!' }
         end
       end.to_app
-    }
-
-    include_examples "flipper middleware"
-  end
-
-  context "with preload_all" do
-    let(:app) {
-      # ensure scoped for builder block, annoying...
-      instance = flipper
-      middleware = described_class
-
-      Rack::Builder.new do
-        use middleware, instance, preload_all: true
-
-        map "/" do
-          run lambda {|env| [200, {}, []] }
-        end
-
-        map "/fail" do
-          run lambda {|env| raise "FAIL!" }
-        end
-      end.to_app
-    }
+    end
 
-    include_examples "flipper middleware"
+    include_examples 'flipper middleware'
 
-    it "eagerly caches known features for duration of request" do
+    it 'eagerly caches known features for duration of request' do
       flipper[:stats].enable
       flipper[:shiny].enable
 
       # clear the log of operations
       adapter.reset
 
-      app = lambda { |env|
+      app = lambda do |_env|
         flipper[:stats].enabled?
         flipper[:stats].enabled?
         flipper[:shiny].enabled?
         flipper[:shiny].enabled?
         [200, {}, []]
-      }
+      end
 
-      middleware = described_class.new app, flipper, preload_all: true
-      middleware.call({})
+      middleware = described_class.new(app, preload_all: true)
+      middleware.call(env)
 
       expect(adapter.count(:features)).to be(1)
       expect(adapter.count(:get_multi)).to be(1)
       expect(adapter.last(:get_multi).args).to eq([[flipper[:stats], flipper[:shiny]]])
     end
 
-    it "caches unknown features for duration of request" do
+    it 'caches unknown features for duration of request' do
       # clear the log of operations
       adapter.reset
 
-      app = lambda { |env|
+      app = lambda do |_env|
         flipper[:other].enabled?
         flipper[:other].enabled?
         [200, {}, []]
-      }
+      end
 
-      middleware = described_class.new app, flipper, preload_all: true
-      middleware.call({})
+      middleware = described_class.new(app, preload_all: true)
+      middleware.call(env)
 
       expect(adapter.count(:get)).to be(1)
       expect(adapter.last(:get).args).to eq([flipper[:other]])
     end
   end
 
-  context "with preload specific" do
-    let(:app) {
+  context 'with preload specific' do
+    let(:app) do
       # ensure scoped for builder block, annoying...
       instance = flipper
       middleware = described_class
 
       Rack::Builder.new do
-        use middleware, instance, preload: %i{stats}
+        use middleware, preload: %i(stats)
 
-        map "/" do
-          run lambda {|env| [200, {}, []] }
+        map '/' do
+          run ->(_env) { [200, {}, []] }
         end
 
-        map "/fail" do
-          run lambda {|env| raise "FAIL!" }
+        map '/fail' do
+          run ->(_env) { raise 'FAIL!' }
         end
       end.to_app
-    }
+    end
 
-    include_examples "flipper middleware"
+    include_examples 'flipper middleware'
 
-    it "eagerly caches specified features for duration of request" do
+    it 'eagerly caches specified features for duration of request' do
       # clear the log of operations
       adapter.reset
 
-      app = lambda { |env|
+      app = lambda do |_env|
         flipper[:stats].enabled?
         flipper[:stats].enabled?
         flipper[:shiny].enabled?
         flipper[:shiny].enabled?
         [200, {}, []]
-      }
+      end
 
-      middleware = described_class.new app, flipper, preload: %i{stats}
-      middleware.call({})
+      middleware = described_class.new app, preload: %i(stats)
+      middleware.call(env)
 
       expect(adapter.count(:get_multi)).to be(1)
       expect(adapter.last(:get_multi).args).to eq([[flipper[:stats]]])
     end
 
-    it "caches unknown features for duration of request" do
+    it 'caches unknown features for duration of request' do
       # clear the log of operations
       adapter.reset
 
-      app = lambda { |env|
+      app = lambda do |_env|
         flipper[:other].enabled?
         flipper[:other].enabled?
         [200, {}, []]
-      }
+      end
 
-      middleware = described_class.new app, flipper, preload: %i{stats}
-      middleware.call({})
+      middleware = described_class.new app, preload: %i(stats)
+      middleware.call(env)
 
       expect(adapter.count(:get)).to be(1)
       expect(adapter.last(:get).args).to eq([flipper[:other]])
     end
   end
 
-  context "when an app raises an exception" do
-    it "resets memoize" do
+  context 'when an app raises an exception' do
+    it 'resets memoize' do
       begin
-        app = lambda { |env| raise }
-        middleware = described_class.new app, flipper
-        middleware.call({})
+        app = ->(_env) { raise }
+        middleware = described_class.new(app)
+        middleware.call(env)
       rescue RuntimeError
         expect(flipper.adapter.memoizing?).to be(false)
       end
     end
   end
 
-  context "with block that yields flipper instance" do
-    let(:app) {
+  context 'with flipper setup in env' do
+    let(:app) do
       # ensure scoped for builder block, annoying...
       instance = flipper
       middleware = described_class
 
       Rack::Builder.new do
-        use middleware, lambda { instance }
+        use middleware
 
-        map "/" do
-          run lambda {|env| [200, {}, []] }
+        map '/' do
+          run ->(_env) { [200, {}, []] }
         end
 
-        map "/fail" do
-          run lambda {|env| raise "FAIL!" }
+        map '/fail' do
+          run ->(_env) { raise 'FAIL!' }
         end
       end.to_app
-    }
+    end
 
-    include_examples "flipper middleware"
+    include_examples 'flipper middleware'
   end
 end