skein 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7343801d33cd7284635f64439201546a196cafbe
-  data.tar.gz: b21b94bd2691c4b295dc521c9ab7f0f6c1b3c08b
+  metadata.gz: ff3221a3eff25a91df8e35a5c1fbcc7aa220c6c3
+  data.tar.gz: 390343d71f7ab2e9a3f854463a5533f009f8c618
 SHA512:
-  metadata.gz: f60918e1da256d70c85474ce4e898286ca793715baf437f3cc2b212ecd884239bb4e92785665ee7135450aa0ad2efc27e4d4234fed2af2fadabf5b0413ec481f
-  data.tar.gz: ec3a51cbba42f4694ee49809798dffa4008fe9d997b6ae4f7e4ecca774823e75d5687dd6b5bc701423cca5d302ac9f6e447898c5943af11f53d4f56f1b4ab40b
+  metadata.gz: f89a9dbacd906a33742294cb909097d213ce7f4d6318aba28df1bb151a9fe6256d91b1b84454a1fc2e7fe1a3b70b08bc966ecae8ff6329e2f40824d062ddb996
+  data.tar.gz: 57754a31620ec832354dba43ca9387fe75c2e91fc7d8d44ac4c45a90f9e5f0dd7a4650d9a34c5fbab6140aec95501f8eb26d2258510d74809f85831993ac5e6c

data/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     birling (0.1.3)
-    builder (3.2.2)
+    builder (3.2.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     faraday (0.9.2)
@@ -18,45 +18,44 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.4.6)
+    hashie (3.5.5)
     highline (1.7.8)
-    jeweler (2.1.2)
+    jeweler (2.3.3)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
       github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-      semver
+      semver2
     jwt (1.5.6)
     mini_portile2 (2.1.0)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.6.8.1-java)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    power_assert (0.3.1)
-    public_suffix (2.0.4)
+    power_assert (1.0.1)
+    psych (2.2.4)
+    public_suffix (2.0.5)
     rack (2.0.1)
-    rake (11.3.0)
-    rdoc (5.0.0)
-    semver (1.0.1)
-    test-unit (3.2.1)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    semver2 (3.4.2)
+    test-unit (3.2.3)
       power_assert
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
+    thread_safe (0.3.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -66,4 +65,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.13.6
+   1.14.5

data/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2016 Scott Tadman, PostageApp
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -9,7 +9,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = 'skein'
   gem.homepage = 'http://github.com/postageapp/skein'
-  gem.license = 'closed'
+  gem.license = 'MIT'
   gem.summary = %Q{RabbitMQ RPC/PubSub Library}
   gem.description = %Q{Wrapper for RabbitMQ that makes blocking RPC calls and handles pub-sub broadcasts.}
   gem.email = 'tadman@postageapp.com'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.5

data/lib/skein/client.rb

@@ -10,8 +10,8 @@ class Skein::Client < Skein::Connected
     new.rpc(*args)
   end
 
-  def self.receiver(*args)
-    new.receiver(*args)
+  def self.worker(*args)
+    new.worker(*args)
   end
 
   def self.publisher(*args)
@@ -37,8 +37,9 @@ class Skein::Client < Skein::Connected
     )
   end
 
