skein 0.3.7 → 0.8.1

data/test/unit/test_skein_client.rb

@@ -9,9 +9,12 @@ class TestSkeinClient < Test::Unit::TestCase
         client = Skein::Client.new
 
         assert client.context
+        assert_false client.connection_shared?
+
+        client&.close
 
       ensure
-        client and client.close
+        client&.close
       end
     end
   end

data/test/unit/test_skein_client_publisher.rb

@@ -5,6 +5,6 @@ class TestSkeinPublisher < Test::Unit::TestCase
     publisher = Skein::Client::Publisher.new('test_name')
 
   ensure
-    publisher and publisher.close
+    publisher and publisher.close(delete_queue: true)
   end
 end

data/test/unit/test_skein_client_rpc.rb

@@ -0,0 +1,37 @@
+require_relative '../helper'
+
+class ExampleWorker < Skein::Client::Worker
+  def echo(*args)
+    args
+  end
+
+  def pops_exception
+    invalid_code!
+  end
+end
+
+class TestSkeinPublisher < Test::Unit::TestCase
+  def setup
+    @test_queue = 'rpc_test_q'
+
+    @rpc = Skein::Client::RPC.new('', routing_key: @test_queue)
+    @worker = ExampleWorker.new(@test_queue)
+  end
+
+  def teardown
+    @rpc and @rpc.close
+    @worker and @worker.close
+  end
+
+  def test_can_echo
+    result = @rpc.echo('example')
+
+    assert_equal %w[ example ], result
+  end
+
+  def test_can_handle_exceptions
+    assert_raise_kind_of(NoMethodError) do
+      @rpc.pops_exception
+    end
+  end
+end

data/test/unit/test_skein_client_subscriber.rb

@@ -1,6 +1,29 @@
 require_relative '../helper'
 
 class TestSkeinClientSubscriber < Test::Unit::TestCase
+  def test_immediate_close
+    client = Skein::Client.new
+
+    received = nil
+
+    subscriber = client.subscriber('test', '*.*') 
+    subscribing = false
+
+    thread = in_thread do
+      subscribing = true
+
+      subscriber.listen do |payload|
+        received = payload
+      end
+    end
+
+    wait_for { subscribing }
+
+  ensure
+    subscriber and subscriber.close(delete_queue: true)
+    client and client.close
+  end
+
   def test_cycle
     client = Skein::Client.new
 
@@ -11,31 +34,25 @@ class TestSkeinClientSubscriber < Test::Unit::TestCase
     subscriber = client.subscriber('test', '*.*') 
     subscribing = false
 
-    thread = Thread.new do
-      Thread.abort_on_exception = true
-
+    thread = in_thread do
       subscribing = true
 
       subscriber.listen do |payload|
         received = payload
-
-        Thread.exit
       end
     end
 
-    while (!subscribing)
-      # Spin-lock to wait for the subscriber to come online
-    end
+    wait_for { subscribing }
 
     publisher.publish!({ data: true }, 'test.notification')
 
-    thread.join
+    wait_for { received }
 
-    assert_equal({ "data" => true }, received)
+    assert_equal({ 'data' => true }, received)
 
   ensure
-    publisher and publisher.close
-    subscriber and subscriber.close
+    publisher and publisher.close(delete_queue: true)
+    subscriber and subscriber.close(delete_queue: true)
     client and client.close
   end
 end

data/test/unit/test_skein_client_worker.rb

@@ -11,8 +11,8 @@ class TestSkeinClientWorker < Test::Unit::TestCase
   end
 
   def test_example
-    worker = Skein::Client::Worker.new('test_rpc')
-    handler = Skein::Handler.for(worker)
+    worker = ErrorGenerator.new('test_rpc')
+    handler = worker.send(:handler)
 
     message = {
       method: 'ident',
@@ -20,12 +20,15 @@ class TestSkeinClientWorker < Test::Unit::TestCase
       id: '43d8352c-4907-4c32-9c81-fc34e91a3884'
     }
 
-    handler.handle(JSON.dump(message)) do |response_json, error|
+    metrics = worker.send(:metrics_tracker)
+    state = worker.send(:state_tracker)
+
+    handler.handle(JSON.dump(message), metrics, state) do |response_json, error|
       response = JSON.load(response_json)
 
       expected = {
+        'jsonrpc' => '2.0',
         'result' => worker.ident,
-        'error' => nil,
         'id' => message[:id]
       }
 
@@ -33,7 +36,7 @@ class TestSkeinClientWorker < Test::Unit::TestCase
     end
 
   ensure
-    worker and worker.close
+    worker and worker.close(delete_queue: true)
   end
 
   def test_throws_exception
@@ -45,17 +48,27 @@ class TestSkeinClientWorker < Test::Unit::TestCase
       id: '29fe8a40-fccf-43c6-ba48-818598c66e6f'
     }
 
-    handler.handle(JSON.dump(message)) do |response_json, error|
+    metrics = worker.send(:metrics_tracker)
+    state = worker.send(:state_tracker)
+
+    handler.handle(JSON.dump(message), metrics, state) do |response_json, error|
       expected = {
-        'result' => nil,
-        'error' => '[TestSkeinClientWorker::ErrorGenerator::CustomError] Example error!',
+        'jsonrpc' => '2.0',
+        'error' => {
+          'code' => -32063,
+          'message' => '[TestSkeinClientWorker::ErrorGenerator::CustomError] Example error!'
+        },
         'id' => message[:id]
       }
 
       assert_equal(expected.to_json, response_json)
+
+      assert_equal(1, metrics[:failed])
+      assert_equal(1, metrics[:errors][:exception])
+      assert(metrics[:time] >= 0, 'Time (%.3f) should be positive' % metrics[:time])
     end
 
   ensure
-    worker and worker.close
+    worker and worker.close(delete_queue: true)
   end
 end

data/test/unit/test_skein_connected.rb

@@ -0,0 +1,21 @@
+require_relative '../helper'
+
+class TestSkeinConnected < Test::Unit::TestCase
+  def test_construct_with_defaults
+    connected = Skein::Connected.new
+
+    assert connected
+
+    assert connected.context
+    assert connected.ident
+    assert connected.connection
+  end
+
+  def test_construct_with_ident
+    ident = ('test-%s' % SecureRandom.uuid).freeze
+    connected = Skein::Connected.new(ident: ident)
+
+    assert connected
+    assert_equal ident, connected.ident
+  end
+end

data/test/unit/test_skein_rpc_timeout.rb

@@ -0,0 +1,19 @@
+require_relative '../helper'
+
+class TestSkeinRpcTimeout< Test::Unit::TestCase
+  def test_low_timeout
+    assert_raise Skein::TimeoutException do
+      client = Skein::Client.new
+
+      result = client.rpc('', routing_key: "test", timeout: 0.1).test
+    end
+  end
+
+  def test_short_timeout
+    assert_raise Skein::TimeoutException do
+      client = Skein::Client.new
+
+      result = client.rpc('', routing_key: "test", timeout: 2).test
+    end
+  end
+end

data/test/unit/test_skein_worker.rb

@@ -19,6 +19,8 @@ class TestSkeinWorker < Test::Unit::TestCase
     assert_equal false, worker.async?
 
   ensure
+    worker and worker.close(delete_queue: true)
+
     client and client.close
   end
 
@@ -33,6 +35,8 @@ class TestSkeinWorker < Test::Unit::TestCase
     assert_equal true, worker.initialized
 
   ensure
+    worker and worker.close(delete_queue: true)
+
     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.7
+  version: 0.8.1
 platform: ruby
 authors:
 - Scott Tadman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: birling
@@ -16,9 +16,37 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: march_hare
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,6 +114,8 @@ files:
 - bin/skein
 - config/.gitignore
 - config/skein.yml.example
+- examples/echo
+- examples/echo-server
 - lib/skein.rb
 - lib/skein/adapter.rb
 - lib/skein/client.rb
@@ -101,27 +131,23 @@ files:
 - lib/skein/handler/threaded.rb
 - lib/skein/rabbitmq.rb
 - lib/skein/reporter.rb
-- lib/skein/rpc.rb
-- lib/skein/rpc/base.rb
-- lib/skein/rpc/error.rb
-- lib/skein/rpc/notification.rb
-- lib/skein/rpc/request.rb
-- lib/skein/rpc/response.rb
 - lib/skein/support.rb
+- lib/skein/timeout_queue.rb
 - skein.gemspec
 - test/data/sample_config.yml
 - test/helper.rb
 - test/script/em_example
 - test/unit/test_skein_client.rb
 - test/unit/test_skein_client_publisher.rb
+- test/unit/test_skein_client_rpc.rb
 - test/unit/test_skein_client_subscriber.rb
 - test/unit/test_skein_client_worker.rb
 - test/unit/test_skein_config.rb
+- test/unit/test_skein_connected.rb
 - test/unit/test_skein_context.rb
 - test/unit/test_skein_rabbitmq.rb
 - test/unit/test_skein_reporter.rb
-- test/unit/test_skein_rpc_error.rb
-- test/unit/test_skein_rpc_request.rb
+- test/unit/test_skein_rpc_timeout.rb
 - test/unit/test_skein_support.rb
 - test/unit/test_skein_worker.rb
 - tmp/.gitignore
@@ -129,7 +155,7 @@ homepage: http://github.com/postageapp/skein
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,9 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: RabbitMQ RPC/PubSub Library
 test_files: []

data/lib/skein/rpc/base.rb

@@ -1,23 +0,0 @@
-require 'json'
-
-class Skein::RPC::Base
-  # == Exceptions ===========================================================
-
-  # == Properties ===========================================================
-  
-  attr_accessor :id
-
-  # == Instance Methods =====================================================
-
-  def to_h
-    {
-      id: self.id
-    }
-  end
-
-  def to_json
-    JSON.dump(
-      self.to_h
-    )
-  end
-end

data/lib/skein/rpc/error.rb

@@ -1,34 +0,0 @@
-class Skein::RPC::Error < Skein::RPC::Base
-  # == Properties ===========================================================
-
-  attr_accessor :error
-
-  # == Instance Methods =====================================================
-
-  def initialize(content = nil)
-    case (content)
-    when String
-      self.error = content
-    when Hash
-      self.assign_from_hash!(content)
-    when nil
-      # Defaults
-    else
-      raise Skein::RPC::Exception, 'Invalid type: %s' % content.class
-    end
-  end
-
-  def self.to_h
-    {
-      result: nil,
-      error: self.error,
-      id: self.id
-    }
-  end
-
-protected
-  def assign_from_hash!(hash)
-    self.error = hash[:error]
-    self.id = hash[:id]
-  end
-end

data/lib/skein/rpc/notification.rb

@@ -1,2 +0,0 @@
-class Skein::RPC::Notification < Skein::RPC::Base
-end

data/lib/skein/rpc/request.rb

@@ -1,62 +0,0 @@
-class Skein::RPC::Request < Skein::RPC::Base
-  # == Properties ===========================================================
-
-  attr_accessor :method
-  attr_accessor :params
-
-  # == Instance Methods =====================================================
-
-  def initialize(content = nil)
-    case (content)
-    when String
-      data = Skein::Support.symbolize_keys(JSON.load(content))
-
-      assign_from_hash!(data)
-    when Hash
-      assign_from_hash!(content)
-    when nil
-      self.id = SecureRandom.uuid
-    else
-      raise Skein::RPC::InvalidPayload, 'Invalid payload type: %s' % content.class
-    end
-  end
-
-  def to_h
-    {
-      method: self.method,
-      params: self.params,
-      id: self.id
-    }
-  end
-
-  def response(result: nil, error: nil)
-    if (result)
-      Skein::RPC::Response.new(
-        result: result,
-        id: self.id
-      )
-    elsif (error)
-      Skein::RPC::Error.new(
-        error: error,
-        id: self.id
-      )
-    end
-  end
-
-protected
-  def assign_from_hash!(hash)
-    self.method = hash[:method]
-    self.params = Skein::Support.arrayify(hash[:params])
-    self.id = hash[:id]
-
-    case (self.method)
-    when String
-      unless (self.method.match(/\A\w+\z/))
-        e = Skein::RPC::InvalidMethod.new('%s is not a valid RPC method name.' % self.method.inspect)
-        e.request = self
-
-        raise e
-      end
-    end
-  end
-end