cotton-tail 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c184ea6b32368cff0639ab825a050dc42e3f8f88d0f56a66d2196deb0585ff0
-  data.tar.gz: e92242ed3918475fbd3de0b15a05978b5c5f3eefe31f8661b51bfc8c70271193
+  metadata.gz: b08350ef7f0bcfc64c8c78ce7728a137c2d66a67b72052493c4946680f40178a
+  data.tar.gz: 32fab7c085c98cc66bbabedfcc23d9e574a7f4c5097c733813b73d30a26866c0
 SHA512:
-  metadata.gz: 59773b7a58f66520f4ce9214e19e9f6ac2ba68cec669b589d77c4c1731bc6fe528bbfab62adf8eed3ef74b64dff9e829747bfbd35da511d5bf605b6e082d0d2e
-  data.tar.gz: 4836be3bef0422446e297b24c7c6643aeeb0e979995b5a06609f7e28b01ff0cc67b51b4fbf65e6b94559d8f379630f8f6ae01b2eed8518903f8103bd9bcc2252
+  metadata.gz: eb8aabeeb45a3c4d81a177808cfb05dea3e248edc6308ccbf19acb8e380b750144f36884931cd1c0ac67b0581353d708f23957f390db748926e868602c7393e3
+  data.tar.gz: 037abfc33e2530440cca0456e92123daf2d26f4d0ddf0f7f30659a8d61d5203e9b7b97230a52488c59864f3d0cfe653cafa8c794c3df45bbd3fae8367fbd6a67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cotton-tail (0.1.2)
+    cotton-tail (0.2.0)
       bunny (~> 2.12)
 
 GEM

data/README.md

@@ -1,6 +1,9 @@
 # CottonTail
 
-CottonTail provides a simple DSL for consuming messages from a RabbitMQ server
+CottonTail provides a simple DSL for consuming messages from a RabbitMQ server.
+
+This gem is in early development. The API will be unstable until the 1.0.0
+release.
 
 ## Installation
 

data/cotton-tail.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|integration)/})
   end
 
-  spec.bindir        = 'exe'
+  spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 

data/lib/cotton_tail/app.rb

@@ -35,7 +35,7 @@ module CottonTail
       supervisors.map(&:start)
       puts 'Waiting for messages ...'
 
-      sleep 0.005 while running?
+      sleep 0.01 while running?
     end
 
     private

data/lib/cotton_tail/configuration.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module CottonTail
+  # Configuration options
+  class Configuration
+    attr_reader :connection_args
+
+    def initialize
+      @connection_args = nil
+    end
+
+    def connection_args=(*args, **kwargs)
+      url, = args
+      @connection_args = url ? Bunny::Session.parse_uri(url) : kwargs
+    end
+  end
+end

data/lib/cotton_tail/queue/bunny.rb

@@ -1,47 +1,65 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+require 'bunny'
+
 module CottonTail
   module Queue
     # A wrapper around a ::Bunny::Queue that makes it interchangeable with a
-    # standard Ruby::Queue
-    class Bunny
+    # standard Ruby Queue
+    class Bunny < SimpleDelegator
+      extend Forwardable
+
       def self.call(name:, **opts)
         new(name, **opts)
       end
 
-      def initialize(name, conn: Connection.new, prefetch: 1, manual_ack: false, **opts)
+      def initialize(name, manual_ack: false, **opts)
+        super ::Queue.new
+
         @name = name
-        @prefetch = prefetch
-        @conn = conn
-        @queue = conn.queue(@name, **opts)
-        @messages = ::Queue.new
-        @queue.subscribe(manual_ack: manual_ack) { |*args| @messages << args }
-      end
+        @source_opts = opts
 
-      def bind(routing_key)
-        @queue.bind('amq.topic', routing_key: routing_key)
+        watch_source manual_ack
       end
 
       def push(args)
         routing_key, message = args
-        @conn.publish message, routing_key: routing_key
+        bind routing_key
+        exchange.publish message, routing_key: routing_key
+      end
+
+      def pop
+        delivery_info, *tail = super
+        [delivery_info[:routing_key], delivery_info, *tail]
       end
 
-      def close
-        @messages.close
+      private
+
+      def_delegator :'CottonTail.configuration', :connection_args
+
+      def bind(routing_key)
+        source.bind('amq.topic', routing_key: routing_key)
       end
 
-      def closed?
-        @messages.closed?
+      def watch_source(manual_ack)
+        source.subscribe(manual_ack: manual_ack) { |*args| self << args }
       end
 
-      def empty?
-        @messages.empty?
+      def connection
+        @connection ||= ::Bunny.new(*connection_args).start
       end
 
-      def pop
-        delivery_info, *tail = @messages.pop
-        [delivery_info[:routing_key], delivery_info, *tail, conn: @conn]
+      def source
+        @source ||= channel.queue(@name, **@source_opts)
+      end
+
+      def channel
+        @channel ||= connection.create_channel
+      end
+
+      def exchange
+        @exchange ||= channel.exchange('amq.topic')
       end
     end
   end

data/lib/cotton_tail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CottonTail
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/cotton_tail.rb

@@ -1,10 +1,25 @@
 # frozen_string_literal: true
 
+require 'bunny'
+
 # Top level namespace for CottonTail
 module CottonTail
   autoload :App, 'cotton_tail/app'
+  autoload :Configuration, 'cotton_tail/configuration'
   autoload :DSL, 'cotton_tail/dsl'
   autoload :Queue, 'cotton_tail/queue'
   autoload :Router, 'cotton_tail/router'
   autoload :Version, 'cotton_tail/version'
+
+  class << self
+    def configure
+      return configuration unless block_given?
+
+      yield configuration
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+  end
 end

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�`�HI���pK�2���B�}��Q]�AZL�L����a��:e�҃ڛ�����;"�8d�$�e0��\G�vv
-�(�bG��׏c
�"��:my7�#��K��#v+��nZ�ԛ�O�6�F��{RXc��8�iz*�W��8���j��!�C�l�8h��%��M�g6�y���ʯ�Q��|���
+|*/B�eE��;#����AD��Y*��RnA�j����q��4
yo�9Oc�*Aң.&�n��N�4��կ���Lo�����R���LW�Q�^���dq����J$�n��q�?B����Hk
���
+�4U�������+�]�m~j��H

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: cotton-tail
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Brennan
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -30,7 +30,7 @@ cert_chain:
   fXe/xr/Sc+2wCjHPVE2J+auN5hk3KCp1I4s2fKqyLIwyhTEF3shuYfCpC8rt/YdN
   cy9/lg5LCI3OvakzxL4Xt1Sq4h/xJZ06ydTVJ1wxfk6BXHrg
   -----END CERTIFICATE-----
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -176,13 +176,13 @@ files:
 - examples/messages/say.hello
 - lib/cotton_tail.rb
 - lib/cotton_tail/app.rb
+- lib/cotton_tail/configuration.rb
 - lib/cotton_tail/dsl.rb
 - lib/cotton_tail/dsl/app.rb
 - lib/cotton_tail/dsl/queue.rb
 - lib/cotton_tail/dsl/topic.rb
 - lib/cotton_tail/queue.rb
 - lib/cotton_tail/queue/bunny.rb
-- lib/cotton_tail/queue/connection.rb
 - lib/cotton_tail/queue/memory.rb
 - lib/cotton_tail/queue/reader.rb
 - lib/cotton_tail/queue/supervisor.rb

data/lib/cotton_tail/queue/connection.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-require 'bunny'
-
-module CottonTail
-  module Queue
-    # Wrapper for Bunny::Session
-    class Connection
-      extend Forwardable
-
-      def initialize(url = ENV.fetch('AMQP_ADDRESS', 'amqp://localhost:5672'))
-        @url = url
-      end
-
-      def chan(prefetch = 1)
-        @channels ||= Hash.new do |h, key|
-          h[key] = session.create_channel.tap do |ch|
-            ch.prefetch(prefetch)
-          end
-        end
-        @channels[prefetch]
-      end
-
-      def exchange
-        @exchange ||= chan.exchange('amq.topic')
-      end
-
-      def session
-        @session ||= ::Bunny.new(@url).tap(&:start)
-      end
-
-      def_delegators :chan, :ack, :nack, :queue
-      def_delegators :exchange, :publish
-    end
-  end
-end