asir_beanstalk 1.1.5 → 1.2.0

data/Changelog

@@ -1,3 +1,8 @@
+2012-12-28  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.0: New version.
+	* ASIR: Support new ASIR internal API using Message::State.
+
 2012-12-11  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.5: 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.1.7"
+  gem.add_dependency "asir", "~> 1.2.0"
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
   gem.add_development_dependency 'rspec', '~> 2.12.0'

data/example/example_helper.rb

@@ -7,7 +7,11 @@ when /java/i
 end
 
 $: << File.expand_path("../../lib", __FILE__)
-gem 'asir'
+if p = ENV['ASIR_LIB_PATH']
+  $:.unshift File.expand_path(p)
+else
+  gem 'asir'
+end
 
 require 'asir'
 require 'asir/coder/chain'

data/lib/asir/transport/beanstalk.rb

@@ -34,14 +34,15 @@ module ASIR
 
       # !SLIDE
       # Sends the encoded Message payload String.
-      def _send_message message, message_payload
+      def _send_message state
         stream.with_stream! do | s |
+          message = state.message
           begin
             match =
               _beanstalk(s,
-                         "put #{message[:beanstalk_priority] || @priority} #{message[:beanstalk_delay] || @delay} #{message[:beanstalk_ttr] || @ttr} #{message_payload.size}\r\n",
+                         "put #{message[:beanstalk_priority] || @priority} #{message[:beanstalk_delay] || @delay} #{message[:beanstalk_ttr] || @ttr} #{state.message_payload.size}\r\n",
                          /\AINSERTED (\d+)\r\n\Z/,
-                         message_payload)
+                         state.message_payload)
             job_id = message[:beanstalk_job_id] = match[1].to_i
             _log { "beanstalk_job_id = #{job_id.inspect}" } if @verbose >= 2
           rescue ::Exception => exc
@@ -56,8 +57,9 @@ module ASIR
 
       # !SLIDE
       # Receives the encoded Message payload String.
-      def _receive_message channel, additional_data
-        channel.with_stream! do | stream |
+      def _receive_message state
+        additional_data = state.additional_data ||= { }
+        state.in_stream.with_stream! do | stream |
           begin
             match =
               _beanstalk(stream,
@@ -66,10 +68,9 @@ module ASIR
             additional_data[:beanstalk_job_id] = match[1].to_i
             additional_data[:beanstalk_message_size] =
               size = match[2].to_i
-            message_payload = stream.read(size)
+            state.message_payload = stream.read(size)
             _read_line_and_expect! stream, /\A\r\n\Z/
-            # Pass the original stream used to #_send_result below.
-            [ message_payload, stream ]
+            state.result_opaque = stream
           rescue ::Exception => exc
             _log { [ :_receive_message, :exception, exc ] }
             additional_data[:beanstalk_error] = exc
@@ -81,7 +82,7 @@ module ASIR
 
       # !SLIDE
       # Sends the encoded Result payload String.
-      def _send_result message, result, result_payload, channel, stream
+      def _send_result state
         #
         # There is a possibility here the following could happen:
         #
@@ -101,19 +102,16 @@ module ASIR
         #   ...
         #
         # Therefore: _receiver_message passes the original message stream to us.
-        # We insure that the same stream is still the active one and use it.
-        channel.with_stream! do | maybe_other_stream |
-          _log [ :_send_result, "stream lost" ] if maybe_other_stream != stream
-          job_id = message[:beanstalk_job_id] or raise "no beanstalk_job_id"
-          _beanstalk(stream,
-                     "delete #{job_id}\r\n",
-                     /\ADELETED\r\n\Z/)
-        end
+        stream = state.result_opaque
+        job_id = state.message[:beanstalk_job_id] or raise "no beanstalk_job_id"
+        _beanstalk(stream,
+         "delete #{job_id}\r\n",
+         /\ADELETED\r\n\Z/)
       end
 
       # !SLIDE
       # Receives the encoded Result payload String.
-      def _receive_result message, opaque_result
+      def _receive_result state
         nil
       end
 

data/lib/asir_beanstalk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir_beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asir
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,18 +117,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1666542740013907559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1666542740013907559
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24