em-beanstalk 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,9 +1,10 @@
-= EMJack
+= EM::Beanstalk
 An attempt to wrap portions of the Beanstalk protocol with EventMachine. Every command
-will return a deferrable object. That object will succeed or fail depending on the 
-reply returned from Beanstalk.
+will return a deferrable object. As well, every command can accept a block with will 
+be used as the succeed callback for each command. That object will succeed or fail
+depending on the reply returned from Beanstalk.
 
-The current, default, errback is to print the error message received.
+The default errback is to print the error message received.
 
 One thing to keep in mind. The Beanstalk protocol executes all commands serially.
 So, if you send a reserve command and there are no jobs Beanstalk _won't_ process
@@ -19,7 +20,7 @@ are no available jobs.
 
 = Examples
   EM.run {
-    jack = EMJack::Connection.new
+    jack = EM::Beanstalk.new
   
     jack.use('mytube') { |tube| puts "Using #{tube}" }
   
@@ -40,14 +41,14 @@ are no available jobs.
   }
 
 
-  EMJack#each_job is useful for scenarios where the client is a job worker 
+  EM::Beanstalk#each_job is useful for scenarios where the client is a job worker 
   and intended to process jobs continuously as they become available. Once 
   the queue is empty, the client will block and wait for a new job.
 
   If multiple workers connect to the queue Beanstalkd will round-robin between
   the workers.
     EM.run {
-      jack = EMJack::Connection.new
+      jack = EM::Beanstalk.new
 
       jack.each_job do |job|
         puts "Got job ##{job.id}: #{job}"
@@ -63,11 +64,3 @@ are no available jobs.
         # Some kind of job processing
       end
     }
