rzmq-enhancement 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bb3bd003a801e1bccbf63499e12bedf681e37e
-  data.tar.gz: 884528721db8a307dfdc46e66b2b3b51b6929614
+  metadata.gz: 742111712ff78ad08ebfd9230481089d37a16ded
+  data.tar.gz: 8bafaddb0af74529b58fa12f91856627e185a5d9
 SHA512:
-  metadata.gz: 3b6088b307501f85b5fbf92ed5c07795990467638c9a5fd948df2658259c57476176386ee2fb266c01b80b1fbb375f3ab2c3dacaca3a230fb6d66e7f898fceb1
-  data.tar.gz: cd0cad6abdb9dbf2d12800b4c0964f0381faa20d92ec5099a0b6e6243fba7706bd8782158dff3b4a5479b20637eb1bdd74f5adf4e9237abba179a0ba402e0138
+  metadata.gz: 9733eb664874cf73ff7e240c810094c5d090ec884a05ce7f77d7048629dcc4ed880635a9e86f30e0e41bba05c07824bce789f709fe97cc49d3d1b4fde2876fe5
+  data.tar.gz: fe6e3095f2af0c2c91d249b28fc4485b4f8abfdc2e30c275a2710309517c29a393179ebf9ba20286e7c0f4c56216118153d681febd8e983cceeea47def5401e0

data/.semver

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 0
-:patch: 26
+:patch: 27
 :special: ''

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    awesome_print (1.7.0)
+    awesome_print (1.8.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
@@ -45,7 +45,7 @@ GEM
       rdoc
       semver2
     jwt (1.5.6)
-    kamelcase (0.0.0)
+    kamelcase (0.0.1)
       semver2 (~> 3)
     method_source (0.8.2)
     mime-types (2.99.3)
@@ -55,8 +55,8 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
-    oauth2 (1.3.1)
-      faraday (>= 0.8, < 0.12)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)

data/README.org

@@ -5,6 +5,7 @@
   - [[#install][Install]]
   - [[#usage][Usage]]
     - [[#tips][Tips]]
+  - [[#release-notes][Release Notes]]
   - [[#contributing-to-rzmq-enhancement][Contributing to rzmq-enhancement]]
   - [[#copyright][Copyright]]
 
@@ -20,30 +21,35 @@
    This is still under development, and currently represents
    only a minimal interface. For the versions of 0.0.x,
    there will be "rapid" development and breaking changes.
-   
+
    Only when we reach version 0.1.0 or higher, the interfaces
    and the API will be stable enough for general use.
 
    Feel free to play with this for now, but don't put it in production
-   code just yet.
+   code just yet. Or if you do, be very aggressive about locking down
+   the exact version. For example:
+
+   #+begin_src ruby
+   gem 'rzmq_enhancement', '0.0.27'
+   #+end_src
 
 ** Preliminaries
 
    This is implemented as a DSLish Ruby-friendly interface. The
    initial implementation shall be as "lean" as possible, basically
-   serving our needs at Sensorberg. Eventually, we'll flesh this 
+   serving our needs at Sensorberg. Eventually, we'll flesh this
    out to fully support most of the ffi-rzmq interface.
 
    This is also "opinionated". We pass all objects as JSON
-   strings, which will probably suit most needs, and will 
+   strings, which will probably suit most needs, and will
    allow the receiving (and sending) ends to be language-agnostic,
    as long as they use JSON as well.
 
 ** Install
-   
+
    Make sure the ZeroMQ library is already installed on your system. If you
    are on a Mac, we recommend 'brew' or 'macports' to get it.
-   
+
    From command-line:
    #+begin_src bash
    gem install rzmq-enhancement
@@ -53,7 +59,7 @@
    #+begin_src ruby
    gem 'rzmq-enhancement'
    #+end_src
-   
+
 ** Usage
    Please see the [[./examples][Examples.]]
 
@@ -68,11 +74,16 @@
    machine,
 
    #+begin_src ruby
-   'ipc://anynameyoulike.ipc' 
+   'ipc://anynameyoulike.ipc'
    #+end_src
 
+** Release Notes
+   | version |       date | details                                                                              |
+   |---------+------------+--------------------------------------------------------------------------------------|
+   | v0.0.27 | 2017-06-22 | zeromq_push semantics now allows you to properly pass the payload in as a parameter. |
+
 ** 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.
    - Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
    - Fork the project.

data/bin/rzmq

@@ -0,0 +1 @@
+# to be determined

data/examples/push-pull-ipc.rb

@@ -7,21 +7,16 @@ include ZeroMQ
 thr = []
 
 # push
-thr << Thread.new { 
+thr << Thread.new {
   (0..10).each do |i|
-    zeromq_push(:pushpull_example, ctx: :push) do |ctx|
-      unless i == 10
-        [i, 'mississippi']
-      else
-        :end_of_stream
-      end
-    end
+    zeromq_push(:pushpull_example, payload: [i, 'mississippi'])
   end
+  zeromq_push(:pushpull_example, payload: :end_of_stream)
 }
 
 # pull
-thr << Thread.new { 
-  zeromq_pull_server(:pushpull_example, ctx: :pull) do |payload|
+thr << Thread.new {
+  zeromq_pull_server(:pushpull_example) do |payload|
     pp payload
     exit if payload == 'end_of_stream'
   end

data/examples/rr-request-ipc.rb

@@ -7,7 +7,7 @@ include ZeroMQ
 # request
 
 (0..10).each do |i|
-  zeromq_request( :hello, payload: [i, i*i] ) do |result|
+  zeromq_request( :hello_example, payload: [i, i*i] ) do |result|
     print "result: "
     pp result
   end

data/examples/rr-response-ipc.rb

@@ -5,7 +5,7 @@ include ZeroMQ
 
 # response
 
-zeromq_response_server :hello do |payload|
+zeromq_response_server :hello_example do |payload|
   print "respond to this: "
   pp payload
   i, j = payload

data/lib/rzmq-enhancement.rb

@@ -10,18 +10,24 @@ IPCDIR = '/tmp'
 Thread.abort_on_exception = true
 
 module ZeroMQ
- 
+  # This bit will seem confusing, but we must redo grand_pusher to
+  # to make this more sane.
   def zeromq_push name,
                   endpoint = "ipc://#{IPCDIR}/#{name}.ipc",
-                  ctx: :default,
+                  ctx: :push,
+                  payload: nil,
                   &block
-    grand_pusher ZMQ::PUSH, name, endpoint, ctx: ctx, &block
-  end  
+    if block_given?
+      grand_pusher ZMQ::PUSH, name, endpoint, ctx: ctx, payload: payload, &block
+    else
+      grand_pusher(ZMQ::PUSH, name, endpoint, ctx: ctx) { payload }
+    end
+  end
 
-  # this does an endless loop as a "server"  
+  # this does an endless loop as a "server"
   def zeromq_pull_server name,
                          endpoint = "ipc://#{IPCDIR}/#{name}.ipc",
-                         ctx: :default,
+                         ctx: :pull,
                          &block
     grand_server ZMQ::PULL, name, endpoint, ctx: ctx, bind: true, &block
   end
@@ -32,7 +38,7 @@ module ZeroMQ
                      **opts,
                      &block
     h = grand_pusher ZMQ::REQ, name, endpoint, **opts, &block
-  end  
+  end
 
   def zeromq_response_server name,
                              endpoint = "ipc://#{IPCDIR}/#{name}.ipc",
@@ -40,13 +46,16 @@ module ZeroMQ
                              &block
     grand_server ZMQ::REP, name, endpoint, bind: true, respond: true, ctx: ctx, &block
   end
-  
-  private
+
+  private_class_method
   def ctx_name name, opts
     :"#{name}.#{opts[:ctx] || :default}"
   end
-  
+
   # TODO: We don't handle the non-block req case at all. Do we want to?
+  # TODO: We need to rewrite this, it works as is, but is too tricky
+  # TODO: to get the semantics right.
+  private_class_method
   def grand_pusher type, name, endpoint, **opts, &block
     init_sys
     ctxname = ctx_name(name,opts)
@@ -61,7 +70,7 @@ module ZeroMQ
         else
           @ctxh[ctxname]
         end
-    
+
     if block_given?
       unless opts[:payload]
         # here, we get the payload from the block
@@ -80,6 +89,7 @@ module ZeroMQ
     h
   end
 
+  private_class_method
   def grand_server type, name, endpoint, **opts, &block
     init_sys
     ctxname = ctx_name(name,opts)
@@ -95,27 +105,29 @@ module ZeroMQ
          end
     error_check(rc)
 
-    loop do     
+    loop do
       rc = h.server_sock.recv_string payload = ''
       error_check(rc)
-      
+
       result = block.(JSON.parse(payload))
       if opts[:respond]
-        rc = h.server_sock.send_string JSON.generate(result)  
+        rc = h.server_sock.send_string JSON.generate(result)
       end
     end if block_given?
     h
   end
-  
+
+  private_class_method
   def init_sys
     @ctxh ||= {}
   end
-  
+
+  private_class_method
   def error_check rc
     if ZMQ::Util.resultcode_ok?(rc)
       false
     else
-      raise "Operation failed, errno [#{ZMQ::Util.errno}] description [#{ZMQ::Util.error_string}]"
+      raise "ZeroMQ Operation failed, errno [#{ZMQ::Util.errno}] description [#{ZMQ::Util.error_string}]"
     end
   end
 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.26 ruby lib
+# stub: rzmq-enhancement 0.0.27 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rzmq-enhancement".freeze
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   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-09"
+  s.date = "2017-06-22"
   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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzmq-enhancement
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Fred Mitchell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semver2