flipper-redis 0.20.3 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77150d170e2438adc121321f69a491368633b51d5184916d1f281ea9f2aaa977
-  data.tar.gz: 4ca36cab2d35592b467045783d2083759fc8e1196f7856fe7f9bf481842220de
+  metadata.gz: '0497d67982091158f32724531d3e5b228b2a9386b97f550c14eb2488549b863d'
+  data.tar.gz: 85a5c6e38629bdfa79a1b6bc5de59da15316b9c3b062c10df3ed4d4c8e105e7a
 SHA512:
-  metadata.gz: 79cc67dba2a9cbbafe6e6c855af33ea1482edc808a6e6c9352292d06bfd2744833f7108db69c0d0c0b2467733bedd458528ceda76b302dc59bf19982ba67bd69
-  data.tar.gz: 2f864cc901be5074e8b4c6df48277e85cc18355f81e4a644af278cb399f1e4aa1d25eb73f27a45474b0edb24f967c9172db22ce409c7ddcbb5865aa888dcd62d
+  metadata.gz: 7f4cb304570ef95e563947a1b50be764a605c211d3b2f7afec71a066cf646f47e6ca4e86b9492588e9923ccdec5634b2d73b88029df227cb0a09497898ca1501
+  data.tar.gz: a13012afc6064abd528872e0524348f95d998b92cb31e7e34c1d0614dbc584ed8dba7e4af16a2daa785b4a32fd09267f7c4638a624080f77c2e9d2cc14cb340a

data/docs/redis/README.md

@@ -18,12 +18,18 @@ Or install it yourself with:
 
 ## Usage
 
+In most cases, all you need to do is require the adapter. It will connect to the Redis instance specified in the `REDIS_URL` or `FLIPPER_REDIS_URL` environment vairable, or localhost by default.
+
 ```ruby
 require 'flipper/adapters/redis'
-client = Redis.new
-adapter = Flipper::Adapters::Redis.new(client)
-flipper = Flipper.new(adapter)
-# profit...
+```
+
+**If you need to customize the adapter**, you can add this to an initializer:
+
+```ruby
+Flipper.configure do |config|
+  config.adapter { Flipper::Adapters::Redis.new(Redis.new) }
+end
 ```
 
 ## Internals

data/examples/redis/basic.rb

@@ -1,30 +1,19 @@
-require 'pathname'
+require 'bundler/setup'
 require 'logger'
 
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
 require 'flipper/adapters/redis'
-options = {}
-if ENV['REDIS_URL']
-  options[:url] = ENV['REDIS_URL']
-end
-client = Redis.new(options)
-adapter = Flipper::Adapters::Redis.new(client)
-flipper = Flipper.new(adapter)
 
-flipper[:stats].enable
+Flipper[:stats].enable
 
-if flipper[:stats].enabled?
+if Flipper[:stats].enabled?
   puts "Enabled!"
 else
   puts "Disabled!"
 end
 
-flipper[:stats].disable
+Flipper[:stats].disable
 
-if flipper[:stats].enabled?
+if Flipper[:stats].enabled?
   puts "Enabled!"
 else
   puts "Disabled!"

data/examples/redis/internals.rb

@@ -1,20 +1,9 @@
+require 'bundler/setup'
 require 'pp'
-require 'pathname'
 require 'logger'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
 require 'flipper/adapters/redis'
 
-options = {}
-if ENV['REDIS_URL']
-  options[:url] = ENV['REDIS_URL']
-end
-client = Redis.new(options)
-adapter = Flipper::Adapters::Redis.new(client)
-flipper = Flipper.new(adapter)
+client = Redis.new
 
 # Register a few groups.
 Flipper.register(:admins) { |thing| thing.admin? }
@@ -23,16 +12,16 @@ Flipper.register(:early_access) { |thing| thing.early_access? }
 # Create a user class that has flipper_id instance method.
 User = Struct.new(:flipper_id)
 
-flipper[:stats].enable
-flipper[:stats].enable_group :admins
-flipper[:stats].enable_group :early_access
-flipper[:stats].enable_actor User.new('25')
-flipper[:stats].enable_actor User.new('90')
-flipper[:stats].enable_actor User.new('180')
-flipper[:stats].enable_percentage_of_time 15
-flipper[:stats].enable_percentage_of_actors 45
+Flipper[:stats].enable
+Flipper[:stats].enable_group :admins
+Flipper[:stats].enable_group :early_access
+Flipper[:stats].enable_actor User.new('25')
+Flipper[:stats].enable_actor User.new('90')
+Flipper[:stats].enable_actor User.new('180')
+Flipper[:stats].enable_percentage_of_time 15
+Flipper[:stats].enable_percentage_of_actors 45
 
