asir 1.1.0 → 1.1.1

data/ChangeLog

@@ -1,3 +1,9 @@
+2012-12-04  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.1.1: New version.
+	* Beanstalk: Moved beanstalkd support to gem asir_beanstalk.
+	* Buffer: Buffer needs Delegation.
+
 2012-12-03  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.0: New version.

data/lib/asir/transport/buffer.rb

@@ -1,4 +1,5 @@
 require 'asir/transport'
+require 'asir/transport/delegation'
 require 'thread'
 
 module ASIR

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -225,12 +225,9 @@ files:
 - example/ex09.rb
 - example/ex10.rb
 - example/ex11.rb
-- example/ex12.rb
 - example/ex13.rb
 - example/ex14.rb
 - example/ex15.rb
-- example/ex16.rb
-- example/ex17.rb
 - example/ex18.rb
 - example/ex19.rb
 - example/ex22.rb
@@ -297,7 +294,6 @@ files:
 - lib/asir/thread_pool.rb
 - lib/asir/thread_variable.rb
 - lib/asir/transport.rb
-- lib/asir/transport/beanstalk.rb
 - lib/asir/transport/broadcast.rb
 - lib/asir/transport/buffer.rb
 - lib/asir/transport/composite.rb
@@ -353,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2626327431831346289
+      hash: 4360037996371201597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -362,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2626327431831346289
+      hash: 4360037996371201597
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/example/ex12.rb

@@ -1,34 +0,0 @@
-# !SLIDE :capture_code_output true
-# Asynchronous beanstalkd service
-
-require 'example_helper'
-require 'asir/transport/beanstalk'
-require 'asir/coder/zlib'
-begin
-  Email.asir.transport = t =
-    ASIR::Transport::Beanstalk.new(:address => '127.0.0.1', :port => 30904)
-  t.encoder =
-    ASIR::Coder::Chain.new(:encoders =>
-                           [ ASIR::Coder::Marshal.new,
-                            ASIR::Coder::Zlib.new, ])
-  t.start_conduit!; sleep 1
-  pr Email.asir.send_email(:pdf_invoice,
-                             :to => "user@email.com", :customer => @customer)
-  sleep 2
-  server_process do
-    t.prepare_server!
-    t.run_server!
-  end
-rescue Object => err
-  $stderr.puts "#{err.inspect}\n#{err.backtrace * "\n"}"
-ensure
-  t.close; sleep 3; server_kill; sleep 2
-  t.stop_conduit!
-end
-
-# !SLIDE END
-# EXPECT: : client process
-# EXPECT: : server process
-# EXPECT: : Email.send_mail :pdf_invoice
-# EXPECT: : pr: nil
-

data/example/ex16.rb

@@ -1,33 +0,0 @@
-# !SLIDE :capture_code_output true
-# Asynchronous beanstalkd service with delay option
-
-require 'example_helper'
-require 'asir/transport/beanstalk'
-begin
-  DelayedService.asir.transport = t =
-    ASIR::Transport::Beanstalk.new(:address => '127.0.0.1', :port => 30916)
-  t.encoder =
-    ASIR::Coder::Marshal.new
-  t.start_conduit!; sleep 1
-  server_process do
-    t.prepare_server!
-    t.run_server!
-  end
-  pr DelayedService.asir.
-    _configure{|req, p| req.delay = 5}.
-    do_it(Time.now)
-  sleep 10
-rescue Object => err
-  $stderr.puts "#{err.inspect}\n#{err.backtrace * "\n"}"
-ensure
-  t.close; sleep 1
-  server_kill; sleep 1
-  t.stop_conduit!
-end
-
-# !SLIDE END
-# EXPECT: : client process
-# EXPECT: : server process
-# EXPECT: DelayedService.do_it => :ok
-# EXPECT: : pr: nil
-

data/example/ex17.rb

@@ -1,42 +0,0 @@
-# !SLIDE :capture_code_output true
-# Buffered asynchronous beanstalkd service with delay option
-
-require 'example_helper'
-require 'asir/transport/beanstalk'
-require 'asir/transport/buffer'
-begin
-  t =
-    ASIR::Transport::Beanstalk.new(:address => '127.0.0.1', :port => 30917)
-  t.encoder =
-    ASIR::Coder::Marshal.new
-  t.start_conduit!; sleep 1
-  DelayedService.asir.transport =
-    t0 = ASIR::Transport::Buffer.new(:transport => t)
-  t0.pause!
-  server_process do
-    t.prepare_server!
-    t.run_server!
-  end
-  pr [ :paused?, t0.paused?, :at, Time.now.iso8601(2) ]
-  pr DelayedService.asir.
-    _configure{|req, p| req.delay = 5}.
-    do_it(Time.now)
-  sleep 2
-  pr [ :resuming, :size, t0.size, :at, Time.now.iso8601(2) ]
-  t0.resume!
-  pr [ :paused?, t0.paused?, :size, t0.size, :at, Time.now.iso8601(2) ]
-  pr [ :resumed, :size, t0.size, :at, Time.now.iso8601(2) ]
-  sleep 7
-rescue Object => err
-  $stderr.puts "#{err.inspect}\n#{err.backtrace * "\n"}"
-ensure
-  t.close; sleep 1; server_kill; sleep 1
-  t.stop_conduit!
-end
-
-# !SLIDE END
-# EXPECT: : client process
-# EXPECT: : server process
-# EXPECT: DelayedService.do_it => :ok
-# EXPECT: : pr: nil
-

data/lib/asir/transport/beanstalk.rb

@@ -1,184 +0,0 @@
-require 'asir/transport/tcp_socket'
-
-module ASIR
-  class Transport
-    # !SLIDE
-    # Beanstalk Transport
-    class Beanstalk < TcpSocket
-      LINE_TERMINATOR = "\r\n".freeze
-
-      attr_accessor :tube, :priority, :delay, :ttr
-
-      def initialize *args
-        @port ||= 11300
-        @tube ||= 'asir'
-        @priority ||= 0
-        @delay ||= 0
-        @ttr ||= 600
-        super
-      end
-
-      # !SLIDE
-      # Sends the encoded Message payload String.
-      def _send_message message, message_payload
-        stream.with_stream! do | s |
-          begin
-            match = 
-              _beanstalk(s, 
-                         "put #{message[:beanstalk_priority] || @priority} #{message[:beanstalk_delay] || @delay} #{message[:beanstalk_ttr] || @ttr} #{message_payload.size}\r\n",
-                         /\AINSERTED (\d+)\r\n\Z/,
-                         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
-            message[:beanstalk_error] = exc
-            close
-            raise exc
-          end
-        end
-      end
-
-      RESERVE = "reserve\r\n".freeze
-
-      # !SLIDE
-      # Receives the encoded Message payload String.
-      def _receive_message channel, additional_data
-        channel.with_stream! do | stream |
-          begin
-            match = 
-              _beanstalk(stream,
-                         RESERVE,
-                         /\ARESERVED (\d+) (\d+)\r\n\Z/)
-            additional_data[:beanstalk_job_id] = match[1].to_i
-            additional_data[:beanstalk_message_size] = 
-              size = match[2].to_i
-            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 ]
-          rescue ::Exception => exc
-            _log { [ :_receive_message, :exception, exc ] }
-            additional_data[:beanstalk_error] = exc
-            channel.close
-            raise exc
-          end
-        end
-      end
-
-      # !SLIDE
-      # Sends the encoded Result payload String.
-      def _send_result message, result, result_payload, channel, stream
-        #
-        # There is a possibility here the following could happen:
-        #
-        #   _receive_message
-        #     channel == #<Channel:1>   
-        #     channel.stream == #<TCPSocket:1234>
-        #   end
-        #   ...
-        #   ERROR OCCURES:
-        #      channel.stream.close
-        #      channel.stream = nil
-        #   ...
-        #   _send_result 
-        #     channel == #<Channel:1>
-        #     channel.stream == #<TCPSocket:5678> # NEW CONNECTION
-        #     stream.write "delete #{job_id}"
-        #   ...
-        #
-        # 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
-      end
-
-      # !SLIDE
-      # Receives the encoded Result payload String.
-      def _receive_result message, opaque_result
-        nil
-      end
-
-      # !SLIDE
-      # Sets beanstalk_delay if message.delay was specified.
-      def relative_message_delay! message, now = nil
-        if delay = super
-          message[:beanstalk_delay] = delay.to_i
-        end
-        delay
-      end
-
-      # !SLIDE
-      # Beanstalk protocol support
-
-      # Send "something ...\r\n".
-      # Expect /\ASOMETHING (\d+)...\r\n".
-      def _beanstalk stream, message, expect, payload = nil
-        _log { [ :_beanstalk, :message, message ] } if @verbose >= 3
-        stream.write message
-        if payload
-          stream.write payload
-          stream.write LINE_TERMINATOR
-        end
-        stream.flush
-        if match = _read_line_and_expect!(stream, expect)
-          _log { [ :_beanstalk, :result, match[0] ] } if @verbose >= 3
-        end
-        match
-      end
-
-      def _after_connect! stream
-        if @tube
-          _beanstalk(stream,
-                     "use #{@tube}\r\n",
-                     /\AUSING #{@tube}\r\n\Z/)
-        end
-      end
-
-      # !SLIDE
-      # Beanstalk Server
-      def _server!
-        _log { "_server! #{uri}" } if @verbose >= 1
-        @server = connect!(:try_max => nil,
-                           :try_sleep => 1,
-                           :try_sleep_increment => 0.1,
-                           :try_sleep_max => 10) do | stream |
-          if @tube
-            _beanstalk(stream, 
-                       "watch #{@tube}\r\n",
-                       /\AWATCHING (\d+)\r\n\Z/)
-          end
-        end
-        self
-      end
-
-      def _server_accept_connection! server
-        prepare_server! unless @server
-        [ @server, @server ]
-      end
-
-      def _server_close_connection! in_stream, out_stream
-        # NOTHING
-      end
-
-      def stream_eof? stream
-        # Note: stream.eof? on a beanstalkd connection,
-        # will cause blocking read *forever* because
-        # beanstalk connections are long lived.
-        false
-      end
-
-      def _start_conduit!
-        addr = address ? "-l #{address} " : ""
-        cmd = "beanstalkd #{addr}-p #{port}"
-        exec(cmd)
-      end
-    end
-    # !SLIDE END
-  end # class
-end # module
-