Support expiration in OrderedSet

Author: heka1024

lib/kredis/types.rb

@@ -73,8 +73,8 @@ def set(key, default: nil, typed: :string, config: :shared, after_change: nil, e
     type_from(Set, config, key, after_change: after_change, default: default, typed: typed, expires_in: expires_in)
   end
 
-  def ordered_set(key, default: nil, typed: :string, limit: nil, config: :shared, after_change: nil)
-    type_from(OrderedSet, config, key, after_change: after_change, default: default, typed: typed, limit: limit)
+  def ordered_set(key, default: nil, typed: :string, limit: nil, config: :shared, after_change: nil, expires_in: nil)
+    type_from(OrderedSet, config, key, after_change: after_change, default: default, typed: typed, limit: limit, expires_in: expires_in)
   end
 
   def slot(key, config: :shared, after_change: nil)

lib/kredis/types/ordered_set.rb

@@ -2,6 +2,7 @@
 
 class Kredis::Types::OrderedSet < Kredis::Types::Proxying
   prepend Kredis::DefaultValues
+  include Kredis::Expiration
 
   proxying :multi, :zrange, :zrem, :zadd, :zremrangebyrank, :zcard, :exists?, :del, :zscore
 
@@ -53,9 +54,11 @@ def insert(elements, prepending: false)
         [ score, element ]
       end
 
-      multi do
-        zadd(elements_with_scores)
-        trim(from_beginning: prepending)
+      with_expiration do
+        multi do
+          zadd(elements_with_scores)
+          trim(from_beginning: prepending)
+        end
       end
     end
 

test/types/ordered_set_test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "test_helper"
+require "active_support/core_ext/integer"
 
 class OrderedSetTest < ActiveSupport::TestCase
   setup { @set = Kredis.ordered_set "ordered-set", limit: 5 }
@@ -31,6 +32,16 @@ class OrderedSetTest < ActiveSupport::TestCase
     assert_equal thousand_elements, @set.elements
   end
 
+  test "append with expiry" do
+    @set = Kredis.ordered_set "ordered-set", limit: 5, expires_in: 1.second
+
+    @set.append(%w[ 1 2 3 ])
+    assert_equal %w[ 1 2 3 ], @set.elements
+
+    sleep 1.1
+    assert @set.elements.empty?
+  end
+
   test "prepend" do
     @set.prepend(%w[ 1 2 3 ])
     @set.prepend(%w[ 1 2 3 4 ])