artsy-eventservice 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f43d3c4c946bacb902c2fa871e03d298cc363e6
-  data.tar.gz: fc947fff1915f6dca1ebdb28b32049c667db5c48
+  metadata.gz: b57886405d5d5d74bc384e16ad8ba63229665cb9
+  data.tar.gz: 3735eb18d6c4ceb84ce01c81902673031d2931bb
 SHA512:
-  metadata.gz: ccb08e7c0fb05d30e63097e0b022f2bbb6143267008f41bc1383e26eb99588f9b197a34fb8765fdaa3aca9aeb557d62d06abb171d622d4358638e859734eb04a
-  data.tar.gz: d8e61d759b911b703aad81e96a959c74c86b166c29403e00d1030fdec8a75cdcdd8d3b671a1e9a1512053aa940efc3d742f9a79b209822d1c0563fef2154549d
+  metadata.gz: e39e3b5ada09e10aa556b087c56ba20cfa1f6f6f263e4a8c9f9eb096cf1114f0d2b489c0eda41c45b88e5518c437d59650d9a14f509697ee784a3b8a1afe1c93
+  data.tar.gz: 0f6b44839fb093d5094c2236c5d7efdad0344a2a9490df774a9b4661823004baf1504c1052e405b9b077cefe768c614ee6b307725aeb21b29f061af80b912c94

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    artsy-eventservice (1.0.6)
+    artsy-eventservice (1.0.8)
       bunny
 
 GEM

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

@@ -2,15 +2,15 @@
 module Artsy
   module EventService
     class Publisher
-      def self.publish_event(topic:, event:, routing_key: nil)
-        new.post_event(topic: topic, event: event, routing_key: routing_key)
+      def self.publish_event(topic:, event:, routing_key: nil, headers: {})
+        new.post_event(topic: topic, event: event, routing_key: routing_key, headers: headers)
       end
 
-      def self.publish_data(topic:, data:, routing_key: nil)
-        new.post_data(topic: topic, data: data, routing_key: routing_key)
+      def self.publish_data(topic:, data:, routing_key: nil, headers: {})
+        new.post_data(topic: topic, data: data, routing_key: routing_key, headers: headers)
       end
 
-      def post_data(topic:, data:, routing_key: nil)
+      def post_data(topic:, data:, routing_key: nil, headers: {})
         RabbitMQConnection.get_channel do |channel|
           channel.confirm_select if config.confirms_enabled
           exchange = channel.topic(topic, durable: true)
@@ -19,18 +19,21 @@ module Artsy
             routing_key: routing_key,
             persistent: true,
             content_type: 'application/json',
+            headers: headers,
             app_id: config.app_name
           )
           raise 'Publishing data failed' if config.confirms_enabled && !channel.wait_for_confirms
         end
       end
 
-      def post_event(topic:, event:, routing_key: nil)
+      def post_event(topic:, event:, routing_key: nil, headers: {})
         raise 'Event missing topic or verb.' if event.verb.to_s.empty? || topic.to_s.empty?
         post_data(
           topic: topic,
           data: event.json,
-          routing_key: routing_key || event.verb)
+          routing_key: routing_key || event.verb,
+          headers: headers
+        )
       end
 
       def config

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

@@ -18,6 +18,8 @@ module Artsy
       def self.get_connection
         @mutex.synchronize do
           @connection ||= self.build_connection
+          @connection = self.build_connection if @connection.closed?
+          @connection
         end
       end
 

data/lib/artsy-eventservice/version.rb

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

data/spec/artsy-eventstream/artsy/event_service/rabbitmq_connection_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Artsy::EventService::RabbitMQConnection do
+  describe '.get_connection' do
+    before :each do
+      Artsy::EventService::RabbitMQConnection.instance_variable_set(:@connection, nil)
+    end
+
+    context 'with an open connection' do
+      it 'returns that connection' do
+        open_conn = double(:open_conn, closed?: false, start: nil)
+        expect(Bunny).to receive(:new).once.and_return(open_conn)
+
+        connection = Artsy::EventService::RabbitMQConnection.get_connection
+
+        expect(connection).to eq open_conn
+      end
+    end
+
+    context 'with a closed connection' do
+      it 'rebuilds and returns that new connection' do
+        closed_conn = double(:closed_conn, closed?: true, start: nil)
+        open_conn = double(:open_conn, closed?: false, start: nil)
+        expect(Bunny).to receive(:new).twice.and_return(closed_conn, open_conn)
+
+        connection = Artsy::EventService::RabbitMQConnection.get_connection
+
+        expect(connection).to eq open_conn
+      end
+    end
+  end
+end

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

