philotic 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: b72b8c6dc5ab1be2da45998cf70ebe908ad3099d
-  data.tar.gz: 8b6473eb588bdbe69d4b401b4b149cdcecb416b9
+  metadata.gz: 3ed9395d1fe81863b4c38f92ab7caa95186d7731
+  data.tar.gz: d550b106f564a798635798e121dcd80d192d9e10
 SHA512: 
-  metadata.gz: 5a95fc1ea9e1729aff8752d68b50168e41d8ed621271c2a00809ec3e714ef68813defcb137febb57b4978df085a22da3b1a39e67b38e878f2de99d41b72e52eb
-  data.tar.gz: 96fb09160928634ec14693512aadd19c99237993d7e608bcf850ced33006a75ca8216ed60da6e6571e2c29b2a6e3c9363b649979578f8584e082b4a2c1358596
+  metadata.gz: 160ebead89967ffdcd676867166573334df6d8b7a01fe08fa061043a0cb7b23b31a8ac23d2ad9c6cff2876871b0b039ed10f4ab00dab48e8451ce4756a1a0d94
+  data.tar.gz: 8e40399b956a627bc93ccd1e7bca8e0408efe25e9cba930ba2833139c8a299d6e5fe95ec206bbbd2ca3f8867f125c19688aeeba06399ad8b5bd4887be6d29b81

data/README.md

@@ -19,7 +19,7 @@ Philotic.config.message_return_handler = lambda do |basic_return, metadata, mess
   Philotic.logger.warn "Message returned. reply_text: #{basic_return.reply_text}"
 end
 
-Philotic.subscriber.subscribe(header_key: 'header_1') do |metadata, message|
+Philotic.subscribe(header_key: 'header_1') do |metadata, message|
   ap message[:attributes]
 end
 
@@ -48,7 +48,7 @@ philotic.config.message_return_handler = lambda do |basic_return, metadata, mess
   philotic.logger.warn "Message returned. reply_text: #{basic_return.reply_text}"
 end
 
-philotic.subscriber.subscribe(header_key: 'header_1') do |metadata, message|
+philotic.subscribe(header_key: 'header_1') do |metadata, message|
   ap message[:attributes]
 end
 

data/examples/simple_instance.rb

@@ -12,7 +12,7 @@ philotic.config.message_return_handler = lambda do |basic_return, metadata, mess
   philotic.logger.warn "Message returned. reply_text: #{basic_return.reply_text}"
 end
 
-philotic.subscriber.subscribe(header_key: 'header_1') do |metadata, message|
+philotic.subscribe(header_key: 'header_1') do |metadata, message|
   ap message[:attributes]
 end
 

data/examples/simple_singleton.rb

@@ -10,7 +10,7 @@ Philotic.config.message_return_handler = lambda do |basic_return, metadata, mess
   Philotic.logger.warn "Message returned. reply_text: #{basic_return.reply_text}"
 end
 
-Philotic.subscriber.subscribe(header_key: 'header_1') do |metadata, message|
+Philotic.subscribe(header_key: 'header_1') do |metadata, message|
   ap message[:attributes]
 end
 

data/examples/subscribing/acks.rb

@@ -6,20 +6,20 @@ require 'philotic'
 require 'awesome_print'
 
 # sometimes ack
-Philotic.subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
+Philotic.subscribe('flaky_queue', ack: true) do |metadata, message|
   ap message[:attributes]
-   [true, false].sample ? Philotic.subscriber.acknowledge(message) : Philotic.subscriber.reject(message)
+   [true, false].sample ? acknowledge(message) : reject(message)
 end
 
 # always ack
-Philotic.subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
+Philotic.subscribe('flaky_queue', ack: true) do |metadata, message|
   ap message[:attributes]
-  Philotic.subscriber.acknowledge(message, true)
+  acknowledge(message, true)
 end
 
 # always reject
-Philotic.subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
+Philotic.subscribe('flaky_queue', ack: true) do |metadata, message|
   ap message[:attributes]
-  Philotic.subscriber.reject message
+  reject message
 end
 Philotic.subscriber.endure

data/examples/subscribing/anonymous_queue.rb

@@ -7,7 +7,7 @@ require 'awesome_print'
 
 Philotic.config.load_file(File.join(File.dirname(__FILE__), '../../', 'Philotic.yml.example'))
 
-Philotic.subscriber.subscribe(philotic_firehose: true) do |metadata, message|
+Philotic.subscribe(philotic_firehose: true) do |metadata, message|
   ap message[:attributes]
 end
 

data/examples/subscribing/multiple_named_queues.rb

@@ -7,11 +7,11 @@ require 'awesome_print'
 
 Philotic.config.load_file(File.join(File.dirname(__FILE__), '../../', 'Philotic.yml.example'))
 
-Philotic.subscriber.subscribe('female_queue') do |metadata, message|
+Philotic.subscribe('female_queue') do |metadata, message|
   ap message[:attributes]
 end
 
-Philotic.subscriber.subscribe('male_queue') do |metadata, message|
+Philotic.subscribe('male_queue') do |metadata, message|
   ap message[:attributes]
 end
 

data/examples/subscribing/named_queue.rb

@@ -5,7 +5,7 @@ $stdout.sync = true
 require 'philotic'
 require 'awesome_print'
 
-Philotic.subscriber.subscribe('test_queue') do |metadata, message|
+Philotic.subscribe('test_queue') do |metadata, message|
   ap message[:attributes]
 end
 

data/lib/philotic/config.rb

@@ -39,6 +39,7 @@ module Philotic
     DEFAULT_APP_ID                  = nil
     DEFAULT_TIMESTAMP               = nil
     DEFAULT_EXPIRATION              = nil
+    DEFAULT_CONNECTION_RETRIES      = 2
 
     attr_accessor :connection
 
@@ -77,6 +78,11 @@ module Philotic
     def log_level
       @log_level ||= defaults[:log_level].to_i
     end
+
+    def connection_retries
+      @connection_retries ||= defaults[:connection_retries].to_i
+    end
+
     attr_writer :connection_failed_handler, :connection_loss_handler, :message_return_handler
 
     def connection_failed_handler

data/lib/philotic/connection.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'bunny'
 require 'logger'
-
+require 'bunny'
 require 'philotic/constants'
 require 'philotic/config'
 require 'philotic/publisher'
@@ -9,13 +9,20 @@ require 'philotic/subscriber'
 
 module Philotic
   class Connection
+
+    class TCPConnectionFailed < Bunny::TCPConnectionFailed; end
+
     extend Forwardable
 
-    attr_reader :connection
+    attr_reader :connection, :connection_attempts
     attr_accessor :logger
 
     attr_writer :publisher, :subscriber
 
+    def initialize
+      @connection_attempts = 0
+    end
+
     def publisher
       @publisher ||= Philotic::Publisher.new self
     end
@@ -44,7 +51,20 @@ module Philotic
     end
 
     def start_connection!
-      @connection = Bunny.new(config.rabbit_url, connection_settings)
+      begin
+        attempt_connection
+      rescue ::Bunny::TCPConnectionFailed => e
+        if connection_attempts <= config.connection_retries
+          retry
+        else
+          raise TCPConnectionFailed.new "Failed to connect after #{connection_attempts} attempts", config.rabbit_host, config.rabbit_port
+        end
+      end
+    end
+
+    def attempt_connection
+      @connection_attempts += 1
+      @connection          = Bunny.new(config.rabbit_url, connection_settings)
       @connection.start
     end
 
@@ -130,7 +150,7 @@ module Philotic
 
     def logger
       unless @logger
-        @logger = Logger.new(STDOUT)
+        @logger       = Logger.new(STDOUT)
         @logger.level = config.log_level
       end
       @logger

data/lib/philotic/event.rb

@@ -6,7 +6,8 @@ module Philotic
   class Event
     include Philotic::Routable
 
-    attr_accessor :connection
+    attr_accessor :connection, :publish_error
+    attr_writer :published
 
     def initialize(routables={}, payloads={}, connection=nil)
       self.timestamp         = Time.now.to_i
@@ -19,6 +20,8 @@ module Philotic
       # over into the bus
       _set_routables_or_payloads(:routable, routables)
       _set_routables_or_payloads(:payload, payloads)
+
+      @published = false
     end
 
     def self.inherited(sub)
@@ -48,6 +51,10 @@ module Philotic
       @connection ||= Philotic.connection
     end
 
+    def published?
+     !!@published
+    end
+
     def publish
       connection.publish self
     end

data/lib/philotic/publisher.rb

@@ -21,19 +21,25 @@ module Philotic
     def publish(event)
       message_metadata = {headers: event.headers}
       message_metadata.merge!(event.message_metadata) if event.message_metadata
-      _publish(event.payload, message_metadata)
+      begin
+        event.published = _publish(event.payload, message_metadata)
+      rescue => e
+        event.publish_error = e
+        logger.error e.message
+      end
+      event
     end
 
     private
     def _publish(payload, message_metadata = {})
       if config.disable_publish
-        log_event_published(:warn,  message_metadata, payload, 'attempted to publish a message when publishing is disabled.')
+        log_event_published(:warn, message_metadata, payload, 'attempted to publish a message when publishing is disabled.')
         return false
       end
       connection.connect!
       unless connection.connected?
         log_event_published(:error, message_metadata, payload, 'unable to publish event, not connected to RabbitMQ')
-        return
+        return false
       end
       message_metadata = merge_metadata(message_metadata)
 
@@ -41,6 +47,7 @@ module Philotic
 
       connection.exchange.publish(payload.to_json, message_metadata)
       log_event_published(:debug, message_metadata, payload, 'published event')
+      true
     end
 
     def normalize_payload_times(payload)

data/lib/philotic/subscriber.rb

@@ -20,7 +20,7 @@ module Philotic
       connection.logger
     end
 
-    def subscription_callback
+    def subscription_callback(&block)
       lambda do |delivery_info, metadata, payload|
         hash_payload = JSON.parse payload
 
@@ -30,7 +30,8 @@ module Philotic
             delivery_info: delivery_info,
             attributes:    metadata[:headers] ? hash_payload.merge(metadata[:headers]) : hash_payload
         }
-        yield(Metadata.new(metadata), event)
+
+        instance_exec(Metadata.new(metadata), event, &block)
       end
     end
 

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/philotic/connection_spec.rb

@@ -43,6 +43,7 @@ describe Philotic::Connection do
 
   describe '#start_connection!' do
     let(:connection) { double }
+    let(:connection_error) {Bunny::TCPConnectionFailed.new 'connection failed', 'localhost', '5672'}
     subject { Philotic::Connection.new }
     specify do
       expect(Bunny).to receive(:new).with(subject.config.rabbit_url, subject.connection_settings).and_return(connection)
@@ -50,6 +51,15 @@ describe Philotic::Connection do
 
       subject.start_connection!
     end
+
+    it 'should retry connecting' do
+      expect(Bunny).to receive(:new) do
+        raise connection_error
+      end.exactly(subject.config.connection_retries + 1).times
+
+      expect { subject.start_connection! }.to raise_error(Philotic::Connection::TCPConnectionFailed)
+    end
+
   end
 
   describe '#close' do

data/spec/philotic/publisher_spec.rb

@@ -17,6 +17,7 @@ describe Philotic::Publisher do
   subject { publisher }
 
   describe 'publish' do
+    let(:publish_error) {StandardError.new 'publish error'}
     it 'should call _publish with the right values' do
       Timecop.freeze
       expect(subject).to receive(:_publish).with(
@@ -36,7 +37,22 @@ describe Philotic::Publisher do
                                  timestamp: Time.now.to_i
                              }
                          )
+      expect(event).to_not be_published
       subject.publish(event)
+      expect(event).to_not be_published # not connected
+    end
+
+    it 'should fail gracefully' do
+      expect(subject).to receive(:_publish) do
+        raise publish_error
+      end
+
+      expect(subject.logger).to receive(:error).with(publish_error.message)
+      expect(event).to_not be_published
+      subject.publish(event)
+      expect(event).to_not be_published
+      expect(event.publish_error).to eq publish_error
+
     end
 
   end
@@ -83,7 +99,9 @@ describe Philotic::Publisher do
                               }.to_json,
                               metadata
                           )
+      expect(event).to_not be_published
       subject.publish(event)
+      expect(event).to be_published
     end
 
     it 'should log an error when there is no connection' do
@@ -93,7 +111,9 @@ describe Philotic::Publisher do
       expect(subject.connection).to receive(:connected?).once.and_return(false)
 
       expect(subject.logger).to receive(:error)
+      expect(event).to_not be_published
       subject.publish(event)
+      expect(event).to_not be_published
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: philotic
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Nathan Keyes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-18 00:00:00 Z
+date: 2014-12-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: codeclimate-test-reporter