flipper-redis 0.11.0.beta9 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8180f4e89f30f967b7cf80a8c78670a04011313d
-  data.tar.gz: 5001f56e1acfe6194955e7c9a0e60981985f309c
+  metadata.gz: a5f75cfdfc5971f034dc0769596d86a430a06020
+  data.tar.gz: 165e82e9aa9662d4562e693c09669bb1a1d0e7d9
 SHA512:
-  metadata.gz: 1818e56084ef172bb54dde7ac7655216a5530a7e62957bd8b3a69c274b45e2314e7ab51ed473aab22aac16c3aab77e4fc33506111b1fb5394489900aed4d8faa
-  data.tar.gz: 8890a3ca4abe1f48f1b1931afb6b869660770ead43feb2d11da4b3d46616da2d0b80b1ddefbfcb8e95b3e467a718c31b088f28163780e0a8c105d5900ff473f0
+  metadata.gz: cc5dc1840fce96636a8ee8a96b8fc5e1fd6042d8e9b84174eb8fef9e1bcdec4f1cc22ef44aac6007788b4860aa0caedb43e697d51d54889d5b1fc76df88f9b87
+  data.tar.gz: 373bbbb5b19a40ad62bd548c7c5d23b497ac86673d8e5cf2d01615c096144346e4f7e4c149ca50ede59a322491f875a529387fc5a1c02826f3e48e635fc7db48

data/lib/flipper/adapters/redis.rb

@@ -23,7 +23,7 @@ module Flipper
 
       # Public: The set of known features.
       def features
-        @client.smembers(FeaturesKey).to_set
+        read_feature_keys
       end
 
       # Public: Adds a feature to the set of known features.
@@ -56,12 +56,12 @@ module Flipper
       end
 
       def get_multi(features)
-        docs = docs_for(features)
-        result = {}
-        features.zip(docs) do |feature, doc|
-          result[feature.key] = result_for_feature(feature, doc)
-        end
-        result
+        read_many_features(features)
+      end
+
+      def get_all
+        features = read_feature_keys.map { |key| Flipper::Feature.new(key, self) }
+        read_many_features(features)
       end
 
       # Public: Enables a gate for a given thing.
@@ -106,6 +106,21 @@ module Flipper
         true
       end
 
+      private
+
+      def read_many_features(features)
+        docs = docs_for(features)
+        result = {}
+        features.zip(docs) do |feature, doc|
+          result[feature.key] = result_for_feature(feature, doc)
+        end
+        result
+      end
+
+      def read_feature_keys
+        @client.smembers(FeaturesKey).to_set
+      end
+
       # Private: Gets a hash of fields => values for the given feature.
       #
       # Returns a Hash of fields => values.

data/lib/flipper/adapters/redis_cache.rb

@@ -10,6 +10,7 @@ module Flipper
       Version = 'v1'.freeze
       Namespace = "flipper/#{Version}".freeze
       FeaturesKey = "#{Namespace}/features".freeze
+      GetAllKey = "#{Namespace}/get_all".freeze
 
       # Private
       def self.key_for(key)
@@ -32,9 +33,7 @@ module Flipper
 
       # Public
       def features
-        fetch(FeaturesKey) do
-          @adapter.features
-        end
+        read_feature_keys
       end
 
       # Public
@@ -67,20 +66,22 @@ module Flipper
       end
 
       def get_multi(features)
-        keys = features.map(&:key)
-        result = Hash[keys.zip(multi_cache_get(keys))]
-        uncached_features = features.reject do |feature|
-          result[feature.key]
-        end
+        read_many_features(features)
+      end
 
-        if uncached_features.any?
-          response = @adapter.get_multi(uncached_features)
+      def get_all
+        if @cache.setnx(GetAllKey, Time.now.to_i)
+          @cache.expire(GetAllKey, @ttl)
+          response = @adapter.get_all
           response.each do |key, value|
-            set_with_ttl(key_for(key), value)
-            result[key] = value
+            set_with_ttl key_for(key), value
           end
+          set_with_ttl FeaturesKey, response.keys.to_set
+          response
+        else
+          features = read_feature_keys.map { |key| Flipper::Feature.new(key, self) }
+          read_many_features(features)
         end
-        result
       end
 
       # Public
@@ -103,13 +104,37 @@ module Flipper
         self.class.key_for(key)
       end
 
