rzmq-enhancement 0.0.4 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa4451bc61e19437a3beca41f893075926a3f06
-  data.tar.gz: f146bec0bbf0210e42623389bc9f195bbca7b313
+  metadata.gz: f6360f3b091688410725c27c5505f753e1e3e688
+  data.tar.gz: 18dd429996fac085eb8e1bd8ad868ed319be08d1
 SHA512:
-  metadata.gz: e0f08bcf7afa5015bd320737cfd983b88cbbb7f5f11a5197480775c866ba20c593ab181a22625aaccdb12caaceade36a653a333dd56c339fb7f6f2395683d8ec
-  data.tar.gz: deaf85707d0e88ea0c5366842a71810494790ea1f837c3a49790d94d15f701731af9d648c5cd035035a962a93acc1f35ba3ccbee8ccb9fc3e8ebddec9aa5f46b
+  metadata.gz: c6254b1dea7b4aed670415f08175b89b09ab6214ec8acbb0dcc794a95e238f989f6d45d27e6e4fb5576903934077c0765709b6d9e625f7fa6d3d216e9c679f14
+  data.tar.gz: d66e70b7b9e27ee39f79eb65155208f837658aee3a5f9b85109fc5a43e71d6bf091c5a1c20887ccbb4db29b0ecec0122fa4755a7db0b40bdc105e48afce1f582

data/.semver

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 0
-:patch: 4
+:patch: 14
 :special: ''

data/Gemfile.lock

@@ -32,7 +32,7 @@ GEM
     highline (1.7.8)
     interception (0.5)
     json (1.8.6)
-    juwelier (2.4.5)
+    juwelier (2.4.6)
       builder
       bundler (>= 1.13)
       git (>= 1.2.5)
@@ -49,12 +49,12 @@ GEM
       semver2 (~> 3)
     method_source (0.8.2)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     oauth2 (1.3.1)
       faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)

data/README.org

@@ -4,6 +4,7 @@
   - [[#preliminaries][Preliminaries]]
   - [[#install][Install]]
   - [[#usage][Usage]]
+    - [[#tips][Tips]]
   - [[#contributing-to-rzmq-enhancement][Contributing to rzmq-enhancement]]
   - [[#copyright][Copyright]]
 
@@ -54,6 +55,9 @@
    #+end_src
    
 ** Usage
+   Please see the [[./examples][Examples.]]
+
+*** Tips
    Do not use "localhost". Use, instead, 127.0.0.1, example:
 
    #+begin_src ruby
@@ -67,7 +71,6 @@
    'ipc://anynameyoulike.ipc' 
    #+end_src
 
-
 ** Contributing to rzmq-enhancement
  
    - Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/examples/push-pull.rb

@@ -27,4 +27,4 @@ thr << Thread.new {
   end
 }
 
-thr.each {|t| t.join }
+thr.each { |t| t.join }

data/examples/rr-request.rb

@@ -0,0 +1,17 @@
+require 'rzmq-enhancement'
+require 'pp'
+require 'thread'
+
+include ZeroMQ
+EP = 'ipc://reqresp.ipc' 
+
+# request
+
+(0..10).each do |i|
+  zeromq_request( :request_example,
+                  EP,
+                  payload: [i, i*i] ) do |result|
+    print "result: "
+    pp result
+  end
+end

data/examples/rr-response.rb

@@ -0,0 +1,15 @@
+require 'rzmq-enhancement'
+require 'pp'
+require 'thread'
+
+include ZeroMQ
+EP = 'ipc://reqresp.ipc' 
+
+# response
+
+zeromq_response_server :response_example, EP do |payload|
+  print "respond to this: "
+  pp payload
+  i, j = payload
+  i + j
+end

data/lib/rzmq-enhancement.rb

@@ -8,14 +8,33 @@ require 'json'
 Thread.abort_on_exception = true
 
 module ZeroMQ
-
  
   def zeromq_push name, endpoint = "ipc://#{name}.ipc", &block
+    grand_pusher ZMQ::PUSH, name, endpoint, {},  &block
+  end  
+
+  # this does an endless loop as a "server"  
+  def zeromq_pull_server name, endpoint = "ipc://#{name}.ipc", &block
+    grand_server ZMQ::PULL, name, endpoint, &block
+  end
+
+  # we make the request and return the response
+  def zeromq_request name, endpoint = "ipc://#{name}.ipc", **opts, &block
+    h = grand_pusher ZMQ::REQ, name, endpoint, **opts, &block    
+  end  
+
+  def zeromq_response_server name, endpoint = "ipc://#{name}.ipc", &block
+    grand_server ZMQ::REP, name, endpoint, bind: true, respond: true, &block
+  end
+  
+  private
+  # TODO: We don't handle the non-block req case at all. Do we want to?
+  def grand_pusher type, name, endpoint, **opts, &block
     init_sys
     h = if @ctxh[name].nil?
           h = (@ctxh[name] ||= OpenStruct.new)
           h.ctx = ZMQ::Context.create(1)
-          h.push_sock = h.ctx.socket(ZMQ::PUSH)
+          h.push_sock = h.ctx.socket(type)
           error_check(h.push_sock.setsockopt(ZMQ::LINGER, 0))
           rc = h.push_sock.bind(endpoint)
           error_check(rc)
@@ -25,34 +44,49 @@ module ZeroMQ
         end
     
     if block_given?
-      payload = block.(h.ctx)
-      rc = h.push_sock.send_string(JSON.generate(payload))
-      error_check(rc)
+      unless opts[:payload]
+        # here, we get the payload from the block
+        payload = block.(h.ctx)
+        rc = h.push_sock.send_string(JSON.generate(payload))
+        error_check(rc)
+      else
+        # here, we call the block with the results
+        rc = h.push_sock.send_string(JSON.generate(opts[:payload]))
+        error_check(rc)
+        rc = h.push_sock.recv_string(result = '')
+        error_check(rc)
+        block.(JSON.parse(result))
+      end
     end
     h
-  end  
+  end
 
-  # this does an endless loop as a "server"  
-  def zeromq_pull_server name, endpoint = "ipc://#{name}.ipc", &block
+  def grand_server type, name, endpoint, **opts, &block
     init_sys
     h = (@ctxh[name] ||= OpenStruct.new)
     h.ctx = ZMQ::Context.create(1)
 
-    h.pull_sock = h.ctx.socket(ZMQ::PULL)
+    h.pull_sock = h.ctx.socket(type)
     error_check(h.pull_sock.setsockopt(ZMQ::LINGER, 0))
-    
-    rc = h.pull_sock.connect(endpoint)
+    rc = if opts[:bind]
+           h.pull_sock.connect(endpoint)
+         else
+           h.pull_sock.connect(endpoint)
+         end
     error_check(rc)
 
     loop do
       rc = h.pull_sock.recv_string payload = ''
-
-      block.(JSON.parse(payload))
+      error_check(rc)
+      
+      result = block.(JSON.parse(payload))
+      if opts[:respond]
+        rc = h.pull_sock.send_string JSON.generate(result)  
+      end
     end if block_given?
     h
   end
   
-  private
   def init_sys
     @ctxh ||= {}
   end

data/rzmq-enhancement.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rzmq-enhancement 0.0.4 ruby lib
+# stub: rzmq-enhancement 0.0.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rzmq-enhancement".freeze
-  s.version = "0.0.4"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Fred Mitchell".freeze, "Sensorberg GmbH".freeze]
-  s.date = "2017-06-06"
+  s.date = "2017-06-07"
   s.description = "\n  The ffi-rzmq wraps ZeroMQ nicely, but not in a Ruby-friendly manner.\n  here, we take that one step further to present a mor Ruby-Friendy\n  interface.".freeze
   s.email = "frederick.mitchell@sensorberg.com".freeze
   s.executables = ["rzmq".freeze]
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "bin/rzmq",
     "examples/push-pull.rb",
+    "examples/rr-request.rb",
+    "examples/rr-response.rb",
     "lib/rzmq-enhancement.rb",
     "rzmq-enhancement.gemspec",
     "spec/rzmq-enhancement_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzmq-enhancement
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.14
 platform: ruby
 authors:
 - Fred Mitchell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semver2
@@ -244,6 +244,8 @@ files:
 - Rakefile
 - bin/rzmq
 - examples/push-pull.rb
+- examples/rr-request.rb
+- examples/rr-response.rb
 - lib/rzmq-enhancement.rb
 - rzmq-enhancement.gemspec
 - spec/rzmq-enhancement_spec.rb