em-jack 0.0.6 → 0.0.7

data/lib/em-jack.rb

@@ -11,6 +11,6 @@ end
 
 module EMJack
   module VERSION
-    STRING = '0.0.6'
+    STRING = '0.0.7'
   end
 end

data/lib/em-jack/connection.rb

@@ -17,37 +17,37 @@ module EMJack
     def self.handlers
       @@handlers
     end
-    
+
     def initialize(opts = {})
       @host = opts[:host] || 'localhost'
       @port = opts[:port] || 11300
       @tube = opts[:tube]
-      
+
       @used_tube = 'default'
       @watched_tubes = ['default']
-      
+
       @data = ""
       @retries = 0
       @in_reserve = false
       @deferrables = []
-      
+
       @conn = EM::connect(host, port, EMJack::BeanstalkConnection) do |conn|
         conn.client = self
       end
-      
+
       unless @tube.nil?
         use(@tube)
         watch(@tube)
       end
     end
-    
+
     def use(tube, &blk)
       return if @used_tube == tube
       @used_tube = tube
       @conn.send(:use, tube)
       add_deferrable(&blk)
     end
-    
+
     def watch(tube, &blk)
       return if @watched_tubes.include?(tube)
       @conn.send(:watch, tube)
@@ -55,7 +55,7 @@ module EMJack
       df.callback { @watched_tubes.push(tube) }
       df
     end
-    
+
     def ignore(tube, &blk)
       return unless @watched_tubes.include?(tube)
       @conn.send(:ignore, tube)
@@ -114,15 +114,15 @@ module EMJack
       pri = (opts[:priority] || 65536).to_i
       pri = 65536 if pri< 0
       pri = 2 ** 32 if pri > (2 ** 32)
-      
+
       delay = (opts[:delay] || 0).to_i
       delay = 0 if delay < 0
-      
+
       ttr = (opts[:ttr] || 300).to_i
       ttr = 300 if ttr < 0
-      
+
       m = msg.to_s
-      
+
       @conn.send_with_data(:put, m, pri, delay, ttr, m.length)
       add_deferrable(&blk)
     end
@@ -160,13 +160,13 @@ module EMJack
           puts "ERROR: #{err}"
         end
       end
-      
+
       df.callback &blk if block_given?
 
       @deferrables.push(df)
       df
     end
-  
+
     def on_error(&blk)
       @error_callback = blk
     end
@@ -194,7 +194,7 @@ module EMJack
           body, @data = extract_body(bytes, @data) unless bytes <= 0
           break if body.nil? && bytes > 0
 
-          handled = h.handle(df, first, body)
+          handled = h.handle(df, first, body, self)
           break if handled
         end
 
@@ -203,7 +203,7 @@ module EMJack
         # not handled means there wasn't enough data to process a complete response
         break unless handled
         next unless @data.index(/\r\n/)
-      
+
         @data = @data[(@data.index(/\r\n/) + 2)..-1]
         @data = "" if @data.nil?
       end
@@ -219,5 +219,5 @@ module EMJack
 
       [body, data]
     end
-  end  
+  end
 end

data/lib/em-jack/handlers/buried.rb

@@ -7,7 +7,7 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.fail(:buried, $1.to_i)

data/lib/em-jack/handlers/deleted.rb

@@ -7,7 +7,7 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.succeed

data/lib/em-jack/handlers/errors.rb

@@ -7,7 +7,7 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
         deferrable.fail($1.downcase.to_sym)
         true

data/lib/em-jack/handlers/inserted.rb

@@ -7,13 +7,13 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.succeed($1.to_i)
         true
       end
-      
+
       EMJack::Connection.register_handler(EMJack::Handler::Inserted)
     end
   end

data/lib/em-jack/handlers/not_ignored.rb

@@ -6,8 +6,8 @@ module EMJack
       def self.handles?(response)
         response =~ RESPONSE
       end
-      
-      def self.handle(deferrable, response, body)
+
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.fail("Can't ignore only watched tube")

data/lib/em-jack/handlers/ok.rb

@@ -11,7 +11,7 @@ module EMJack
         end
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
         bytes = $1.to_i
 

data/lib/em-jack/handlers/released.rb

@@ -7,13 +7,13 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.succeed
         true
       end
-      
+
       EMJack::Connection.register_handler(EMJack::Handler::Released)
     end
   end

data/lib/em-jack/handlers/reserved.rb

@@ -11,12 +11,12 @@ module EMJack
         end
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn)
         return false unless response =~ RESPONSE
         id = $1.to_i
         bytes = $2.to_i
 
-        job = EMJack::Job.new(self, id, body)
+        job = EMJack::Job.new(conn, id, body)
         deferrable.succeed(job)
 
         true

data/lib/em-jack/handlers/using.rb

@@ -7,7 +7,7 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.succeed($1)

data/lib/em-jack/handlers/watching.rb

@@ -7,7 +7,7 @@ module EMJack
         response =~ RESPONSE
       end
 
-      def self.handle(deferrable, response, body)
+      def self.handle(deferrable, response, body, conn=nil)
         return false unless response =~ RESPONSE
 
         deferrable.succeed($1.to_i)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - dan sinclair