driq 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9bfe313c82a020e678e20a9ca2980e3e7127328a925bc22bf85ce0c6e34c9f
-  data.tar.gz: d28b5801801938d574a35800cad49f37e43c57b716a2b7104a12002684662fba
+  metadata.gz: 71c4465149e2b87307aafcc9adaf476fb9c800f180eded2d6563e6e9aeafbb87
+  data.tar.gz: 6d39cd85e7ffbb9d58c078438193b84787c8ebe425da9698600d67452933d1a8
 SHA512:
-  metadata.gz: 382b94d20063c64f2ee9743c5b6d5417b45cd410fdd18e5e58fda4a82863ee908a5c45e578d0f67cf842f3ac9d85160b32e3fc1bde59a6ab167d11dc8a02035a
-  data.tar.gz: e5a74e976a9aa30882f2d2a0fca3ec2ec93e82f97d5365f8826004959bc9dc815d98baf0ef4483dc88c525b9b86170d6c28ec20101b9fa4046d4e7def971b83d
+  metadata.gz: c9e563e99a35e7c62a3c6c23d4382f98f1f36760d627ff71fc0ea9ccb657ae9f1405e9845c5660b89449394b40011aba2d3b2c9111a28e2ed169ff9db2a6121c
+  data.tar.gz: 9f2ee41bcd00d77a0ec5d637bdc6a9dc5a203265c91c7433bc89563e06fd81dce7941095afa9a1abe3c53aaa9bf3ab37f05dde5ffec090d2552b2082b2a937da

data/lib/driq.rb

@@ -26,8 +26,8 @@ class Driq
   end
   alias push write
 
-  def read(key)
-    readpartial(key, 1).first
+  def read(key, timeout=nil)
+    readpartial(key, 1, timeout).first
   end
 
   def last(if_empty=nil)
@@ -40,18 +40,18 @@ class Driq
     @last
   end
 
-  def readpartial(key, size)
+  def readpartial(key, size, timeout=nil)
     synchronize do
       key = @last unless key
       raise ClosedQueueError if @closed
       idx = seek(key)
       if idx.nil?
         key = @last
-        @event.wait
+        @event.wait(timeout)
         idx = seek(key)
       end
       raise ClosedQueueError if @closed
-      @list.slice(idx, size)
+      idx ? @list.slice(idx, size) : []
     end
   end
 
@@ -100,10 +100,12 @@ end
 
 class Driq
   class EventSource
-    def initialize(driq = nil)
+    def initialize(driq = nil, timeout = 60)
       @driq = driq || Driq.new
+      @timeout = timeout
     end
     attr_reader :driq
+    attr_accessor :timeout
 
     def write(value)
       @driq.write([nil, value])
@@ -137,7 +139,7 @@ class Driq
     end
 
     def read(cursor)
-      cursor, value = @driq.read(cursor)
+      cursor, value = @driq.read(cursor, @timeout) || [cursor, [:ping, 'keep']]
       return cursor, build_packet(cursor, value[0], value[1])
     end
   end

data/lib/driq/version.rb

@@ -1,3 +1,3 @@
 class Driq
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: driq
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masatoshi SEKI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit