fastly_nsq 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9571195fbffa3a39f6492fc49347bd85c1bfaac
-  data.tar.gz: 90ca9fe5c3e90bcf601d6c6eace43dfa8ebd0b05
+  metadata.gz: 3c2224ce762e2487411032220c774087ec93f288
+  data.tar.gz: c6b22724957b8d1cc9233f07c89a5b3ff0cd765e
 SHA512:
-  metadata.gz: 083ea4782ca2fbae00c977a8df145eb2aedceeab334e465fb8d76313582121bb2ee0aab174b96a12f64d012866e5be392ab67507d23428a5da30952cc3c7577a
-  data.tar.gz: 07a6dcdeb0ae6cd14750a3b9556beaac9937452ca329f895315d1915da2ff1f26638cb3e5cd67cb97e3a22b376506de7cd38f788449ae20ba2c96f9ea136e659
+  metadata.gz: 426790e527f752f503651e7c34f979eeecbe8908ae1adad34d9ce9d087c7b0d246859b7fa3b7067b22abdae2b4c3f47704f31c015d33b466492e5bca0e7ad16d
+  data.tar.gz: 6cff0c873d115bf3042f665f7c9ae6ba136f86ca5ec7dd305f1e32bf7e90ffff4e6adbded480ef4a13ba47e9e62ec9a1ae5c23e7011f6a8661131c4d81aa1849

data/lib/fastly_nsq/message.rb

@@ -34,10 +34,17 @@ class FastlyNsq::Message
     nsq_message.finish
   end
 
-  def requeue(*args)
+  def requeue(timeout = nil)
     return managed if managed
+    timeout ||= requeue_period
 
     @managed = :requeued
-    nsq_message.requeue(*args)
+    nsq_message.requeue(timeout)
+  end
+
+  private
+
+  def requeue_period
+    ((attempts**4) + 45 + (rand(60) * (attempts + 1))) * 1_000
   end
 end

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/spec/message_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'json'
 
 RSpec.describe FastlyNsq::Message do
-  let(:nsq_message) { double 'Nsq::Message', body: json_body, attempts: nil, finish: nil, requeue: nil, touch: nil, timestamp: nil }
+  let(:nsq_message) { double 'Nsq::Message', body: json_body, attempts: 1, finish: nil, requeue: nil, touch: nil, timestamp: nil }
   let(:body)        { { 'data' => 'goes here', 'other_field' => 'is over here', 'meta' => 'meta stuff' } }
   let(:json_body)   { body.to_json }
   subject           { FastlyNsq::Message.new nsq_message }
@@ -57,4 +57,16 @@ RSpec.describe FastlyNsq::Message do
 
     expect(subject.managed).to eq(:finished)
   end
+
+  it 'uses the passed timeout for the requeue timeout' do
+    expect(nsq_message).to receive(:requeue).with(1000)
+
+    subject.requeue(1000)
+  end
+
+  it 'uses exponential backoff for timeout if none is given' do
+    expect(nsq_message).to receive(:requeue).with(46_000..166_000)
+
+    subject.requeue
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter