pwwka 0.23.0.RC2 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1566e5fcf144982ced4cbb8cd68a2018095fb15b7f3c2f2035efafbff5b6c6de
-  data.tar.gz: abb34f5e6fd3e568ece3f45b3d32d270f4f48ae27a559114ebc7aacf2cf4e591
+  metadata.gz: 267500c638d786f3a583dd73661818565dcd40b778ee96a788fe9604d3e898ed
+  data.tar.gz: 6e64b966616a2650f7c78702981cc209e571625c554b2da2140d1aa8610fdee6
 SHA512:
-  metadata.gz: e72cc514ad6c61053f0032c9a7eecca722c4d5480a7d2263ea23bd28249c2a95c2bfc40989ad57403a56b86ba8e000eccb2561d8c40c18e4989f86894ee00a9f
-  data.tar.gz: fe191d94862d59e99eb99dc85d88f3e20b5db3dbc7b39075d37f250b4b8d5e0e6d4b6a2a807562c6fa4a6b491f5753c5d32bc1602f022f50cd33c583f223969e
+  metadata.gz: 997e9a6c703e482ec343e024f72d2ac0b12602b7b7578ee9b66675216a8fa18e6f30bddea80ecc9b1b63f8173f5a73296dc9f847017e7bb3e554216f416c42c3
+  data.tar.gz: 67a92f5b32a3be3d311dad301a15d929b002d5ca347aa1b792c07ce1bf67264929e7f6ed218476a2a4dcf1dc8818b16a3ff6903112de075e02609bab4a370659

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/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,7 +176,12 @@ Pwwka.configure do |config|
 end
 ```
 
-Regardless of which processor you use, the name of the queue created is `pwwka_send_message_async`.
+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
+```
+
 
 You can also configure Pwwka to use your own custom job using the `async_job_klass` configuration option. An example might be:
 ```
@@ -191,7 +196,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:
@@ -255,7 +260,7 @@ Here is an example:
 
 ```ruby
 class ClientIndexMessageHandler
-  
+
   def self.handle!(delivery_info, properties, payload)
     handler.do_a_thing(payload)
   end
@@ -430,7 +435,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!
 
@@ -454,9 +459,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,7 +27,6 @@ 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/transmitter.rb

@@ -23,13 +23,20 @@ module Pwwka
 
     DEFAULT_DELAY_BY_MS = 5000
 
+    attr_reader :caller_manages_connector
     attr_reader :channel_connector
 
-    def initialize
-      @channel_connector = ChannelConnector.new(connection_name: "p: #{Pwwka.configuration.app_id} #{Pwwka.configuration.process_name}".strip)
+    def initialize(channel_connector: nil)
+      if channel_connector
+        @caller_manages_connector = true
+        @channel_connector = channel_connector
+      else
+        @caller_manages_connector = false
+        @channel_connector = ChannelConnector.new(connection_name: "p: #{Pwwka.configuration.app_id} #{Pwwka.configuration.process_name}".strip)
+      end
     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
@@ -54,11 +61,13 @@ module Pwwka
                            delay_by: nil,
                            type: nil,
                            message_id: :auto_generate,
-                           headers: nil)
+                           headers: nil,
+                           channel_connector: nil
+                          )
       if delayed
-        new.send_delayed_message!(*[payload, routing_key, delay_by].compact, type: type, headers: headers, message_id: message_id)
+        new(channel_connector: channel_connector).send_delayed_message!(*[payload, routing_key, delay_by].compact, type: type, headers: headers, message_id: message_id)
       else
-        new.send_message!(payload, routing_key, type: type, headers: headers, message_id: message_id)
+        new(channel_connector: channel_connector).send_message!(payload, routing_key, type: type, headers: headers, message_id: message_id)
       end
       logf "AFTER Transmitting Message on %{routing_key} -> %{payload}",routing_key: routing_key, payload: payload
       true
@@ -95,11 +104,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 }
@@ -134,7 +156,9 @@ module Pwwka
       logf "END Transmitting Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
       true
     ensure
-      channel_connector.connection_close
+      unless caller_manages_connector
+        channel_connector.connection_close
+      end
     end
 
 
@@ -154,7 +178,9 @@ module Pwwka
       logf "END Transmitting Delayed Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
       true
     ensure
-      channel_connector.connection_close
+      unless caller_manages_connector
+        channel_connector.connection_close
+      end
     end
 
   end

data/lib/pwwka/version.rb

@@ -1,3 +1,4 @@
 module Pwwka
-  VERSION = '0.23.0.RC2'
+  VERSION = '0.23.0'
 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
@@ -576,5 +576,41 @@ describe Pwwka::Transmitter do
       end
     end
   end
-end
 
+  context "application manages connection" do
+    let(:managed_connector) { instance_double(Pwwka::ChannelConnector,
+                                              topic_exchange: double(:topic_exchange).as_null_object,
+                                              delayed_exchange: double(:delayed_exchange).as_null_object
+                                             ).as_null_object }
+    describe ".send_message!" do
+
+      context "send immediate" do
+        it "doesn't open a new connection" do
+          described_class.send_message!(payload, routing_key, delayed: false, channel_connector: managed_connector)
+
+          expect(Pwwka::ChannelConnector).not_to have_received(:new)
+        end
+
+        it "doesn't close a passed in connection" do
+          described_class.send_message!(payload, routing_key, delayed: false, channel_connector: managed_connector)
+
+          expect(managed_connector).not_to have_received(:connection_close)
+        end
+      end
+
+      context "send delayed" do
+        it "doesn't open a new connection" do
+          described_class.send_message!(payload, routing_key, delayed: true, channel_connector: managed_connector)
+
+          expect(Pwwka::ChannelConnector).not_to have_received(:new)
+        end
+
+        it "doesn't close a passed in connection" do
+          described_class.send_message!(payload, routing_key, delayed: true, channel_connector: managed_connector)
+
+          expect(managed_connector).not_to have_received(:connection_close)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwwka
 version: !ruby/object:Gem::Version
-  version: 0.23.0.RC2
+  version: 0.23.0
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-07-01 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
@@ -264,7 +265,6 @@ 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,7 +294,6 @@ 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
@@ -316,12 +315,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Send and receive messages via RabbitMQ
@@ -344,7 +342,6 @@ 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/lib/pwwka/persistent_transmitter.rb

@@ -1,59 +0,0 @@
-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/spec/unit/persistent_transmitter_spec.rb

@@ -1,153 +0,0 @@
-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