flipper-active_support_cache_store 0.11.0.beta9 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e8d7316856c656b4b521d6134b81d974481144
-  data.tar.gz: 8025ed93371a25fb3f7a1c1c46b75b07d99e9fcc
+  metadata.gz: 20d38d3242893e6a85d8933402c1eee942b416ee
+  data.tar.gz: 55ca0340f7250cbd7e8922523b3487da9e10d8f3
 SHA512:
-  metadata.gz: a7e61ade46c07e82f6384cef0a0cb70c36f1d1a84519a021cb8f5ef38195a539af5944b473d092df19bd79120faffcd43a005c39e1f558521560f4c1bc4d4cfe
-  data.tar.gz: d460d2e9f218f7ae7b335c5197cc885b5e0d258746e6bf5f17764ad4dc0503e28dcbdd1d4722b46a91fdb757aa1bd9bc7e13e6661c8f4d7fae7213b8fb5c2bfe
+  metadata.gz: 9fd879aeedb517919e2b4f338969f893ecfcd9f311f60de934289f51fb18b96843fa27c947ecc9ea523706de3821e8d2cd46e64a2bf368f4b29201fedafa4b3a
+  data.tar.gz: 1d17ee8bd8df24c6cae2a383376c11e878559bb6fea3253e8c7827922c1b98c1d6adf9f924ce97f0a52fa2753d68c1ad9dfb2ca097b02980571c0c9ce3247125

data/lib/flipper/adapters/active_support_cache_store.rb

@@ -9,6 +9,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)
@@ -27,14 +28,12 @@ module Flipper
         @name = :active_support_cache_store
         @cache = cache
         @write_options = {}
-        @write_options.merge!(expires_in: expires_in) if expires_in
+        @write_options[:expires_in] = expires_in if expires_in
       end
 
       # Public
       def features
-        @cache.fetch(FeaturesKey, @write_options) do
-          @adapter.features
-        end
+        read_feature_keys
       end
 
       # Public
@@ -67,17 +66,21 @@ module Flipper
       end
 
       def get_multi(features)
-        keys = features.map { |feature| key_for(feature.key) }
-        result = @cache.read_multi(keys)
-        uncached_features = features.reject { |feature| result[feature.key] }
-        if uncached_features.any?
-          response = @adapter.get_multi(uncached_features)
+        read_many_features(features)
+      end
+
+      def get_all
+        if @cache.write(GetAllKey, Time.now.to_i, @write_options.merge(unless_exist: true))
+          response = @adapter.get_all
           response.each do |key, value|
             @cache.write(key_for(key), value, @write_options)
-            result[key] = value
           end
+          @cache.write(FeaturesKey, response.keys.to_set, @write_options)
+          response
+        else
+          features = read_feature_keys.map { |key| Flipper::Feature.new(key, self) }
+          read_many_features(features)
         end
-        result
       end
 
       ## Public
@@ -99,6 +102,33 @@ module Flipper
       def key_for(key)
         self.class.key_for(key)
       end
+
+      # Internal: Returns an array of the known feature keys.
+      def read_feature_keys
+        @cache.fetch(FeaturesKey, @write_options) { @adapter.features }
+      end
+
+      # Internal: Given an array of features, attempts to read through cache in
+      # as few network calls as possible.
+      def read_many_features(features)
+        keys = features.map { |feature| key_for(feature.key) }
+        cache_result = @cache.read_multi(*keys)
+        uncached_features = features.reject { |feature| cache_result[key_for(feature)] }
+
+        if uncached_features.any?
+          response = @adapter.get_multi(uncached_features)
+          response.each do |key, value|
+            @cache.write(key_for(key), value, @write_options)
+            cache_result[key_for(key)] = value
+          end
+        end
+
+        result = {}
+        features.each do |feature|
+          result[feature.key] = cache_result[key_for(feature.key)]
+        end
+        result
+      end
     end
   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/active_support_cache_store_spec.rb

@@ -1,17 +1,25 @@
 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'
 
 RSpec.describe Flipper::Adapters::ActiveSupportCacheStore do
-  let(:memory_adapter) { Flipper::Adapters::Memory.new }
-  let(:cache) { ActiveSupport::Cache::MemoryStore.new }
-  let(:adapter) { described_class.new(memory_adapter, cache) }
+  let(:memory_adapter) do
+    Flipper::Adapters::OperationLogger.new(Flipper::Adapters::Memory.new)
+  end
+  let(:cache) { ActiveSupport::Cache::DalliStore.new }
+  let(:adapter) { described_class.new(memory_adapter, cache, expires_in: 10.seconds) }
   let(:flipper) { Flipper.new(adapter) }
 
   subject { adapter }
 
+  before do
+    cache.clear
+  end
+
   it_should_behave_like 'a flipper adapter'
 
   describe '#remove' do
@@ -31,6 +39,8 @@ RSpec.describe Flipper::Adapters::ActiveSupportCacheStore do
       stats.enable
       search.enable
 
+      memory_adapter.reset
+
       adapter.get(stats)
       expect(cache.read(described_class.key_for(search))).to be(nil)
       expect(cache.read(described_class.key_for(other))).to be(nil)
@@ -39,6 +49,37 @@ RSpec.describe Flipper::Adapters::ActiveSupportCacheStore do
 
       expect(cache.read(described_class.key_for(search))[:boolean]).to eq('true')
       expect(cache.read(described_class.key_for(other))[: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(cache.read(described_class.key_for(stats))[:boolean]).to eq('true')
+      expect(cache.read(described_class.key_for(search))[:boolean]).to be(nil)
+      expect(cache.read(described_class::GetAllKey)).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-active_support_cache_store
 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: activesupport
   requirement: !ruby/object:Gem::Requirement