pwwka 0.22.7 → 0.23.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6a80c2598afc2264f985779fd52a6bfed9b2e6a9aa3d0b4859a26ad242e916
-  data.tar.gz: ea64e44b4ec47eb2b9586a03f546546dde67d86df3e2bf5ff6b1b9976b458eea
+  metadata.gz: 312eaa13f1a4ba429bd2ab95c9c95713e7f95a8436870a268eb889824fde311a
+  data.tar.gz: '008f9726a92efe538913689cd0b761e09bae1b5d967bf6c521db86a4527a7bb8'
 SHA512:
-  metadata.gz: f65ded4e96afa7bf2a3c90d7aad3392c8089d10cf9b65a98c5fa71f89bbab66643d83d7e9a20267f9fc06e78d2f46ffd0805889fb81db53021da774e7fb76178
-  data.tar.gz: 99c3386a1f87d5833e4c916b82151007265bf3ec7455057831f1e9efb8651e5570f85eacfaedd69b978fe1a4129b65a07df1eb8e152b08cd2086c1a0addc6151
+  metadata.gz: 38b032c92ccbb1fbb216bb42b53c45f6679426426a2c2813a3d8c1af9e20da851da69ce2b1ca0ce2e90774d6ddcbf4023dbc0667a2c211e51d20b03941dc5ccb
+  data.tar.gz: 53513f852876b8ce83fb101018205d8dd74dd150d0b61f6dc69fdb91c35cf6a3f5a280e7b890261f1e063220adab1b7ee70a78bce3211d53d7955dce45448f89

data/.circleci/config.yml

@@ -3,31 +3,16 @@
 ---
 version: 2
 jobs:
-  release:
+  ruby-2.6.1-rails-5.2:
     docker:
-    - image: circleci/ruby:2.7.1
-    steps:
-    - checkout
-    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
-    - run: bundle install --full-index
-    - run:
-        name: Artifactory login
-        command: mkdir -p ~/.gem && curl -u$ARTIFACTORY_USER:$ARTIFACTORY_TOKEN https://stitchfix01.jfrog.io/stitchfix01/api/gems/eng-gems/api/v1/api_key.yaml
-          > ~/.gem/credentials && chmod 0600 ~/.gem/credentials
-    - run:
-        name: Build/release gem to artifactory
-        command: bundle exec rake push_artifactory
-  ruby-2.7.1-rails-6.0:
-    docker:
-    - image: circleci/ruby:2.7.1
+    - image: circleci/ruby:2.6.1
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-6.0
+        BUNDLE_GEMFILE: Gemfile.rails-5.2
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
-    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
@@ -37,21 +22,20 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-messaging-ops"
+        command: 'bundle exec y-notify #eng-platform'
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.6.6-rails-6.0:
+  ruby-2.5.3-rails-5.2:
     docker:
-    - image: circleci/ruby:2.6.6
+    - image: circleci/ruby:2.5.3
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-6.0
+        BUNDLE_GEMFILE: Gemfile.rails-5.2
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
-    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
@@ -61,21 +45,20 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-messaging-ops"
+        command: 'bundle exec y-notify #eng-platform'
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.7.1-rails-5.2:
+  ruby-2.6.1-rails-5.1:
     docker:
-    - image: circleci/ruby:2.7.1
+    - image: circleci/ruby:2.6.1
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-5.2
+        BUNDLE_GEMFILE: Gemfile.rails-5.1
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
-    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
@@ -85,21 +68,20 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-messaging-ops"
+        command: 'bundle exec y-notify #eng-platform'
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.6.6-rails-5.2:
+  ruby-2.5.3-rails-5.1:
     docker:
-    - image: circleci/ruby:2.6.6
+    - image: circleci/ruby:2.5.3
       environment:
-        BUNDLE_GEMFILE: Gemfile.rails-5.2
+        BUNDLE_GEMFILE: Gemfile.rails-5.1
     - image: redis:2.8.12
     - image: rabbitmq:3.5.6
     working_directory: "~/pwwka"
     steps:
     - checkout
-    - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
     - run: bundle install --full-index
     - run: bundle exec rspec --format RspecJunitFormatter --out /tmp/test-results/rspec.xml
         --format=doc
@@ -109,7 +91,7 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-messaging-ops"
+        command: 'bundle exec y-notify #eng-platform'
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
@@ -117,38 +99,14 @@ workflows:
   version: 2
   on-commit:
     jobs:
-    - release:
-        context: org-global
-        requires:
-        - 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|rc)[-\.]?\d*)?$/
-          branches:
-            ignore: /.*/
-    - ruby-2.7.1-rails-6.0:
+    - ruby-2.6.1-rails-5.2:
         context: org-global
-        filters:
-          tags:
-            only: &1 /.*/
-    - ruby-2.6.6-rails-6.0:
+    - ruby-2.5.3-rails-5.2:
         context: org-global
-        filters:
-          tags:
-            only: *1
-    - ruby-2.7.1-rails-5.2:
+    - ruby-2.6.1-rails-5.1:
         context: org-global
-        filters:
-          tags:
-            only: *1
-    - ruby-2.6.6-rails-5.2:
+    - ruby-2.5.3-rails-5.1:
         context: org-global
-        filters:
-          tags:
-            only: *1
   scheduled:
     triggers:
     - schedule:
@@ -158,11 +116,11 @@ workflows:
             only:
             - master
     jobs:
-    - ruby-2.7.1-rails-6.0:
+    - ruby-2.6.1-rails-5.2:
         context: org-global
-    - ruby-2.6.6-rails-6.0:
+    - ruby-2.5.3-rails-5.2:
         context: org-global
-    - ruby-2.7.1-rails-5.2:
+    - ruby-2.6.1-rails-5.1:
         context: org-global
-    - ruby-2.6.6-rails-5.2:
+    - ruby-2.5.3-rails-5.1:
         context: org-global

data/.ruby-version

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

data/Gemfile.rails-5.1

@@ -1,6 +1,7 @@
 # DO NOT MODIFY - this is managed by Git Reduce in goro
 #
-source 'https://stitchfix01.jfrog.io/stitchfix01/api/gems/eng-gems/'
+source 'https://gem.fury.io/me/'
+source 'https://www.rubygems.org'
 
 gemspec
 

data/Gemfile.rails-5.2

@@ -1,6 +1,7 @@
 # DO NOT MODIFY - this is managed by Git Reduce in goro
 #
-source 'https://stitchfix01.jfrog.io/stitchfix01/api/gems/eng-gems/'
+source 'https://gem.fury.io/me/'
+source 'https://www.rubygems.org'
 
 gemspec
 

data/README.md

@@ -148,8 +148,8 @@ Pwwka::Transmitter.send_message!(payload, routing_key, on_error: :ignore)
 
 #### Delayed Messages
 
-You might want to delay sending a message (for example, if you have just created a database
-record and a race condition keeps catching you out). In that case you can use delayed message
+You might want to delay sending a message (for example, if you have just created a database 
+record and a race condition keeps catching you out). In that case you can use delayed message 
 options:
 
 ```ruby
@@ -176,12 +176,7 @@ Pwwka.configure do |config|
 end
 ```
 
-Regardless of which processor you use, the name of the queue created is `pwwka_send_message_async`. You will need to start a worker process to work the queue. For a `Procfile` setup, with Resque as the processor, that could look something like this:
-
-```ruby
-pwwka_send_message_async_worker: rake resque:work QUEUE=pwwka_send_message_async
-```
-
+Regardless of which processor you use, the name of the queue created is `pwwka_send_message_async`.
 
 You can also configure Pwwka to use your own custom job using the `async_job_klass` configuration option. An example might be:
 ```
@@ -196,7 +191,7 @@ If you are using Resque and `Resque::Plugins::ExponentialBackoff` is available,
 
 #### Message Queuer
 
-You can queue up messages and send them in a batch. This is most useful when multiple messages
+You can queue up messages and send them in a batch. This is most useful when multiple messages 
 need to sent from within a transaction block.
 
 For example:
@@ -260,7 +255,7 @@ Here is an example:
 
 ```ruby
 class ClientIndexMessageHandler
-
+  
   def self.handle!(delivery_info, properties, payload)
     handler.do_a_thing(payload)
   end
@@ -435,7 +430,7 @@ If you use [Resque][resque], and you wish to handle messages in a resque job, yo
 
    Note that you must provide `@queue` in your job.  `QueueResqueJobHandler` doesn't support setting a custom queue at enqueue-time (PRs welcome :).
 
-   Note that if you were using this library before version 0.12.0, your job would only be given the payload.  If you change your job to accept exatly three arguments, you will be given the payload, routing key, and message properties.  If any of those arguments are optional, you will need to set `PWWKA_QUEUE_EXTENDED_INFO` to `"true"` to force pwwka to pass those along.  Without it, your job only gets the payload to avoid breaking legacy consumers.
+   Note that if you were using this library before version 0.12.0, your job would only be given the payload.  If you change your job to accept exatly three arguments, you will be given the payload, routing key, and message properties.  If any of those arguments are optional, you will need to set `PWWKA_QUEUE_EXTENDED_INFO` to `"true"` to force pwwka to pass those along.  Without it, your job only gets the payload to avoid breaking legacy consumers. 
 
 3. Profit!
 
@@ -459,9 +454,9 @@ describe "my integration test" do
     @test_handler.test_setup
   end
 
-  after(:all) do
+  after(:all) do 
     # this clears out any messages, so you have a clean test environment next time
-    @test_handler.test_teardown
+    @test_handler.test_teardown 
   end
 
   it "uses the message bus" do

data/lib/pwwka.rb

@@ -27,6 +27,7 @@ require 'pwwka/channel_connector'
 require 'pwwka/handling'
 require 'pwwka/receiver'
 require 'pwwka/transmitter'
+require 'pwwka/persistent_transmitter'
 require 'pwwka/message_queuer'
 require 'pwwka/error_handlers'
 require 'pwwka/configuration'

data/lib/pwwka/configuration.rb

@@ -45,15 +45,10 @@ module Pwwka
     def app_id
       if @app_id.to_s.strip == ""
         if defined?(Rails)
-          if Rails.respond_to?(:application) && Rails.respond_to?(:version)
-            # Module#module_parent is the preferred technique, but we keep usage
-            # of the deprecated Module#parent for Rails 5 compatibility. see
-            # https://github.com/stitchfix/pwwka/issues/91 for context.
-            app_klass = Rails.application.class
-            app_parent = Rails.version =~ /^6/ ? app_klass.module_parent : app_klass.parent
-            app_parent.name
+          if Rails.respond_to?(:application)
+            Rails.application.class.parent.name
           else
-            raise "'Rails' is defined, but it doesn't respond to #application or #version, so could not derive the app_id; you must explicitly set it"
+            raise "'Rails' is defined, but it doesn't respond to #application, so could not derive the app_id; you must explicitly set it"
           end
         else
           raise "Could not derive the app_id; you must explicitly set it"

data/lib/pwwka/persistent_transmitter.rb

@@ -0,0 +1,59 @@
+require_relative "publish_options"
+
+begin  # optional dependency
+  require 'resque'
+  require 'resque-retry'
+rescue LoadError
+end
+
+module Pwwka
+  # Primary interface for sending messages.
+  #
+  # Example:
+  #
+  #     # Send a message, blowing up if there's any problem
+  #     Pwwka::PersistentTransmitter.batch do |transmitter|
+  #         transmitter.send_message!({ user_id: @user.id }, "users.user.activated")
+  #     end  
+
+  class PersistentTransmitter
+
+    extend Pwwka::Logging
+    include Pwwka::Logging
+
+    DEFAULT_DELAY_BY_MS = 5000
+
+    attr_reader :channel_connector
+   
+    def initialize
+      @channel_connector = ChannelConnector.new(connection_name: "p: #{Pwwka.configuration.app_id} #{Pwwka.configuration.process_name}".strip)
+    end
+
+    def send_message!(payload, routing_key, type: nil, headers: nil, message_id: :auto_generate)
+      publish_options = Pwwka::PublishOptions.new(
+        routing_key: routing_key,
+        message_id: message_id,
+        type: type,
+        headers: headers
+      )
+      logf "START Transmitting Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
+      channel_connector.topic_exchange.publish(payload.to_json, publish_options.to_h)
+      # if it gets this far it has succeeded
+      logf "END Transmitting Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
+      true
+    end
+    
+
+    class << self
+        private :new
+
+        def batch
+          transmitter = new
+          yield(transmitter)
+        ensure
+          transmitter.channel_connector.connection_close
+        end
+
+    end
+  end
+end

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,24 +95,11 @@ module Pwwka
       job = Pwwka.configuration.async_job_klass
 
       if background_job_processor == :resque
-        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)
+        # 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)
         else
-          Resque.enqueue_in(delay_by_ms/1000, *resque_args)
+          Resque.enqueue_in(delay_by_ms/1000, job, payload, routing_key, type: type, message_id: message_id, headers: headers)
         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.7'
+  VERSION = '0.23.RC1'
 end
 

data/owners.json

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

data/pwwka.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
   s.add_development_dependency("resque")
-  s.add_development_dependency("resque-retry", "~> 1.5.3")
+  s.add_development_dependency("resque-retry")
   s.add_development_dependency("sidekiq")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("resqutils")

data/spec/integration/send_and_receive_spec.rb

@@ -11,9 +11,6 @@ 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"
@@ -33,8 +30,7 @@ describe "sending and receiving messages", :integration do
     FooReceiver.reset!
     MultiRoutingReceived.reset!
     OtherFooReceiver.reset!
-    clear_queue(async_resque_queue)
-    clear_queue(delayed_resque_queue)
+    clear_queue(:delayed)
     clear_queue(MyTestJob)
   end
 
@@ -148,7 +144,7 @@ describe "sending and receiving messages", :integration do
 
       expect(AllReceiver.messages_received.size).to eq(0)
 
-      process_resque_job(Pwwka::SendMessageAsyncJob, async_resque_queue)
+      process_resque_job(Pwwka::SendMessageAsyncJob,:delayed)
 
       allow_receivers_to_process_queues
 
@@ -170,7 +166,7 @@ describe "sending and receiving messages", :integration do
 
       expect(AllReceiver.messages_received.size).to eq(0)
 
-      process_resque_job(Pwwka::SendMessageAsyncJob, async_resque_queue)
+      process_resque_job(Pwwka::SendMessageAsyncJob,:delayed)
 
       allow_receivers_to_process_queues
 
@@ -190,28 +186,12 @@ describe "sending and receiving messages", :integration do
 
       allow(Pwwka).to receive(:configuration).and_return(configuration)
 
-      allow(Resque).to receive(:enqueue)
+      allow(Resque).to receive(:enqueue_in)
 
       Pwwka::Transmitter.send_message_async({ sample: "payload", has: { deeply: true, nested: 4 }},
                                             "pwwka.testing.bar")
 
-      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)
+      expect(Resque).to have_received(:enqueue_in).with(anything, async_job_klass, anything, anything)
     end
   end
 

data/spec/unit/configuration_spec.rb

@@ -75,10 +75,6 @@ describe Pwwka::Configuration do
           def self.application
             MyAmazingApp::Application.new
           end
-
-          def self.version
-            '5.2.0'
-          end
         end
         Object.const_set("Rails",rails)
       end
@@ -101,7 +97,7 @@ describe Pwwka::Configuration do
       it "blows up when not set" do
         expect {
           configuration.app_id
-        }.to raise_error(/'Rails' is defined, but it doesn't respond to #application or #version, so could not derive the app_id; you must explicitly set it/)
+        }.to raise_error(/'Rails' is defined, but it doesn't respond to #application, so could not derive the app_id; you must explicitly set it/)
       end
     end
   end

data/spec/unit/persistent_transmitter_spec.rb

@@ -0,0 +1,153 @@
+require 'spec_helper.rb'
+
+describe Pwwka::PersistentTransmitter do
+  let(:topic_exchange) { double("topic exchange") }
+  let(:delayed_exchange) { double("delayed exchange") }
+  let(:channel_connector) { instance_double(Pwwka::ChannelConnector, topic_exchange: topic_exchange, delayed_exchange: delayed_exchange) }
+  let(:logger) { double(Logger) }
+  let(:payload) {
+    {
+      foo: { bar: "blah" },
+      crud: 12,
+    }
+  }
+  let(:routing_key) { "sf.foo.bar" }
+
+
+  before do
+    @original_logger = Pwwka.configuration.logger
+    Pwwka.configuration.logger = logger
+    allow(logger).to receive(:info)
+    allow(logger).to receive(:warn)
+    allow(logger).to receive(:error)
+    allow(Pwwka::ChannelConnector).to receive(:new).with(connection_name: "p: MyAwesomeApp my_awesome_process").and_return(channel_connector)
+    allow(channel_connector).to receive(:connection_close)
+    allow(topic_exchange).to receive(:publish)
+    allow(delayed_exchange).to receive(:publish)
+  end
+
+  after do
+    Pwwka.configuration.logger = @original_logger
+  end
+
+
+  shared_examples "it sends standard and overridden data to the exchange" do
+    it "publishes to the topic exchange" do
+      expect(exchange).to have_received(:publish).with(payload.to_json, kind_of(Hash))
+    end
+
+    it "passes the routing key" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(routing_key: routing_key))
+    end
+
+    it "sets the type" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(type: "Customer"))
+    end
+
+    it "sets the headers" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(headers: { "custom" => "value", "other_custom" => "other_value" }))
+    end
+
+    it "uses the overridden message id" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(message_id: "snowflake id that is likely a bad idea, but if you must"))
+    end
+
+    it "sets the app id to what's configured" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(app_id: "MyAwesomeApp"))
+    end
+
+    it "sets the content type to JSON with a version" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(content_type: "application/json; version=1"))
+    end
+
+    it "sets persistent true" do
+      expect(exchange).to have_received(:publish).with(
+        payload.to_json,
+        hash_including(persistent: true))
+    end
+  end
+
+
+    context "no new instance creation" do
+      it "doesn't allow creation of new instances unless inside the batch method" do
+        expect{ Pwwka::PersistentTransmitter.new }.to raise_error
+      end
+    end
+
+    describe "#batch" do
+      context "Logging" do
+          it "logs the start and end of the transmission" do
+            described_class.batch do |transmitter|
+              transmitter.send_message!(payload,routing_key)
+            end
+            expect(logger).to have_received(:info).with(/START Transmitting Message on id\[[\w\-\d]+\] #{routing_key} ->/)
+            expect(logger).to have_received(:info).with(/END Transmitting Message on id\[[\w\-\d]+\] #{routing_key} ->/)
+          end
+      end
+
+      it "closes the channel connector" do
+        described_class.batch do |transmitter|
+          transmitter.send_message!(payload,routing_key)
+        end      
+        expect(channel_connector).to have_received(:connection_close)
+      end
+
+      it "only uses one connection" do
+        described_class.batch do |transmitter|
+          10.times do
+            transmitter.send_message!(payload,routing_key)
+          end
+        end  
+        expect(channel_connector).to have_received(:connection_close).once
+      end
+    end
+
+    context 'when an error is raised' do
+
+      let(:error) { 'oh no' }
+
+      before do
+        allow(topic_exchange).to receive(:publish).and_raise(error)
+      end
+
+      it 'should raise the error and still close the channel_connector' do     
+        expect { described_class.batch do |transmitter|
+                    transmitter.send_message!(payload,routing_key)
+                 end } .to raise_error(error)
+        expect(channel_connector).to have_received(:connection_close)
+      end
+    end
+  
+   context "with everything overridden" do
+      before do
+        described_class.batch do |transmitter|
+            transmitter.send_message!(
+              payload,
+              routing_key,
+              message_id: "snowflake id that is likely a bad idea, but if you must",
+              type: "Customer",
+              headers: {
+                "custom" => "value",
+                "other_custom" => "other_value",
+              })
+        end
+      end
+
+      it_behaves_like "it sends standard and overridden data to the exchange" do
+        let(:exchange) { topic_exchange }
+      end
+    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)
+          allow(Resque).to receive(:enqueue_in)
           described_class.send_message!(payload,routing_key, on_error: :resque)
-          expect(Resque).to have_received(:enqueue).with(Pwwka::SendMessageAsyncJob,payload,routing_key)
+          expect(Resque).to have_received(:enqueue_in).with(0,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).and_raise("NOPE")
+            allow(Resque).to receive(:enqueue_in).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).and_raise("NOPE")
+            allow(Resque).to receive(:enqueue_in).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)
+              allow(Resque).to receive(:enqueue_in)
             end
 
             it "queues a Resque job" do
               described_class.send_message!(payload, routing_key, on_error: :retry_async)
