flipper 0.19.1 → 0.20.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77bf46fd4c4a3bc04f7cfd38cbd48083dbd72855a809df63ab33a429bf8dc902
-  data.tar.gz: 43bbedd3cb73e09b6323c9841dd4cec1ac5298a7c42ff68affab032dd7f63fc4
+  metadata.gz: b11913845dd63e7156086ce778927c1986694c48472dbb5b779155318c6eeab6
+  data.tar.gz: bc1bf62134ccd35ef86a5373f8105a9d511e3061e5666e55b0183fd20437a74f
 SHA512:
-  metadata.gz: 98f7becbf89ad1fe63f7c6425b4600e80b27d1af7136fe61c1e3ce0a449dfce01e1720a00d3eee1e3cc08e4fedee055f9b9991c49d6c025e601337fc7ac1c10f
-  data.tar.gz: f219af56cf0c3ae7ec6b43cf1a774b4e62c9e4b73ad8b5a8b88ae1c8556ee49c2051191e332c456d448fbca810f623f2add81f9d6040ec30fced90cdb48ab651
+  metadata.gz: ec24f067db0fc80d5d3e9f00ce1b87b51d5111f89e9d35842d044347dbbbfc836663e972e7eb0c640713e375938e10a7d70769af27c87aea82270eba29432ca0
+  data.tar.gz: fb56eb175c3067f1b301d5875818b0c0a372f6e11da7e68c88337ab2660c8a7cfa20c027e8862cfc9aca126c5bd4b424dc962b846e2c812932400cc0f9592855

data/Gemfile

@@ -17,6 +17,7 @@ gem 'rails', "~> #{ENV['RAILS_VERSION'] || '6.0.0'}"
 gem 'minitest', '~> 5.8'
 gem 'minitest-documentation'
 gem 'webmock', '~> 3.0'
+gem 'climate_control'
 
 group(:guard) do
   gem 'guard', '~> 2.15'

data/lib/flipper.rb

@@ -65,7 +65,8 @@ module Flipper
                  :time, :percentage_of_time,
                  :features, :feature, :[], :preload, :preload_all,
                  :adapter, :add, :exist?, :remove, :import,
-                 :memoize=, :memoizing?
+                 :memoize=, :memoizing?,
+                 :sync, :sync_secret # For Flipper::Cloud. Will error for OSS Flipper.
 
   # Public: Use this to register a group by name.
   #

data/lib/flipper/adapters/sync.rb

@@ -34,26 +34,26 @@ module Flipper
           synchronizer = Synchronizer.new(@local, @remote, sync_options)
           IntervalSynchronizer.new(synchronizer, interval: options[:interval])
         end
-        sync
+        synchronize
       end
 
       def features
-        sync
+        synchronize
         @local.features
       end
 
       def get(feature)
-        sync
+        synchronize
         @local.get(feature)
       end
 
       def get_multi(features)
-        sync
+        synchronize
         @local.get_multi(features)
       end
 
       def get_all
-        sync
+        synchronize
         @local.get_all
       end
 
@@ -89,7 +89,7 @@ module Flipper
 
       private
 
-      def sync
+      def synchronize
         @synchronizer.call
       end
     end

data/lib/flipper/adapters/sync/synchronizer.rb

@@ -15,6 +15,7 @@ module Flipper
         #          adapter should be brought in line with.
         # options - The Hash of options.
         #           :instrumenter - The instrumenter used to instrument.
+        #           :raise - Should errors be raised (default: true).
         def initialize(local, remote, options = {})
           @local = local
           @remote = remote

data/lib/flipper/middleware/setup_env.rb

@@ -7,7 +7,8 @@ module Flipper
       #
       # app - The app this middleware is included in.
       # flipper_or_block - The Flipper::DSL instance or a block that yields a
-      #                    Flipper::DSL instance to use for all operations.
+      #                    Flipper::DSL instance to use for all operations
+      #                    (optional, default: Flipper).
       #
       # Examples
       #
@@ -19,18 +20,27 @@ module Flipper
       #   # using with a block that yields a flipper instance
       #   use Flipper::Middleware::SetupEnv, lambda { Flipper.new(...) }
       #
-      def initialize(app, flipper_or_block, options = {})
+      #   # using default configured Flipper instance
+      #   Flipper.configure do |config|
+      #     config.default { Flipper.new(...) }
+      #   end
+      #   use Flipper::Middleware::SetupEnv
+      def initialize(app, flipper_or_block = nil, options = {})
         @app = app
         @env_key = options.fetch(:env_key, 'flipper')
 
         if flipper_or_block.respond_to?(:call)
           @flipper_block = flipper_or_block
         else
-          @flipper = flipper_or_block
+          @flipper = flipper_or_block || Flipper
         end
       end
 
       def call(env)