@@ -22,11 +22,11 @@ describe Artsy::EventService::Publisher do
       expect { Artsy::EventService::Publisher.publish_event(topic: nil, event: event) }.to raise_error 'Event missing topic or verb.'
     end
     it 'fails when event.verb is empty' do
-      allow(event).to receive(:verb).and_return('')
+      expect(event).to receive(:verb).and_return('')
       expect { Artsy::EventService::Publisher.publish_event(topic: 'test', event: event) }.to raise_error 'Event missing topic or verb.'
     end
     it 'fails when event.verb is nil' do
-      allow(event).to receive(:verb).and_return(nil)
+      expect(event).to receive(:verb).and_return(nil)
       expect { Artsy::EventService::Publisher.publish_event(topic: 'test', event: event) }.to raise_error 'Event missing topic or verb.'
     end
     it 'uses verb as routing key when calling publish on the exchange without passing routing_key' do
@@ -34,60 +34,85 @@ describe Artsy::EventService::Publisher do
       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(true)
-      allow(channel).to receive(:close)
+      expect(conn).to receive(:create_channel).and_return(channel)
+      expect(channel).to receive(:open?).and_return(true)
+      expect(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      expect(channel).to receive(:confirm_select)
+      expect(channel).to receive(:wait_for_confirms).and_return(true)
+      expect(channel).to receive(:close)
 
       expect(exchange).to receive(:publish).with(
         JSON.generate(hello: true),
         routing_key: 'testing',
         persistent: true,
         content_type: 'application/json',
+        headers: {},
         app_id: 'artsy'
       )
       Artsy::EventService::Publisher.publish_event(topic: 'test', event: event)
     end
-    it 'uses verb as routing key when calling publish on the exchange without passing routing_key' do
+    it 'uses the provided routing_key key when calling publish on the exchange when passing routing_key' 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(true)
-      allow(channel).to receive(:close)
+      expect(conn).to receive(:create_channel).and_return(channel)
+      expect(channel).to receive(:open?).and_return(true)
+      expect(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      expect(channel).to receive(:confirm_select)
+      expect(channel).to receive(:wait_for_confirms).and_return(true)
+      expect(channel).to receive(:close)
 
       expect(exchange).to receive(:publish).with(
         JSON.generate(hello: true),
         routing_key: 'good.route',
         persistent: true,
         content_type: 'application/json',
+        headers: {},
         app_id: 'artsy'
       )
       Artsy::EventService::Publisher.publish_event(topic: 'test', event: event, routing_key: 'good.route')
     end
-    it 'raises an error if event publishing is unconfirmed' do
+    it 'passes through provided headers when calling publish on the exchange' 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(conn).to receive(:create_channel).and_return(channel)
+      expect(channel).to receive(:open?).and_return(true)
+      expect(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      expect(channel).to receive(:confirm_select)
+      expect(channel).to receive(:wait_for_confirms).and_return(true)
+      expect(channel).to receive(:close)
+
+      expect(exchange).to receive(:publish).with(
+        JSON.generate(hello: true),
+        routing_key: 'good.route',
+        persistent: true,
+        content_type: 'application/json',
+        headers: {"x-foo": "bar"},
+        app_id: 'artsy'
+      )
+      Artsy::EventService::Publisher.publish_event(topic: 'test', event: event, routing_key: 'good.route', headers: {"x-foo": "bar"})
+    end
+    it 'raises an error if event publishing is unconfirmed' do
+      conn = double
+      channel = double
+      exchange = double
+      expect(Artsy::EventService::RabbitMQConnection).to receive(:get_connection).with(no_args).and_return(conn)
+      expect(conn).to receive(:create_channel).and_return(channel)
+      expect(channel).to receive(:open?).and_return(true)
+      expect(channel).to receive(:topic).with('test', durable: true).and_return(exchange)
+      expect(channel).to receive(:confirm_select)
+      expect(channel).to receive(:wait_for_confirms).and_return(false)
+      expect(channel).to receive(:close)
 
       expect(exchange).to receive(:publish).with(
         JSON.generate(hello: true),
         routing_key: 'good.route',
         persistent: true,
         content_type: 'application/json',
+        headers: {},
         app_id: 'artsy'
       )
       expect do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artsy-eventservice
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Ashkan Nasseri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -50,6 +50,7 @@ files:
 - lib/artsy-eventservice/config.rb
 - lib/artsy-eventservice/presenters/events/base_event.rb
 - lib/artsy-eventservice/version.rb
+- spec/artsy-eventstream/artsy/event_service/rabbitmq_connection_spec.rb
 - spec/artsy-eventstream/artsy/event_service_spec.rb
 - spec/artsy-eventstream/artsy/publisher_spec.rb
 - spec/artsy-eventstream/config_spec.rb
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Gem for producing events in Artsy's event stream