+      def read_feature_keys
+        fetch(FeaturesKey) { @adapter.features }
+      end
+
+      def read_many_features(features)
+        keys = features.map(&:key)
+        cache_result = Hash[keys.zip(multi_cache_get(keys))]
+        uncached_features = features.reject { |feature| cache_result[feature.key] }
+
+        if uncached_features.any?
+          response = @adapter.get_multi(uncached_features)
+          response.each do |key, value|
+            set_with_ttl(key_for(key), value)
+            cache_result[key] = value
+          end
+        end
+
+        result = {}
+        features.each do |feature|
+          result[feature.key] = cache_result[feature.key]
+        end
+        result
+      end
+
       def fetch(key)
         cached = @cache.get(key)
         if cached
           Marshal.load(cached)
         else
           to_cache = yield
-          set_with_ttl(key, to_cache)
+          set_with_ttl(key_for(key), to_cache)
           to_cache
         end
       end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.11.0.beta9'.freeze
+  VERSION = '0.11.0.rc1'.freeze
 end

data/spec/flipper/adapters/redis_cache_spec.rb

@@ -1,20 +1,20 @@
 require 'helper'
 require 'flipper/adapters/memory'
+require 'flipper/adapters/operation_logger'
 require 'flipper/adapters/redis_cache'
 require 'flipper/spec/shared_adapter_specs'
 
 RSpec.describe Flipper::Adapters::RedisCache do
   let(:client) do
     options = {}
-
     options[:url] = ENV['REDIS_URL'] if ENV['REDIS_URL']
-
     Redis.new(options)
   end
 
-  let(:memory_adapter) { Flipper::Adapters::Memory.new }
-  let(:cache)   { Redis.new(url: ENV.fetch('REDIS_URL', 'redis://localhost:6379')) }
-  let(:adapter) { described_class.new(memory_adapter, cache) }
+  let(:memory_adapter) do
+    Flipper::Adapters::OperationLogger.new(Flipper::Adapters::Memory.new)
+  end
+  let(:adapter) { described_class.new(memory_adapter, client) }
   let(:flipper) { Flipper.new(adapter) }
 
   subject { adapter }
@@ -30,7 +30,7 @@ RSpec.describe Flipper::Adapters::RedisCache do
       feature = flipper[:stats]
       adapter.get(feature)
       adapter.remove(feature)
-      expect(cache.get(described_class.key_for(feature))).to be(nil)
+      expect(client.get(described_class.key_for(feature))).to be(nil)
     end
   end
 
@@ -42,17 +42,50 @@ RSpec.describe Flipper::Adapters::RedisCache do
       stats.enable
       search.enable
 
+      memory_adapter.reset
+
       adapter.get(stats)
-      expect(cache.get(described_class.key_for(search))).to be(nil)
-      expect(cache.get(described_class.key_for(other))).to be(nil)
+      expect(client.get(described_class.key_for(search))).to be(nil)
+      expect(client.get(described_class.key_for(other))).to be(nil)
 
       adapter.get_multi([stats, search, other])
 
       search_cache_value, other_cache_value = [search, other].map do |f|
-        Marshal.load(cache.get(described_class.key_for(f)))
+        Marshal.load(client.get(described_class.key_for(f)))
       end
       expect(search_cache_value[:boolean]).to eq('true')
       expect(other_cache_value[:boolean]).to be(nil)
+
+      adapter.get_multi([stats, search, other])
+      adapter.get_multi([stats, search, other])
+      expect(memory_adapter.count(:get_multi)).to eq(1)
+    end
+  end
+
+  describe '#get_all' do
+    let(:stats) { flipper[:stats] }
+    let(:search) { flipper[:search] }
+
+    before do
+      stats.enable
+      search.add
+    end
+
+    it 'warms all features' do
+      adapter.get_all
+      expect(Marshal.load(client.get(described_class.key_for(stats.key)))[:boolean]).to eq('true')
+      expect(Marshal.load(client.get(described_class.key_for(search.key)))[:boolean]).to be(nil)
+      expect(client.get(described_class::GetAllKey).to_i).to be_within(2).of(Time.now.to_i)
+    end
+
+    it 'returns same result when already cached' do
+      expect(adapter.get_all).to eq(adapter.get_all)
+    end
+
+    it 'only invokes one call to wrapped adapter' do
+      memory_adapter.reset
+      5.times { adapter.get_all }
+      expect(memory_adapter.count(:get_all)).to eq(1)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-redis
 version: !ruby/object:Gem::Version
-  version: 0.11.0.beta9
+  version: 0.11.0.rc1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0.beta9
+        version: 0.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0.beta9
+        version: 0.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement