asir_zmq 1.1.1 → 1.2.0

data/Changelog

@@ -1,3 +1,8 @@
+2012-12-29  Kurt A. Stephens  <ks.git@kurtstephens.com>
+
+	* v1.2.0: New version.
+	* ASIR: Support new Message::State internal API.
+
 2012-12-04  Kurt A. Stephens  <ks.git@kurtstephens.com>
 
 	* v1.1.1: New version.

data/asir_zmq.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.0"
+  gem.add_dependency "asir", "~> 1.2.0"
   gem.add_dependency "zmq", "~> 2.1.4"
 
   gem.add_development_dependency 'rake', '>= 0.9.0'

data/example/ex03.rb

@@ -0,0 +1,35 @@
+# !SLIDE :capture_code_output true
+# One-way ZMQ service on alternate queue.
+
+require 'example_helper'
+require 'asir/transport/zmq'
+begin
+  zmq = ASIR::Transport::Zmq.new(:port => 31923,
+                                 :encoder => ASIR::Coder::Marshal.new,
+                                 :one_way => true,
+                                 :queue => 'alternate')
+  server_process do
+    zmq.prepare_server!
+    zmq.run_server!
+  end
+  UnsafeService.asir.transport = t = zmq
+  pr(UnsafeService.asir._configure{ | message, proxy |
+       message[:queue] = 'alternate'
+     }.do_it(":ok"))
+  pr(UnsafeService.asir._configure{ | message, proxy |
+       message[:queue] = 'other'
+     }.do_it(":other"))
+rescue ::Exception => err
+  $stderr.puts "### #{$$}: ERROR: #{err.inspect}\n  #{err.backtrace * "\n  "}"
+  raise
+ensure
+  zmq.close rescue nil; sleep 1; server_kill
+end
+
+# !SLIDE END
+# EXPECT: : client process
+# EXPECT: : server process
+# EXPECT: UnsafeService.do_it => :ok
+# EXPECT: : pr: nil
+# EXPECT!: UnsafeService.do_it => :other
+# EXPECT!: ERROR

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/marshal'

data/lib/asir/transport/zmq.rb

@@ -30,27 +30,31 @@ module ASIR
         raise exc.class, "#{self.class} #{zmq_uri}: #{exc.message}", exc.backtrace
       end
 
-      def _receive_result message, opaque_result
-        return nil if one_way || message.one_way
+      def _receive_result state
+        return nil if one_way || state.message.one_way
         super
       end
 
-      def _send_result message, result, result_payload, stream, message_state
-        return nil if one_way || message.one_way
+      def _send_result state
+        return nil if one_way || state.message.one_way
         super
       end
 
-      def _write payload, stream, context
+      def _write payload, stream, state
         if one_way
-          q = context && (context[:queue] || context[:zmq_queue])
-          payload.insert(0, q || queue_)
+          q = state && state.message
+          q &&= q[:zmq_queue] || q[:queue]
+          payload.insert(0, q ? "#{q} " : queue_)
         end
         stream.send payload, 0
         stream
       end
 
-      def _read stream, context
-        stream.recv 0
+      def _read stream, state
+        if data = stream.recv(0) and one_way
+          q, data = data.split(/ /, 2)
+        end
+        data
       end
 
       def queue
@@ -68,7 +72,7 @@ module ASIR
       end
       def queue_
         @queue_ ||=
-          (queue.empty? ? queue : queue + " ").freeze
+          (queue.empty? ? "asir ": queue + " ").freeze
       end
 
       # server represents a receiving ZMQ endpoint.

data/lib/asir_zmq/version.rb

@@ -1,3 +1,3 @@
 module AsirZmq
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 require 'rubygems'
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-gem 'asir'
+if p = ENV['ASIR_LIB_PATH']
+  $:.unshift File.expand_path(p)
+else
+  gem 'asir'
+end
 require 'asir'
 
 module ASIR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir_zmq
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 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.0
+        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.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: zmq
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,7 @@ files:
 - example/config/asir_config.rb
 - example/ex01.rb
 - example/ex02.rb
+- example/ex03.rb
 - example/example_helper.rb
 - example/sample_service.rb
 - example/unsafe_service.rb
@@ -131,18 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4489244510687288142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4489244510687288142
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24