dustin-beanstalk-client 1.0.2 → 1.0.2.1

data/History.txt

@@ -1,3 +1,15 @@
+== 1.0.2 2008-06-18
+
+* Support reserve-with-timeout on pools. (Dustin Sallings)
+
+== 1.0.1 (never released)
+
+* Fix bug preventing jobs from being deleted.
+* Remove an extraneous message. (Dustin Sallings)
+* Fix the github gemspec so beanstalk-client builds. (Isaac Feliu)
+* Support the new reserve-with-timeout command in dev beanstalkd.
+  (Dustin Sallings)
+
 == 1.0.0 2008-05-29
 
 * Preserve the watch list when a Pool instance reconnects.

data/lib/beanstalk-client/connection.rb

@@ -50,6 +50,10 @@ module Beanstalk
     end
 
     def put(body, pri=65536, delay=0, ttr=120)
+      pri = pri.to_i
+      delay = delay.to_i
+      ttr = ttr.to_i
+      body = body.to_s # Make sure that body.size gives a useful number
       interact("put #{pri} #{delay} #{ttr} #{body.size}\r\n#{body}\r\n",
                %w(INSERTED BURIED))[0].to_i
     end
@@ -101,6 +105,9 @@ module Beanstalk
     end
 
     def release(id, pri, delay)
+      id = id.to_i
+      pri = pri.to_i
+      delay = delay.to_i
       interact("release #{id} #{pri} #{delay}\r\n", %w(RELEASED))
       :ok
     end
@@ -110,6 +117,15 @@ module Beanstalk
       :ok
     end
 
+    def touch(id)
+      interact("touch #{id}\r\n", %w(TOUCHED))
+      :ok
+    end
+
+    def kick(n)
+      interact("kick #{n}\r\n", %w(KICKED))[0].to_i
+    end
+
     def use(tube)
       return tube if tube == @last_used
       @last_used = interact("use #{tube}\r\n", %w(USING))[0]
@@ -193,7 +209,7 @@ module Beanstalk
       id, bytes = check_resp(word).map{|s| s.to_i}
       body = read_bytes(bytes)
       raise 'bad trailer' if read_bytes(2) != "\r\n"
-      [id, body]
+      [id, body, word == 'RESERVED']
     end
 
     def read_yaml(word)

data/lib/beanstalk-client/job.rb

@@ -36,28 +36,38 @@ class Beanstalk::Job
     (@ybody ||= [begin YAML.load(body) rescue nil end])[0]
   end
 
-  def initialize(conn, id, body)
+  def initialize(conn, id, body, reserved=true)
     @conn = conn
     @id = id
     @body = body
-    @deleted = false
+    @reserved = reserved
   end
 
   def delete()
-    @conn.delete(id) if !@deleted
-    @deleted = true
+    return if !@reserved
+    @conn.delete(id)
+    @reserved = false
   end
 
   def put_back(pri=self.pri, delay=0, ttr=self.ttr)
     @conn.put(body, pri, delay, ttr)
   end
 
-  def release(newpri=pri, delay=0)
-    @conn.release(id, newpri, delay)
+  def release(newpri=nil, delay=0)
+    return if !@reserved
+    @conn.release(id, newpri || pri, delay)
+    @reserved = false
   end
 
-  def bury(newpri=pri)
-    @conn.bury(id, newpri)
+  def bury(newpri=nil)
+    return if !@reserved
+    @conn.bury(id, newpri || pri)
+    @reserved = false
+  end
+
+  def touch
+    return if !@reserved
+    @conn.touch(id)
   end
 
   def stats()

data/lib/beanstalk-client/version.rb

@@ -1,5 +1,5 @@
 module Beanstalk #:nodoc:
   module VERSION #:nodoc:
-    STRING = '1.0.0'
+    STRING = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dustin-beanstalk-client
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.2.1
 platform: ruby
 authors: 
 - Keith Rarick
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: beanstalk
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby client library for the Beanstalk protocol