asir 0.2.0 → 1.0.1

data/lib/asir/transport/file.rb

@@ -55,22 +55,23 @@ module ASIR
       def serve_file!
         ::File.open(file, "r") do | stream |
           @running = true
-          serve_stream! stream, nil # One-way: no result stream.
+          _serve_stream! stream, nil # One-way: no result stream.
         end
       end
 
       # !SLIDE
       # Named Pipe Server
 
-      def prepare_pipe_server!
+      def prepare_server!
         # _log [ :prepare_pipe_server!, file ]
         unless ::File.exist? file
           system(cmd = "mkfifo #{file.inspect}") or raise "cannot run #{cmd.inspect}"
           ::File.chmod(perms, file) rescue nil if perms
         end
       end
+      alias :prepare_pipe_server! :prepare_server!
 
-      def run_pipe_server!
+      def run_server!
         # _log [ :run_pipe_server!, file ]
         with_server_signals! do
           @running = true
@@ -79,6 +80,7 @@ module ASIR
           end
         end
       end
+      alias :run_pipe_server! :run_server!
 
       # !SLIDE END
     end

data/lib/asir/transport/payload_io.rb

@@ -4,25 +4,29 @@ module ASIR
     # Payload IO for Transport
     #
     # Framing
-    # * Line containing the number of bytes in the payload.
+    # * Header line containing the number of bytes in the payload.
     # * The payload bytes.
     # * Blank line.
+    # * Footer.
     module PayloadIO
       class UnexpectedResponse < Error; end
 
-      NEWLINE = "\n"
+      HEADER = "# asir_payload_size: "
+      FOOTER = "\n# asir_payload_end"
 
       def _write payload, stream
+        stream.write HEADER
         stream.puts payload.size
         stream.write payload
-        stream.write NEWLINE
+        stream.puts FOOTER
         stream.flush
         stream
       end
 
       def _read stream
-        size = stream.readline.chomp.to_i
+        size = /\d+$/.match(stream.readline.chomp)[0].to_i # HEADER (size)
         payload = stream.read(size)
+        stream.readline # FOOTER
         stream.readline
         payload
       end

data/lib/asir/transport/resque.rb

@@ -0,0 +1,212 @@
+require 'asir/transport/connection_oriented'
+require 'resque'
+require 'asir/poll_throttle'
+
+module ASIR
+  class Transport
+    # !SLIDE
+    # Resque Transport
+    class Resque < ConnectionOriented
+      include PollThrottle
+
+      attr_accessor :queues, :queue, :namespace, :throttle
+
+      def initialize *args
+        @port_default = 6379
+        @scheme_default = 'redis'.freeze
+        super
+        self.one_way = true
+        # Reraise exception, let Resque::Worker handle it.
+        @on_exeception ||= lambda do | trans, exc, type, message |
+          raise exc, exc.backtrace
+        end
+      end
+
+      # !SLIDE
+      # Resque client.
+      def _client_connect!
+        # $stderr.puts "  #{$$} #{self} _client_connect!"
+        resque_connect!
+      rescue ::Exception => exc
+        raise exc.class, "#{self.class} #{uri}: #{exc.message}", exc.backtrace
+      end
+
+      # !SLIDE
+      # Resque server (worker).
+      def _server!
+        resque_connect!
+        resque_worker
+      rescue ::Exception => exc
+        raise exc.class, "#{self.class} #{uri}: #{exc.message}", exc.backtrace
+      end
+
+      def _receive_result message, opaque_result
+        return nil if one_way || message.one_way
+        super
+      end
+
+      def _send_result message, result, result_payload, stream, message_state
+        return nil if one_way || message.one_way
+        super
+      end
+
+      def _send_message message, message_payload
+        stream.with_stream! do | io |  # Force connect
+          $stderr.puts "  #{self} _send_message #{message_payload.inspect} to queue=#{queue.inspect} as #{self.class} :process_job" if @verbose >= 2
+          ::Resque.enqueue_to(queue, self.class, message_payload)
+        end
+      end
+
+      def queues
+        @queues ||=
+          (
+          x = nil
+          x = path if @uri
+          x ||= ""
+          root, x = x.split('/')
+          x ||= ""
+          x = x.split(/(\s+|\s*,\s*)/)
+          x.each(&:freeze)
+          x.freeze
+          )
+      end
+
+      # Defaults to [ 'asir' ].
+      def queues_
+        @queues_ ||=
+          queues.empty? ? [ DEFAULT_QUEUE ] : queues.freeze
+      end
+
+      # Defaults to 'asir'.
+      def queue
+        @queue ||= queues_.first || DEFAULT_QUEUE
+      end
+
+      # Defaults to 'asir'.
+      def namespace_
+        @namespace_ ||= namespace || DEFAULT_QUEUE
+      end
+
+      DEFAULT_QUEUE = 'asir'.freeze
+
+      def _server_accept_connection! server
+        [ server, server ]
+      end
+
+      # Resque is message-oriented, process only one message per "connection".
+      def stream_eof? stream
+        false
+      end
+
+      # Nothing to be closed for Resque.
+      def _server_close_connection! in_stream, out_stream
+        # NOTHING
+      end
+
+      def serve_stream_message! in_stream, out_stream # ignored
+        save = Thread.current[:asir_transport_resque_instance]
+        Thread.current[:asir_transport_resque_instance] = self
+        poll_throttle throttle do
+          # $stderr.puts "  #{self} resque_worker = #{resque_worker} on queues #{resque_worker.queues}"
+          if job = resque_worker.reserve
+            $stderr.puts "  #{self} serve_stream_message! job=#{job.class}:#{job.inspect}" if @verbose >= 2
+            resque_worker.process(job)
+          end
+          job
+        end
+        self
+      ensure
+        Thread.current[:asir_transport_resque_instance] = save
+      end
+
+      # Class method entry point from Resque::Job.perform.
+      def self.perform payload
+        # $stderr.puts "  #{self} process_job payload=#{payload.inspect}"
+        t = Thread.current[:asir_transport_resque_instance]
+        # Pass payload as in_stream; _receive_message will return it.
+        t.serve_message! payload, nil
+      end
+
+      def _receive_message payload, additional_data # is actual payload
+        # $stderr.puts "  #{self} _receive_message payload=#{payload.inspect}"
+        [ payload, nil ]
+      end
+
+      ####################################
+
+      def resque_uri
+        @resque_uri ||=
+          (
+          unless scheme == 'redis'
+            raise ArgumentError, "Invalid resque URI: #{uri.inspect}"
+          end
+          _uri
+          )
+      end
+
+      def resque_connect!
+        @redis =
+          ::Redis.new({
+                        :host => address || '127.0.0.1',
+                        :port => port,
+                        :thread_safe => true,
+                      })
+        if namespace_
+          ::Resque.redis =
+            @redis =
+            ::Redis::Namespace.new(namespace_, :redis => @redis)
+          ::Resque.redis.namespace = namespace_
+        else
+          ::Resque.redis = @redis
+        end
+        # $stderr.puts "  *** #{$$} #{self} resque_connect! #{@redis.inspect}"
+        @redis
+      end
+
+      def resque_disconnect!
+        ::Resque.redis = nil
+      end
+
+      def resque_worker
+        @resque_worker ||= ::Resque::Worker.new(queues_)
+      end
+
+      def server_on_start!
+        # prune_dead_workers expects processes to have "resque " in the name.
+        @save_progname ||= $0.dup
+        $0 = "resque #{$0}"
+        if worker = resque_worker
+          worker.prune_dead_workers
+          worker.register_worker
+        end
+        self
+      end
+
+      def server_on_stop!
+        $0 = @save_progname if @save_progname
+        if worker = @resque_worker
+          worker.unregister_worker
+        end
+        self
+      end
+
+      #########################################
+
+      def _start_conduit!
+        @redis_dir ||= "/tmp"
+        @redis_conf ||= "#{@redis_dir}/asir-redis-#{port}.conf"
+        @redis_log ||= "#{@redis_dir}/asir-redis-#{port}.log"
+        ::File.open(@redis_conf, "w+") do | out |
+          out.puts "daemonize no"
+          out.puts "port #{port}"
+          out.puts "loglevel warning"
+          out.puts "logfile #{@redis_log}"
+        end
+        exec "redis-server", @redis_conf
+      end
+    end
+    # !SLIDE END
+  end # class
+end # module
+
+

data/lib/asir/transport/stream.rb

@@ -11,19 +11,29 @@ module ASIR
       # Serve all Messages from a stream.
       def serve_stream! in_stream, out_stream
         with_server_signals! do
-          while @running && ! in_stream.eof?
-            begin
-              serve_stream_message! in_stream, out_stream
-            rescue Error::Terminate => err
-              @running = false
-              _log [ :serve_stream_terminate, err ]
-            rescue ::Exception => err
-              _log [ :serve_stream_error, err ]
-            end
+          @running = true
+          _serve_stream! in_stream, out_stream
+        end
+      end
+
+      def _serve_stream! in_stream, out_stream
+        while @running && ! stream_eof?(in_stream)
+          begin
+            serve_stream_message! in_stream, out_stream
+          rescue Error::Terminate => err
+            @running = false
+            _log [ :serve_stream_terminate, err ]
+          rescue ::Exception => err
+            _log [ :serve_stream_error, err ]
           end
         end
       end
 