-
-
-= Contact
-If you've got any questions, comments or bugs, please let me know. You can
-contact me by email at dj2 at everburning dot com.
-
-= Contributors
-Peter Kieltyka (EMJack#each_job)

data/Rakefile

@@ -1,8 +1,6 @@
 libdir = File.expand_path("lib")
 $:.unshift(libdir) unless $:.include?(libdir)
 
-require 'em-jack'
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/{em-jack/connection.rb → em-beanstalk.rb}

@@ -1,12 +1,24 @@
 require 'eventmachine'
 require 'yaml'
 
-module EMJack
-  class Connection
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+
+require 'em-beanstalk/job'
+require 'em-beanstalk/connection'
+
+module EM
+  class Beanstalk
+
+    Disconnected   = Class.new(RuntimeError)
+    InvalidCommand = Class.new(RuntimeError)
+
+    module VERSION
+      STRING = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+    end
 
     attr_accessor :host, :port
     attr_reader :default_priority, :default_delay, :default_ttr
-    
+  
     def initialize(opts = nil)
       @host = opts && opts[:host] || 'localhost'
       @port = opts && opts[:port] || 11300
@@ -16,32 +28,32 @@ module EMJack
       @default_delay = opts && opts[:default_delay] || 0
       @default_ttr = opts && opts[:default_ttr] || 300
       @default_timeout = opts && opts[:timeout] || 5
-      
+    
       @used_tube = 'default'
       @watched_tubes = [@used_tube]
-      
+    
       @data = ""
       @retries = 0
       @in_reserve = false
       @deferrables = []
-      
-      @conn = EM::connect(host, port, EMJack::BeanstalkConnection) do |conn|
+    
+      @conn = EM::connect(host, port, EM::Beanstalk::Connection) do |conn|
         conn.client = self
         conn.comm_inactivity_timeout = 0
         conn.pending_connect_timeout = @default_timeout
       end
-      
+    
       unless @tube.nil?
         use(@tube)
         watch(@tube)
       end
     end
-    
+  
     def close
       @disconnect_manually = true
       @conn.close_connection
     end
-    
+  
     def drain!(&block)
       stats do |stats|
         stats['current-jobs-ready'].zero? ?
@@ -49,22 +61,22 @@ module EMJack
           reserve{|job| job.delete{ drain!(&block) }}
       end
     end
-    
+  
     def use(tube, &block)
       return if @used_tube == tube
       @used_tube = tube
       @conn.send(:use, tube)
       add_deferrable(&block)
-      
-    end
     
+    end
+  
     def watch(tube, &block)
       return if @watched_tubes.include?(tube)
       @watched_tubes.push(tube)
       @conn.send(:watch, tube)
       add_deferrable(&block)
     end
-    
+  
     def ignore(tube, &block)
       return if not @watched_tubes.include?(tube)
       @watched_tubes.delete(tube)
@@ -97,7 +109,7 @@ module EMJack
       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 EMJack::InvalidCommand.new
+      else raise EM::Beanstalk::InvalidCommand.new
       end
       add_deferrable(&block)
     end
@@ -110,13 +122,13 @@ module EMJack
         val
       end
     end
-    
+  
     def list(type = nil, &block)
       case(type)
       when 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 EMJack::InvalidCommand.new
+      else raise EM::Beanstalk::InvalidCommand.new
       end
       add_deferrable(&block)
     end
@@ -126,7 +138,7 @@ module EMJack
       @conn.send(:delete, job_id(val))
       add_deferrable(&block)
     end
-    
+  
     def put(msg, opts = nil, &block)
       case msg
       when Job
@@ -140,16 +152,16 @@ module EMJack
         ttr = opts && opts[:ttr] || default_ttr
         body = msg.to_s
       end
-      
+    
       priority = default_priority if priority < 0
       priority = 2 ** 32 if priority > (2 ** 32)
       delay = default_delay if delay < 0
       ttr = default_ttr if ttr < 0
-      
+    
       @conn.send_with_data(:put, body, priority, delay, ttr, body.size)
       add_deferrable(&block)
     end
-  
+
     def release(job, &block)
       return if job.nil?
       @conn.send(:release, job.jobid, 0, 0)
@@ -163,7 +175,7 @@ module EMJack
     def disconnected
       @deferrables.each {|d| d.fail }
       unless @disconnect_manually
-        raise EMJack::Disconnected if @retries >= @retry_count
+        raise EM::Beanstalk::Disconnected if @retries >= @retry_count
         @retries += 1
         EM.add_timer(1) { reconnect }
       end
@@ -183,16 +195,16 @@ module EMJack
           puts "ERROR"
         end
       end
-      
+    
       @deferrables.push(df)
       df.callback(&block) if block
       df
     end
-  
+
     def on_error(&block)
       @error_callback = block
     end
-  
+
     def received(data)
       @data << data
 
@@ -201,7 +213,7 @@ module EMJack
         break if idx.nil?
 
         first = $1
-        
+      
         handled = false
         %w(OUT_OF_MEMORY INTERNAL_ERROR DRAINING BAD_FORMAT
            UNKNOWN_COMMAND EXPECTED_CRLF JOB_TOO_BIG DEADLINE_SOON
@@ -259,7 +271,7 @@ module EMJack
           break if body.nil?
 
           df = @deferrables.shift
-          job = EMJack::Job.new(self, id, body)
+          job = EM::Beanstalk::Job.new(self, id, body)
           df.succeed(job)
           next
         else
@@ -268,7 +280,7 @@ module EMJack
         @data.slice!(0, first.size)
       end
     end
-    
+  
     def extract_body(bytes, data)
       rem = data[(data.index(/\r\n/) + 2)..-1]
       return [nil, data] if rem.length < bytes

data/lib/em-beanstalk/connection.rb

@@ -0,0 +1,38 @@
+module EM
+  class Beanstalk
+    class Connection < EM::Connection
+      attr_accessor :client
+  
+      def connection_completed
+        client.connected
+      end
+
+      def receive_data(data)
+        client.received(data)
+      end
+  
+      def send(command, *args)
+        real_send(command, args, nil)
+      end
+  
+      def send_with_data(command, data, *args)
+        real_send(command, args, data)
+      end
+  
+      def unbind
+        client.disconnected
+      end
+      
+      protected
+      def real_send(command, args, data = nil)
+        send_data(command.to_s)
+        args.each{ |a| send_data(' '); send_data(a) }
+        send_data("\r\n")
+        if data
+          send_data(data)
+          send_data("\r\n")
+        end
+      end
+    end
+  end
+end

data/lib/em-beanstalk/job.rb

@@ -0,0 +1,32 @@
+module EM
+  class Beanstalk
+    class Job
+    
+      attr_reader :id, :conn
+      attr_accessor :body, :ttr, :priority, :delay
+    
+      def initialize(conn, id, body)
+        @conn = conn
+        @id = id && Integer(id)
+        @body = body
+        @priority = conn && conn.default_priority
+        @delay = conn && conn.default_delay
+        @ttr = conn && conn.default_ttr
+      end
+    
+      alias_method :jobid, :id
+    
+      def delete(&block)
+        conn.delete(self, &block)
+      end
+    
+      def stats(&block)
+        conn.stats(:job, self, &block)
+      end
+
+      def to_s
+        "#{id} -- #{body.inspect}"
+      end
+    end
+  end
+end

data/spec/connection_spec.rb

@@ -1,49 +1,49 @@
 require 'spec/spec_helper'
 
-describe EMJack::Connection do
+describe EM::Beanstalk do
   before(:each) do
     @connection_mock = mock(:conn)
     EM.should_receive(:connect).and_return(@connection_mock)
   end
 
   it 'should use a default host of "localhost"' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.host.should == 'localhost'
   end
 
   it 'should use a default port of 11300' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.port.should == 11300    
   end
 
   it 'should watch and use a provided tube on connect' do
     @connection_mock.should_receive(:send).once.with(:use, "mytube")
     @connection_mock.should_receive(:send).once.with(:watch, "mytube")
-    conn = EMJack::Connection.new(:tube => "mytube")
+    conn = EM::Beanstalk.new(:tube => "mytube")
   end
 
   it 'should send the "use" command' do
     @connection_mock.should_receive(:send).once.with(:use, "mytube")
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.use("mytube")
   end
 
   it 'should not send the use command to the currently used tube' do
     @connection_mock.should_receive(:send).once.with(:use, "mytube")
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.use("mytube")
     conn.use("mytube")
   end
 
   it 'should send the "watch" command' do
     @connection_mock.should_receive(:send).once.with(:watch, "mytube")
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.watch("mytube")
   end
 
   it 'should not send the watch command for a tube currently watched' do
     @connection_mock.should_receive(:send).once.with(:watch, "mytube")
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.watch("mytube")
     conn.watch("mytube")
   end
@@ -52,70 +52,70 @@ describe EMJack::Connection do
     msg = "my message"
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, msg, anything, anything, anything, msg.length)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put(msg)
   end
 
   it 'should default the delay, priority and ttr settings' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 65536, 0, 300, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg")
   end
 
   it 'should accept a delay setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, 42, anything, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :delay => 42)
   end
 
   it 'should accept a ttr setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, anything, 999, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :ttr => 999)
   end
 
   it 'should accept a priority setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 233, anything, anything, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :priority => 233)
   end
 
   it 'shoudl accept a priority, delay and ttr setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 99, 42, 2000, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :priority => 99, :delay => 42, :ttr => 2000)
   end
 
   it 'should force delay to be >= 0' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, 0, anything, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :delay => -42)
   end
 
   it 'should force ttr to be >= 0' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, anything, 300, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :ttr => -42)
   end
 
   it 'should force priority to be >= 0' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 65536, anything, anything, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :priority => -42)
   end
 
   it 'should force priority to be < 2**32' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, (2 ** 32), anything, anything, anything)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put("msg", :priority => (2 ** 32 + 1))
   end
 
