Support expiration in Set

Author: heka1024

lib/kredis/types.rb

@@ -69,8 +69,8 @@ def unique_list(key, default: nil, typed: :string, limit: nil, config: :shared,
     type_from(UniqueList, config, key, after_change: after_change, default: default, typed: typed, limit: limit)
   end
 
-  def set(key, default: nil, typed: :string, config: :shared, after_change: nil)
-    type_from(Set, config, key, after_change: after_change, default: default, typed: typed)
+  def set(key, default: nil, typed: :string, config: :shared, after_change: nil, expires_in: nil)
+    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)

lib/kredis/types/set.rb

@@ -2,6 +2,7 @@
 
 class Kredis::Types::Set < Kredis::Types::Proxying
   prepend Kredis::DefaultValues
+  include Kredis::Expiration
 
   proxying :smembers, :sadd, :srem, :multi, :del, :sismember, :scard, :spop, :exists?, :srandmember
 
@@ -13,7 +14,11 @@ def members
   alias to_a members
 
   def add(*members)
-    sadd types_to_strings(members, typed) if members.flatten.any?
+    return unless members.flatten.any?
+
+    with_expiration do
+      sadd types_to_strings(members, typed)
+    end
   end
   alias << add
 

test/types/set_test.rb

@@ -2,6 +2,7 @@
 
 require "test_helper"
 require "active_support/core_ext/object/inclusion"
+require "active_support/core_ext/integer"
 
 class SetTest < ActiveSupport::TestCase
   setup { @set = Kredis.set "myset" }
@@ -70,10 +71,10 @@ class SetTest < ActiveSupport::TestCase
 
     @set.add 1.5, 2.7
     @set << 2.7
-    assert_equal [ 1.5, 2.7 ], @set.members
+    assert_equal [1.5, 2.7], @set.members
 
     @set.remove(2.7)
-    assert_equal [ 1.5 ], @set.members
+    assert_equal [1.5], @set.members
 
     assert_equal 1.5, @set.take
   end
@@ -97,11 +98,10 @@ class SetTest < ActiveSupport::TestCase
     @set = Kredis.set "mylist", typed: :float
     @set.add 1.5, 2.7
 
-    assert @set.sample.in?([ 1.5, 2.7 ])
-    assert_equal [ 1.5, 2.7 ], @set.sample(2).sort
+    assert @set.sample.in?([1.5, 2.7])
+    assert_equal [1.5, 2.7], @set.sample(2).sort
   end
 
-
   test "default" do
     @set = Kredis.set "mylist", default: %w[ 1 2 3 ]
     assert_equal %w[ 1 2 3 ], @set.members
@@ -128,6 +128,18 @@ class SetTest < ActiveSupport::TestCase
     assert_equal [ 1, 2, 3, 5, 6, 7 ], @set.members
   end
 
+  test "add with expiration" do
+    @set = Kredis.set "mylist", typed: :integer, expires_in: 1.second
+    @set.add(%w[ 1 2 3 ])
+
+    sleep 0.7.seconds
+    @set.add(%w[ 4 5 ])
+    assert_equal [1, 2, 3, 4, 5], @set.members
+
+    sleep 0.5.seconds
+    assert_equal [], @set.members
+  end
+
   test "remove with default" do
     @set = Kredis.set "mylist", default: -> () { %w[ 1 2 3 4 ] }
     @set.remove(%w[ 2 3 ])
@@ -139,6 +151,6 @@ class SetTest < ActiveSupport::TestCase
     @set = Kredis.set "mylist", typed: :integer, default: -> () { %w[ 1 2 3 ] }
     @set.add(%w[ 5 6 7 ])
     @set.replace(%w[ 8 9 10 ])
-    assert_equal [ 8, 9, 10 ], @set.members
+    assert_equal [8, 9, 10], @set.members
   end
 end