artsy-eventservice 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2fc420aec74a16109d3473d71cb71bd2c1fbafd
-  data.tar.gz: eda0bb72a66fe5cdc85887ea8d3c0aa325d5bae8
+  metadata.gz: 730a1c3e93fc39daa432c14e98e4d3e470bd21d5
+  data.tar.gz: b91155920aa1d4d24d9c1c96e1b13cb822a121ca
 SHA512:
-  metadata.gz: 6bf09515e7ed36508e0f0de94fa652ed91842418b3c79411748c8bf9affc5abad0795d15e2a6aea6b65ee6780e959a586da34d14cad0c4eea486b60fd882ca91
-  data.tar.gz: 96323a9511c6db2f81a1f2c5bde6a316b8e9740b43f1385f8698421a2079bbcce5eb73af576871baefcbc654dd534a092f3287be7471bf9e4b722d6e1ac90ce6
+  metadata.gz: 26960c9c97661ea5bba215c7863f78162713e975ea60917527d0d6a3ba8fb6809a94ce1d34c7f9f2e6770aa07e628a4f950aacffd7cd089f3e7364b61eddc726
+  data.tar.gz: e4a4eddb337a77cba72ed97d39c9f06225ea42c40ffa34e92ffd6dc0d417a60582e7135387b9e2a04633aee652241a30f5c578bd48388b3f2121dd2bb730f29e

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    artsy-eventservice (1.0.3)
-      bunny (~> 2.6.2)
+    artsy-eventservice (1.0.4)
+      bunny (~> 2.7.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    amq-protocol (2.0.1)
+    amq-protocol (2.2.0)
     ast (2.3.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bunny (2.6.2)
-      amq-protocol (>= 2.0.1)
+    bunny (2.7.1)
+      amq-protocol (>= 2.2.0)
     coderay (1.1.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
@@ -76,4 +76,4 @@ RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.14.6
+   1.15.4

data/artsy-eventservice.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/artsy/artsy-eventservice'
   s.licenses = ['MIT']
   s.summary = "Ruby Gem for producing events in Artsy's event stream"
-  s.add_dependency 'bunny', '~> 2.6.2'
+  s.add_dependency 'bunny', '~> 2.7.1'
 end

data/lib/artsy-eventservice/artsy/event_service/publisher.rb

@@ -2,16 +2,14 @@
 module Artsy
   module EventService
     class Publisher
-      include RabbitMQConnection
-
       def self.publish(topic:, event:, routing_key: nil)
         new.post_event(topic: topic, event: event, routing_key: routing_key)
       end
 
       def post_event(topic:, event:, routing_key: nil)
         raise 'Event missing topic or verb.' if event.verb.to_s.empty? || topic.to_s.empty?
-        connect_to_rabbit do |conn|
-          channel = conn.create_channel
+        RabbitMQConnection.get_channel do |channel|
+          channel.confirm_select if config.confirms_enabled
           exchange = channel.topic(topic, durable: true)
           exchange.publish(
             event.json,
@@ -20,10 +18,11 @@ module Artsy
             content_type: 'application/json',
             app_id: config.app_name
           )
+          raise 'Publishing event failed' if config.confirms_enabled && !channel.wait_for_confirms
         end
       end
 
-      def self.config
+      def config
         Artsy::EventService.config
       end
     end

data/lib/artsy-eventservice/artsy/event_service/rabbitmq_connection.rb

@@ -3,43 +3,55 @@ require 'bunny'
 
 module Artsy
   module EventService
-    module RabbitMQConnection
-      # get a new RabbitMQ Client
-      def create_conn
-        Bunny.new(rabbitmq_url, **bunny_params)
-      end
+    class RabbitMQConnection
+      @connection = nil
+      @mutex = Mutex.new
 
-      # Connect, do something and close the connection
-      def connect_to_rabbit
-        conn = create_conn
+      # Build a new connection to RabbitMQ
+      def self.build_connection
+        conn = Bunny.new(self.rabbitmq_url, **self.bunny_params)
         conn.start
-        yield(conn)
-        conn.stop
+        conn
+      end
+
+      # Synchronized access to the connection
+      def self.get_connection
+        @mutex.synchronize do
+          @connection ||= self.build_connection
+        end
+      end
+
+      # Get a channel from the connection - synchronized access to create_channel is provided by Bunny
+      def self.get_channel
+        channel = self.get_connection.create_channel
+        yield channel if block_given?
+      ensure
+        channel.close if channel && channel.open?
       end
 
-      def rabbitmq_url
-        config.rabbitmq_url
+      def self.rabbitmq_url
+        self.config.rabbitmq_url
       end
 
-      def bunny_params
-        config.tls ? tls_params : no_tls_params
+      def self.bunny_params
+        self.config.tls ? self.tls_params : self.no_tls_params
       end
 
-      def tls_params
+      def self.tls_params
         {
-          tls: config.tls,
-          tls_cert: config.tls_cert,
-          tls_key: config.tls_key,
-          tls_ca_certificates: [config.tls_ca_certificate],
-          verify_peer: config.verify_peer
+          tls: self.config.tls,
+          tls_cert: self.config.tls_cert,
+          tls_key: self.config.tls_key,
+          tls_ca_certificates: [self.config.tls_ca_certificate],
+          verify_peer: self.config.verify_peer
         }
       end
 
-      def no_tls_params
+      def self.no_tls_params
         {}
       end
 
-      def config
+      def self.config
         Artsy::EventService.config
       end
     end

data/lib/artsy-eventservice/config.rb

@@ -13,6 +13,7 @@ module Artsy
       attr_accessor :tls_cert
       attr_accessor :tls_key
       attr_accessor :verify_peer
+      attr_accessor :confirms_enabled
 
       def reset
         self.app_name = nil
@@ -23,6 +24,7 @@ module Artsy
         self.tls_cert = nil
         self.tls_key = nil
         self.verify_peer = nil
+        self.confirms_enabled = true
       end
 
       reset

data/lib/artsy-eventservice/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Artsy
   module EventService
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

data/spec/artsy-eventstream/artsy/publisher_spec.rb

@@ -33,11 +33,13 @@ describe Artsy::EventService::Publisher do
       conn = double
       channel = double
       exchange = double
-      allow(Bunny).to receive(:new).and_return(conn)
-      expect(conn).to receive(:start).once
-      expect(conn).to receive(:stop).once
+      allow(Artsy::EventService::RabbitMQConnection).to receive(:get_connection).with(no_args).and_return(conn)
       allow(conn).to receive(:create_channel).and_return(channel)
+      allow(channel).to receive(:open?).and_return(true)
       allow(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      allow(channel).to receive(:confirm_select)
+      allow(channel).to receive(:wait_for_confirms).and_return(true)
+      allow(channel).to receive(:close)
 
       expect(exchange).to receive(:publish).with(
         JSON.generate(hello: true),
@@ -52,11 +54,13 @@ describe Artsy::EventService::Publisher do
       conn = double
       channel = double
       exchange = double
-      allow(Bunny).to receive(:new).and_return(conn)
-      expect(conn).to receive(:start).once
-      expect(conn).to receive(:stop).once
+      allow(Artsy::EventService::RabbitMQConnection).to receive(:get_connection).with(no_args).and_return(conn)
       allow(conn).to receive(:create_channel).and_return(channel)
+      allow(channel).to receive(:open?).and_return(true)
       allow(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      allow(channel).to receive(:confirm_select)
+      allow(channel).to receive(:wait_for_confirms).and_return(true)
+      allow(channel).to receive(:close)
 
       expect(exchange).to receive(:publish).with(
         JSON.generate(hello: true),
@@ -67,5 +71,28 @@ describe Artsy::EventService::Publisher do
       )
       Artsy::EventService::Publisher.publish(topic: 'test', event: event, routing_key: 'good.route')
     end
+    it 'raises an error if event publishing is unconfirmed' do
+      conn = double
+      channel = double
+      exchange = double
+      allow(Artsy::EventService::RabbitMQConnection).to receive(:get_connection).with(no_args).and_return(conn)
+      allow(conn).to receive(:create_channel).and_return(channel)
+      allow(channel).to receive(:open?).and_return(true)
+      allow(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      allow(channel).to receive(:confirm_select)
+      allow(channel).to receive(:wait_for_confirms).and_return(false)
+      allow(channel).to receive(:close)
+
+      expect(exchange).to receive(:publish).with(
+        JSON.generate(hello: true),
+        routing_key: 'good.route',
+        persistent: true,
+        content_type: 'application/json',
+        app_id: 'artsy'
+      )
+      expect do
+        Artsy::EventService::Publisher.publish(topic: 'test', event: event, routing_key: 'good.route')
+      end.to raise_error 'Publishing event failed'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artsy-eventservice
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ashkan Nasseri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.7.1
 description: 
 email: ashkan.nasseri@gmail.com
 executables: []