skein 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6896b1151e348573c5b58ee131b6f568373d7547
-  data.tar.gz: 4ae4f3c7de9c5eaf0d17e9e0ec77ef02390824f1
+  metadata.gz: d56cf67111c3a47096df2c6936b9a66329648bc4
+  data.tar.gz: cc63a8071f98e2e1efb3e1281886c104e0709e20
 SHA512:
-  metadata.gz: 32a30b3dc6c37ac747d372f9379f90463f0c36de086ef2eb464eedc0d5f93b8b88e8737c5d0cd3a42dcbed0ccdd0d12e43bf2ac6f4f7679527d7f2e8e8aa88cc
-  data.tar.gz: fb8169c2061892dbe1c2c05da18a672646e09abf773a020ccbe556cabdbc997b6c8d85548f8392a751d834dc7a13c1970e59147d7d73d58d778caa3be50cafde
+  metadata.gz: ce7e54be719abd78fd9c87d0adfd69445820b019776df34062f284a284344be608ff414a322aa4c05ba9294c0507f28a33fce189ab03e2c6dfb420b22c5a9ab5
+  data.tar.gz: 0a3306cccb1edc161543003c6c41d3ef5686645b45bf507c112002f09cc6565a27dbfdca6531572dc1cc11f9994b821de730892db9f3bfaa575e3e46b783d322

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/skein

@@ -10,10 +10,10 @@ require_relative '../lib/skein'
 # == Support Classes ========================================================
 
 class EchoWorker < Skein::Client::Worker
-  def initialize(queue_name, options = nil)
-    super(queue_name, options || { })
+  def initialize(queue_name, debug: false, **options)
+    super(queue_name, options)
 
-    @debug = options && options[:debug]
+    @debug = debug
   end
 
   def echo(text)
@@ -56,7 +56,9 @@ end
 
 options = {
   count: 1,
-  threads: 1
+  threads: 1,
+  queue_name: 'test_echo',
+  exchange_name: nil
 }
 
 parser = OptionParser.new do |parser|
@@ -77,6 +79,13 @@ parser = OptionParser.new do |parser|
     options[:debug] = true
   end
 
+  parser.on('-e', '--exchange=s') do |s|
+    options[:exchange_name] = s
+  end
+  parser.on('-q', '--queue=s') do |s|
+    options[:queue_name] = s
+  end
+
   parser.on('-h', '--help') do
     puts parser
     exit(0)
@@ -135,20 +144,33 @@ when 'echo'
       end
     end
 
+    if (options[:threads] > 1)
+      # Warm up RabbitMQ driver, force all autoloads
+      Skein::Client.new.close
+    end
+
     options[:threads].times.map do
       in_thread(options) do
         client = Skein::Client.new
-        rpc = client.rpc('test_echo')
+        rpc = client.rpc(options[:exchange_name], routing_key: options[:queue_name])
 
         options[:count].times do |i|
           test_data = SecureRandom.uuid
 
+          if (options[:verbose])
+            print '[%s] ??? (%d/%d)' % [
+              '---',
+              i + 1,
+              options[:count]
+            ]
+          end
+
           response = rpc.echo(test_data)
 
           results << (response == test_data)
 
           if (options[:verbose])
-            puts '[%s] %s (%d/%d)' % [
+            puts "\r[%s] %s (%d/%d)" % [
               (response == test_data ? 'OK' : 'ERR'),
               response.inspect,
               i + 1,
@@ -177,7 +199,11 @@ when 'echo'
 when 'echo_server'
   rescue_safely(options) do
     options[:threads].times.map do
-      EchoWorker.new('test_echo')
+      EchoWorker.new(
+        options[:queue_name],
+        exchange_name: options[:exchange_name],
+        debug: options[:debug]
+      )
     end.each(&:join)
   end
 else

data/lib/skein.rb

@@ -14,6 +14,7 @@ end
 
 require_relative './skein/connected'
 
+require_relative './skein/adapter'
 require_relative './skein/client'
 require_relative './skein/config'
 require_relative './skein/context'

data/lib/skein/adapter.rb

@@ -0,0 +1,18 @@
+module Skein::Adapter
+  # == Mixin Methods =========================================================
+  
+  def subscribe(queue, block: true, manual_ack: true)
+    case (queue.class.to_s.split(/::/)[0])
+    when 'Bunny'
+      queue.subscribe(block: block, manual_ack: manual_ack) do |delivery_info, properties, payload|
+        yield(payload, delivery_info[:delivery_tag], properties[:reply_to])
+      end
+    when 'MarchHare'
+      queue.subscribe(block: block, manual_ack: manual_ack) do |metadata, payload|
+        yield(payload, metadata.delivery_tag, metadata.reply_to)
+      end
+    end
+  end
+
+  extend self
+end

data/lib/skein/client.rb

@@ -28,20 +28,37 @@ class Skein::Client < Skein::Connected
     super(connection: connection, context: context)
   end
 
-  def rpc(queue_name = nil)
-    Skein::Client::RPC.new(queue_name, connection: self.connection, context: self.context)
+  def rpc(exchange_name = nil, routing_key: nil)
+    Skein::Client::RPC.new(
+      exchange_name,
+      routing_key: routing_key,
+      connection: self.connection,
+      context: self.context
+    )
   end
 
   def receiver
-    Skein::Client::Receiver.new(connection: self.connection, context: self.context)
+    Skein::Client::Receiver.new(
+      connection: self.connection,
+      context: self.context
+    )
   end
 
   def publisher(queue_name)
-    Skein::Client::Publisher.new(queue_name, connection: self.connection, context: self.context)
+    Skein::Client::Publisher.new(
+      queue_name,
+      connection: self.connection,
+      context: self.context
+    )
   end
 
   def subscriber(queue_name, routing_key = nil)
-    Skein::Client::Subscriber.new(queue_name, routing_key, connection: self.connection, context: self.context)
+    Skein::Client::Subscriber.new(
+      queue_name,
+      routing_key,
+      connection: self.connection,
+      context: self.context
+    )
   end
 end
 

data/lib/skein/client/rpc.rb

@@ -4,33 +4,23 @@ require 'fiber'
 class Skein::Client::RPC < Skein::Connected
   # == Constants ============================================================
 
-  QUEUE_NAME_DEFAULT = 'skein_rpc'.freeze
+  EXCHANGE_NAME_DEFAULT = ''.freeze
 
   # == Properties ===========================================================
 
   # == Instance Methods =====================================================
 
-  def initialize(queue_name = nil, connection: nil, context: nil)
+  def initialize(exchange_name = nil, routing_key: nil, connection: nil, context: nil)
     super(connection: connection, context: context)
 
-    @rpc_queue = self.channel.queue(queue_name || QUEUE_NAME_DEFAULT, durable: true)
+    @rpc_exchange = self.channel.direct(exchange_name || EXCHANGE_NAME_DEFAULT, durable: true)
+    @routing_key = routing_key
     @response_queue = self.channel.queue(@ident, durable: true, header: true, auto_delete: true)
 
     @callback = { }
 
-    @consumer = @response_queue.subscribe do |metadata, payload, extra|
-      # FIX: Deal with mixup between Bunny and MarchHare
-      # puts [metadata,payload,extra].inspect
-
-      # puts [metadata,payload,extra].map(&:class).inspect
-
-      if (extra)
-        payload = extra
-      elsif (!payload)
-        payload = metadata
-      end
-
-      begin
+    @consumer = Skein::Adapter.subscribe(@response_queue, block: false) do |payload, delivery_tag, reply_to|
+      self.context.trap do
         response = JSON.load(payload)
 
         if (callback = @callback.delete(response['id']))
@@ -41,9 +31,8 @@ class Skein::Client::RPC < Skein::Connected
             callback.call
           end
         end
-      rescue => e
-        # FIX: Error handling
-        puts e.inspect
+
+        self.channel.acknowledge(delivery_tag)
       end
     end
   end
@@ -67,10 +56,11 @@ class Skein::Client::RPC < Skein::Connected
       id: message_id
     )
 
-    @channel.default_exchange.publish(
+    @rpc_exchange.publish(
       request,
-      routing_key: @rpc_queue.name,
+      routing_key: @routing_key,
       reply_to: blocking ? @ident : nil,
+      content_type: 'application/json',
       message_id: message_id
     )
 

data/lib/skein/client/subscriber.rb

@@ -1,13 +1,19 @@
 class Skein::Client::Subscriber < Skein::Connected
   # == Instance Methods =====================================================
 
-  def initialize(queue_name, routing_key = nil, connection: nil, context: nil)
+  def initialize(exchange, routing_key = nil, connection: nil, context: nil)
     super(connection: connection, context: context)
 
-    @queue = self.channel.topic(queue_name)
-    @subscribe_queue = self.channel.queue('', exclusive: true)
+    @exchange =
+      case (exchange)
+      when String, Symbol
+        self.channel.topic(exchange)
+      else
+        exchange
+      end
 
-    @subscribe_queue.bind(@queue, routing_key: routing_key)
+    @subscribe_queue = self.channel.queue('', exclusive: true)
+    @subscribe_queue.bind(@exchange, routing_key: routing_key)
   end
 
   def listen

data/lib/skein/client/worker.rb

@@ -3,25 +3,33 @@ require 'json'
 class Skein::Client::Worker < Skein::Connected
   # == Instance Methods =====================================================
 
-  def initialize(queue_name, connection: nil, context: nil)
+  def initialize(queue_name, exchange_name: nil, connection: nil, context: nil)
     super(connection: connection, context: context)
 
     lock do
-      queue = self.channel.queue(queue_name, durable: true)
+      @reply_exchange = self.channel.default_exchange
+      @queue = self.channel.queue(queue_name, durable: true)
 
-      @handler = Skein::Handler.for(self)
+      if (exchange_name)
+        @exchange = self.channel.direct(exchange_name, durable: true)
+
+        @queue.bind(@exchange)
+      end
 
-      @subscriber = Skein::Client::Subscriber.new(queue_name, connection: self.connection)
+      @handler = Skein::Handler.for(self)
 
       @thread = Thread.new do
-        @subscriber.listen do |payload, delivery_tag, reply_to|
+        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)
-              channel.default_exchange.publish(
+              @reply_exchange.publish(
                 reply_json,
-                routing_key: reply_to
+                routing_key: reply_to,
+                content_type: 'application/json'
               )
             end
           end
@@ -46,6 +54,4 @@ class Skein::Client::Worker < Skein::Connected
     # callback-style delegation.
     false
   end
-
-protected
 end

data/lib/skein/context.rb

@@ -35,4 +35,10 @@ class Skein::Context
   def exception!(*args)
     @reporter and @reporter.exception!(*args)
   end
+
+  def trap
+    yield
+  rescue => e
+    self.exception!(e)
+  end
 end

data/lib/skein/handler.rb

@@ -1,4 +1,8 @@
 class Skein::Handler
+  # == Properties ===========================================================
+
+  attr_reader :context
+
   # == Class Methods ========================================================
 
   def self.for(target)
@@ -12,24 +16,23 @@ class Skein::Handler
 
   # == Instance Methods =====================================================
 
-  def initialize(target)
+  def initialize(target, context = nil)
     @target = target
+    @context = context
   end
 
   def handle(message_json)
-    # REFACTOR: Roll this into a module to keep it more contained.
-    # REFACTOR: Use Skein::RPC::Request
     request =
       begin
         JSON.load(message_json)
 
       rescue Object => e
-        @context.exception!(e, message_json)
+        @context and @context.exception!(e, message_json)
 
         return yield(JSON.dump(
           result: nil,
           error: '[%s] %s' % [ e.class, e ],
-          id: request['id']
+          id: nil
         ))
       end
 
@@ -71,7 +74,7 @@ class Skein::Handler
         ))
       end
     rescue Object => e
-      @reporter and @reporter.exception!(e, message_json)
+      @context and @context.exception!(e, message_json)
 
       yield(JSON.dump(
         result: nil,

data/skein.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: skein 0.3.0 ruby lib
+# stub: skein 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "skein".freeze
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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-07"
+  s.date = "2016-12-12"
   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]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "config/.gitignore",
     "config/skein.yml.example",
     "lib/skein.rb",
+    "lib/skein/adapter.rb",
     "lib/skein/client.rb",
     "lib/skein/client/publisher.rb",
     "lib/skein/client/rpc.rb",
@@ -68,7 +69,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/postageapp/skein".freeze
   s.licenses = ["closed".freeze]
-  s.rubygems_version = "2.6.8".freeze
+  s.rubygems_version = "2.5.2".freeze
   s.summary = "RabbitMQ RPC/PubSub Library".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skein
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Scott Tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: birling
@@ -85,6 +85,7 @@ files:
 - config/.gitignore
 - config/skein.yml.example
 - lib/skein.rb
+- lib/skein/adapter.rb
 - lib/skein/client.rb
 - lib/skein/client/publisher.rb
 - lib/skein/client/rpc.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: RabbitMQ RPC/PubSub Library