-  def receiver
-    Skein::Client::Receiver.new(
+  def worker(queue_name)
+    Skein::Client::Worker.new(
+      queue_name,
       connection: self.connection,
       context: self.context
     )

data/lib/skein/client/subscriber.rb

@@ -16,16 +16,18 @@ class Skein::Client::Subscriber < Skein::Connected
     @subscribe_queue.bind(@exchange, routing_key: routing_key)
   end
 
-  def listen
+  def listen(block = true)
     case (@subscribe_queue.class.to_s.split(/::/)[0])
     when 'Bunny'
-      @subscribe_queue.subscribe(block: true) do |delivery_info, properties, payload|
+      @subscribe_queue.subscribe(block: block) do |delivery_info, properties, payload|
         yield(JSON.load(payload), delivery_info, properties)
       end
     when 'MarchHare'
-      @subscribe_queue.subscribe(block: true) do |metadata, payload|
+      @subscribe_queue.subscribe(block: block) do |metadata, payload|
         yield(JSON.load(payload), metadata)
       end
+    else
+      raise "Unknown queue type #{@subscribe_queue.class}, cannot listen."
     end
   end
 end

data/lib/skein/client/worker.rb

@@ -3,7 +3,7 @@ require 'json'
 class Skein::Client::Worker < Skein::Connected
   # == Instance Methods =====================================================
 
-  def initialize(queue_name, exchange_name: nil, connection: nil, context: nil)
+  def initialize(queue_name, exchange_name: nil, connection: nil, context: nil, concurrency: nil)
     super(connection: connection, context: context)
 
     lock do
@@ -17,36 +17,82 @@ class Skein::Client::Worker < Skein::Connected
       end
 
       @handler = Skein::Handler.for(self)
+      @received = Queue.new
+      @replies = Queue.new
+      @concurrency = concurrency && concurrency.to_i || 1
+      @threads = [ ]
 
-      @thread = Thread.new do
+      @threads << Thread.new do
         Thread.abort_on_exception = true
 
         Skein::Adapter.subscribe(@queue) do |payload, delivery_tag, reply_to|
-          @handler.handle(payload) do |reply_json|
-            channel.acknowledge(delivery_tag, true)
-
-            if (reply_to)
-              @reply_exchange.publish(
-                reply_json,
-                routing_key: reply_to,
-                content_type: 'application/json'
-              )
+          @received << [ payload, delivery_tag, reply_to ]
+        end
+      end
+
+      @threads << Thread.new do
+        Thread.abort_on_exception = true
+
+        loop do
+          payload, delivery_tag, reply_to, reply_json = @replies.pop
+
+          channel.acknowledge(delivery_tag, true)
+
+          if (reply_to)
+            @reply_exchange.publish(
+              reply_json,
+              routing_key: reply_to,
+              content_type: 'application/json'
+            )
+          end
+        end
+      end
+
+      @concurrency.times do
+        @threads << Thread.new do
+          Thread.abort_on_exception = true
+
+          loop do
+            payload, delivery_tag, reply_to = @received.pop
+            thread = Thread.current
+
+            @handler.handle(payload) do |reply_json|
+              @replies << [ payload, delivery_tag, reply_to, reply_json ]
+
+              if (thread == Thread.current)
+                thread = nil
+              else
+                thread.wakeup
+              end
             end
+
+            thread and Thread.stop
           end
         end
       end
     end
+
+    self.after_initialize
+  end
+
+  # Extend this in derived classes to implement any desired customization to
+  # be performed after initialization
+  def after_initialize
   end
 
   def close
-    @thread.kill
-    @thread.join
+    @threads.each do |thread|
+      thread.kill
+      thread.join
+    end
 
     super
   end
 
   def join
-    @thread and @thread.join
+    @threads.each do |thread|
+      thread.join
+    end
   end
 
   def async?

data/skein.gemspec

@@ -2,25 +2,27 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: skein 0.3.2 ruby lib
+# stub: skein 0.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "skein".freeze
-  s.version = "0.3.2"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Scott Tadman".freeze]
-  s.date = "2016-12-14"
+  s.date = "2017-03-20"
   s.description = "Wrapper for RabbitMQ that makes blocking RPC calls and handles pub-sub broadcasts.".freeze
   s.email = "tadman@postageapp.com".freeze
   s.executables = ["skein".freeze]
   s.extra_rdoc_files = [
+    "LICENSE.md",
     "README.md"
   ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
+    "LICENSE.md",
     "README.md",
     "RELEASES.md",
     "Rakefile",
@@ -65,10 +67,11 @@ Gem::Specification.new do |s|
     "test/unit/test_skein_rpc_error.rb",
     "test/unit/test_skein_rpc_request.rb",
     "test/unit/test_skein_support.rb",
+    "test/unit/test_skein_worker.rb",
     "tmp/.gitignore"
   ]
   s.homepage = "http://github.com/postageapp/skein".freeze
-  s.licenses = ["closed".freeze]
+  s.licenses = ["MIT".freeze]
   s.rubygems_version = "2.5.2".freeze
   s.summary = "RabbitMQ RPC/PubSub Library".freeze
 

data/test/script/em_example

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+require 'optparse'
 
 gem 'eventmachine'
 require 'eventmachine'
@@ -12,8 +13,25 @@ require 'skein'
 # == Support Classes ========================================================
 
 class EchoWorker < Skein::Client::Worker
+  def initialize(*args, concurrency: nil, delay: nil, wait: false, verbose: false)
+    super(*args, concurrency: concurrency)
+
+    @delay = delay || 0.0
+    @wait = false
+  end
+
   def echo(*args)
-    yield(*args)
+    if (@delay > 0)
+      EventMachine::Timer.new(self.delay) do
+        yield(*args)
+      end
+    elsif (@wait)
+      EventMachine.next_tick do
+        yield(*args)
+      end
+    else
+      yield(*args)
+    end
   end
 
   def async?
@@ -23,6 +41,38 @@ end
 
 # == Main ===================================================================
 
+options = {
+  concurrency: 1,
+  delay: 0.0,
+  wait: false,
+  verbose: false
+}
+
+parser = OptionParser.new do |parser|
+  parser.on('-v', '--verbose') do
+    options[:verbose] = true
+  end
+
+  parser.on('-d', '--delay=n') do |n|
+    options[:delay] = n.to_f
+  end
+
+  parser.on('-c', '--concurrency=n') do |n|
+    options[:concurrency] = n.to_i
+  end
+
+  parser.on('-w', '--wait') do
+    options[:wait] = true
+  end
+
+  parser.on('-h', '--help') do
+    puts parser
+    exit(0)
+  end
+end
+
+args = parser.parse(*ARGV)
+
 EventMachine.run do
-  EchoWorker.new('test_echo')
+  worker = EchoWorker.new('test_echo', options)
 end

data/test/unit/test_skein_client.rb

@@ -5,14 +5,14 @@ class TestSkeinClient < Test::Unit::TestCase
     client = nil
 
     assert_no_threads do
-      client = Skein::Client.new
+      begin
+        client = Skein::Client.new
 
-      assert client.context
+        assert client.context
 
-      client.close
+      ensure
+        client and client.close
+      end
     end
-
-  # ensure
-  #   client and client.close
   end
 end

data/test/unit/test_skein_worker.rb

@@ -0,0 +1,16 @@
+require_relative '../helper'
+
+class TestSkeinWorker  < Test::Unit::TestCase
+  def test_default
+    client = Skein::Client.new
+
+    worker = client.worker('test_queue')
+
+    assert worker
+
+    assert_equal false, worker.async?
+
+  ensure
+    client and client.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skein
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Scott Tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: birling
@@ -73,10 +73,12 @@ executables:
 - skein
 extensions: []
 extra_rdoc_files:
+- LICENSE.md
 - README.md
 files:
 - Gemfile
 - Gemfile.lock
+- LICENSE.md
 - README.md
 - RELEASES.md
 - Rakefile
@@ -121,10 +123,11 @@ files:
 - test/unit/test_skein_rpc_error.rb
 - test/unit/test_skein_rpc_request.rb
 - test/unit/test_skein_support.rb
+- test/unit/test_skein_worker.rb
 - tmp/.gitignore
 homepage: http://github.com/postageapp/skein
 licenses:
-- closed
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []