em-beanstalk 0.0.5 → 0.0.6

data/README.rdoc

@@ -50,7 +50,7 @@ EM.run {
 
   jack.delete(job_id) {
     puts "deleted job!"
-  }.error {|message|
+  }.on_error {|message|
     puts "I couldn't delete the job because of #{message}"
   }
 }

data/Rakefile

@@ -7,7 +7,7 @@ begin
     s.name = "em-beanstalk"
     s.description = s.summary = "EventMachine client for Beanstalkd"
     s.email = "dan@postrank.com"
-    s.homepage = "http://github.com/joshbuddy/em-jack"
+    s.homepage = "http://github.com/joshbuddy/em-beastalk"
     s.authors = ["Dan"]
     s.files = FileList["[A-Z]*", "{lib,spec}/**/*"]
     s.add_dependency 'eventmachine'

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/em-beanstalk/connection.rb

@@ -25,13 +25,14 @@ module EM
       
       protected
       def real_send(command, args, data = nil)
-        send_data(command.to_s)
-        args.each{ |a| send_data(' '); send_data(a) }
+        send_data(command.to_s.downcase)
+        args.each{ |a| send_data(' '); send_data(a.to_s) }
         send_data("\r\n")
         if data
           send_data(data)
           send_data("\r\n")
         end
+        
       end
     end
   end

data/lib/em-beanstalk/defer.rb

@@ -1,15 +1,22 @@
 module EventMachine
   class Beanstalk
     class Defer < EM::DefaultDeferrable
-      def initialize(default_error_callback = nil, &block)
-        errback(&default_error_callback) if default_error_callback
+      def initialize(default_error_callback, &block)
+        @error = default_error_callback
         callback(&block) if block
+        errback{|message| @error.call(message)}
       end
       
-      def error(&block)
-        errback(&block)
+      def on_error(&block)
+        @error = block
         self
       end
+      
+      def on_success(&block)
+        callback(&block)
+        self
+      end
+      
     end
   end
 end

data/lib/em-beanstalk/job.rb

@@ -27,6 +27,7 @@ module EM
       def to_s
         "#{id} -- #{body.inspect}"
       end
+      
     end
   end
 end

data/lib/em-beanstalk.rb

@@ -32,6 +32,7 @@ module EM
       @default_ttr            = opts && opts[:default_ttr] || 300
       @default_timeout        = opts && opts[:timeout] || 5
       @default_error_callback = opts && opts[:default_error_callback] || Proc.new{ |error| puts "ERROR: #{error.inspect}" }
+      @raise_on_disconnect    = opts && opts.key?(:raise_on_disconnect) ? opts[:raise_on_disconnect] : true
       
       @used_tube = 'default'
       @watched_tubes = [@used_tube]
@@ -110,10 +111,10 @@ module EM
 
     def stats(type = nil, val = nil, &block)
       case(type)
-      when nil then @conn.send(:stats)
-      when :tube then @conn.send(:'stats-tube', val)
-      when :job then @conn.send(:'stats-job', job_id(val))
-      else raise EM::Beanstalk::InvalidCommand.new
+      when nil        then @conn.send(:stats)
+      when :tube      then @conn.send(:'stats-tube', val)
+      when :job       then @conn.send(:'stats-job', job_id(val))
+      else                 raise EM::Beanstalk::InvalidCommand.new
       end
       add_deferrable(&block)
     end
@@ -129,10 +130,10 @@ module EM
   
     def list(type = nil, &block)
       case(type)
-      when :tube, :tubes, nil then @conn.send(:'list-tubes')
-      when :use, :used        then @conn.send(:'list-tube-used')
-      when :watch, :watched   then @conn.send(:'list-tubes-watched')
-      else raise EM::Beanstalk::InvalidCommand.new
+      when :tube, :tubes, nil then  @conn.send(:'list-tubes')
+      when :use, :used        then  @conn.send(:'list-tube-used')
+      when :watch, :watched   then  @conn.send(:'list-tubes-watched')
+      else                          raise EM::Beanstalk::InvalidCommand.new
       end
       add_deferrable(&block)
     end
@@ -142,7 +143,17 @@ module EM
       @conn.send(:delete, job_id(val))
       add_deferrable(&block)
     end
-  
+    
+    def peek(id, &block)
+      case id
+      when :ready   then  @conn.send(:'peek-ready')
+      when :delayed then  @conn.send(:'peek-delayed')
+      when :buried  then  @conn.send(:'peek-buried')
+      else                @conn.send(:'peek', id)
+      end
+      add_deferrable(&block)
+    end
+    
     def put(msg, opts = nil, &block)
       case msg
       when Job
@@ -166,9 +177,9 @@ module EM
       add_deferrable(&block)
     end
 
-    def release(job, &block)
-      return if job.nil?
-      @conn.send(:release, job.jobid, 0, 0)
+    def release(val, &block)
+      return if val.nil?
+      @conn.send(:release, job_id(val), 0, 0)
       add_deferrable(&block)
     end
 
@@ -177,9 +188,9 @@ module EM
     end
 
     def disconnected
-      @deferrables.each {|d| d.fail }
+      @deferrables.each {|d| d.fail(:disconnected) }
       unless @disconnect_manually
-        raise EM::Beanstalk::Disconnected if @retries >= @retry_count
+        raise EM::Beanstalk::Disconnected if @retries >= @retry_count && @raise_on_disconnect
         @retries += 1
         EM.add_timer(1) { reconnect }
       end
@@ -201,7 +212,6 @@ module EM
     end
 
     def received(data)
-      puts "received: #{data.inspect}"
       @data << data
       
       until @data.empty?
@@ -239,9 +249,9 @@ module EM
           else
             break
           end
-        when /^RESERVED\s+(\d+)\s+(\d+)/
-          id = $1.to_i
-          bytes = $2.to_i
+        when /^(RESERVED|FOUND)\s+(\d+)\s+(\d+)/
+          id = $2.to_i
+          bytes = $3.to_i
           if body = extract_body(bytes, @data)
             @data = body.data
             df = @deferrables.shift

data/spec/integration_spec.rb

@@ -24,7 +24,7 @@ describe EM::Beanstalk, "integration" do
     conn = EM::Beanstalk.new
     conn.delete(123123) {
       fail
-    }.error { |err|
+    }.on_error { |err|
       puts "err! #{err.inspect}"
       done
     } 
@@ -50,6 +50,16 @@ describe EM::Beanstalk, "integration" do
     end
   end
 
+  it "should peek a job" do
+    conn = EM::Beanstalk.new
+    conn.put('myjob') do |id|
+      conn.peek(id) do |job|
+        job.body.should == 'myjob'
+        job.delete { done }
+      end
+    end
+  end
+
   it "should drain the queue" do
     conn = EM::Beanstalk.new
     conn.put('myjob')
@@ -77,6 +87,18 @@ describe EM::Beanstalk, "integration" do
     end
   end
   
+  it 'should default the delay, priority and ttr settings' do
+    conn = EM::Beanstalk.new
+    conn.put('myjob') do
+      conn.reserve do |job|
+        job.delay.should == conn.default_delay
+        job.ttr.should == conn.default_ttr
+        job.priority.should == conn.default_priority
+        job.delete { done }
+      end
+    end
+  end
+  
   it 'should accept a delay setting' do
     conn = EM::Beanstalk.new
     start = Time.new.to_f

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-beanstalk
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -05:00
+date: 2009-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/joshbuddy/em-jack
+homepage: http://github.com/joshbuddy/em-beastalk
 licenses: []
 
 post_install_message: