philotic 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: ee1d9812c7c6660194339252c4bf0937e5b61835
-  data.tar.gz: 67e432c035d71d4e0c225a6fc6f7bb4007df302e
+  metadata.gz: a60ac5e8053afb45e0459396f2b03ddf13a24f59
+  data.tar.gz: daed056c818497be3ac3990bee70c236df0f197a
 SHA512: 
-  metadata.gz: f03f343eb79f3b7408fcd55eb8a94c756b6955c5afa3df8d6a9bf2f97a1508cd4122a28b203ddd8cb0d744c864e5d25d668c043d48bef1b0692449cc4340c391
-  data.tar.gz: 106f0215edb60b7a1b8011984e0498533db8e1ca41c25dd316c4b1ecb7c057f53216ce66aec2fa74905d04245b26a58cbea42e6314d40c856a642ad033f2f6c5
+  metadata.gz: 169e1c7a78948103445daff4d1fe69d6caad5851180f842b26ff5d4d0d35a3804b240b99a0ce9d22a532803f30362e1c1949fd5a4cf67cc6c3a28d300d4c359c
+  data.tar.gz: 4bf8d7a2832ffa99f0633e8f18693c24d31eb7eaff8789bdc409a8f7bd14c0329e540ec6e6477b72d728fad1eb51131c74f51d34ee9ef7369e21e23ea8c53b0c

data/README.md

@@ -2,8 +2,9 @@
 
 Lightweight, opinionated wrapper for using RabbitMQ headers exchanges
 
