freddy 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b88342f4abad123fd8c0d118482a9b4337d2456b
-  data.tar.gz: 7c951d5e3a6256216aedc40618ecf72ba13f2e1e
+SHA256:
+  metadata.gz: c2c342119c1a4c330673258a8c5dbeb5d33ea15bc06ddbe261e1cfb8485829fe
+  data.tar.gz: a66de9b5b4f97ff58e1f8a321daa5846526a68c41fb4d7e4121d0c90fed55101
 SHA512:
-  metadata.gz: 464832871f2743a4af000d6a37e65e0f1058c0f1e0b06714b273b481fc9c90c09ff35c7199fb083c3a959944cf194a7e5744aabc30aaddf8815037be2f1627d2
-  data.tar.gz: 4945d3dd2d281746ce4a239aa2fd48a5bb92fe097a0773ba584b13d2252381743813ec4c579c2f23b58ff2f4d74e2f04cae763f74bec1f971c2acf4cb117ab28
+  metadata.gz: fa9f61272f5f792c2e944ad39d2604693a14950d0a7bef43f3fcba8d3865ce0ff992877bc27427d66aa29314e1b6ae1fc6acde15e1f513169fbe49a1cc1c496a
+  data.tar.gz: '0678e4121e3eaaa5669d5d5ef4963c91a31ace9f605ecaf1050136f98a3df1c3b6e24b6709e5abaed8b530c21f89695b18d6ed7c5ab7f6543e47e254abd01b18'

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
               else
                 'freddy'
               end
-  spec.version       = '1.5.0'
+  spec.version       = '1.6.0'
   spec.authors       = ['Salemove TechMovers']
   spec.email         = ['techmovers@salemove.com']
   spec.description   = 'Messaging API'

data/lib/freddy/adapters/bunny_adapter.rb

@@ -34,7 +34,7 @@ class Freddy
           @channel = channel
         end
 
-        def_delegators :@channel, :topic, :default_exchange, :consumers, :acknowledge
+        def_delegators :@channel, :topic, :default_exchange, :consumers, :acknowledge, :reject
 
         def queue(*args)
           Queue.new(@channel.queue(*args))

data/lib/freddy/adapters/march_hare_adapter.rb

@@ -33,7 +33,7 @@ class Freddy
           @channel = channel
         end
 
-        def_delegators :@channel, :topic, :default_exchange, :consumers, :acknowledge
+        def_delegators :@channel, :topic, :default_exchange, :consumers, :acknowledge, :reject
 
         def queue(*args)
           Queue.new(@channel.queue(*args))

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -12,6 +12,8 @@ class Freddy
         @pattern = pattern
         @channel = channel
         @options = options
+
+        raise 'Do not use durable queues without specifying a group' if durable? && !group
       end
 
       def consume(&block)
@@ -28,11 +30,10 @@ class Freddy
 
       def create_queue
         topic_exchange = @channel.topic(Freddy::FREDDY_TOPIC_EXCHANGE_NAME)
-        group = @options.fetch(:group, nil)
 
         if group
           @channel
-            .queue("groups.#{group}")
+            .queue("groups.#{group}", durable: durable?)
             .bind(topic_exchange, routing_key: @pattern)
         else
           @channel
@@ -54,12 +55,36 @@ class Freddy
                                          force_follows_from: true)
 
             yield delivery.payload, delivery.routing_key
+
+            @channel.acknowledge(delivery.tag)
+          rescue StandardError
+            case on_exception
+            when :reject
+              @channel.reject(delivery.tag)
+            when :requeue
+              @channel.reject(delivery.tag, true)
+            else
+              @channel.acknowledge(delivery.tag)
+            end
+
+            raise
           ensure
-            @channel.acknowledge(delivery.tag, false)
             scope.close
           end
         end
       end
+
+      def group
+        @options.fetch(:group, nil)
+      end
+
+      def durable?
+        @options.fetch(:durable, false)
+      end
+
+      def on_exception
+        @options.fetch(:on_exception, :ack)
+      end
     end
   end
 end

data/lib/freddy.rb

@@ -111,6 +111,15 @@ class Freddy
   # @option options [String] :group
   #   only one of the listeners in given group will receive a message. All
   #   listeners will receive a message if the group is not specified.
+  # @option options [Boolean] :durable
+  #   Should the consumer queue be durable? Default is `false`. This option can
+  #   be used only in combination with option `:group`.
+  # @option options [Boolean] :on_exception
+  #   Defines consumer's behaviour when the callback fails to process a message
+  #   and raises an exception. Can be one of `:ack`, `:reject` or `:requeue`.
+  #   `:ack` simply acknowledges the message and re-raises the exception. `:reject`
+  #   rejects the message without requeueing it. `:requeue` rejects the message with
+  #   `requeue` flag.
   #
   # @yield [message] Yields received message to the block
   #

data/spec/integration/tap_into_with_group_spec.rb

@@ -10,6 +10,11 @@ describe 'Tapping into with group identifier' do
 
   after { [deliverer, responder1, responder2].each(&:close) }
 
+  it 'raises an exception if option :durable is provided without group' do
+    expect { responder1.tap_into(destination, durable: true) }
+      .to raise_error(RuntimeError)
+  end
+
   it 'receives a message once' do
     msg_counter = Hamster::MutableSet[]
 
@@ -21,4 +26,18 @@ describe 'Tapping into with group identifier' do
     default_sleep
     expect(msg_counter.count).to eq(1)
   end
+
+  it 'can requeue message on exception' do
+    counter = 0
+
+    responder1.tap_into(destination, group: arbitrary_id, on_exception: :requeue) do
+      counter += 1
+      raise 'error' if counter == 1
+    end
+
+    deliverer.deliver(destination, {})
+
+    wait_for { counter == 2 }
+    expect(counter).to eq(2)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Salemove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response