@@ -123,51 +123,51 @@ describe EMJack::Connection do
     msg = 22
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, msg.to_s, anything, anything, anything, msg.to_s.length)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put(msg) 
   end
 
   it 'should send the "delete" command' do
     @connection_mock.should_receive(:send).once.with(:delete, 1)
-    job = EMJack::Job.new(nil, 1, "body")
-    conn = EMJack::Connection.new
+    job = EM::Beanstalk::Job.new(nil, 1, "body")
+    conn = EM::Beanstalk.new
     conn.delete(job)
   end
 
   it 'should handle a nil job sent to the "delete" command' do
     @connection_mock.should_not_receive(:send).with(:delete, nil)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.delete(nil)
   end
 
   it 'should send the "reserve" command' do
     @connection_mock.should_receive(:send).with(:reserve)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.reserve
   end
 
   it 'should raise exception if reconnect fails more then RETRY_COUNT times' do
     EM.should_receive(:add_timer).exactly(5).times
 
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     5.times { conn.disconnected }
-    lambda { conn.disconnected }.should raise_error(EMJack::Disconnected)
+    lambda { conn.disconnected }.should raise_error(EM::Beanstalk::Disconnected)
   end
 
   it 'should reset the retry count on connection' do
     EM.should_receive(:add_timer).at_least(1).times
 
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     5.times { conn.disconnected }
     conn.connected
-    lambda { conn.disconnected }.should_not raise_error(EMJack::Disconnected)
+    lambda { conn.disconnected }.should_not raise_error(EM::Beanstalk::Disconnected)
   end
 
   %w(OUT_OF_MEMORY INTERNAL_ERROR DRAINING BAD_FORMAT
      UNKNOWN_COMMAND EXPECTED_CRLF JOB_TOO_BIG DEADLINE_SOON
      TIMED_OUT NOT_FOUND).each do |cmd|
     it "should handle #{cmd} messages" do
-       conn = EMJack::Connection.new
+       conn = EM::Beanstalk.new
 
        df = conn.add_deferrable
        df.should_receive(:fail).with(cmd.downcase.to_sym)
@@ -177,7 +177,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle deleted messages' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
     df.should_receive(:succeed)
@@ -186,7 +186,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle inserted messages' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
     df.should_receive(:succeed).with(40)
@@ -195,7 +195,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle buried messages' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
     df.should_receive(:fail).with(:buried, 40)
@@ -204,7 +204,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle using messages' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
     df.should_receive(:succeed).with("mytube")
@@ -213,7 +213,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle watching messages' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
     df.should_receive(:succeed).with(24)
@@ -222,13 +222,13 @@ describe EMJack::Connection do
   end
 
   it 'should handle reserved messages' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     msg = "This is my message"
 
     df = conn.add_deferrable
     df.should_receive(:succeed).with do |job|
-      job.class.should == EMJack::Job
+      job.class.should == EM::Beanstalk::Job
       job.jobid.should == 42
       job.body.should == msg
     end
@@ -237,7 +237,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle receiving multiple replies in one packet' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
     df.should_receive(:succeed).with(24)
@@ -249,7 +249,7 @@ describe EMJack::Connection do
   end
 
   it 'should handle receiving data in chunks' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     
     msg1 = "First half of the message\r\n"
     msg2 = "Last half of the message"
@@ -265,12 +265,12 @@ describe EMJack::Connection do
   
   it 'should send the stat command' do
     @connection_mock.should_receive(:send).once.with(:stats)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.stats
   end
 
   it 'should handle receiving the OK command' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     msg =<<-HERE
 ---
@@ -298,51 +298,51 @@ HERE
   end
 
   it 'should support job stats' do
-    job = EMJack::Job.new(nil, 42, "blah")
+    job = EM::Beanstalk::Job.new(nil, 42, "blah")
 
     @connection_mock.should_receive(:send).once.with(:'stats-job', 42)
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.stats(:job, job)
   end
 
   it 'should support tube stats' do
     @connection_mock.should_receive(:send).once.with(:'stats-tube', "mytube")
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.stats(:tube, "mytube")
   end
 
   it 'should throw exception on invalid stats command' do
     @connection_mock.should_not_receive(:send)
-    conn = EMJack::Connection.new
-    lambda { conn.stats(:blah) }.should raise_error(EMJack::InvalidCommand)
+    conn = EM::Beanstalk.new
+    lambda { conn.stats(:blah) }.should raise_error(EM::Beanstalk::InvalidCommand)
   end
 
   it 'should support listing tubes' do
     @connection_mock.should_receive(:send).once.with(:'list-tubes')
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.list
   end
 
   it 'should support listing tube used' do
     @connection_mock.should_receive(:send).once.with(:'list-tube-used')
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.list(:used)
   end
 
   it 'should support listing tubes watched' do
     @connection_mock.should_receive(:send).once.with(:'list-tubes-watched')
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.list(:watched)
   end
 
   it 'should throw exception on invalid list command' do
     @connection_mock.should_not_receive(:send)
-    conn = EMJack::Connection.new
-    lambda { conn.list(:blah) }.should raise_error(EMJack::InvalidCommand)
+    conn = EM::Beanstalk.new
+    lambda { conn.list(:blah) }.should raise_error(EM::Beanstalk::InvalidCommand)
   end
 
   it 'should accept a response broken over multiple packets' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     msg1 = "First half of the message\r\n"
     msg2 = "Last half of the message"
@@ -358,7 +358,7 @@ HERE
   end
 
   it 'should accept a response broken over multiple packets' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
 
     msg1 = "First half of the message\r\n"
     msg2 = "Last half of the message"

data/spec/integration_spec.rb

@@ -1,17 +1,17 @@
 require 'spec/spec_helper'
 
-describe EMJack::Connection, "integration" do
+describe EM::Beanstalk, "integration" do
   include EM::Spec
 
   it 'should use a default host of "localhost" and port of 11300' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.host.should == 'localhost'
     conn.port.should == 11300    
     done
   end
 
   it 'should watch and use a provided tube on connect' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.watch('my-lovely-tube') do 
       conn.list(:watched) do |watched|
         watched.should include("my-lovely-tube")
@@ -21,7 +21,7 @@ describe EMJack::Connection, "integration" do
   end
 
   it 'should send the "use" command' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.use('my-lovely-tube') do 
       conn.list(:used) do |used|
         used.should include("my-lovely-tube")
@@ -31,7 +31,7 @@ describe EMJack::Connection, "integration" do
   end
   
   it "should put a job" do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put('myjob') do
       conn.reserve do |job|
         job.body.should == 'myjob'
@@ -41,7 +41,7 @@ describe EMJack::Connection, "integration" do
   end
 
   it "should drain the queue" do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put('myjob')
     conn.put('myjob')
     conn.put('myjob')
@@ -56,7 +56,7 @@ describe EMJack::Connection, "integration" do
   end
 
   it 'should default the delay, priority and ttr settings' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put('myjob') do
       conn.reserve do |job|
         job.delay.should == conn.default_delay
@@ -68,7 +68,7 @@ describe EMJack::Connection, "integration" do
   end
   
   it 'should accept a delay setting' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     start = Time.new.to_f
     conn.put('mydelayedjob', :delay => 3) do |id|
       conn.reserve do |job|
@@ -80,13 +80,13 @@ describe EMJack::Connection, "integration" do
   end
   
   it 'should accept a ttr setting' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put('mydelayedjob', :ttr => 1) do |id|
       
       conn.reserve do |job|
         job.id.should == id
         EM.add_timer(3) do
-          conn2 = EMJack::Connection.new
+          conn2 = EM::Beanstalk.new
           conn2.reserve do |job2|
             job2.id.should == id
             job2.delete { done }
@@ -97,7 +97,7 @@ describe EMJack::Connection, "integration" do
   end
   
   it 'should accept a priority setting' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put('myhighpriorityjob', :priority => 800) do |low_id|
       conn.put('myhighpriorityjob', :priority => 300) do |high_id|
         conn.reserve do |job|
@@ -109,7 +109,7 @@ describe EMJack::Connection, "integration" do
   end
   
   it 'should handle a non-string provided as the put message' do
-    conn = EMJack::Connection.new
+    conn = EM::Beanstalk.new
     conn.put(22) do |id|
       conn.reserve do |job|
         job.body.should == '22'
@@ -120,45 +120,45 @@ describe EMJack::Connection, "integration" do
   #
   #it 'should send the "delete" command' do
   #  @connection_mock.should_receive(:send).once.with(:delete, 1)
-  #  job = EMJack::Job.new(nil, 1, "body")
-  #  conn = EMJack::Connection.new
+  #  job = EM::Beanstalk::Job.new(nil, 1, "body")
+  #  conn = EM::Beanstalk.new
   #  conn.delete(job)
   #end
   #
   #it 'should handle a nil job sent to the "delete" command' do
   #  @connection_mock.should_not_receive(:send).with(:delete, nil)
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.delete(nil)
   #end
   #
   #it 'should send the "reserve" command' do
   #  @connection_mock.should_receive(:send).with(:reserve)
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.reserve
   #end
   #
   #it 'should raise exception if reconnect fails more then RETRY_COUNT times' do
   #  EM.should_receive(:add_timer).exactly(5).times
   #
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  5.times { conn.disconnected }
-  #  lambda { conn.disconnected }.should raise_error(EMJack::Disconnected)
+  #  lambda { conn.disconnected }.should raise_error(EM::Beanstalk::Disconnected)
   #end
   #
   #it 'should reset the retry count on connection' do
   #  EM.should_receive(:add_timer).at_least(1).times
   #
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  5.times { conn.disconnected }
   #  conn.connected
-  #  lambda { conn.disconnected }.should_not raise_error(EMJack::Disconnected)
+  #  lambda { conn.disconnected }.should_not raise_error(EM::Beanstalk::Disconnected)
   #end
   #
   #%w(OUT_OF_MEMORY INTERNAL_ERROR DRAINING BAD_FORMAT
   #   UNKNOWN_COMMAND EXPECTED_CRLF JOB_TOO_BIG DEADLINE_SOON
   #   TIMED_OUT NOT_FOUND).each do |cmd|
   #  it "should handle #{cmd} messages" do
-  #     conn = EMJack::Connection.new
+  #     conn = EM::Beanstalk.new
   #
   #     df = conn.add_deferrable
   #     df.should_receive(:fail).with(cmd.downcase.to_sym)
@@ -168,7 +168,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle deleted messages' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:succeed)
@@ -177,7 +177,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle inserted messages' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:succeed).with(40)
@@ -186,7 +186,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle buried messages' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:fail).with(:buried, 40)
@@ -195,7 +195,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle using messages' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:succeed).with("mytube")
@@ -204,7 +204,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle watching messages' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:succeed).with(24)
@@ -213,13 +213,13 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle reserved messages' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  msg = "This is my message"
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:succeed).with do |job|
-  #    job.class.should == EMJack::Job
+  #    job.class.should == EM::Beanstalk::Job
   #    job.id.should == 42
   #    job.body.should == msg
   #  end
@@ -228,7 +228,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle receiving multiple replies in one packet' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  df = conn.add_deferrable
   #  df.should_receive(:succeed).with(24)
@@ -240,7 +240,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should handle receiving data in chunks' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  
   #  msg1 = "First half of the message\r\n"
   #  msg2 = "Last half of the message"
@@ -256,12 +256,12 @@ describe EMJack::Connection, "integration" do
   #
   #it 'should send the stat command' do
   #  @connection_mock.should_receive(:send).once.with(:stats)
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.stats
   #end
   #
   #it 'should handle receiving the OK command' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  msg =<<-HERE
 #---
@@ -289,51 +289,51 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should support job stats' do
-  #  job = EMJack::Job.new(nil, 42, "blah")
+  #  job = EM::Beanstalk::Job.new(nil, 42, "blah")
   #
   #  @connection_mock.should_receive(:send).once.with(:'stats-job', 42)
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.stats(:job, job)
   #end
   #
   #it 'should support tube stats' do
   #  @connection_mock.should_receive(:send).once.with(:'stats-tube', "mytube")
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.stats(:tube, "mytube")
   #end
   #
   #it 'should throw exception on invalid stats command' do
   #  @connection_mock.should_not_receive(:send)
-  #  conn = EMJack::Connection.new
-  #  lambda { conn.stats(:blah) }.should raise_error(EMJack::InvalidCommand)
+  #  conn = EM::Beanstalk.new
+  #  lambda { conn.stats(:blah) }.should raise_error(EM::Beanstalk::InvalidCommand)
   #end
   #
   #it 'should support listing tubes' do
   #  @connection_mock.should_receive(:send).once.with(:'list-tubes')
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.list
   #end
   #
   #it 'should support listing tube used' do
   #  @connection_mock.should_receive(:send).once.with(:'list-tube-used')
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.list(:used)
   #end
   #
   #it 'should support listing tubes watched' do
   #  @connection_mock.should_receive(:send).once.with(:'list-tubes-watched')
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #  conn.list(:watched)
   #end
   #
   #it 'should throw exception on invalid list command' do
   #  @connection_mock.should_not_receive(:send)
-  #  conn = EMJack::Connection.new
-  #  lambda { conn.list(:blah) }.should raise_error(EMJack::InvalidCommand)
+  #  conn = EM::Beanstalk.new
+  #  lambda { conn.list(:blah) }.should raise_error(EM::Beanstalk::InvalidCommand)
   #end
   #
   #it 'should accept a response broken over multiple packets' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  msg1 = "First half of the message\r\n"
   #  msg2 = "Last half of the message"
@@ -349,7 +349,7 @@ describe EMJack::Connection, "integration" do
   #end
   #
   #it 'should accept a response broken over multiple packets' do
-  #  conn = EMJack::Connection.new
+  #  conn = EM::Beanstalk.new
   #
   #  msg1 = "First half of the message\r\n"
   #  msg2 = "Last half of the message"

data/spec/job_spec.rb

@@ -1,14 +1,14 @@
 require 'spec/spec_helper'
 
