fluffle 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77c72df240211039c526d501f7f34af3bb36330c
-  data.tar.gz: f71668dca91239e6b211be0239d43f5a72dd51d4
+  metadata.gz: a7267d1c8c0b56d933eb3e755e15541901aa4a5f
+  data.tar.gz: 0413ba9a5100acd9dbfef940c61f18ef8df4d0d6
 SHA512:
-  metadata.gz: e195c331ce7a3817cef21c76f05f2253b46929b1355b4fad38c617c2b15ab53c7b05ff74c2a9c4296bf0ca5d375a0598b6c9bfcd5f19392595c00edb8dc25997
-  data.tar.gz: d1c08745886f2031b8582890b1e28f09783e66b9f93d45e176b3707d8cb6012eabd46d70967bd2c58149b0d9007cc65c38f36949cfda72d15296660a42211e97
+  metadata.gz: 04044d6fab23dc039b32b1fba003f18c070c77d07eddb1785de5b44296af97299f99d9e48eb8d189e719c9316bbe8dd7dd1e20f9d2ff2318287ebde5aae19157
+  data.tar.gz: 9bea8e8e0029b92eb4f97cc56b4ca1f8612627ab88a6bb95cbea524a9cacaabd3c71c181677f675292594941af2ec0b2130a32dd1caa162880c4679ef0ed4629

data/examples/testing.rb

@@ -0,0 +1,23 @@
+lib = File.join File.dirname(__FILE__), '..', 'lib'
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'fluffle'
+require 'fluffle/testing'
+
+server = Fluffle::Server.new url: 'amqp://localhost'
+
+server.drain do |dispatcher|
+  dispatcher.handle('foo') { 'bar' }
+end
+
+server.start
+
+client = Fluffle::Client.new url: 'amqp://localhost'
+
+timings = 10.times.map do
+  t0 = Time.now
+  client.call('foo').inspect
+  Time.now - t0
+end
+
+puts timings

data/lib/fluffle/client.rb

@@ -83,16 +83,22 @@ module Fluffle
       end
     end
 
-    protected
-
     # Publish a payload to the server and wait (block) for the response
     #
-    # Returns a Hash from the parsed JSON response from the server
+    # It creates an `IVar` future for the response, stores that in
+    # `@pending_responses`, and then publishes the payload to the server.
+    # After publishing it waits for the `IVar` to be set with the response.
+    # It also clears that `IVar` if it times out to avoid leaking.
+    #
+    # Returns a Hash from the JSON response from the server
     # Raises TimeoutError if server failed to respond in time
     def publish_and_wait(payload, queue:, timeout:)
       id = payload['id']
 
-      ivar = self.publish payload, queue: queue
+      ivar = Concurrent::IVar.new
+      @pending_responses[id] = ivar
+
+      self.publish payload, queue: queue
 
       response = ivar.value timeout
 
@@ -108,27 +114,18 @@ module Fluffle
       @pending_responses.delete id
     end
 
-    # Create an `IVar` future for the response, store that in
-    # `@pending_responses`, and finally publish the payload to the server
-    #
-    # Returns the `IVar`
     def publish(payload, queue:)
-      id = payload['id']
-
       opts = {
         routing_key: Fluffle.request_queue_name(queue),
-        correlation_id: id,
+        correlation_id: payload['id'],
         reply_to: @reply_queue.name
       }
 
-      ivar = Concurrent::IVar.new
-      @pending_responses[id] = ivar
-
       @exchange.publish Oj.dump(payload), opts
-
-      ivar
     end
 
+    protected
+
     def random_bytes_as_hex(bytes)
       # Adapted from `SecureRandom.hex`
       @prng.bytes(bytes).unpack('H*')[0]

data/lib/fluffle/server.rb

@@ -1,8 +1,6 @@
 module Fluffle
   class Server
-    class << self
-      attr_accessor :default_server
-    end
+    include Connectable
 
     attr_reader :connection, :handlers
 
@@ -15,15 +13,8 @@ module Fluffle
       self.class.default_server ||= self
     end
 
-    def connect(*args)
-      self.stop if self.connected?
-
-      @connection = Bunny.new *args
-      @connection.start
-    end
-
-    def connected?
-      @connection&.connected?
+    class << self
+      attr_accessor :default_server
     end
 
     def drain(queue: 'default', handler: nil, &block)

data/lib/fluffle/testing.rb

@@ -0,0 +1,134 @@
+require 'concurrent'
+
+module Fluffle
+  module Testing
+    # Patch in a new `#connect` method that injects the loopback
+    module Connectable
+      def self.included(klass)
+        klass.class_eval do
+          alias_method :original_connect, :connect
+
+          def connect(*args)
+            @connection = Loopback.instance.connection
+          end
+        end
+      end
+    end
+
+    def self.inject_connectable
+      [Fluffle::Client, Fluffle::Server].each do |mod|
+        mod.include Connectable
+      end
+    end
+
+    # Fake RabbitMQ server presented through a subset of the `Bunny`
+    # library's interface
+    class Loopback
+      # Singleton server instance that lives in the process
+      def self.instance
+        @instance ||= self.new
+      end
+
+      def initialize
+        @queues = Concurrent::Map.new
+      end
+
+      def connection
+        Connection.new self
+      end
+
+      def add_queue_subscriber(queue_name, block)
+        subscribers = (@queues[queue_name] ||= Concurrent::Array.new)
+
+        subscribers << block
+      end
+
+      def publish(payload, opts)
+        queue_name = opts[:routing_key]
+        raise "Missing `:routing_key' in `#publish' opts" unless queue_name
+
+        delivery_info = nil
+
+        properties = {
+          reply_to: opts[:reply_to],
+          correlation_id: opts[:correlation_id]
+        }
+
+        subscribers = @queues[queue_name]
+
+        if subscribers.nil? || subscribers.empty?
+          $stderr.puts "No subscribers active for queue '#{queue_name}'"
+          return nil
+        end
+
+        subscribers.each do |subscriber|
+          Thread.new do
+            subscriber.call(delivery_info, properties, payload)
+          end
+        end
+      end
+
+      class Connection
+        def initialize(server)
+          @server = server
+        end
+
+        def create_channel
+          Channel.new(@server)
+        end
+      end
+
+      class Channel
+        def initialize(server)
+          @server = server
+        end
+
+        def default_exchange
+          @default_exchange ||= Exchange.new(@server)
+        end
+
+        def work_pool
+          @work_pool ||= WorkPool.new
+        end
+
+        def queue(name, **opts)
+          opts = opts.merge server: @server
+
+          Queue.new name, opts
+        end
+      end
+
+      class Exchange
+        def initialize(server)
+          @server = server
+        end
+
+        def publish(payload, opts)
+          @server.publish(payload, opts)
+        end
+      end
+
+      class Queue
+        attr_reader :name
+
+        def initialize(name, server:, **opts)
+          @name   = name
+          @server = server
+        end
+
+        def subscribe(&block)
+          @server.add_queue_subscriber @name, block
+        end
+      end
+
+      class WorkPool
+        # No-op in testing
+        def join
+        end
+      end
+
+    end # class LoopbackServer
+  end # module Testing
+end # module Fluffle
+
+Fluffle::Testing.inject_connectable

data/lib/fluffle/version.rb

@@ -1,3 +1,3 @@
 module Fluffle
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluffle
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Dirk Gadsden
@@ -123,6 +123,7 @@ files:
 - Rakefile
 - examples/client.rb
 - examples/server.rb
+- examples/testing.rb
 - fluffle.gemspec
 - fluffle.jpg
 - lib/fluffle.rb
@@ -133,6 +134,7 @@ files:
 - lib/fluffle/handlers/delegator.rb
 - lib/fluffle/handlers/dispatcher.rb
 - lib/fluffle/server.rb
+- lib/fluffle/testing.rb
 - lib/fluffle/version.rb
 - spec/client_spec.rb
 - spec/server_spec.rb