ears 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c122db057142136f9cbd1a20760711e0391494df1fa4d57eec4182ad5f748903
-  data.tar.gz: 92301abc303c0623cdcf33a24b20923a86514c3c3cbf0fff6515bdaecd66fd47
+  metadata.gz: 8d16a56d89359232938fc2e04641e7db0f45440bd6cee7770b8e7d0be30fb014
+  data.tar.gz: fd3f8ce9db2ec52e646593b57c0f0b868d13fc5edb09c66e4ee7f345e49cd605
 SHA512:
-  metadata.gz: b32705e3c3a137514451440dc8e151ab2181f938f7e772a47d698f7bec115165b8a7c867a163cbd1f6507f0b200fba070babd1d31ece9a3571f764eab6b27830
-  data.tar.gz: 606693da62fc02b53efcde24be5b92ed0eafd10a83795cc8fd08c56cfa0f496bdbacad8b7350fddfa3080e87982307567c994bae5c3aab04b8ebc4766b3b592d
+  metadata.gz: d36a71c0a123865108370bdfa167a33128331b35626556794becb972b4ead16368df897f4cb6c998926c5b353e095580a67f7687cc111a2f54c2c80f84b10fb9
+  data.tar.gz: 8ed9d81e0da9cc807f15a81faf72dc88763e0482d31db53fc0f8b720be032bb3ccc657e5caa03bbefdf1816e2b69dd069230f2ac6a223cb56814c4237ee3d8f9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.1 (2021-05-07)
+
+### Changes
+
+- internally, user-defined `Ears::Consumer` instances are now wrapped by `Ears::ConsumerWrapper` to make the user-defined class smaller and easier to test
+
 ## 0.3.0 (2021-05-07)
 
 ### Breaking

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ears (0.3.0)
+    ears (0.3.1)
       bunny
       multi_json
 

data/lib/ears/consumer.rb

@@ -1,7 +1,7 @@
 require 'bunny'
 
 module Ears
-  class Consumer < Bunny::Consumer
+  class Consumer
     class InvalidReturnError < StandardError
       def initialize(value)
         super(
@@ -49,7 +49,7 @@ module Ears
     def work_proc
       ->(delivery_info, metadata, payload) do
         work(delivery_info, metadata, payload).tap do |result|
-          process_result(result, delivery_info.delivery_tag)
+          verify_result(result)
         end
       end
     end
@@ -60,15 +60,8 @@ module Ears
       end
     end
 
-    def process_result(result, delivery_tag)
-      case result
-      when :ack
-        channel.ack(delivery_tag, false)
-      when :reject
-        channel.reject(delivery_tag)
-      when :requeue
-        channel.reject(delivery_tag, true)
-      else
+    def verify_result(result)
+      unless %i[ack reject requeue].include?(result)
         raise InvalidReturnError, result
       end
     end

data/lib/ears/consumer_wrapper.rb

@@ -0,0 +1,33 @@
+require 'bunny'
+
+module Ears
+  class ConsumerWrapper < Bunny::Consumer
+    def initialize(consumer, channel, queue, consumer_tag, arguments = {})
+      @consumer = consumer
+      super(channel, queue, consumer_tag, false, false, arguments)
+    end
+
+    def process_delivery(delivery_info, metadata, payload)
+      consumer
+        .process_delivery(delivery_info, metadata, payload)
+        .tap { |result| process_result(result, delivery_info.delivery_tag) }
+    end
+
+    private
+
+    attr_reader :consumer
+
+    def process_result(result, delivery_tag)
+      case result
+      when :ack
+        channel.ack(delivery_tag, false)
+      when :reject
+        channel.reject(delivery_tag)
+      when :requeue
+        channel.reject(delivery_tag, true)
+      else
+        raise InvalidReturnError, result
+      end
+    end
+  end
+end

data/lib/ears/setup.rb

@@ -1,5 +1,6 @@
 require 'bunny'
 require 'ears/consumer'
+require 'ears/consumer_wrapper'
 
 module Ears
   class Setup
@@ -27,12 +28,11 @@ module Ears
     private
 
     def create_consumer(queue, consumer_class, args, number)
-      consumer_class.new(
+      ConsumerWrapper.new(
+        consumer_class.new,
         queue.channel,
         queue,
         "#{consumer_class.name}-#{number}",
-        false,
-        false,
         args,
       )
     end

data/lib/ears/version.rb

@@ -1,3 +1,3 @@
 module Ears
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ears
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mario Mainz
@@ -131,6 +131,7 @@ files:
 - lib/ears.rb
 - lib/ears/configuration.rb
 - lib/ears/consumer.rb
+- lib/ears/consumer_wrapper.rb
 - lib/ears/middlewares/appsignal.rb
 - lib/ears/middlewares/json.rb
 - lib/ears/setup.rb