pwwka 0.22.6 → 0.22.7.RC

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282868c5e4071c9ad47f0f4c553cf78ff177606af19105660fa25346645c1dce
-  data.tar.gz: b3d27d5902acbc6436cedbf901d6f80421a4b562dadee3bcb54e4786670c4485
+  metadata.gz: 965ff1503560b0afd024c39ff93d9e1411e1cd928dd701a3bf41cd5116be5212
+  data.tar.gz: 0f0c8c330746ee727780759649c781aba69aa36d8c42904d9f3bdf8a044e5772
 SHA512:
-  metadata.gz: fc55c0a0ba5732e12673cdd88b2c094d670a9d96e55e37498ce0ab099974990983427674e8df2ae095580472d94ae300479bb276cd18713e1eabcb6b834661f2
-  data.tar.gz: fb8d23c0bc7e4f91798f25387c6384c5e36c5edb80a00c2b304ae17f2504ea4f008a3c9df0ee763f2c27fe997ae95b24293814e24d7179fcfc488f6810ffb481
+  metadata.gz: 43809503913bf7b18ae45ee3ecbcf26074e9182afb938262777782ff8a433191ed10461a6938a3db0d904e409dcb783df98a27a18d14723407eca56346ce7dd7
+  data.tar.gz: 9b6afecdce66ed9d36536c8f7eea142093fea738dcbc76225c72704d31e5a60e592cb9e3029dd57039dc0b228a39a5a1852ee6696bfbfe0ecfed4761bcdfea1a

data/.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2
 jobs:
   release:
     docker:
-    - image: circleci/ruby:2.6.4
+    - image: circleci/ruby:2.7.1
     steps:
     - checkout
     - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
@@ -17,9 +17,9 @@ jobs:
     - run:
         name: Build/release gem to artifactory
         command: bundle exec rake push_artifactory
-  ruby-2.6.4-rails-6.0:
+  ruby-2.7.1-rails-6.0:
     docker:
-    - image: circleci/ruby:2.6.4
+    - image: circleci/ruby:2.7.1
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-6.0
     - image: redis:2.8.12
@@ -37,13 +37,13 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#eng-messaging-ops"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.5.6-rails-6.0:
+  ruby-2.6.6-rails-6.0:
     docker:
-    - image: circleci/ruby:2.5.6
+    - image: circleci/ruby:2.6.6
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-6.0
     - image: redis:2.8.12
@@ -61,13 +61,13 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#eng-messaging-ops"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.6.4-rails-5.2:
+  ruby-2.7.1-rails-5.2:
     docker:
-    - image: circleci/ruby:2.6.4
+    - image: circleci/ruby:2.7.1
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-5.2
     - image: redis:2.8.12
@@ -85,13 +85,13 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#eng-messaging-ops"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.5.6-rails-5.2:
+  ruby-2.6.6-rails-5.2:
     docker:
-    - image: circleci/ruby:2.5.6
+    - image: circleci/ruby:2.6.6
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-5.2
     - image: redis:2.8.12
@@ -109,7 +109,7 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#eng-messaging-ops"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
@@ -120,31 +120,31 @@ workflows:
     - release:
         context: org-global
         requires:
-        - ruby-2.6.4-rails-6.0
-        - ruby-2.5.6-rails-6.0
-        - ruby-2.6.4-rails-5.2
-        - ruby-2.5.6-rails-5.2
+        - ruby-2.7.1-rails-6.0
+        - ruby-2.6.6-rails-6.0
+        - ruby-2.7.1-rails-5.2
+        - ruby-2.6.6-rails-5.2
         filters:
           tags:
-            only: /^[0-9]+\.[0-9]+\.[0-9]+(\.?RC[-\.]?\d*)?$/
+            only: /^[0-9]+\.[0-9]+\.[0-9]+(\.?(RC|rc)[-\.]?\d*)?$/
           branches:
             ignore: /.*/
-    - ruby-2.6.4-rails-6.0:
+    - ruby-2.7.1-rails-6.0:
         context: org-global
         filters:
           tags:
             only: &1 /.*/
-    - ruby-2.5.6-rails-6.0:
+    - ruby-2.6.6-rails-6.0:
         context: org-global
         filters:
           tags:
             only: *1
-    - ruby-2.6.4-rails-5.2:
+    - ruby-2.7.1-rails-5.2:
         context: org-global
         filters:
           tags:
             only: *1
-    - ruby-2.5.6-rails-5.2:
+    - ruby-2.6.6-rails-5.2:
         context: org-global
         filters:
           tags:
@@ -158,11 +158,11 @@ workflows:
             only:
             - master
     jobs:
-    - ruby-2.6.4-rails-6.0:
+    - ruby-2.7.1-rails-6.0:
         context: org-global
-    - ruby-2.5.6-rails-6.0:
+    - ruby-2.6.6-rails-6.0:
         context: org-global
-    - ruby-2.6.4-rails-5.2:
+    - ruby-2.7.1-rails-5.2:
         context: org-global
-    - ruby-2.5.6-rails-5.2:
+    - ruby-2.6.6-rails-5.2:
         context: org-global

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.1

data/CODEOWNERS

@@ -0,0 +1 @@
+* @stitchfix/eng-messaging

data/lib/pwwka/transmitter.rb

@@ -29,7 +29,7 @@ module Pwwka
       @channel_connector = ChannelConnector.new(connection_name: "p: #{Pwwka.configuration.app_id} #{Pwwka.configuration.process_name}".strip)
     end
 
-    # Send an important message that must go through.  This method allows any raised exception 
+    # Send an important message that must go through.  This method allows any raised exception
     # to pass through.
     #
     # payload:: Hash of what you'd like to include in your message
@@ -95,11 +95,24 @@ module Pwwka
       job = Pwwka.configuration.async_job_klass
 
       if background_job_processor == :resque
-        # Be perhaps too carefully making sure we queue jobs in the legacy way
-        if type == nil && message_id == :auto_generate && headers == nil
-          Resque.enqueue_in(delay_by_ms/1000, job, payload, routing_key)
+        resque_args = [job, payload, routing_key]
+
+        unless type == nil && message_id == :auto_generate && headers == nil
+          # NOTE: (jdlubrano)
+          # Why can't we pass these options all of the time?  Well, if a user
+          # of pwwka has configured their own async_job_klass that only has an
+          # arity of 2 (i.e. payload and routing key), then passing these options
+          # as an additional argument would break the user's application.  In
+          # order to maintain compatibility with preceding versions of Pwwka,
+          # we need to ensure that the same arguments passed into this method
+          # result in compatible calls to enqueue any Resque jobs.
+          resque_args << { type: type, message_id: message_id, headers: headers }
+        end
+
+        if delay_by_ms.zero?
+          Resque.enqueue(*resque_args)
         else
-          Resque.enqueue_in(delay_by_ms/1000, job, payload, routing_key, type: type, message_id: message_id, headers: headers)
+          Resque.enqueue_in(delay_by_ms/1000, *resque_args)
         end
       elsif background_job_processor == :sidekiq
         options = { delay_by_ms: delay_by_ms, type: type, message_id: message_id, headers: headers }

data/lib/pwwka/version.rb

@@ -1,4 +1,4 @@
 module Pwwka
-  VERSION = '0.22.6'
+  VERSION = '0.22.7.RC'
 end
 

data/owners.json

@@ -1,7 +1,7 @@
 {
   "owners": [
     {
-      "team": "platform"
+      "team": "messaging"
     }
   ]
 }

data/spec/integration/send_and_receive_spec.rb

@@ -11,6 +11,9 @@ describe "sending and receiving messages", :integration do
   include IntegrationTestHelpers
   include Resqutils::Spec::ResqueHelpers
 
+  let(:async_resque_queue) { 'pwwka_send_message_async' }
+  let(:delayed_resque_queue) { :delayed }
+
   before do
     ENV["JOB_KLASS"] = MyTestJob.name
     ENV["PWWKA_QUEUE_EXTENDED_INFO"] = "true"
@@ -30,7 +33,8 @@ describe "sending and receiving messages", :integration do
     FooReceiver.reset!
     MultiRoutingReceived.reset!
     OtherFooReceiver.reset!
-    clear_queue(:delayed)
+    clear_queue(async_resque_queue)
+    clear_queue(delayed_resque_queue)
     clear_queue(MyTestJob)
   end
 
@@ -144,7 +148,7 @@ describe "sending and receiving messages", :integration do
 
       expect(AllReceiver.messages_received.size).to eq(0)
 
-      process_resque_job(Pwwka::SendMessageAsyncJob,:delayed)
+      process_resque_job(Pwwka::SendMessageAsyncJob, async_resque_queue)
 
       allow_receivers_to_process_queues
 
@@ -166,7 +170,7 @@ describe "sending and receiving messages", :integration do
 
       expect(AllReceiver.messages_received.size).to eq(0)
 
-      process_resque_job(Pwwka::SendMessageAsyncJob,:delayed)
+      process_resque_job(Pwwka::SendMessageAsyncJob, async_resque_queue)
 
       allow_receivers_to_process_queues
 
@@ -186,12 +190,28 @@ describe "sending and receiving messages", :integration do
 
       allow(Pwwka).to receive(:configuration).and_return(configuration)
 
-      allow(Resque).to receive(:enqueue_in)
+      allow(Resque).to receive(:enqueue)
 
       Pwwka::Transmitter.send_message_async({ sample: "payload", has: { deeply: true, nested: 4 }},
                                             "pwwka.testing.bar")
 
-      expect(Resque).to have_received(:enqueue_in).with(anything, async_job_klass, anything, anything)
+      expect(Resque).to have_received(:enqueue).with(async_job_klass, anything, anything)
+    end
+
+    it "can queue a job to send a message with a delay" do
+      Pwwka::Transmitter.send_message_async({ sample: "payload" },
+                                            "pwwka.testing.bar",
+                                            delay_by_ms: 1)
+
+      allow_receivers_to_process_queues # not expecting anything to be processed
+
+      expect(AllReceiver.messages_received.size).to eq(0)
+
+      process_resque_job(Pwwka::SendMessageAsyncJob, delayed_resque_queue)
+
+      allow_receivers_to_process_queues
+
+      expect(AllReceiver.messages_received.size).to eq(1)
     end
   end
 

data/spec/unit/transmitter_spec.rb

@@ -312,19 +312,19 @@ describe Pwwka::Transmitter do
       end
       context "on_error: :resque" do
         it "queues a Resque job" do
-          allow(Resque).to receive(:enqueue_in)
+          allow(Resque).to receive(:enqueue)
           described_class.send_message!(payload,routing_key, on_error: :resque)
-          expect(Resque).to have_received(:enqueue_in).with(0,Pwwka::SendMessageAsyncJob,payload,routing_key)
+          expect(Resque).to have_received(:enqueue).with(Pwwka::SendMessageAsyncJob,payload,routing_key)
         end
         context "when there is a problem queueing the resque job" do
           it "raises the original exception job" do
-            allow(Resque).to receive(:enqueue_in).and_raise("NOPE")
+            allow(Resque).to receive(:enqueue).and_raise("NOPE")
             expect {
               described_class.send_message!(payload,routing_key, on_error: :resque)
             }.to raise_error(/OH NOES/)
           end
           it "logs the Resque error as a warning" do
-            allow(Resque).to receive(:enqueue_in).and_raise("NOPE")
+            allow(Resque).to receive(:enqueue).and_raise("NOPE")
             begin
               described_class.send_message!(payload,routing_key, on_error: :resque)
             rescue => ex
@@ -338,18 +338,18 @@ describe Pwwka::Transmitter do
         context "when configured background_job_processor is Resque" do
           context "when the job is queued successfully" do
             before do
-              allow(Resque).to receive(:enqueue_in)
+              allow(Resque).to receive(:enqueue)
             end
 
             it "queues a Resque job" do
               described_class.send_message!(payload, routing_key, on_error: :retry_async)
-              expect(Resque).to have_received(:enqueue_in).with(0, Pwwka::SendMessageAsyncJob, payload, routing_key)
+              expect(Resque).to have_received(:enqueue).with(Pwwka::SendMessageAsyncJob, payload, routing_key)
             end
           end
 
           context "when there is a problem queueing the Resque job" do
             before do
-              allow(Resque).to receive(:enqueue_in).and_raise("NOPE")
+              allow(Resque).to receive(:enqueue).and_raise("NOPE")
             end
 
             it "raises the original exception job" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwwka
 version: !ruby/object:Gem::Version
-  version: 0.22.6
+  version: 0.22.7.RC
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -235,6 +235,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -314,11 +315,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Send and receive messages via RabbitMQ