+        dup.call!(env)
+      end
+
+      def call!(env)
         env[@env_key] ||= flipper
         @app.call(env)
       end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.19.1'.freeze
+  VERSION = '0.20.0.beta1'.freeze
 end

data/spec/flipper/adapters/sync_spec.rb

@@ -175,22 +175,22 @@ RSpec.describe Flipper::Adapters::Sync do
   end
 
   it 'synchronizes for #features' do
-    expect(subject).to receive(:sync)
+    expect(subject).to receive(:synchronize)
     subject.features
   end
 
   it 'synchronizes for #get' do
-    expect(subject).to receive(:sync)
+    expect(subject).to receive(:synchronize)
     subject.get sync[:search]
   end
 
   it 'synchronizes for #get_multi' do
-    expect(subject).to receive(:sync)
+    expect(subject).to receive(:synchronize)
     subject.get_multi [sync[:search]]
   end
 
   it 'synchronizes for #get_all' do
-    expect(subject).to receive(:sync)
+    expect(subject).to receive(:synchronize)
     subject.get_all
   end
 

data/spec/flipper/middleware/setup_env_spec.rb

@@ -56,21 +56,57 @@ RSpec.describe Flipper::Middleware::SetupEnv do
     end
   end
 
-  context 'when flipper instance is nil' do
+  context 'when flipper instance or block are nil but env flipper is configured' do
     let(:app) do
       app = lambda do |env|
         [200, { 'Content-Type' => 'text/html' }, [env['flipper'].object_id.to_s]]
       end
       builder = Rack::Builder.new
-      builder.use described_class, nil
+      builder.use described_class
       builder.run app
       builder
     end
 
-    it 'leaves env flipper alone' do
+    it 'can use env flipper' do
       env_flipper = build_flipper
       get '/', {}, 'flipper' => env_flipper
       expect(last_response.body).to eq(env_flipper.object_id.to_s)
     end
   end
+
+  context 'when flipper instance or block are nil and default Flipper is configured' do
+    let(:app) do
+      Flipper.configure do |config|
+        config.default { flipper }
+      end
+      app = lambda do |env|
+        [200, { 'Content-Type' => 'text/html' }, [env['flipper'].object_id.to_s]]
+      end
+      builder = Rack::Builder.new
+      builder.use described_class
+      builder.run app
+      builder
+    end
+
+    it 'can use env flipper' do
+      get '/', {}, {}
+      expect(last_response.body).to eq(Flipper.object_id.to_s)
+    end
+  end
+
+  context 'when flipper instance or block are nil and default Flipper is NOT configured' do
+    let(:app) do
+      app = lambda do |env|
+        [200, { 'Content-Type' => 'text/html' }, [env['flipper'].enabled?(:search)]]
+      end
+      builder = Rack::Builder.new
+      builder.use described_class
+      builder.run app
+      builder
+    end
+
+    it 'can use env flipper' do
+      expect { get '/' }.to raise_error(Flipper::DefaultNotSet)
+    end
+  end
 end

data/spec/flipper_spec.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'flipper/cloud'
 
 RSpec.describe Flipper do
   describe '.new' do
@@ -215,6 +216,32 @@ RSpec.describe Flipper do
     it 'delegates memoizing? to instance' do
       expect(described_class.memoizing?).to eq(described_class.adapter.memoizing?)
     end
+
+    it 'delegates sync stuff to instance and errors for OSS' do
+      expect { described_class.sync }.to raise_error(NoMethodError)
+      expect { described_class.sync_secret }.to raise_error(NoMethodError)
+    end
+
+    it 'delegates sync stuff to instance for Flipper::Cloud' do
+      stub = stub_request(:get, "https://www.flippercloud.io/adapter/features").
+        with({
+          headers: {
+            'Flipper-Cloud-Token'=>'asdf',
+          },
+        }).to_return(status: 200, body: '{"features": {}}', headers: {})
+      cloud_configuration = Flipper::Cloud::Configuration.new({
+        token: "asdf",
+        sync_secret: "tasty",
+        sync_method: :webhook,
+      })
+
+      described_class.configure do |config|
+        config.default { Flipper::Cloud::DSL.new(cloud_configuration) }
+      end
+      described_class.sync
+      expect(described_class.sync_secret).to eq("tasty")
+      expect(stub).to have_been_requested
+    end
   end
 
   describe '.register' do

data/spec/support/spec_helpers.rb

@@ -1,3 +1,4 @@
+require 'climate_control'
 require 'json'
 require 'rack/test'
 
@@ -56,6 +57,10 @@ module SpecHelpers
       'more_info' => api_error_code_reference_url,
     }
   end
+
+  def with_modified_env(options, &block)
+    ClimateControl.modify(options, &block)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0.beta1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -166,9 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: