flipper-dalli 0.11.0.beta9 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0e885c3a861e13d624272de21687bef04e106d
-  data.tar.gz: a96395558a3343f89aac93fbead0109a70332477
+  metadata.gz: 34a9a158115cd2e295c9d00b3754efcfd7aca9d7
+  data.tar.gz: 8d2e5e9955f24abb9eb2bc23c2392509c7a86b1f
 SHA512:
-  metadata.gz: 61e0470e2d1ac03a2877794108dff89786d6ce9e22e06ab091df2e0b382dc2c18be976daa8d5811d6c15344554399381aac3fbd32e816d0dbb1d133f9cfb659b
-  data.tar.gz: a2b4650389c85603e4cb2a7dbec388ac3ed9cc03455b276dbfa2dad217872cbf5b20ae28e5647b0de6eb8cf2c9561272178806a1001565dc304e7454221a8f39
+  metadata.gz: 56f05426c86cba861cc43707cf793dfa0fd65f8a947a3f348dea21d27cac764f40c8ad627881785e99be696568152a183903831b2bd77c5bd27389493bc227fe
+  data.tar.gz: 4afdcfb18d9ec5ce3d43c2d3d328fa321a611674622fac59af7149e15957bcdfd991d4e0e4eca01ed5d5004c36be0464db4a2c31f48499f765b0eba83eafe428

data/lib/flipper/adapters/dalli.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)
@@ -22,6 +23,9 @@ module Flipper
       # Public: The name of the adapter.
       attr_reader :name
 
+      # Public: The ttl for all cached data.
+      attr_reader :ttl
+
       # Public
       def initialize(adapter, cache, ttl = 0)
         @adapter = adapter
@@ -32,9 +36,7 @@ module Flipper
 
       # Public
       def features
-        @cache.fetch(FeaturesKey, @ttl) do
-          @adapter.features
-        end
+        read_feature_keys
       end
 
       # Public
@@ -67,19 +69,21 @@ module Flipper
       end
 
       def get_multi(features)
-        keys = features.map { |feature| key_for(feature.key) }
-        result = @cache.get_multi(keys)
-        uncached_features = features.reject { |feature| result[key_for(feature.key)] }
+        read_many_features(features)
+      end
 
-        if uncached_features.any?
-          response = @adapter.get_multi(uncached_features)
+      def get_all
+        if @cache.add(GetAllKey, Time.now.to_i, @ttl)
+          response = @adapter.get_all
           response.each do |key, value|
             @cache.set(key_for(key), value, @ttl)
-            result[key] = value
           end
+          @cache.set(FeaturesKey, response.keys.to_set, @ttl)
+          response
+        else
+          features = read_feature_keys.map { |key| Flipper::Feature.new(key, self) }
+          read_many_features(features)
         end
-
-        result
       end
 
       # Public
@@ -101,6 +105,32 @@ module Flipper
       def key_for(key)
         self.class.key_for(key)
       end
+
+      def read_feature_keys
+        @cache.fetch(FeaturesKey, @ttl) { @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.get_multi(keys)
+        uncached_features = features.reject { |feature| cache_result[key_for(feature.key)] }
+
+        if uncached_features.any?
+          response = @adapter.get_multi(uncached_features)
+          response.each do |key, value|
+            @cache.set(key_for(key), value, @ttl)
+            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/dalli_spec.rb

@@ -1,10 +1,13 @@
 require 'helper'
 require 'flipper/adapters/memory'
+require 'flipper/adapters/operation_logger'
 require 'flipper/adapters/dalli'
 require 'flipper/spec/shared_adapter_specs'
 
 RSpec.describe Flipper::Adapters::Dalli do
-  let(:memory_adapter) { Flipper::Adapters::Memory.new }
+  let(:memory_adapter) do
+    Flipper::Adapters::OperationLogger.new(Flipper::Adapters::Memory.new)
+  end
   let(:cache)   { Dalli::Client.new(ENV['MEMCACHED_URL'] || '127.0.0.1:11211') }
   let(:adapter) { described_class.new(memory_adapter, cache) }
   let(:flipper) { Flipper.new(adapter) }
@@ -34,6 +37,8 @@ RSpec.describe Flipper::Adapters::Dalli 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)
@@ -42,6 +47,37 @@ RSpec.describe Flipper::Adapters::Dalli do
 
       expect(cache.get(described_class.key_for(search))[:boolean]).to eq('true')
       expect(cache.get(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.get(described_class.key_for(stats))[:boolean]).to eq('true')
+      expect(cache.get(described_class.key_for(search))[:boolean]).to be(nil)
+      expect(cache.get(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-dalli
 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: dalli
   requirement: !ruby/object:Gem::Requirement