improve Kredis::Types::List

lib/kredis/types/hash.rb

@@ -5,7 +5,7 @@
 class Kredis::Types::Hash < Kredis::Types::Proxying
   prepend Kredis::DefaultValues
 
-  proxying :hget, :hset, :hmget, :hdel, :hgetall, :hkeys, :hvals, :del, :exists?
+  proxying :hget, :hset, :hmget, :hdel, :hgetall, :hkeys, :hvals, :del, :exists?, :expire, :expireat
 
   attr_accessor :typed
 
@@ -47,6 +47,10 @@ def values
     strings_to_types(hvals || [], typed)
   end
 
+  def expire_at(datetime)
+    expireat datetime.to_i
+  end
+
   private
     def set_default
       update(**default)

lib/kredis/types/list.rb

@@ -3,12 +3,12 @@
 class Kredis::Types::List < Kredis::Types::Proxying
   prepend Kredis::DefaultValues
 
-  proxying :lrange, :lrem, :lpush, :ltrim, :rpush, :exists?, :del
+  proxying :lrange, :lrem, :lpush, :ltrim, :rpush, :exists?, :del, :llen
 
   attr_accessor :typed
 
-  def elements
-    strings_to_types(lrange(0, -1) || [], typed)
+  def elements(start = 0, stop = -1)
+    strings_to_types(lrange(start, stop) || [], typed)
   end
   alias to_a elements
 
@@ -29,10 +29,20 @@ def clear
     del
   end
 
+  def first(n = nil)
+    n ? elements(0, n - 1) : elements(0, 0).first
+  end
+
   def last(n = nil)
-    n ? lrange(-n, -1) : lrange(-1, -1).first
+    n ? elements(-n, -1) : elements(-1, -1).first
   end
 
+  def size
+    llen
+  end
+
+  alias length size
+
   private
     def set_default
       append default

test/types/list_test.rb

@@ -6,6 +6,12 @@
 class ListTest < ActiveSupport::TestCase
   setup { @list = Kredis.list "mylist" }
 
+  test "elements" do
+    @list.clear
+    @list.append %w[ 1 2 3 ]
+    assert_equal %w[ 1 2 3 ], @list.elements
+  end
+
   test "append" do
     @list.append(%w[ 1 2 3 ])
     @list << 4
@@ -43,6 +49,16 @@ class ListTest < ActiveSupport::TestCase
     assert_equal [], @list.elements
   end
 
+  test "first" do
+    @list.prepend(%w[ 1 2 3 ])
+    assert_equal "3", @list.first
+  end
+
+  test "first(n)" do
+    @list.prepend(%w[ 1 2 3 ])
+    assert_equal %w[ 3 2 ], @list.first(2)
+  end
+
   test "last" do
     @list.append(%w[ 1 2 3 ])
     assert_equal "3", @list.last
@@ -53,14 +69,15 @@ class ListTest < ActiveSupport::TestCase
     assert_equal %w[ 2 3 ], @list.last(2)
   end
 
-  test "typed as datetime" do
-    @list = Kredis.list "mylist", typed: :datetime
-
-    @list.append [ 1.day.from_now.midnight.in_time_zone("Pacific Time (US & Canada)"), 2.days.from_now.midnight.in_time_zone("UTC") ]
-    assert_equal [ 1.day.from_now.midnight, 2.days.from_now.midnight ], @list.elements
+  test "size" do
+    @list.clear
+    @list.append(%w[ 1 2 3 ])
+    assert_equal 3, @list.size
+  end
 
-    @list.remove(2.days.from_now.midnight)
-    assert_equal [ 1.day.from_now.midnight ], @list.elements
+  test "size when list removed" do
+    @list.clear
+    assert_equal 0, @list.size
   end
 
   test "exists?" do
@@ -76,7 +93,6 @@ class ListTest < ActiveSupport::TestCase
     assert_equal %w[ 2 3 ], @list.elements
   end
 
-
   test "default" do
     @list = Kredis.list "mylist", default: %w[ 1 2 3 ]
 
@@ -132,3 +148,43 @@ class ListTest < ActiveSupport::TestCase
     assert_equal [ 0, 1, 2, 3, 4, 10, 20, 30 ], Kredis.list("mylist", typed: :integer).to_a.sort
   end
 end
+
+class TypedListTest < ActiveSupport::TestCase
+  setup { @list = Kredis.list "mylist.typed", typed: :integer }
+
+  test "elements" do
+    @list.clear
+    @list.append 1, 2, 3
+    assert_equal [ 1, 2, 3 ], @list.elements
+  end
+
+  test "first" do
+    @list.prepend 1, 2, 3
+    assert_equal 3, @list.first
+  end
+
+  test "first(n)" do
+    @list.prepend 3, 2, 1
+    assert_equal [ 1, 2 ], @list.first(2)
+  end
+
+  test "last" do
+    @list.append 1, 2, 3
+    assert_equal 3, @list.last
+  end
+
+  test "last(n)" do
+    @list.append 1, 2, 3
+    assert_equal [ 2, 3 ], @list.last(2)
+  end
+
+  test "typed as datetime" do
+    @list = Kredis.list "mylist", typed: :datetime
+
+    @list.append [ 1.day.from_now.midnight.in_time_zone("Pacific Time (US & Canada)"), 2.days.from_now.midnight.in_time_zone("UTC") ]
+    assert_equal [ 1.day.from_now.midnight, 2.days.from_now.midnight ], @list.elements
+
+    @list.remove(2.days.from_now.midnight)
+    assert_equal [ 1.day.from_now.midnight ], @list.elements
+  end
+end