fino-redis 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f208678be6c8dc8bdf5fde1a3c8458e8cd908c59f870f432b4136e4f8e38bf5
-  data.tar.gz: 134c3275f900f0dcd9ace76124f6a3b2167316d2b2b7845ddc2597c64c3647ed
+  metadata.gz: bf8532d7c9300576fc53693bc44a1ae65cecc2177c7cffe1ced5e233c915272a
+  data.tar.gz: 0a8d663f550775de858394e53c6ee522e07d0a90fe257fd1c6d5a16773a743cc
 SHA512:
-  metadata.gz: 4ea485e204970f5f571f8993cfe3431cfa7a031f9c70167214656646b1538af6a3d568cd260faa2de51db66b7c54f793ed64c6b5d11a7c6cb7819a035b46e0dc
-  data.tar.gz: a65a7aaa5a427741f39f56daa5e2913c80b3347c3806dc47f5c58eed6a9ddbeab341816954ce724477702c92790c93df41f6a7e62e57b822fac0e1f20c665446
+  metadata.gz: c7257b235d5755fb4474fb5e3a478b8e97b0a80a78b54b11967faf871bf70f3e34e3f7a4f49da1cf24729df12052617c6ec1b9fd1ebff255f5cccd40daf8937c
+  data.tar.gz: 5c44aa7255f8e5bb2ea16a8167acd64385e031a22635ebd583ebeac17aead3dd5c8acf504bd2134c4f550c5f3dc329d88b3593df9bf4e2676ed94037cffbb073

data/lib/fino/redis/adapter.rb

@@ -6,6 +6,8 @@ class Fino::Redis::Adapter
   using Fino::CustomRedisScripts
 
   DEFAULT_REDIS_NAMESPACE = "fino"
+  SETTINGS_NAMESPACE = "s"
+  PERSISTED_SETTINGS_KEYS_REDIS_KEY = "psl"
   SCOPE_PREFIX = "s"
   VARIANT_PREFIX = "v"
   VALUE_KEY = "v"
@@ -15,12 +17,12 @@ class Fino::Redis::Adapter
     @redis_namespace = namespace
   end
 
-  def read(setting_definition)
-    redis.hgetall(redis_key_for(setting_definition))
+  def read(setting_key)
+    redis.hgetall(redis_key_for(setting_key))
   end
 
-  def read_multi(setting_definitions)
-    keys = setting_definitions.map { |definition| redis_key_for(definition) }
+  def read_multi(setting_keys)
+    keys = setting_keys.map { |setting_key| redis_key_for(setting_key) }
 
     redis.pipelined do |pipeline|
       keys.each { |key| pipeline.hgetall(key) }
@@ -42,7 +44,23 @@ class Fino::Redis::Adapter
       hash["#{VARIANT_PREFIX}/#{variant.percentage}/#{VALUE_KEY}"] = serialize_value.call(variant.value)
     end
 
-    redis.mapped_hreplace(redis_key_for(setting_definition), hash)
+    redis.multi do |r|
+      r.mapped_hreplace(redis_key_for(setting_definition.key), hash)
+      r.sadd(build_redis_key(PERSISTED_SETTINGS_KEYS_REDIS_KEY), setting_definition.key)
+    end
+  end
+
+  def read_persisted_setting_keys
+    redis.smembers(build_redis_key(PERSISTED_SETTINGS_KEYS_REDIS_KEY))
+  end
+
+  def clear(setting_key)
+    _, cleared = redis.multi do |r|
+      r.del(redis_key_for(setting_key))
+      r.srem(build_redis_key(PERSISTED_SETTINGS_KEYS_REDIS_KEY), setting_key)
+    end
+
+    cleared == 1
   end
 
   def fetch_value_from(raw_adapter_data)
@@ -72,7 +90,11 @@ class Fino::Redis::Adapter
 
   attr_reader :redis, :redis_namespace
 
-  def redis_key_for(setting_definition)
-    "#{redis_namespace}:#{setting_definition.path.join(':')}"
+  def redis_key_for(setting_key)
+    build_redis_key(SETTINGS_NAMESPACE, setting_key)
+  end
+
+  def build_redis_key(*parts)
+    [redis_namespace, *parts].join(":")
   end
 end

data/lib/fino/redis/custom_redis_scripts.rb

@@ -1,12 +1,24 @@
 # frozen_string_literal: true
 
 module Fino::CustomRedisScripts
+  module_function
+
+  def mapped_hreplace(connection, key, values_mapping)
+    connection.del(key)
+    connection.mapped_hmset(key, values_mapping)
+  end
+
   refine Redis do
     def mapped_hreplace(key, values_mapping)
-      multi do |r|
-        r.del(key)
-        r.mapped_hmset(key, values_mapping)
+      multi do |multi|
+        Fino::CustomRedisScripts.mapped_hreplace(multi, key, values_mapping)
       end
     end
   end
+
+  refine Redis::MultiConnection do
+    def mapped_hreplace(key, values_mapping)
+      Fino::CustomRedisScripts.mapped_hreplace(self, key, values_mapping)
+    end
+  end
 end

data/lib/fino/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Fino
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
   REQUIRED_RUBY_VERSION = ">= 3.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fino-redis
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Egor Iskrenkov
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement