flipper-redis 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75794c8cf100a5df75ec07ec97123cda83eb195ee7eab7d91b58b1aab04354e
-  data.tar.gz: 78ae668ed8767209136cfe09d05e8c6a67fc3e7bc9466f4a5637403a99c43706
+  metadata.gz: cef5d8c3766ffc4fbaf2dcf79349035b859bd391ccfa87e08086883ddbbcb005
+  data.tar.gz: 24984f0ff0baa968662b53b8e7e47288a2597d76f995b7907d19491e4faec447
 SHA512:
-  metadata.gz: 513f65a411e1be74144e3870e3149724a78c5ce25692122f85657f50b149b95715473e01b5f423d74edec58d141fe45235246dbf206354b7747d9ad3bfecfd62
-  data.tar.gz: f1a5a543226d2d0fd55c2c817207541ded0bb09f49e152ca5bb40fbf0069c6e2d9a9d0c9cee0a1b4903177cdbc50f9fb2841e8b778dcc8e98d877792760d447a
+  metadata.gz: 2c4f17c5b1ef32124dca429462638d75f2e589825c227bd83af8006248b53cee87ef88da3fa58e8abd91b8c8858508a69d7d538f1e1419c10e961c4a79394ed1
+  data.tar.gz: d09947d3c470a5e03ae7937c91b4d7ea7899f3a8663a5ec8399d3c5a2e5fdd22156b262a573aaad5c725685ec356d0e29466e6b725afc64044abc8b4197307ba

data/lib/flipper/adapters/redis.rb

@@ -7,9 +7,6 @@ module Flipper
     class Redis
       include ::Flipper::Adapter
 
-      # Public: The name of the adapter.
-      attr_reader :name
-
       attr_reader :key_prefix
 
       def features_key
@@ -27,7 +24,6 @@ module Flipper
       #              flipper's Redis keys
       def initialize(client, key_prefix: nil)
         @client = client
-        @name = :redis
         @key_prefix = key_prefix
       end
 
@@ -97,6 +93,8 @@ module Flipper
           @client.hset feature_key, gate.key, thing.value.to_s
         when :set
           @client.hset feature_key, to_field(gate, thing), 1
+        when :json
+          @client.hset feature_key, gate.key, Typecast.to_json(thing.value)
         else
           unsupported_data_type gate.data_type
         end
@@ -120,6 +118,8 @@ module Flipper
           @client.hset feature_key, gate.key, thing.value.to_s
         when :set
           @client.hdel feature_key, to_field(gate, thing)
+        when :json
+          @client.hdel feature_key, gate.key
         else
           unsupported_data_type gate.data_type
         end
@@ -172,6 +172,9 @@ module Flipper
               doc[gate.key.to_s]
             when :set
               fields_to_gate_value fields, gate
+            when :json
+              value = doc[gate.key.to_s]
+              Typecast.from_json(value)
             else
               unsupported_data_type gate.data_type
             end

data/lib/flipper/adapters/redis_cache.rb

@@ -8,28 +8,19 @@ module Flipper
     class RedisCache
       include ::Flipper::Adapter
 
-      Version = 'v1'.freeze
-      Namespace = "flipper/#{Version}".freeze
-      FeaturesKey = "#{Namespace}/features".freeze
-      GetAllKey = "#{Namespace}/get_all".freeze
-
-      # Private
-      def self.key_for(key)
-        "#{Namespace}/feature/#{key}"
-      end
-
       # Internal
       attr_reader :cache
 
-      # Public: The name of the adapter.
-      attr_reader :name
-
       # Public
       def initialize(adapter, cache, ttl = 3600)
         @adapter = adapter
-        @name = :redis_cache
         @cache = cache
         @ttl = ttl
+
+        @version = 'v1'.freeze
+        @namespace = "flipper/#{@version}".freeze
+        @features_key = "#{@namespace}/features".freeze
+        @get_all_key = "#{@namespace}/get_all".freeze
       end
 
       # Public
@@ -40,14 +31,14 @@ module Flipper
       # Public
       def add(feature)
         result = @adapter.add(feature)
-        @cache.del(FeaturesKey)
+        @cache.del(@features_key)
         result
       end
 
       # Public
       def remove(feature)
         result = @adapter.remove(feature)
-        @cache.del(FeaturesKey)
+        @cache.del(@features_key)
         @cache.del(key_for(feature.key))
         result
       end
@@ -71,13 +62,13 @@ module Flipper
       end
 
       def get_all
-        if @cache.setnx(GetAllKey, Time.now.to_i)
-          @cache.expire(GetAllKey, @ttl)
+        if @cache.setnx(@get_all_key, Time.now.to_i)
+          @cache.expire(@get_all_key, @ttl)
           response = @adapter.get_all
           response.each do |key, value|
             set_with_ttl key_for(key), value
           end
-          set_with_ttl FeaturesKey, response.keys.to_set
+          set_with_ttl @features_key, response.keys.to_set
           response
         else
           features = read_feature_keys.map { |key| Flipper::Feature.new(key, self) }
@@ -102,11 +93,11 @@ module Flipper
       private
 
       def key_for(key)
-        self.class.key_for(key)
+        "#{@namespace}/feature/#{key}"
       end
 
       def read_feature_keys
-        fetch(FeaturesKey) { @adapter.features }
+        fetch(@features_key) { @adapter.features }
       end
 
       def read_many_features(features)

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/flipper/adapters/redis_cache_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Flipper::Adapters::RedisCache do
       feature = flipper[:stats]
       adapter.get(feature)
       adapter.remove(feature)
-      expect(client.get(described_class.key_for(feature))).to be(nil)
+      expect(client.get("flipper/v1/feature/#{feature.key}")).to be(nil)
     end
   end
 
@@ -37,7 +37,7 @@ RSpec.describe Flipper::Adapters::RedisCache do
     it 'uses correct cache key' do
       stats = flipper[:stats]
       adapter.get(stats)
-      expect(client.get(described_class.key_for(stats))).not_to be_nil
+      expect(client.get("flipper/v1/feature/#{stats.key}")).not_to be_nil
     end
   end
 
@@ -52,13 +52,13 @@ RSpec.describe Flipper::Adapters::RedisCache do
       memory_adapter.reset
 
       adapter.get(stats)
-      expect(client.get(described_class.key_for(search))).to be(nil)
-      expect(client.get(described_class.key_for(other))).to be(nil)
+      expect(client.get("flipper/v1/feature/#{search.key}")).to be(nil)
+      expect(client.get("flipper/v1/feature/#{other.key}")).to be(nil)
 
       adapter.get_multi([stats, search, other])
 
       search_cache_value, other_cache_value = [search, other].map do |f|
-        Marshal.load(client.get(described_class.key_for(f)))
+        Marshal.load(client.get("flipper/v1/feature/#{f.key}"))
       end
       expect(search_cache_value[:boolean]).to eq('true')
       expect(other_cache_value[:boolean]).to be(nil)
@@ -80,9 +80,9 @@ RSpec.describe Flipper::Adapters::RedisCache do
 
     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)
+      expect(Marshal.load(client.get("flipper/v1/feature/#{stats.key}"))[:boolean]).to eq('true')
+      expect(Marshal.load(client.get("flipper/v1/feature/#{search.key}"))[:boolean]).to be(nil)
+      expect(client.get("flipper/v1/get_all").to_i).to be_within(2).of(Time.now.to_i)
     end
 
     it 'returns same result when already cached' do

metadata

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