-flipper[:search].enable
+Flipper[:search].enable
 
 print 'all keys: '
 pp client.keys
@@ -64,7 +53,7 @@ pp client.hgetall('search')
 puts
 
 puts 'flipper get of feature'
-pp adapter.get(flipper[:stats])
+pp Flipper.adapter.get(Flipper[:stats])
 # flipper get of feature
 # {:boolean=>"true",
 #  :groups=>#<Set: {"admins", "early_access"}>,

data/examples/redis/namespaced.rb

@@ -1,18 +1,7 @@
-require 'pp'
-require 'pathname'
-require 'logger'
-begin
-  require 'redis-namespace'
-rescue LoadError
-  puts 'you must have redis-namespace gem installed'
-  exit 1
-end
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+require 'bundler/setup'
+require 'redis-namespace'
 require 'flipper/adapters/redis'
+
 options = {url: 'redis://127.0.0.1:6379'}
 if ENV['REDIS_URL']
   options[:url] = ENV['REDIS_URL']

data/lib/flipper/adapters/redis.rb

@@ -178,3 +178,10 @@ module Flipper
     end
   end
 end
+
+Flipper.configure do |config|
+  config.adapter do
+    client = Redis.new(url: ENV["FLIPPER_REDIS_URL"] || ENV["REDIS_URL"])
+    Flipper::Adapters::Redis.new(client)
+  end
+end

data/lib/flipper/adapters/redis_cache.rb

@@ -148,7 +148,7 @@ module Flipper
         return [] if keys.empty?
 
         cache_keys = keys.map { |key| key_for(key) }
-        @cache.mget(cache_keys).map do |value|
+        @cache.mget(*cache_keys).map do |value|
           value ? Marshal.load(value) : nil
         end
       end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.20.3'.freeze
+  VERSION = '0.22.0'.freeze
 end

data/spec/flipper/adapters/redis_cache_spec.rb

@@ -19,7 +19,11 @@ RSpec.describe Flipper::Adapters::RedisCache do
   subject { adapter }
 
   before do
-    client.flushdb
+    begin
+      client.flushdb
+    rescue Redis::CannotConnectError
+      ENV['CI'] ? raise : skip('Redis not available')
+    end
   end
 
   it_should_behave_like 'a flipper adapter'

data/spec/flipper/adapters/redis_spec.rb

@@ -14,8 +14,21 @@ RSpec.describe Flipper::Adapters::Redis do
   subject { described_class.new(client) }
 
   before do
-    client.flushdb
+    begin
+      client.flushdb
+    rescue Redis::CannotConnectError
+      ENV['CI'] ? raise : skip('Redis not available')
+    end
   end
 
   it_should_behave_like 'a flipper adapter'
+
+  it 'configures itself on load' do
+    Flipper.configuration = nil
+    Flipper.instance = nil
+
+    load 'flipper/adapters/redis.rb'
+
+    expect(Flipper.adapter.adapter).to be_a(Flipper::Adapters::Redis)
+  end
 end

data/test/adapters/redis_cache_test.rb

@@ -9,6 +9,8 @@ class RedisCacheTest < MiniTest::Test
     @cache = Redis.new(url: url).tap(&:flushdb)
     memory_adapter = Flipper::Adapters::Memory.new
     @adapter = Flipper::Adapters::RedisCache.new(memory_adapter, @cache)
+  rescue Redis::CannotConnectError
+    ENV['CI'] ? raise : skip('Reids not available')
   end
 
   def teardown

data/test/adapters/redis_test.rb

@@ -8,5 +8,7 @@ class RedisTest < MiniTest::Test
     url = ENV.fetch('REDIS_URL', 'redis://localhost:6379')
     client = Redis.new(url: url).tap(&:flushdb)
     @adapter = Flipper::Adapters::Redis.new(client)
+  rescue Redis::CannotConnectError
+    ENV['CI'] ? raise : skip('Redis not available')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-redis
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.22.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement