From b7ec2cbd141feae112f550e12b374d2a721e705f Mon Sep 17 00:00:00 2001 From: John Nunemaker Date: Tue, 15 May 2018 10:44:30 -0400 Subject: [PATCH] Remove all the memory adapter requires No longer needed because it is required in flipper/adapter which is required by flipper --- README.md | 2 -- docs/Adapters.md | 2 -- docs/Optimization.md | 2 -- docs/active_support_cache_store/README.md | 2 -- docs/read-only/README.md | 1 - docs/ui/README.md | 1 - examples/basic.rb | 1 - examples/cloud/import.rb | 1 - examples/configuring_default.rb | 1 - examples/dsl.rb | 1 - examples/enabled_for_actor.rb | 1 - examples/group.rb | 1 - examples/group_dynamic_lookup.rb | 1 - examples/group_with_members.rb | 1 - examples/individual_actor.rb | 1 - examples/instrumentation.rb | 1 - examples/percentage_of_actors.rb | 1 - examples/percentage_of_actors_enabled_check.rb | 1 - examples/percentage_of_actors_group.rb | 1 - examples/percentage_of_time.rb | 1 - lib/flipper.rb | 1 - lib/flipper/adapter.rb | 3 +++ spec/flipper/adapter_spec.rb | 1 - spec/flipper/adapters/active_support_cache_store_spec.rb | 1 - spec/flipper/adapters/dalli_spec.rb | 1 - spec/flipper/adapters/instrumented_spec.rb | 1 - spec/flipper/adapters/memoizable_spec.rb | 1 - spec/flipper/adapters/memory_spec.rb | 1 - spec/flipper/adapters/operation_logger_spec.rb | 1 - spec/flipper/adapters/redis_cache_spec.rb | 1 - spec/flipper/adapters/rollout_spec.rb | 1 - spec/flipper/adapters/sync_spec.rb | 1 - spec/flipper/dsl_spec.rb | 1 - spec/flipper/feature_spec.rb | 1 - spec/flipper/instrumentation/log_subscriber_spec.rb | 1 - spec/flipper/instrumentation/statsd_subscriber_spec.rb | 1 - spec/flipper/middleware/memoizer_spec.rb | 1 - spec/flipper/ui/decorators/feature_spec.rb | 1 - spec/flipper/ui/decorators/gate_spec.rb | 1 - spec/integration_spec.rb | 1 - spec/support/spec_helpers.rb | 1 - test/adapters/dalli_test.rb | 1 - test/adapters/memory_test.rb | 1 - test/adapters/redis_cache_test.rb | 1 - 44 files changed, 3 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 411dfaebb..c96e84eb3 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ The goal of the API for flipper was to have everything revolve around features a ```ruby require 'flipper' -require 'flipper/adapters/memory' Flipper.configure do |config| config.default do @@ -105,4 +104,3 @@ Of course there are more [examples for you to peruse](examples/). You could also | ![@alexwheeler](https://avatars3.githubusercontent.com/u/3260042?s=64) | [@alexwheeler](https://github.com/alexwheeler) | api | | ![@thetimbanks](https://avatars1.githubusercontent.com/u/471801?s=64) | [@thetimbanks](https://github.com/thetimbanks) | ui | | ![@lazebny](https://avatars1.githubusercontent.com/u/6276766?s=64) | [@lazebny](https://github.com/lazebny) | docker | - diff --git a/docs/Adapters.md b/docs/Adapters.md index fff9f2426..746ca6e9e 100644 --- a/docs/Adapters.md +++ b/docs/Adapters.md @@ -43,7 +43,6 @@ For example, here is what the in-memory adapter spec looks like: ```ruby require 'helper' -require 'flipper/adapters/memory' # The shared specs are included with the flipper gem so you can use them in # separate adapter specific gems. @@ -67,7 +66,6 @@ Here is what an in-memory adapter MiniTest looks like: ```ruby require 'test_helper' -require 'flipper/adapters/memory' class MemoryTest < MiniTest::Test prepend SharedAdapterTests diff --git a/docs/Optimization.md b/docs/Optimization.md index 613000550..356202b1b 100644 --- a/docs/Optimization.md +++ b/docs/Optimization.md @@ -78,7 +78,6 @@ Initialize `RedisCache` with a flipper [adapter](https://github.com/jnunemaker/ Example using the RedisCache adapter with the Memory adapter and a TTL of 4800 seconds: ```ruby - require 'flipper/adapters/memory' require 'flipper/adapters/redis_cache' redis = Redis.new(url: ENV['REDIS_URL']) @@ -107,7 +106,6 @@ Example using the ActiveSupportCacheStore adapter with ActiveSupport's [MemorySt ```ruby require 'active_support/cache' -require 'flipper/adapters/memory' require 'flipper/adapters/active_support_cache_store' memory_adapter = Flipper::Adapters::Memory.new diff --git a/docs/active_support_cache_store/README.md b/docs/active_support_cache_store/README.md index ee17a48cb..fd60532bd 100644 --- a/docs/active_support_cache_store/README.md +++ b/docs/active_support_cache_store/README.md @@ -20,7 +20,6 @@ Or install it yourself with: ```ruby require 'active_support/cache' -require 'flipper/adapters/memory' require 'flipper/adapters/active_support_cache_store' memory_adapter = Flipper::Adapters::Memory.new @@ -40,7 +39,6 @@ Each key is namespaced under `flipper/v1/feature/` ```ruby require 'active_support/cache' -require 'flipper/adapters/memory' require 'flipper/adapters/active_support_cache_store' memory_adapter = Flipper::Adapters::Memory.new diff --git a/docs/read-only/README.md b/docs/read-only/README.md index aa8ae474e..315af2975 100644 --- a/docs/read-only/README.md +++ b/docs/read-only/README.md @@ -8,7 +8,6 @@ Any attempted write raises `Flipper::Adapters::ReadOnly::WriteAttempted` with m ## Usage ```ruby # example wrapping memory adapter -require 'flipper/adapters/memory' require 'flipper/adapters/read_only' memory_adapter = Flipper::Adapters::Memory.new diff --git a/docs/ui/README.md b/docs/ui/README.md index 07cd4de48..e0ab56618 100644 --- a/docs/ui/README.md +++ b/docs/ui/README.md @@ -107,7 +107,6 @@ Minimal example for Rack: # config.ru require 'flipper-ui' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/basic.rb b/examples/basic.rb index 8ee78c517..508ed9ac3 100644 --- a/examples/basic.rb +++ b/examples/basic.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' Flipper.configure do |config| config.default do diff --git a/examples/cloud/import.rb b/examples/cloud/import.rb index 9faf24835..9907c1fbd 100644 --- a/examples/cloud/import.rb +++ b/examples/cloud/import.rb @@ -7,7 +7,6 @@ $:.unshift(lib_path) require 'flipper' -require 'flipper/adapters/memory' require 'flipper/cloud' memory_adapter = Flipper::Adapters::Memory.new diff --git a/examples/configuring_default.rb b/examples/configuring_default.rb index fffc71cb5..5abf4dda2 100644 --- a/examples/configuring_default.rb +++ b/examples/configuring_default.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' # sets up default adapter so Flipper works like Flipper::DSL Flipper.configure do |config| diff --git a/examples/dsl.rb b/examples/dsl.rb index ffaafe5ea..0f499beb0 100644 --- a/examples/dsl.rb +++ b/examples/dsl.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/enabled_for_actor.rb b/examples/enabled_for_actor.rb index c10e60441..21980fd97 100644 --- a/examples/enabled_for_actor.rb +++ b/examples/enabled_for_actor.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' # Some class that represents what will be trying to do something class User diff --git a/examples/group.rb b/examples/group.rb index af34137e9..1b7c8c44f 100644 --- a/examples/group.rb +++ b/examples/group.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/group_dynamic_lookup.rb b/examples/group_dynamic_lookup.rb index b17a009bb..5033106c2 100644 --- a/examples/group_dynamic_lookup.rb +++ b/examples/group_dynamic_lookup.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/group_with_members.rb b/examples/group_with_members.rb index d08ba75cf..fb1ad2a75 100644 --- a/examples/group_with_members.rb +++ b/examples/group_with_members.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/individual_actor.rb b/examples/individual_actor.rb index 3aca8606e..b9dee4d0e 100644 --- a/examples/individual_actor.rb +++ b/examples/individual_actor.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/instrumentation.rb b/examples/instrumentation.rb index 6807285f0..25e4c38a4 100644 --- a/examples/instrumentation.rb +++ b/examples/instrumentation.rb @@ -13,7 +13,6 @@ def call(*args) end require 'flipper' -require 'flipper/adapters/memory' require 'flipper/adapters/instrumented' # pick an adapter diff --git a/examples/percentage_of_actors.rb b/examples/percentage_of_actors.rb index 019a8c004..c5b1f61a8 100644 --- a/examples/percentage_of_actors.rb +++ b/examples/percentage_of_actors.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/percentage_of_actors_enabled_check.rb b/examples/percentage_of_actors_enabled_check.rb index 897bd868b..14570bdad 100644 --- a/examples/percentage_of_actors_enabled_check.rb +++ b/examples/percentage_of_actors_enabled_check.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/percentage_of_actors_group.rb b/examples/percentage_of_actors_group.rb index 099e03592..bd77e15b7 100644 --- a/examples/percentage_of_actors_group.rb +++ b/examples/percentage_of_actors_group.rb @@ -5,7 +5,6 @@ # plucked from memcached, redis, mysql or whatever. require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/examples/percentage_of_time.rb b/examples/percentage_of_time.rb index 832773b65..7948d2725 100644 --- a/examples/percentage_of_time.rb +++ b/examples/percentage_of_time.rb @@ -1,7 +1,6 @@ require File.expand_path('../example_setup', __FILE__) require 'flipper' -require 'flipper/adapters/memory' adapter = Flipper::Adapters::Memory.new flipper = Flipper.new(adapter) diff --git a/lib/flipper.rb b/lib/flipper.rb index 5b540916b..1f8163543 100644 --- a/lib/flipper.rb +++ b/lib/flipper.rb @@ -142,7 +142,6 @@ def groups_registry=(registry) require 'flipper/actor' require 'flipper/configuration' require 'flipper/adapter' -require 'flipper/adapters/memory' require 'flipper/dsl' require 'flipper/errors' require 'flipper/feature' diff --git a/lib/flipper/adapter.rb b/lib/flipper/adapter.rb index 39f41ee25..d1972b10a 100644 --- a/lib/flipper/adapter.rb +++ b/lib/flipper/adapter.rb @@ -52,3 +52,6 @@ def default_config end end end + +require "flipper/adapters/memory" +require "flipper/adapters/instrumented" diff --git a/spec/flipper/adapter_spec.rb b/spec/flipper/adapter_spec.rb index 683b2e3e4..1eec522bb 100644 --- a/spec/flipper/adapter_spec.rb +++ b/spec/flipper/adapter_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' RSpec.describe Flipper::Adapter do let(:source_flipper) { build_flipper } diff --git a/spec/flipper/adapters/active_support_cache_store_spec.rb b/spec/flipper/adapters/active_support_cache_store_spec.rb index e6350ee1e..37a765dd9 100644 --- a/spec/flipper/adapters/active_support_cache_store_spec.rb +++ b/spec/flipper/adapters/active_support_cache_store_spec.rb @@ -1,7 +1,6 @@ require 'helper' require 'active_support/cache' require 'active_support/cache/dalli_store' -require 'flipper/adapters/memory' require 'flipper/adapters/operation_logger' require 'flipper/adapters/active_support_cache_store' require 'flipper/spec/shared_adapter_specs' diff --git a/spec/flipper/adapters/dalli_spec.rb b/spec/flipper/adapters/dalli_spec.rb index 079d340fd..d4439c96e 100644 --- a/spec/flipper/adapters/dalli_spec.rb +++ b/spec/flipper/adapters/dalli_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' require 'flipper/adapters/operation_logger' require 'flipper/adapters/dalli' require 'flipper/spec/shared_adapter_specs' diff --git a/spec/flipper/adapters/instrumented_spec.rb b/spec/flipper/adapters/instrumented_spec.rb index 13fa6a465..755cb65da 100644 --- a/spec/flipper/adapters/instrumented_spec.rb +++ b/spec/flipper/adapters/instrumented_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' require 'flipper/adapters/instrumented' require 'flipper/instrumenters/memory' require 'flipper/spec/shared_adapter_specs' diff --git a/spec/flipper/adapters/memoizable_spec.rb b/spec/flipper/adapters/memoizable_spec.rb index 24a607198..121f83b3a 100644 --- a/spec/flipper/adapters/memoizable_spec.rb +++ b/spec/flipper/adapters/memoizable_spec.rb @@ -1,6 +1,5 @@ require 'helper' require 'flipper/adapters/memoizable' -require 'flipper/adapters/memory' require 'flipper/adapters/operation_logger' require 'flipper/spec/shared_adapter_specs' diff --git a/spec/flipper/adapters/memory_spec.rb b/spec/flipper/adapters/memory_spec.rb index a9df28a53..62a3a594a 100644 --- a/spec/flipper/adapters/memory_spec.rb +++ b/spec/flipper/adapters/memory_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' require 'flipper/spec/shared_adapter_specs' RSpec.describe Flipper::Adapters::Memory do diff --git a/spec/flipper/adapters/operation_logger_spec.rb b/spec/flipper/adapters/operation_logger_spec.rb index 16d8c81a2..5eec8f1a6 100644 --- a/spec/flipper/adapters/operation_logger_spec.rb +++ b/spec/flipper/adapters/operation_logger_spec.rb @@ -1,6 +1,5 @@ require 'helper' require 'flipper/adapters/operation_logger' -require 'flipper/adapters/memory' require 'flipper/spec/shared_adapter_specs' RSpec.describe Flipper::Adapters::OperationLogger do diff --git a/spec/flipper/adapters/redis_cache_spec.rb b/spec/flipper/adapters/redis_cache_spec.rb index 3e5a03e4a..f1618a981 100644 --- a/spec/flipper/adapters/redis_cache_spec.rb +++ b/spec/flipper/adapters/redis_cache_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' require 'flipper/adapters/operation_logger' require 'flipper/adapters/redis_cache' require 'flipper/spec/shared_adapter_specs' diff --git a/spec/flipper/adapters/rollout_spec.rb b/spec/flipper/adapters/rollout_spec.rb index 013631d9f..003e850b5 100644 --- a/spec/flipper/adapters/rollout_spec.rb +++ b/spec/flipper/adapters/rollout_spec.rb @@ -2,7 +2,6 @@ require 'redis' require 'rollout' require 'flipper/adapters/rollout' -require 'flipper/adapters/memory' require 'flipper/spec/shared_adapter_specs' RSpec.describe Flipper::Adapters::Rollout do diff --git a/spec/flipper/adapters/sync_spec.rb b/spec/flipper/adapters/sync_spec.rb index 5ec8d2952..dd7eed702 100644 --- a/spec/flipper/adapters/sync_spec.rb +++ b/spec/flipper/adapters/sync_spec.rb @@ -1,6 +1,5 @@ require 'helper' require 'flipper/adapters/sync' -require 'flipper/adapters/memory' require 'flipper/adapters/operation_logger' require 'flipper/spec/shared_adapter_specs' require 'active_support/notifications' diff --git a/spec/flipper/dsl_spec.rb b/spec/flipper/dsl_spec.rb index 82cb87271..02914c59f 100644 --- a/spec/flipper/dsl_spec.rb +++ b/spec/flipper/dsl_spec.rb @@ -1,6 +1,5 @@ require 'helper' require 'flipper/dsl' -require 'flipper/adapters/memory' RSpec.describe Flipper::DSL do subject { described_class.new(adapter) } diff --git a/spec/flipper/feature_spec.rb b/spec/flipper/feature_spec.rb index 0be900ea6..06af6e623 100644 --- a/spec/flipper/feature_spec.rb +++ b/spec/flipper/feature_spec.rb @@ -1,6 +1,5 @@ require 'helper' require 'flipper/feature' -require 'flipper/adapters/memory' require 'flipper/instrumenters/memory' RSpec.describe Flipper::Feature do diff --git a/spec/flipper/instrumentation/log_subscriber_spec.rb b/spec/flipper/instrumentation/log_subscriber_spec.rb index 529b3439e..1ec8d400a 100644 --- a/spec/flipper/instrumentation/log_subscriber_spec.rb +++ b/spec/flipper/instrumentation/log_subscriber_spec.rb @@ -1,7 +1,6 @@ require 'logger' require 'helper' require 'flipper/adapters/instrumented' -require 'flipper/adapters/memory' require 'flipper/instrumentation/log_subscriber' RSpec.describe Flipper::Instrumentation::LogSubscriber do diff --git a/spec/flipper/instrumentation/statsd_subscriber_spec.rb b/spec/flipper/instrumentation/statsd_subscriber_spec.rb index 341e78dbb..1e596815d 100644 --- a/spec/flipper/instrumentation/statsd_subscriber_spec.rb +++ b/spec/flipper/instrumentation/statsd_subscriber_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' require 'flipper/adapters/instrumented' require 'flipper/instrumentation/statsd' require 'statsd' diff --git a/spec/flipper/middleware/memoizer_spec.rb b/spec/flipper/middleware/memoizer_spec.rb index 503c66953..b9a04ac44 100644 --- a/spec/flipper/middleware/memoizer_spec.rb +++ b/spec/flipper/middleware/memoizer_spec.rb @@ -5,7 +5,6 @@ require 'flipper/middleware/memoizer' require 'flipper/adapters/active_support_cache_store' require 'flipper/adapters/operation_logger' -require 'flipper/adapters/memory' RSpec.describe Flipper::Middleware::Memoizer do include Rack::Test::Methods diff --git a/spec/flipper/ui/decorators/feature_spec.rb b/spec/flipper/ui/decorators/feature_spec.rb index 77326cec1..af366a19a 100644 --- a/spec/flipper/ui/decorators/feature_spec.rb +++ b/spec/flipper/ui/decorators/feature_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' RSpec.describe Flipper::UI::Decorators::Feature do let(:source) { {} } diff --git a/spec/flipper/ui/decorators/gate_spec.rb b/spec/flipper/ui/decorators/gate_spec.rb index 993a86040..11a51b0dc 100644 --- a/spec/flipper/ui/decorators/gate_spec.rb +++ b/spec/flipper/ui/decorators/gate_spec.rb @@ -1,5 +1,4 @@ require 'helper' -require 'flipper/adapters/memory' require 'flipper/ui/decorators/gate' RSpec.describe Flipper::UI::Decorators::Gate do diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 03be37c83..45939e012 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -1,6 +1,5 @@ require 'helper' require 'flipper/feature' -require 'flipper/adapters/memory' RSpec.describe Flipper do let(:adapter) { Flipper::Adapters::Memory.new } diff --git a/spec/support/spec_helpers.rb b/spec/support/spec_helpers.rb index fc3d2305a..d26e3dbd2 100644 --- a/spec/support/spec_helpers.rb +++ b/spec/support/spec_helpers.rb @@ -1,5 +1,4 @@ require 'json' -require 'flipper/adapters/memory' require 'rack/test' module SpecHelpers diff --git a/test/adapters/dalli_test.rb b/test/adapters/dalli_test.rb index dcdf0af8f..9cdce24af 100644 --- a/test/adapters/dalli_test.rb +++ b/test/adapters/dalli_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'flipper/adapters/memory' require 'flipper/adapters/dalli' class DalliTest < MiniTest::Test diff --git a/test/adapters/memory_test.rb b/test/adapters/memory_test.rb index bc0286725..3acb4e757 100644 --- a/test/adapters/memory_test.rb +++ b/test/adapters/memory_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'flipper/adapters/memory' class MemoryTest < MiniTest::Test prepend Flipper::Test::SharedAdapterTests diff --git a/test/adapters/redis_cache_test.rb b/test/adapters/redis_cache_test.rb index 0a7985667..44a37c8bf 100644 --- a/test/adapters/redis_cache_test.rb +++ b/test/adapters/redis_cache_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'flipper/adapters/memory' require 'flipper/adapters/redis_cache' class DalliTest < MiniTest::Test