-              expect(Resque).to have_received(:enqueue).with(Pwwka::SendMessageAsyncJob, payload, routing_key)
+              expect(Resque).to have_received(:enqueue_in).with(0, 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).and_raise("NOPE")
+              allow(Resque).to receive(:enqueue_in).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.7
+  version: 0.23.RC1
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -119,16 +119,16 @@ dependencies:
   name: resque-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,6 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
-- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -243,7 +242,6 @@ files:
 - Gemfile.rails-5.0
 - Gemfile.rails-5.1
 - Gemfile.rails-5.2
-- Gemfile.rails-6.0
 - LICENSE
 - README.md
 - Rakefile
@@ -265,6 +263,7 @@ files:
 - lib/pwwka/handling.rb
 - lib/pwwka/logging.rb
 - lib/pwwka/message_queuer.rb
+- lib/pwwka/persistent_transmitter.rb
 - lib/pwwka/publish_options.rb
 - lib/pwwka/queue_resque_job_handler.rb
 - lib/pwwka/receiver.rb
@@ -294,6 +293,7 @@ files:
 - spec/unit/configuration_spec.rb
 - spec/unit/logging_spec.rb
 - spec/unit/message_queuer_spec.rb
+- spec/unit/persistent_transmitter_spec.rb
 - spec/unit/queue_resque_job_handler_spec.rb
 - spec/unit/receiver_spec.rb
 - spec/unit/send_message_async_job_spec.rb
@@ -315,11 +315,12 @@ 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.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Send and receive messages via RabbitMQ
@@ -342,6 +343,7 @@ test_files:
 - spec/unit/configuration_spec.rb
 - spec/unit/logging_spec.rb
 - spec/unit/message_queuer_spec.rb
+- spec/unit/persistent_transmitter_spec.rb
 - spec/unit/queue_resque_job_handler_spec.rb
 - spec/unit/receiver_spec.rb
 - spec/unit/send_message_async_job_spec.rb

data/CODEOWNERS

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

data/Gemfile.rails-6.0

@@ -1,7 +0,0 @@
-# DO NOT MODIFY - this is managed by Git Reduce in goro
-#
-source 'https://stitchfix01.jfrog.io/stitchfix01/api/gems/eng-gems/'
-
-gemspec
-
-gem 'activesupport', '~> 6.0.0'