multiple_man 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b0b5340cba015cfbf0a2a43f04283743415bf2f
-  data.tar.gz: 541a5bc2ba571cc2d915508b6ba12e70c58a9e14
+  metadata.gz: c8569fbeb2332b746b624b89ca693b82fafbbbd8
+  data.tar.gz: 22546e311063337f0570896f2ed40387547a6135
 SHA512:
-  metadata.gz: 3ef57043bd9b127e7418b5f6935ed3589d71919f1a740b4d658a0d04e9025af6d73fb467a5414d6b44cd8a2340f1ff2efe18de6ecf25fa63731506c21dcdfe63
-  data.tar.gz: 192d47727ed9dd2b881351d9eac3eb2c0fcc66e145ef56f9dcbb07f7b71cbb4257a25e7afbc2a9ac6ebf240424d4c142e3a740877cd0e62bb3aea7da874c81bd
+  metadata.gz: 9ca8387c22e2ca8665d4cf90f5e990dea472d7a46b1a448540e8adb01af6d8c759c358c2ca5505e1005a03e49aba257cd5df6fb93d050e0478211881318e3736
+  data.tar.gz: 0e022910a4b70baea88d04092bebabbbf4b90a7a34cc34f7c2e1d013d5d85d9e34aca2569eb4bba0e747520da1a4d6e94fd45b36e425575bb3c096db72f257b9

data/lib/multiple_man.rb

@@ -4,6 +4,8 @@ require 'active_support'
 module MultipleMan
   Error = Class.new(StandardError)
   ConsumerError = Class.new(Error)
+  ProducerError = Class.new(Error)
+  ConnectionError = Class.new(Error)
 
   require 'multiple_man/railtie' if defined?(Rails)
 

data/lib/multiple_man/configuration.rb

@@ -11,7 +11,8 @@ module MultipleMan
     attr_reader :subscriber_registry
     attr_accessor :topic_name, :app_name, :connection, :enabled, :error_handler,
                   :worker_concurrency, :reraise_errors, :connection_recovery,
-                  :queue_name, :prefetch_size, :bunny_opts, :exchange_opts
+                  :queue_name, :prefetch_size, :bunny_opts, :exchange_opts,
+                  :publisher_confirms
 
     attr_writer :logger
 
@@ -29,6 +30,7 @@ module MultipleMan
       }
       self.bunny_opts = {}
       self.exchange_opts = {}
+      self.publisher_confirms = false
 
       @subscriber_registry = Subscribers::Registry.new
     end

data/lib/multiple_man/connection.rb

@@ -21,7 +21,7 @@ module MultipleMan
         retry
       else
         Thread.current[:multiple_man_exception_retry_count] = 0
-        raise "MultipleMan::ConnectionError"
+        raise ConnectionError, e
       end
     end
 
@@ -29,6 +29,7 @@ module MultipleMan
       Thread.current.thread_variable_get(:multiple_man_current_channel) || begin
         channel = connection.create_channel
         channel_gc.push(channel)
+        channel.confirm_select if MultipleMan.configuration.publisher_confirms
         Thread.current.thread_variable_set(:multiple_man_current_channel, channel)
 
         channel

data/lib/multiple_man/model_publisher.rb

@@ -20,7 +20,8 @@ module MultipleMan
         end
       end
     rescue Exception => ex
-      MultipleMan.error(ex)
+      err = ProducerError.new(reason: ex, payload: records.inspect)
+      MultipleMan.error(err, reraise: false)
     end
 
   private
@@ -45,6 +46,5 @@ module MultipleMan
         yield records
       end
     end
-
   end
 end

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/spec/model_publisher_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MultipleMan::ModelPublisher do 
+describe MultipleMan::ModelPublisher do
   let(:channel_stub) { double(Bunny::Channel, topic: topic_stub)}
   let(:topic_stub) { double(Bunny::Exchange, publish: nil) }
 
@@ -35,10 +35,17 @@ describe MultipleMan::ModelPublisher do
     end
 
     it "should call the error handler on error" do
-      ex = Exception.new("Bad stuff happened")
+      records    = MockObject.new
+      mock_error = MultipleMan::ProducerError.new
+      ex         = Exception.new("Bad stuff happened")
+
       topic_stub.stub(:publish) { raise ex }
-      MultipleMan.should_receive(:error).with(ex)
-      described_class.new(fields: [:foo]).publish(MockObject.new)
+      MultipleMan.should_receive(:error).with(mock_error, reraise: false)
+      MultipleMan::ProducerError.should_receive(
+        :new
+      ).with(reason: ex, payload: records.inspect).and_return(mock_error)
+
+      described_class.new(fields: [:foo]).publish(records)
     end
   end
 
@@ -59,5 +66,4 @@ describe MultipleMan::ModelPublisher do
       subject.publish(obj)
     end
   end
-
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny