em-jack 0.0.9 → 0.1.0

data/lib/em-jack.rb

@@ -11,6 +11,6 @@ end
 
 module EMJack
   module VERSION
-    STRING = '0.0.9'
+    STRING = '0.1.0'
   end
 end

data/lib/em-jack/beanstalk_connection.rb

@@ -3,7 +3,7 @@ require 'eventmachine'
 module EMJack
   class BeanstalkConnection < EM::Connection
     attr_accessor :client
-  
+
     def connection_completed
       @client.connected
     end
@@ -11,18 +11,18 @@ module EMJack
     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

data/lib/em-jack/connection.rb

@@ -185,7 +185,7 @@ module EMJack
 
       m = msg.to_s
 
-      callback { @conn.send_with_data(:put, m, pri, delay, ttr, m.length) }
+      callback { @conn.send_with_data(:put, m, pri, delay, ttr, m.bytesize) }
 
       add_deferrable(&blk)
     end
@@ -253,11 +253,15 @@ module EMJack
           next unless handles
           bytes = bytes.to_i
 
-          # if this handler requires us to receive a body make sure we can get
-          # the full length of body. If not, we'll go around and wait for more
-          # data to be received
-          body, @data = extract_body!(bytes, @data) unless bytes <= 0
-          break if body.nil? && bytes > 0
+          if bytes > 0
+            # if this handler requires us to receive a body make sure we can get
+            # the full length of body. If not, we'll go around and wait for more
+            # data to be received
+            body, @data = extract_body!(bytes, @data) unless bytes <= 0
+            break if body.nil?
+          else
+            @data = @data[(@data.index(/\r\n/) + 2)..-1]
+          end
 
           handled = h.handle(df, first, body, self)
           break if handled
@@ -269,14 +273,13 @@ module EMJack
         break unless handled
         next unless @data.index(/\r\n/)
 
-        @data = @data[(@data.index(/\r\n/) + 2)..-1]
         @data = "" if @data.nil?
       end
     end
 
     def extract_body!(bytes, data)
       rem = data[(data.index(/\r\n/) + 2)..-1]
-      return [nil, data] if rem.length < bytes
+      return [nil, data] if rem.bytesize < bytes
 
       body = rem[0..(bytes - 1)]
       data = rem[(bytes + 2)..-1]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - dan sinclair
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -04:00
+date: 2010-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency