asir_beanstalk 1.2.0 → 1.2.3

data/Changelog

@@ -1,3 +1,14 @@
+2013-01-16  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.3: New version: bug fixes.
+	* one_way: by default.
+	* reserve: Fix Channel close on reserve error.
+	* flush: stream.flush can cause protocol errors.
+	* delete: Handle job deletion in #_after_invoke_message since #one_way.
+	* tube: Correctly handle /tube uri.
+	* beanstalkd: handle 1MB jobs.
+	* stop: Correctly handle #stop! during block IO during reserve.
+
 2012-12-28  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.0: New version.

data/asir_beanstalk.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "asir", "~> 1.2.0"
+  gem.add_dependency "asir", "~> 1.2.3"
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
   gem.add_development_dependency 'rspec', '~> 2.12.0'

data/example/ex03.rb

@@ -6,7 +6,7 @@ require 'asir/transport/beanstalk'
 require 'asir/transport/buffer'
 begin
   t =
-    ASIR::Transport::Beanstalk.new(:address => '127.0.0.1', :port => 30917)
+    ASIR::Transport::Beanstalk.new(:uri => "beanstalk://127.0.0.1:30917/other")
   t.encoder =
     ASIR::Coder::Marshal.new
   t.start_conduit!; sleep 1

data/lib/asir/transport/beanstalk.rb

@@ -9,6 +9,7 @@ module ASIR
       attr_accessor :priority, :delay, :ttr
 
       def initialize *args
+        @one_way = true
         self.scheme_default ||= 'beanstalk'
         self.host_default   ||= '127.0.0.1'
         self.port_default   ||= 11300
@@ -61,10 +62,11 @@ module ASIR
         additional_data = state.additional_data ||= { }
         state.in_stream.with_stream! do | stream |
           begin
-            match =
+            match = with_force_stop! do
               _beanstalk(stream,
-                         RESERVE,
-                         /\ARESERVED (\d+) (\d+)\r\n\Z/)
+               RESERVE,
+               /\ARESERVED (\d+) (\d+)\r\n\Z/)
+            end
             additional_data[:beanstalk_job_id] = match[1].to_i
             additional_data[:beanstalk_message_size] =
               size = match[2].to_i
@@ -74,7 +76,7 @@ module ASIR
           rescue ::Exception => exc
             _log { [ :_receive_message, :exception, exc ] }
             additional_data[:beanstalk_error] = exc
-            channel.close
+            state.in_stream.close
             raise exc
           end
         end
@@ -82,7 +84,7 @@ module ASIR
 
       # !SLIDE
       # Sends the encoded Result payload String.
-      def _send_result state
+      def _after_invoke_message state
         #
         # There is a possibility here the following could happen:
         #
@@ -107,6 +109,7 @@ module ASIR
         _beanstalk(stream,
          "delete #{job_id}\r\n",
          /\ADELETED\r\n\Z/)
+        # state.in_stream.close # Force close.
       end
 
       # !SLIDE
@@ -136,8 +139,7 @@ module ASIR
           stream.write payload
           stream.write LINE_TERMINATOR
         end
-        stream.flush
-        if match = _read_line_and_expect!(stream, expect)
+        if match = _read_line_and_expect!(stream, expect) # , /\A(BAD_FORMAT|UNKNOWN_COMMAND)\r\n\Z/)
           _log { [ :_beanstalk, :result, match[0] ] } if @verbose >= 3
         end
         match
@@ -146,10 +148,10 @@ module ASIR
       LINE_TERMINATOR = "\r\n".freeze
 
       def _after_connect! stream
-        if @tube
+        if t = tube
           _beanstalk(stream,
-                     "use #{@tube}\r\n",
-                     /\AUSING #{@tube}\r\n\Z/)
+                     "use #{t}\r\n",
+                     /\AUSING #{t}\r\n\Z/)
         end
       end
 
@@ -161,9 +163,9 @@ module ASIR
                            :try_sleep => 1,
                            :try_sleep_increment => 0.1,
                            :try_sleep_max => 10) do | stream |
-          if @tube
+          if t = tube
             _beanstalk(stream,
-                       "watch #{@tube}\r\n",
+                       "watch #{t}\r\n",
                        /\AWATCHING (\d+)\r\n\Z/)
           end
         end
@@ -188,7 +190,7 @@ module ASIR
 
       def _start_conduit!
         opt = host ? "-l #{host} " : ""
-        cmd = "beanstalkd #{opt}-p #{port}"
+        cmd = "beanstalkd #{opt}-p #{port} -z #{1 * 1024 * 1024} #{@conduit_options[:beanstalkd_options]}"
         $stderr.puts "  #{cmd}" if @conduit_options[:verbose]
         exec(cmd)
       end

data/lib/asir_beanstalk/version.rb

@@ -1,3 +1,3 @@
 module AsirBeanstalk
-  VERSION = "1.2.0"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir_beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asir
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement