cotton-tail 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 162f785a8c6f03379f26cc784a5c4a8e28a831d1f1b1145452addb16532f04c2
-  data.tar.gz: b5336ab860aafca2a2a15d9c6bc75aff74155bf43ee47948b2ea46688f805cdf
+  metadata.gz: e850fbee254829b5680d9ef8b653f7112d839340070c63133e1615d02a2717d8
+  data.tar.gz: bcf0010028eb6b98a227764f951b5a9b2d50a0b1cc0beface95838295dfbee48
 SHA512:
-  metadata.gz: 1e95e2b691fbfe5ebdbc39b857fd26912015b7b8b74a0a7820540a2b5ab957ad437c06c235149cf7e8bbdadd4634007ce4ce83fc07c7e193c8996d0f71ea3e0f
-  data.tar.gz: 21e79d79373570d5d1371d29de75e0e918060f63c0877439bdf9da23ef030ccc85009d68d0f148c585e253a09a95d6dbd6f1a620b6cb67d94bbde1e0dd16df6e
+  metadata.gz: 9fff4b3fec0934022cd1255e95557f9fd7e0be9011a91affcb30be960b8e5ff84c149f83ab7bc047a13909999292f57f51b32b31271c888820176e0f22ea854a
+  data.tar.gz: f5a658bbb3f3473fc9aac6331f76c435aa0cc297a5be6dbe783972ae895761b54eac3c5577b2d23ab6f7e4d46c6bdb62baf6fd8a57113cbf29f9022ad32420aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cotton-tail (0.3.0)
+    cotton-tail (0.4.0)
       bunny (~> 2.12)
       ibsciss-middleware (~> 0.4.2)
 

data/examples/app.rb

@@ -20,30 +20,22 @@ app.routes.draw do
       puts 'Goodbye cruel world!'
     end
 
-    handle 'inspect.message' do |env, routing_key, delivery_info, properties, payload|
+    handle 'inspect.message' do |env, request, response|
       puts env: env
-      puts routing_key: routing_key
-      puts delivery_info: delivery_info
-      puts properties: properties
-      puts payload: payload
+      puts request: request
+      puts response: response
     end
   end
 
   queue 'require_ack_queue', exclusive: true, manual_ack: true do
-    handle 'get.acked' do |_env, _routing_key, delivery_info, _properties, _message|
-      delivery_tag = delivery_info[:delivery_tag]
-      puts "acking with #{delivery_tag}"
-
-      ch = delivery_info[:channel]
-      ch.ack(delivery_tag)
+    handle 'get.acked' do |_env, request, _response|
+      puts "acking with #{request.delivery_tag}"
+      request.channel.ack(request.delivery_tag)
     end
 
-    handle 'get.nacked' do |_env, _routing_key, delivery_info, _properties, _message|
-      delivery_tag = delivery_info[:delivery_tag]
-      puts "nacking with #{delivery_tag}"
-
-      ch = delivery_info[:channel]
-      ch.nack(delivery_tag)
+    handle 'get.nacked' do |_env, request, _response|
+      puts "nacking with #{request.delivery_tag}"
+      request.channel.nack(request.delivery_tag)
     end
   end
 end

data/examples/app_with_middleware.rb

@@ -6,10 +6,20 @@ require 'cotton_tail'
 
 app = CottonTail::App.new
 
-app.config.middleware do |_b|
+upcase = lambda { |(env, req, res)|
+  [env, req, CottonTail::Response.new(res.body.upcase)]
+}
+
+print = lambda { |(env, req, res)|
+  puts res.body
+  [env, req, res]
+}
+
+app.config.middleware do |d|
   # This is added to the end of the middleware stack
   # 'message' is the return value of the handlers defined below
-  d.use ->(message) { puts message.upcase }
+  d.use upcase
+  d.use print
 end
 
 app.routes.draw do

data/lib/cotton_tail/app.rb

@@ -3,15 +3,18 @@
 module CottonTail
   # App is the main class for a CottonTail server
   class App
-    attr_reader :env, :config
+    attr_reader :env
 
-    def initialize(queue_strategy: Queue::Bunny, env: {}, connection: Bunny.new, config: Configuration.new)
+    def initialize(queue_strategy: Queue::Bunny, env: {}, connection: Bunny.new)
       @dependencies = { queue_strategy: queue_strategy, connection: connection }
       @env = env
-      @config = config
       @connection = connection.start
     end
 
+    def config
+      @config ||= Configuration.new(middleware: Middleware.default_stack(self))
+    end
+
     def queues
       routes.queues
     end

data/lib/cotton_tail/configuration.rb

@@ -7,9 +7,9 @@ module CottonTail
   class Configuration
     attr_reader :connection_args
 
-    def initialize
+    def initialize(middleware: nil)
       @connection_args = nil
-      @middleware = Middleware::DEFAULT_STACK
+      @middleware = middleware
       @user_configs = {}
     end
 
@@ -29,7 +29,7 @@ module CottonTail
       return @middleware unless block_given?
 
       @middleware = ::Middleware::Builder.new do |b|
-        b.use @middleware
+        b.use @middleware if @middleware
         yield b
       end
     end

data/lib/cotton_tail/middleware/router.rb

@@ -4,29 +4,26 @@ module CottonTail
   module Middleware
     # Router Middleware
     class Router
-      def initialize(app)
+      attr_reader :handlers
+
+      def initialize(app, handlers:)
         @app = app
+        @handlers = handlers
       end
 
-      def call(request)
-        message = parse(request)
-        request.shift
-        request.unshift message.app.env
-        @app.call handler(message.app, message.routing_key).call(request)
+      def call(message)
+        env, req, = message
+        @app.call [env, req, response(req.routing_key, message)]
       end
 
       private
 
-      def handler(app, route)
-        handlers(app).fetch(route) { raise UndefinedRouteError }
-      end
-
-      def parse(msg)
-        Message.new(*msg)
+      def handler(route)
+        handlers.fetch(route) { raise UndefinedRouteError }
       end
 
-      def handlers(app)
-        app.routes.handlers
+      def response(routing_key, message)
+        CottonTail::Response.new handler(routing_key).call(message)
       end
     end
   end

data/lib/cotton_tail/middleware.rb

@@ -8,8 +8,10 @@ module CottonTail
   module Middleware
     autoload :Router, 'cotton_tail/middleware/router'
 
-    DEFAULT_STACK = ::Middleware::Builder.new do |b|
-      b.use Router
+    def self.default_stack(app)
+      ::Middleware::Builder.new do |b|
+        b.use Router, handlers: app.routes.handlers
+      end
     end
   end
 end

data/lib/cotton_tail/queue/bunny.rb

@@ -24,15 +24,13 @@ module CottonTail
         watch_source manual_ack
       end
 
-      def push(args)
-        routing_key, message = args
-        bind routing_key
-        exchange.publish message, routing_key: routing_key
+      def push(request)
+        bind request.routing_key
+        exchange.publish request.payload, routing_key: request.routing_key
       end
 
       def pop
-        delivery_info, *tail = super
-        [delivery_info[:routing_key], delivery_info, *tail]
+        Request.new(*super)
       end
 
       def bind(routing_key)

data/lib/cotton_tail/queue/reader.rb

@@ -28,13 +28,17 @@ module CottonTail
       private
 
       def call_next
-        args = fiber.resume
-        middleware.call([@app, *args]) if args
+        request = fiber.resume
+        middleware.call([env, request, Response.new]) if request
       end
 
       def middleware
         @app.config.middleware
       end
+
+      def env
+        @app.env
+      end
     end
   end
 end

data/lib/cotton_tail/version.rb

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

data/lib/cotton_tail.rb

@@ -12,10 +12,21 @@ module CottonTail
   autoload :Router, 'cotton_tail/router'
   autoload :Version, 'cotton_tail/version'
 
-  # Message is a struct for working with the messages that are passed through
-  # the middleware stack.
-  Message = Struct.new(:app, :routing_key, :delivery_info, :properties,
-                       :payload)
+  Request = Struct.new(:delivery_info, :properties, :payload) do
+    def routing_key
+      delivery_info[:routing_key]
+    end
+
+    def delivery_tag
+      delivery_info[:delivery_tag]
+    end
+
+    def channel
+      delivery_info[:channel]
+    end
+  end
+
+  Response = Struct.new(:body)
 
   class UndefinedRouteError < StandardError
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cotton-tail
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Brennan
@@ -30,7 +30,7 @@ cert_chain:
   fXe/xr/Sc+2wCjHPVE2J+auN5hk3KCp1I4s2fKqyLIwyhTEF3shuYfCpC8rt/YdN
   cy9/lg5LCI3OvakzxL4Xt1Sq4h/xJZ06ydTVJ1wxfk6BXHrg
   -----END CERTIFICATE-----
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny

metadata.gz.sig

@@ -1,2 +1,2 @@
-�E�}�Lv�k2E��#	ͬ
-����Ԉ�v�j%U�D�Rh�W'��iP��u�j��"t�P�()oO��ژ������ZL��t׳�Iɯ��B��c_D���x�u����*P�%����-j��v�X40��������޷�hݷ�U�ǻao�Ń�%�
+L���w�T�>+�Xd��g��S�c�Gܤ̧��W�15��/��t���]DkZ�
O�f��
+�=���`�XD���`�~Z-����x��b�7C��`n0z�]�Q�'��=`V>B�i���x��_��q��>$*���Y�"m