-describe EMJack::Job do
+describe EM::Beanstalk::Job do
   it 'should convert id to an integer' do
-    j = EMJack::Job.new(nil, "123", "body")
+    j = EM::Beanstalk::Job.new(nil, "123", "body")
     j.id.should == 123
   end
   
   it 'should fail if id is not an integer' do
     proc {
-      j = EMJack::Job.new(nil, "asd", "body")
+      j = EM::Beanstalk::Job.new(nil, "asd", "body")
     }.should raise_error
   end
   
@@ -18,7 +18,7 @@ describe EMJack::Job do
     conn.should_receive(:default_delay)
     conn.should_receive(:default_ttr)
     
-    j = EMJack::Job.new(conn, 1, "body")
+    j = EM::Beanstalk::Job.new(conn, 1, "body")
 
     conn.should_receive(:delete).with(j)
     
@@ -31,7 +31,7 @@ describe EMJack::Job do
     conn.should_receive(:default_delay)
     conn.should_receive(:default_ttr)
 
-    j = EMJack::Job.new(conn, 2, 'body')
+    j = EM::Beanstalk::Job.new(conn, 2, 'body')
     conn.should_receive(:stats).with(:job, j)
 
     j.stats

data/spec/spec_helper.rb

@@ -1,14 +1,3 @@
-libdir = File.expand_path("lib")
-$:.unshift(libdir) unless $:.include?(libdir)
-
-require 'em-jack'
-#require 'rubygems'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'em-beanstalk')
 require "em-spec/rspec"
 
-#def with_connection(*args)
-#  EM.run do
-#    yield EMJack::Connection.new(*args)
-#    EM.stop
-#  end
-  
-#end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-beanstalk
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,11 +35,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/em-jack.rb
-- lib/em-jack/beanstalk_connection.rb
-- lib/em-jack/connection.rb
-- lib/em-jack/errors.rb
-- lib/em-jack/job.rb
+- lib/em-beanstalk.rb
+- lib/em-beanstalk/connection.rb
+- lib/em-beanstalk/job.rb
 - spec/connection_spec.rb
 - spec/integration_spec.rb
 - spec/job_spec.rb

data/lib/em-jack.rb

@@ -1,12 +0,0 @@
-$:.unshift(File.dirname(__FILE__))
-
-require 'em-jack/job'
-require 'em-jack/errors'
-require 'em-jack/beanstalk_connection'
-require 'em-jack/connection'
-
-module EMJack
-  module VERSION
-    STRING = '0.0.3'
-  end
-end

data/lib/em-jack/beanstalk_connection.rb

@@ -1,30 +0,0 @@
-require 'eventmachine'
-
-module EMJack
-  class BeanstalkConnection < EM::Connection
-    attr_accessor :client
-  
-    def connection_completed
-      @client.connected
-    end
-
-    def receive_data(data)
-      @client.received(data)
-    end
-  
-    def send(command, *args)
-      cmd = command.to_s
-      cmd << " #{args.join(" ")}" unless args.length == 0
-      cmd << "\r\n"
-      send_data(cmd)
-    end
-  
-    def send_with_data(command, data, *args)
-      send_data("#{command.to_s} #{args.join(" ")}\r\n#{data}\r\n")
-    end
-  
-    def unbind
-      @client.disconnected
-    end
-  end
-end

data/lib/em-jack/errors.rb

@@ -1,7 +0,0 @@
-module EMJack
-  class Disconnected < RuntimeError
-  end
-
-  class InvalidCommand < RuntimeError
-  end
-end

data/lib/em-jack/job.rb

@@ -1,30 +0,0 @@
-module EMJack
-  class Job
-    
-    attr_reader :id, :conn
-    attr_accessor :body, :ttr, :priority, :delay
-    
-    def initialize(conn, id, body)
-      @conn = conn
-      @id = id && Integer(id)
-      @body = body
-      @priority = conn && conn.default_priority
-      @delay = conn && conn.default_delay
-      @ttr = conn && conn.default_ttr
-    end
-    
-    alias_method :jobid, :id
-    
-    def delete(&block)
-      conn.delete(self, &block)
-    end
-    
-    def stats(&block)
-      conn.stats(:job, self, &block)
-    end
-
-    def to_s
-      "#{id} -- #{body.inspect}"
-    end
-  end
-end