Proxying multi

Author: capripot

lib/kredis/types/counter.rb

@@ -1,19 +1,19 @@
 class Kredis::Types::Counter < Kredis::Types::Proxying
-  proxying :multi, :set, :get, :del, :exists?
+  proxying :multi, :set, :incrby, :decrby, :get, :del, :exists?
 
   attr_accessor :expires_in
 
   def increment(by: 1)
     multi do |pipeline|
-      pipeline.set key, 0, ex: expires_in, nx: true
-      pipeline.incrby key, by
+      pipeline.set 0, ex: expires_in, nx: true
+      pipeline.incrby by
     end
   end
 
   def decrement(by: 1)
     multi do |pipeline|
-      pipeline.set key, 0, ex: expires_in, nx: true
-      pipeline.decrby key, by
+      pipeline.set 0, ex: expires_in, nx: true
+      pipeline.decrby by
     end
   end
 

lib/kredis/types/list.rb

@@ -8,16 +8,16 @@ def elements
   end
   alias to_a elements
 
-  def remove(*elements)
-    types_to_strings(elements, typed).each { |element| lrem 0, element }
+  def remove(*elements, pipeline: nil)
+    types_to_strings(elements, typed).each { |element| (pipeline || proxy).lrem 0, element }
   end
 
-  def prepend(*elements)
-    lpush types_to_strings(elements, typed) if elements.flatten.any?
+  def prepend(*elements, pipeline: nil)
+    (pipeline || proxy).lpush types_to_strings(elements, typed) if elements.flatten.any?
   end
 
-  def append(*elements)
-    rpush types_to_strings(elements, typed) if elements.flatten.any?
+  def append(*elements, pipeline: nil)
+    (pipeline || proxy).rpush types_to_strings(elements, typed) if elements.flatten.any?
   end
   alias << append
 end

lib/kredis/types/proxy.rb

@@ -9,8 +9,12 @@ def initialize(redis, key, **options)
     options.each { |key, value| send("#{key}=", value) }
   end
 
-  def multi(...)
-    redis.multi(...)
+  def multi(&block)
+    return redis.multi unless block
+
+    redis.multi do |pipeline|
+      block.call(Kredis::Types::Proxy.new(pipeline, key))
+    end
   end
 
   def method_missing(method, *args, **kwargs)

lib/kredis/types/set.rb

@@ -8,19 +8,19 @@ def members
   end
   alias to_a members
 
-  def add(*members)
-    sadd types_to_strings(members, typed) if members.flatten.any?
+  def add(*members, pipeline: nil)
+    (pipeline || proxy).sadd types_to_strings(members, typed) if members.flatten.any?
   end
   alias << add
 
-  def remove(*members)
-    srem types_to_strings(members, typed) if members.flatten.any?
+  def remove(*members, pipeline: nil)
+    (pipeline || proxy).srem types_to_strings(members, typed) if members.flatten.any?
   end
 
   def replace(*members)
     multi do |pipeline|
-      pipeline.del key
-      pipeline.sadd key, types_to_strings(members, typed) if members.flatten.any?
+      pipeline.del
+      add members, pipeline: pipeline
     end
   end
 

lib/kredis/types/unique_list.rb

@@ -1,6 +1,6 @@
 # You'd normally call this a set, but Redis already has another data type for that
 class Kredis::Types::UniqueList < Kredis::Types::List
-  proxying :multi, :exists?
+  proxying :multi, :ltrim, :exists?
 
   attr_accessor :typed, :limit
 
@@ -9,9 +9,9 @@ def prepend(elements)
     return if elements.empty?
 
     multi do |pipeline|
-      types_to_strings(elements, typed).each { |element| pipeline.lrem key, 0, element }
+      remove elements, pipeline: pipeline
       super
-      pipeline.ltrim key, 0, (limit - 1) if limit
+      pipeline.ltrim 0, (limit - 1) if limit
     end
   end
 
@@ -20,9 +20,9 @@ def append(elements)
     return if elements.empty?
 
     multi do |pipeline|
-      types_to_strings(elements, typed).each { |element| pipeline.lrem key, 0, element }
+      remove elements, pipeline: pipeline
       super
-      pipeline.ltrim key, -limit, -1 if limit
+      pipeline.ltrim -limit, -1 if limit
     end
   end
   alias << append