+      # Subclasses can override this method.
+      def stream_eof? stream
+        stream.eof?
+      end
+
       # !SLIDE
       # Serve a Message from a stream.
       def serve_stream_message! in_stream, out_stream

data/lib/asir/transport/tcp_socket.rb

@@ -20,10 +20,11 @@ module ASIR
       end
 
       def _server_accept_connection! server
-        server.accept
+        socket = server.accept
+        [ socket, socket ] # Use same socket for in_stream and out_stream
       end
 
-      def _server_close_connection! stream
+      def _server_close_connection! stream, out_stream
         stream.close rescue nil
       end
     end

data/lib/asir/transport/zmq.rb

@@ -50,7 +50,6 @@ module ASIR
         stream.recv 0
       end
 
-      # def scheme; SCHEME; end; SCHEME = 'tcp'.freeze
       def queue
         @queue ||=
           (
@@ -69,23 +68,21 @@ module ASIR
           (queue.empty? ? queue : queue + " ").freeze
       end
 
+      # server represents a receiving ZMQ endpoint.
+      def _server_accept_connection! server
+        [ server, @one_way ? nil : server ]
+      end
 
-      def run_server!
-        _log { "run_server! #{uri}" } if @verbose >= 1
-        with_server_signals! do
-          @running = true
-          while @running
-            begin
-              serve_stream_message!(@server, @one_way ? nil : @server)
-            rescue Error::Terminate => err
-              @running = false
-              _log [ :run_server_terminate, err ]
-            end
-          end
-        end
-        self
-      ensure
-        _server_close!
+      # ZMQ is message-oriented, process only one message per "connection".
+      alias :_server_serve_stream :serve_message!
+
+      def stream_eof? stream
+        false
+      end
+
+      # Nothing to be closed for ZMQ.
+      def _server_close_connection! in_stream, out_stream
+        # NOTHING
       end
 
       def zmq_uri

data/lib/asir/uri_config.rb

@@ -0,0 +1,51 @@
+require 'asir'
+require 'uri'
+
+module ASIR
+  module UriConfig
+    attr_accessor :uri, :scheme, :host, :port, :path
+    attr_accessor :scheme_default, :host_default, :port_default, :path_default
+    alias :protocol :scheme
+    alias :protocol= :scheme=
+    alias :address :host
+    alias :address= :host=
+
+    def uri
+      @uri ||= "#{scheme}://#{host}:#{port}"
+    end
+
+    def _uri
+      @_uri ||=
+        URI === @uri ? @uri : URI.parse(uri)
+    end
+
+    def scheme
+      @scheme ||=
+        (@uri && _uri.scheme) ||
+        @scheme_default ||
+        S_TCP
+    end
+    S_TCP = 'tcp'.freeze
+
+    def host
+      @host ||=
+        (@uri && _uri.host) ||
+        @host_default ||
+        S_LOCALHOST
+    end
+    S_LOCALHOST = '127.0.0.1'.freeze
+
+    def port
+      @port ||=
+        (@uri && _uri.port) ||
+        @port_default ||
+        (raise Error, "#{self.class}: port not set.")
+    end
+
+    def path
+      @path ||=
+        (@uri && _uri.path) ||
+        @path_default
+    end
+  end
+end

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "0.2.0"
+  VERSION = "1.0.1"
 end

data/spec/client_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+require 'asir'
+
+describe "ASIR::Client" do
+  attr_accessor :client, :data, :object
+
+  before(:each) do
+    self.data = { }
+    transport = ASIR::Transport::Local.new
+    self.object = ASIR::Test::TestObject.new(self)
+    self.client = object.class.asir
+    client.transport = transport
+    client.transport.should == transport
+  end
+
+  it 'should return the same Proxy instance for a Module.' do
+    object.class.asir.object_id.should == object.class.asir.object_id
+  end
+
+  it 'should return a cloned Proxy instances for each object.' do
+    object.asir.object_id.should_not == client.object_id
+    object.asir.object_id.should_not == object.asir.object_id
+    object.asir.transport.object_id.should == client.transport.object_id
+  end
+
+  it 'should return a cloned Proxy for class.asir._configure.' do
+    client._configure { | message, proxy | }.object_id.should_not == client.object_id
+  end
+
+  it 'should not return a cloned Proxy for object.asir._configure.' do
+    c = object.asir
+    c._configure { | message, proxy | }.object_id.should == c.object_id
+  end
+
+  it 'should handle _configure blocks' do
+    proxy = object.asir._configure { | message, proxy |
+      message[:test_proxy] = proxy
+      message[:test_data] = :test
+    }
+    proxy.object_id.should_not == client.object_id
+    proxy.object_id.should_not == object.asir.object_id
+    proxy.return_argument :foo
+    object.message[:test_data].should == :test
+    object.message[:test_proxy].should == proxy
+  end
+end
+