active_publisher 0.3.0 → 0.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8dc1803e915b78f127dfa54c7f716e0929727a
-  data.tar.gz: 5c69b27822b0d1c5817c9a3ae4059a4364f78cc2
+  metadata.gz: 7a21d679e539f7491e518f9de8ee35413c30271d
+  data.tar.gz: 25463b0153368b796740fc0d3d8445a7f58f6757
 SHA512:
-  metadata.gz: ceb1258a8c92aadc6ae56935dd005a21a6bccfb21a5c8d3eed9d2bab7e7b43ab9f373f980cce052a9c0bb19403a8d75b435d84a9a74c283996fec308db67c922
-  data.tar.gz: 8edf37ae3960b1b4e544ec404db1ea1cb275294c56f6efddc19c675eb567c70630e6844a7676bc794d4c78665091d115eb8fe5bbb3a2ad0387dcbefb7d7da39f
+  metadata.gz: c80ad112bf9d6d25a668b51412e42cf2941276aba76732cae1da85a144ddb2622d8e0cb0d30cf40949f48822d8a544d7df7b4e353a93911ed710511aa27415e3
+  data.tar.gz: b2d54a6bb7515fcdff35591691bf72aa376b87e3feb253e03cf095ceaf84de9339e490e35f96225d9e2f2c60230d35d4dc9dcc41a14a754cef835fa47eec411d

data/.travis.yml

@@ -1,15 +1,11 @@
 language: ruby
 rvm:
- - 2.0
- - 2.1
  - 2.2
+ - 2.3
+ - 2.4
  - jruby-1.7
- - jruby-9.1.0.0
- - jruby-head
+ - jruby-9.1.12.0
 services:
  - rabbitmq
 sudo: false
 cache: bundler
-matrix:
-  allow_failures:
-    - rvm: jruby-head

data/lib/active_publisher.rb

@@ -16,6 +16,7 @@ require "active_publisher/connection"
 module ActivePublisher
   class UnknownMessageClassError < StandardError; end
   class ExchangeMismatchError < StandardError; end
+  class FailedPublisherConfirms < StandardError; end
 
   def self.configuration
     @configuration ||= ::ActivePublisher::Configuration.new
@@ -62,7 +63,7 @@ module ActivePublisher
       :persistent => false,
       :routing_key => route,
     }.merge(in_options)
-    
+
     if ::RUBY_PLATFORM == "java"
       java_options = {}
       java_options[:mandatory]   = options.delete(:mandatory)

data/lib/active_publisher/async/in_memory_adapter/consumer_thread.rb

@@ -35,20 +35,28 @@ module ActivePublisher
           end
         end
 
+        def make_channel
+          channel = ::ActivePublisher::Connection.connection.create_channel
+          channel.confirm_select if ::ActivePublisher.configuration.publisher_confirms
+          channel
+        end
+
         def start_thread
           return if alive?
           @thread = ::Thread.new do
             loop do
               # Sample the queue size so we don't shutdown when messages are in flight.
               @sampled_queue_size = queue.size
-              current_messages = queue.pop_up_to(20)
+              current_messages = queue.pop_up_to(50)
 
               begin
+                @channel ||= make_channel
+
                 # Only open a single connection for each group of messages to an exchange
                 current_messages.group_by(&:exchange_name).each do |exchange_name, messages|
                   begin
                     current_messages -= messages
-                    ::ActivePublisher.publish_all(exchange_name, messages)
+                    publish_all(@channel, exchange_name, messages)
                   ensure
                     current_messages.concat(messages)
                   end
@@ -76,6 +84,40 @@ module ActivePublisher
             end
           end
         end
+
+        def publish_all(channel, exchange_name, messages)
+          exchange = channel.topic(exchange_name)
+          potentially_retry = []
+          loop do
+            break if messages.empty?
+            message = messages.shift
+
+            fail ActivePublisher::UnknownMessageClassError, "bulk publish messages must be ActivePublisher::Message" unless message.is_a?(ActivePublisher::Message)
+            fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
+
+            begin
+              options = ::ActivePublisher.publishing_options(message.route, message.options || {})
+              exchange.publish(message.payload, options)
+              potentially_retry << message
+            rescue
+              messages << message
+              raise
+            end
+          end
+          wait_for_confirms(channel, messages, potentially_retry)
+        end
+
+        def wait_for_confirms(channel, messages, potentially_retry)
+          return true unless channel.using_publisher_confirms?
+          if channel.method(:wait_for_confirms).arity > 0
+            channel.wait_for_confirms(::ActivePublisher.configuration.publisher_confirms_timeout)
+          else
+            channel.wait_for_confirms
+          end
+        rescue
+          messages.concat(potentially_retry)
+          raise
+        end
       end
     end
   end

data/lib/active_publisher/configuration.rb

@@ -9,6 +9,7 @@ module ActivePublisher
                   :password,
                   :port,
                   :publisher_confirms,
+                  :publisher_confirms_timeout,
                   :seconds_to_wait_for_graceful_shutdown,
                   :timeout,
                   :tls,
@@ -33,6 +34,7 @@ module ActivePublisher
       :password => "guest",
       :port => 5672,
       :publisher_confirms => false,
+      :publisher_confirms_timeout => 5_000, #specified as a number of milliseconds
       :seconds_to_wait_for_graceful_shutdown => 30,
       :timeout => 1,
       :tls => false,

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "0.3.0"
+  VERSION = "0.4.0.pre1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.pre1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -145,12 +145,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: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Aims to make publishing work across MRI and jRuby painless and add some nice