-[![Gem Version](https://badge.fury.io/rb/philotic.png)](http://badge.fury.io/rb/philotic)
 [![Build Status](https://travis-ci.org/nkeyes/philotic.png?branch=master)](https://travis-ci.org/nkeyes/philotic)
+[![Gem Version](https://badge.fury.io/rb/philotic.png)](http://badge.fury.io/rb/philotic)
+[![Dependency Status](https://gemnasium.com/nkeyes/philotic.svg)](https://gemnasium.com/nkeyes/philotic)
 [![Code Climate](https://codeclimate.com/github/nkeyes/philotic/badges/gpa.svg)](https://codeclimate.com/github/nkeyes/philotic)
 [![Test Coverage](https://codeclimate.com/github/nkeyes/philotic/badges/coverage.svg)](https://codeclimate.com/github/nkeyes/philotic)
 

data/lib/philotic/config.rb

@@ -25,10 +25,10 @@ module Philotic
     DEFAULT_EXCHANGE_NAME           = 'philotic.headers'
     DEFAULT_TIMEOUT                 = 2
     DEFAULT_ROUTING_KEY             = nil
-    DEFAULT_PERSISTENT              = true
-    # DEFAULT_IMMEDIATE = false
-    DEFAULT_MANDATORY               = true
-    DEFAULT_CONTENT_TYPE            = nil
+    DEFAULT_PERSISTENT              = false
+    DEFAULT_IMMEDIATE               = false
+    DEFAULT_MANDATORY               = false
+    DEFAULT_CONTENT_TYPE            = 'application/json'
     DEFAULT_CONTENT_ENCODING        = nil
     DEFAULT_PRIORITY                = nil
     DEFAULT_MESSAGE_ID              = nil
@@ -40,6 +40,7 @@ module Philotic
     DEFAULT_TIMESTAMP               = nil
     DEFAULT_EXPIRATION              = nil
     DEFAULT_CONNECTION_ATTEMPTS     = 3
+    DEFAULT_PREFETCH_COUNT          = 1
 
     attr_accessor :connection
 
@@ -83,17 +84,21 @@ module Philotic
       @connection_retries ||= defaults[:connection_attempts].to_i
     end
 
+    def prefetch_count
+      @prefetch_count ||= defaults[:prefetch_count].to_i
+    end
+
     attr_writer :connection_failed_handler, :connection_loss_handler, :message_return_handler
 
     def connection_failed_handler
       @connection_failed_handler ||= lambda do |settings|
-        logger.error { "RabbitMQ connection failure; host:#{rabbit_host}" }
+        logger.error { "RabbitMQ connection failure: #{sanitized_rabbit_url}" }
       end
     end
 
     def connection_loss_handler
       @connection_loss_handler ||= lambda do |conn, settings|
-        logger.warn { "RabbitMQ connection loss; host:#{rabbit_host}" }
+        logger.warn { "RabbitMQ connection loss: #{sanitized_rabbit_url}" }
         conn.reconnect(false, 2)
       end
     end

data/lib/philotic/connection.rb

@@ -82,7 +82,7 @@ module Philotic
     def connection_settings
       {
           timeout:                   config.timeout.to_i,
-          automatically_recover:     true,
+          automatic_recovery:        true,
           on_tcp_connection_failure: config.connection_failed_handler,
       }
     end
@@ -167,7 +167,7 @@ module Philotic
       @logger
     end
 
-    def_delegators :publisher, :publish
-    def_delegators :subscriber, :subscribe
+    def_delegators :publisher, *(Philotic::Publisher.public_instance_methods(false) - [:connection, :config, :logger])
+    def_delegators :subscriber, *(Philotic::Subscriber.public_instance_methods(false) - [:connection, :config, :logger])
   end
 end

data/lib/philotic/constants.rb

@@ -13,7 +13,7 @@ module Philotic
   MESSAGE_OPTIONS    = [
       :routing_key,
       :persistent,
-      # :immediate,
+      :immediate,
       :mandatory,
       :content_type,
       :content_encoding,

data/lib/philotic/subscriber.rb

@@ -2,13 +2,6 @@ require 'philotic/constants'
 
 module Philotic
   class Subscriber
-    class Metadata
-      attr_accessor :attributes
-
-      def initialize(attributes)
-        self.attributes = attributes
-      end
-    end
 
     attr_accessor :connection
 
@@ -20,7 +13,11 @@ module Philotic
       connection.logger
     end
 
-    def subscription_callback(&block)
+    def config
+      connection.config
+    end
+
+    def subscription_callback(queue, &block)
       lambda do |delivery_info, metadata, payload|
         hash_payload = JSON.parse payload
 
@@ -31,22 +28,27 @@ module Philotic
             attributes:    metadata[:headers] ? hash_payload.merge(metadata[:headers]) : hash_payload
         }
 
-        instance_exec(Metadata.new(metadata), event, &block)
+        instance_exec(event, metadata, queue, &block)
       end
     end
 
     def subscribe(subscription = {}, subscribe_options = Philotic::DEFAULT_SUBSCRIBE_OPTIONS, &block)
       connection.connect!
-      @exchange = connection.exchange
+      connection.channel.prefetch(connection.config.prefetch_count)
 
       subscription_settings = get_subscription_settings subscription, subscribe_options
 
-      q = connection.channel.queue(subscription_settings[:queue_name], subscription_settings[:queue_options])
+      queue = initialize_queue(subscription_settings)
+
+      queue.subscribe(subscription_settings[:subscribe_options], &subscription_callback(queue, &block))
 
-      q.bind(@exchange, arguments: subscription_settings[:arguments]) if subscription_settings[:arguments]
+    end
 
-      q.subscribe(subscription_settings[:subscribe_options], &subscription_callback(&block))
+    def initialize_queue(subscription_settings)
+      queue = connection.channel.queue(subscription_settings[:queue_name], subscription_settings[:queue_options])
 
+      queue.bind(connection.exchange, arguments: subscription_settings[:arguments]) if subscription_settings[:arguments]
+      queue
     end
 
     def get_subscription_settings(subscription, subscribe_options)

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/philotic.yml.example

@@ -11,9 +11,9 @@ defaults: &defaults
   
   #message settings
   routing_key: ~
-  persistent: true
-  # immediate: true
-  mandatory: true
+  persistent: false
+  immediate: false
+  mandatory: false
   content_type: ~
   content_encoding: ~
   priority: ~

data/spec/philotic/publisher_spec.rb

@@ -66,9 +66,7 @@ describe Philotic::Publisher do
         subject.publish(event)
         expect(event).to_not be_published
       end
-
     end
-
   end
 
   describe '#raw_publish' do
@@ -82,9 +80,10 @@ describe Philotic::Publisher do
       expect(subject.connection).to receive(:connected?).and_return(true)
       metadata = {
           routing_key:      nil,
-          persistent:       true,
-          mandatory:        true,
-          content_type:     nil,
+          persistent:       false,
+          immediate:        false,
+          mandatory:        false,
+          content_type:     'application/json',
           content_encoding: nil,
           priority:         nil,
           message_id:       nil,
@@ -120,7 +119,6 @@ describe Philotic::Publisher do
 
     it 'should log an error when there is no connection' do
 
-
       expect(subject.connection).to receive(:connect!)
       expect(subject.connection).to receive(:connected?).once.and_return(false)
 
@@ -132,7 +130,6 @@ describe Philotic::Publisher do
 
   end
 
-
   describe '#normalize_payload_times' do
     let(:responds_to_utc) { double }
     let(:responds_to_to_utc) { double }
@@ -153,6 +150,5 @@ describe Philotic::Publisher do
       expect(payload).to eq normalized_payload
 
     end
-
   end
 end

data/spec/philotic/subscriber_spec.rb

@@ -24,8 +24,8 @@ describe Philotic::Subscriber do
 
         expect(subject.connection).to receive(:connect!)
 
-        expect(subject.connection).to receive(:exchange).and_return(exchange)
-        expect(subject.connection).to receive(:channel).and_return(channel)
+        expect(subject.connection).to receive(:channel).and_return(channel).twice
+        expect(channel).to receive(:prefetch).with(subject.connection.config.prefetch_count)
         expect(channel).to receive(:queue).and_return(queue)
 
         expect(queue).not_to receive(:bind)
@@ -57,7 +57,8 @@ describe Philotic::Subscriber do
         expect(subject.connection).to receive(:connect!)
 
         expect(subject.connection).to receive(:exchange).and_return(exchange)
-        expect(subject.connection).to receive(:channel).and_return(channel)
+        expect(subject.connection).to receive(:channel).and_return(channel).twice
+        expect(channel).to receive(:prefetch).with(subject.connection.config.prefetch_count)
         expect(channel).to receive(:queue).and_return(queue)
 
         expect(queue).to receive(:bind).with(exchange, hash_including(arguments: subscription))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: philotic
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors: 
 - Nathan Keyes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-02 00:00:00 Z
+date: 2015-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: codeclimate-test-reporter