philotic 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5aa6de95d72e998edad55939b1b194101189c96
-  data.tar.gz: b1972e32e338076a218f18f96a32ca9150cb0ca1
+  metadata.gz: fb0f8544430bd4ed0961e39da04d9f8b31de77fb
+  data.tar.gz: 8179fe31b21760200bed1315dda3c2241998523b
 SHA512:
-  metadata.gz: 3a3fc577e42079e2747e72b13905a831f1bdbccdfd7bbd6dae815e1fcb013fd1e8ee7e37d68444f4a773bea2c9005884c4f44d4be77ac20bae32de147f21a0a7
-  data.tar.gz: 10075f5fd0473498dae8b45ea57eca725ffa48909eedb203cf31d9a8bcd7acb1a5f6b4642f275b313ccbb7f1a6f116ff0241b08b490187563357757461000cf0
+  metadata.gz: bf07ca965eb1503d85fa28910d37410d5076256f9dfe2f6d938643fa1cc0d43ce708541da7235f37172cd01da22520a695271d8b851248c7b9feb660a3e246b6
+  data.tar.gz: c37eedc369ed1c0f4257ba819f1596e6d41d177a0f4a1236f6fec432506b43f12f99a37b7a695532d7ef3ccf2c93f8fe9b517b4287c2003c75db32be1449cf3d

data/.travis.yml

@@ -1,13 +1,17 @@
+sudo: false
 language: ruby
 before_install: gem install bundler -v 1.10.6
 rvm:
 - 2.0.0
-- 2.1
-- 2.2
+- 2.1.5
+- 2.2.0
+- 2.2.1
+- 2.2.2
+- 2.2.3
 - rbx-2
-# - jruby-19mode
+- jruby-19mode
 - ruby-head
-# - jruby-head
+- jruby-head
 script:
 - bundle exec rspec
 addons:
@@ -17,6 +21,11 @@ addons:
 notifications:
   hipchat:
     rooms:
-      secure: akLY832/pt0+9Y2TFKpzW08bagPMY//AcQJ5JGzc0yd3hZbXTlkW4S8bMEclBeHBqLGCV6vaWeN90PiYwIBs4IWlxopPAop4BEWeqRvD8+B4fxarXYwejt54vH3v4iCnHhSNBpFJDbykyfL0f0g9fhvM48eHzhBXTxPZfpQ9nXs=
+      secure: HXE1RU8b95gp0/4QoQXws1dVSw+uHGg0wqb/q5EKBjvKXxaqfIrBWeZlTAn3ykz8HQja8YoUOlwFL7lpmwdbXlbmuSb0RPyqWURNvooDw3twn675E0dtf5vlKWbADsIK73Gs1LfR3Gpb0l/85T5P+/knNRkh9p43hqiRaW/LJ/M=
     template:
-      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}'
+    - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
+matrix:
+  allow_failures:
+  - rvm: jruby-19mode
+  - rvm: jruby-head
+  - rvm: ruby-head

data/README.md

@@ -69,7 +69,12 @@ end
 
 ### Tested with the following Rubies
 * 2.0.0
-* 2.1.x
-* 2.2.x
-* rbx-2
-* ruby-head
+* 2.1.5
+* 2.2.0
+* 2.2.1
+* 2.2.2
+* 2.2.3
+* rbx*2
+* jruby*19mode
+* ruby*head
+* jruby*head

data/examples/simple_instance.rb

@@ -7,6 +7,8 @@ require 'awesome_print'
 
 philotic = Philotic::Connection.new
 
+MessageClass = Class.new(Philotic::Message)
+
 # override the message return handler
 philotic.config.message_return_handler = lambda do |basic_return, metadata, message|
   philotic.logger.warn { "Message returned. reply_text: #{basic_return.reply_text}" }
@@ -23,7 +25,7 @@ end
 # to keep the parent thread alive while the subscribers do their thing
 # but this infinite publish loop takes care of that
 loop do
-  message = Philotic::Message.new({header_key: "header_#{[1, 2].sample}"}, {payload_key: 'payload_value'})
+  message = MessageClass.new({header_key: "header_#{[1, 2].sample}"}, {payload_key: 'payload_value'})
   philotic.publish message
   # only send a message every two seconds so we can see whats going on
   sleep 2

data/lib/philotic.rb

@@ -1,12 +1,6 @@
 require 'pathname'
 
 module Philotic
-  class << self
-    def root
-      ::Pathname.new File.expand_path('../../', __FILE__)
-    end
-  end
-
 end
 
 require 'philotic/constants'
@@ -17,6 +11,7 @@ require 'philotic/version'
 require 'philotic/config'
 require 'philotic/message'
 require 'philotic/publisher'
+require 'philotic/serialization'
 require 'philotic/subscriber'
 require 'philotic/consumer'
 require 'philotic/logging'

data/lib/philotic/config.rb

@@ -1,46 +1,20 @@
 require 'yaml'
-require 'json'
+require 'multi_json'
+require 'oj'
 require 'singleton'
 require 'forwardable'
 require 'cgi'
 require 'bunny/session'
 require 'logger'
+require 'philotic/config/defaults'
+require 'active_support/inflections'
 
 module Philotic
   class Config
 
-    ENV_PREFIX = 'PHILOTIC'
+    include Defaults
 
-    DEFAULT_DISABLE_PUBLISH         = false
-    DEFAULT_INITIALIZE_NAMED_QUEUES = false
-    DEFAULT_DELETE_EXISTING_QUEUES  = false
-    DEFAULT_LOG_LEVEL               = Logger::DEBUG
-    DEFAULT_RABBIT_SCHEME           = 'amqp'
-    DEFAULT_RABBIT_HOST             = 'localhost'
-    DEFAULT_RABBIT_PORT             = 5672
-    DEFAULT_RABBIT_USER             = 'guest'
-    DEFAULT_RABBIT_PASSWORD         = 'guest'
-    DEFAULT_RABBIT_VHOST            = '%2f' # '/'
-    DEFAULT_RABBIT_URL              = "#{DEFAULT_RABBIT_SCHEME}://#{DEFAULT_RABBIT_USER}:#{DEFAULT_RABBIT_PASSWORD}@#{DEFAULT_RABBIT_HOST}:#{DEFAULT_RABBIT_PORT}/#{DEFAULT_RABBIT_VHOST}"
-    DEFAULT_EXCHANGE_NAME           = 'philotic.headers'
-    DEFAULT_TIMEOUT                 = 2
-    DEFAULT_ROUTING_KEY             = 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
-    DEFAULT_CORRELATION_ID          = nil
-    DEFAULT_REPLY_TO                = nil
-    DEFAULT_TYPE                    = nil
-    DEFAULT_USER_ID                 = nil
-    DEFAULT_APP_ID                  = nil
-    DEFAULT_TIMESTAMP               = nil
-    DEFAULT_EXPIRATION              = nil
-    DEFAULT_CONNECTION_ATTEMPTS     = 3
-    DEFAULT_PREFETCH_COUNT          = 0
+    ENV_PREFIX = 'PHILOTIC'
 
     attr_accessor :connection
 
@@ -53,29 +27,6 @@ module Philotic
       connection.logger
     end
 
-    def defaults
-      @defaults ||= Hash[Config.constants.select { |c| c.to_s.start_with? 'DEFAULT_' }.collect do |c|
-                           key = c.slice(8..-1).downcase.to_sym
-
-                           env_key = "#{ENV_PREFIX}_#{key}".upcase
-
-                           [key, ENV[env_key] || Config.const_get(c)]
-                         end
-      ]
-    end
-
-    Config.constants.each do |c|
-      if c.to_s.start_with? 'DEFAULT_'
-        attr_symbol = c.slice(8..-1).downcase.to_sym
-        attr_writer attr_symbol
-        class_eval %Q{
-          def #{attr_symbol}
-            @#{attr_symbol} ||= defaults[:#{attr_symbol}]
-          end
-        }
-      end
-    end
-
     def log_level
       @log_level ||= defaults[:log_level].to_i
     end
@@ -88,20 +39,7 @@ module Philotic
       @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: #{sanitized_rabbit_url}" }
-      end
-    end
-
-    def connection_loss_handler
-      @connection_loss_handler ||= lambda do |conn, settings|
-        logger.warn { "RabbitMQ connection loss: #{sanitized_rabbit_url}" }
-        conn.reconnect(false, 2)
-      end
-    end
+    attr_writer :message_return_handler
 
     def message_return_handler
       @message_return_handler ||= lambda do |basic_return, metadata, payload|
@@ -118,7 +56,7 @@ module Philotic
         current_value = send("rabbit_#{setting}")
 
         # only use the value from the URI if the existing value is nil or the default
-        if settings[setting] && [self.class.const_get("default_rabbit_#{setting}".upcase), nil].include?(current_value)
+        if settings[setting] && [Defaults.const_get("rabbit_#{setting}".upcase), nil].include?(current_value)
           send("rabbit_#{setting}=", settings[setting])
         end
       end
@@ -146,5 +84,14 @@ module Philotic
       config = YAML.load_file(filename)
       load_config(config[env])
     end
+
+    def serializations
+      self.serializations = MultiJson.load(defaults[:serializations]) unless @serializations
+      @serializations
+    end
+
+    def content_type
+      Philotic::Serialization::Serializer.factory(serializations.last).content_type
+    end
   end
-end
+end

data/lib/philotic/config/defaults.rb

@@ -0,0 +1,71 @@
+require 'logger'
+
+module Philotic
+  class Config
+    module Defaults
+
+      DISABLE_PUBLISH           = false
+      INITIALIZE_NAMED_QUEUES   = false
+      DELETE_EXISTING_QUEUES    = false
+      LOG_LEVEL                 = Logger::DEBUG
+      RABBIT_SCHEME             = 'amqp'
+      RABBIT_HOST               = 'localhost'
+      RABBIT_PORT               = 5672
+      RABBIT_USER               = 'guest'
+      RABBIT_PASSWORD           = 'guest'
+      RABBIT_VHOST              = '%2f' # '/'
+      RABBIT_URL                = "#{RABBIT_SCHEME}://#{RABBIT_USER}:#{RABBIT_PASSWORD}@#{RABBIT_HOST}:#{RABBIT_PORT}/#{RABBIT_VHOST}"
+      EXCHANGE_NAME             = 'philotic.headers'
+      ROUTING_KEY               = nil
+      PERSISTENT                = false
+      IMMEDIATE                 = false
+      MANDATORY                 = false
+      SERIALIZATIONS            = '["json"]' # serializations is expected to be a JSON ray of strings
+      CONTENT_TYPE              = 'application/json'
+      CONTENT_ENCODING          = nil
+      PRIORITY                  = nil
+      MESSAGE_ID                = nil
+      CORRELATION_ID            = nil
+      REPLY_TO                  = nil
+      TYPE                      = nil
+      USER_ID                   = nil
+      APP_ID                    = nil
+      TIMESTAMP                 = nil
+      EXPIRATION                = nil
+      CONNECTION_ATTEMPTS       = 3
+      PREFETCH_COUNT            = 0
+      AUTOMATICALLY_RECOVER     = true
+      NETWORK_RECOVERY_INTERVAL = 5 # seconds
+      CONTINUATION_TIMEOUT      = 4000 # ms
+      RAISE_ERROR_ON_PUBLISH    = false
+      ENCRYPTION_KEY            = nil
+
+
+      def defaults
+        @defaults ||= Hash[Philotic::Config::Defaults.constants.map do |c|
+                             key = c.downcase.to_sym
+
+                             env_key = "#{ENV_PREFIX}_#{key}".upcase
+
+                             [key, ENV[env_key] || Philotic::Config::Defaults.const_get(c)]
+                           end
+        ]
+      end
+
+      def self.included(base)
+        Philotic::Config::Defaults.constants.each do |c|
+          attr_symbol = c.downcase.to_sym
+          base.send(:attr_writer, attr_symbol)
+          base.class_eval %Q{
+          def #{attr_symbol}
+            unless defined? @#{attr_symbol}
+              @#{attr_symbol} = defaults[:#{attr_symbol}]
+            end
+            @#{attr_symbol}
+          end
+        }
+        end
+      end
+    end
+  end
+end

data/lib/philotic/connection.rb

@@ -82,9 +82,9 @@ module Philotic
 
     def connection_settings
       {
-          timeout:                   config.timeout.to_i,
-          automatic_recovery:        true,
-          on_tcp_connection_failure: config.connection_failed_handler,
+        automatically_recover: config.automatically_recover,
+        network_recovery_interval: config.network_recovery_interval,
+        continuation_timeout: config.continuation_timeout,
       }
     end
 

data/lib/philotic/constants.rb

@@ -1,47 +1,39 @@
 module Philotic
 
-  CONNECTION_OPTIONS = [
-      :rabbit_host,
-      :connection_failed_handler,
-      :connection_loss_handler,
-      :timeout,
-  ]
-  EXCHANGE_OPTIONS   = [
-      :exchange_name,
-      :message_return_handler,
-  ]
-  MESSAGE_OPTIONS    = [
-      :routing_key,
-      :persistent,
-      :immediate,
-      :mandatory,
-      :content_type,
-      :content_encoding,
-      :priority,
-      :message_id,
-      :correlation_id,
-      :reply_to,
-      :type,
-      :user_id,
-      :app_id,
-      :timestamp,
-      :expiration,
+  MESSAGE_OPTIONS = [
+    :routing_key,
+    :persistent,
+    :immediate,
+    :mandatory,
+    :content_type,
+    :content_encoding,
+    :priority,
+    :message_id,
+    :correlation_id,
+    :reply_to,
+    :type,
+    :user_id,
+    :app_id,
+    :timestamp,
+    :expiration,
   ]
 
   PHILOTIC_HEADERS = [
-      :philotic_firehose,
-      :philotic_product,
-      :philotic_component,
-      :philotic_message_type,
+    :philotic_firehose,
+    :philotic_product,
+    :philotic_component,
+    :philotic_message_type,
+    :philotic_serializations,
+
   ]
 
   DEFAULT_NAMED_QUEUE_OPTIONS     = {
-      auto_delete: false,
-      durable:     true
+    auto_delete: false,
+    durable:     true
   }
   DEFAULT_ANONYMOUS_QUEUE_OPTIONS = {
-      auto_delete: true,
-      durable:     false
+    auto_delete: true,
+    durable:     false
   }
 
   DEFAULT_SUBSCRIBE_OPTIONS = {}

data/lib/philotic/message.rb

@@ -1,5 +1,6 @@
 require 'philotic/constants'
 require 'philotic/singleton'
+require 'active_support/inflections'
 
 module Philotic
   class Message
@@ -30,9 +31,10 @@ module Philotic
 
     def initialize(routables={}, payloads={}, connection=nil)
       raise NotInstantiableError if self.class == Philotic::Message
-      self.timestamp         = Time.now.to_i
-      self.philotic_firehose = true
-      self.connection        = connection
+      self.timestamp               = Time.now.to_i
+      self.philotic_firehose       = true
+      self.connection              = connection
+      self.philotic_serializations = self.connection.config.serializations
 
       # dynamically insert any passed in routables into both attr_routable
       # and attr_payload

data/lib/philotic/publisher.rb

@@ -1,4 +1,5 @@
 require 'philotic/constants'
+require 'philotic/serialization/serializer'
 
 module Philotic
   class Publisher
@@ -26,6 +27,7 @@ module Philotic
       rescue => e
         message.publish_error = e
         logger.error e.message
+        raise e if config.raise_error_on_publish
       end
       message
     end
@@ -55,7 +57,7 @@ module Philotic
 
       payload = normalize_payload_times(payload)
 
-      connection.exchange.publish(payload.to_json, metadata)
+      connection.exchange.publish(Philotic::Serialization::Serializer.dump(payload, metadata), metadata)
       log_message_published(:debug, metadata, payload, 'published message')
       true
     end

data/lib/philotic/serialization.rb

@@ -0,0 +1,8 @@
+require 'philotic/serialization/serializer'
+require 'philotic/serialization/encryptor'
+require 'philotic/serialization/json'
+
+module Philotic
+  module Serialization
+  end
+end

data/lib/philotic/serialization/encryptor.rb

@@ -0,0 +1,56 @@
+require 'encryptor'
+require 'philotic/serialization/serializer'
+require 'base64'
+
+module Philotic
+  module Serialization
+    module Encryptor
+      extend self
+
+      def content_type
+        'application/json'
+      end
+
+      def serialization
+        :encrypted
+      end
+
+      def default_encryption_key
+        Philotic.config.encryption_key
+      end
+
+      def random_salt
+        Base64.encode64 SecureRandom.random_bytes(256)
+      end
+
+      def default_algorithm
+        'aes-256-cbc'
+      end
+
+      def random_iv(algorithm = default_algorithm)
+        OpenSSL::Cipher::Cipher.new(algorithm).random_iv
+      end
+
+      def key
+        @key ||= default_encryption_key
+      end
+
+      def dump(payload, metadata)
+        metadata[:headers][:encryption] ||= {}
+        algorithm                       = (metadata[:headers][:encryption][:algorithm] ||= default_algorithm)
+        iv                              = Base64.decode64(metadata[:headers][:encryption][:iv] ||= Base64.encode64(random_iv(algorithm)))
+        salt                            = Base64.decode64(metadata[:headers][:encryption][:salt] ||= Base64.encode64(random_salt))
+        Base64.encode64 ::Encryptor.encrypt(payload, key: key, iv: iv, salt: salt)
+      end
+
+      def load(payload, metadata)
+        headers = metadata[:headers].deep_dup.deep_symbolize_keys
+
+        iv = Base64.decode64 headers[:encryption][:iv]
+        salt = Base64.decode64 headers[:encryption][:salt]
+        ::Encryptor.decrypt(Base64.decode64(payload), key: key, iv: iv, salt: salt)
+      end
+    end
+  end
+end
+Philotic::Serialization::Serializer.register Philotic::Serialization::Encryptor

data/lib/philotic/serialization/json.rb

@@ -0,0 +1,29 @@
+require 'multi_json'
+require 'oj'
+
+require 'philotic/serialization/serializer'
+
+module Philotic
+  module Serialization
+    module Json
+      extend self
+
+      def content_type
+        'application/json'
+      end
+
+      def serialization
+        :json
+      end
+
+      def dump(payload, metadata)
+        MultiJson.dump payload
+      end
+
+      def load(payload, metadata)
+        MultiJson.load payload
+      end
+    end
+  end
+end
+Philotic::Serialization::Serializer.register Philotic::Serialization::Json

data/lib/philotic/serialization/serializer.rb

@@ -0,0 +1,44 @@
+module Philotic
+  module Serialization
+    module Serializer
+      extend self
+
+      def serializers
+        @serializers ||= {}
+      end
+
+      def factory(serialization)
+        serialization = serialization.to_s.downcase.to_sym
+        @serializers[serialization]
+      end
+
+      def register(serializer)
+        serializers[serializer.serialization] = serializer
+      end
+
+      # return the fully deserialized payload
+      def load(payload, metadata)
+        _transform(:load, payload, metadata)
+      end
+
+      def dump(payload, metadata)
+        _transform(:dump, payload, metadata)
+      end
+
+      private
+      def _transform(dump_or_load, payload, metadata)
+        headers = metadata[:headers].deep_dup.deep_symbolize_keys
+
+        serializations = headers[:philotic_serializations]
+
+        serializations.reverse! if(dump_or_load == :load)
+
+        serializations.reduce(payload.dup) do |transformed, serialization|
+          serializer = factory serialization
+          (serializer &&
+            serializer.public_send(dump_or_load, transformed, metadata)) || transformed
+        end
+      end
+    end
+  end
+end

data/lib/philotic/subscriber.rb

@@ -1,5 +1,6 @@
 require 'philotic/constants'
 require 'philotic/message'
+require 'philotic/serialization/serializer'
 
 module Philotic
   class Subscriber
@@ -20,7 +21,7 @@ module Philotic
 
     def subscription_callback(&block)
       lambda do |delivery_info, metadata, payload|
-        hash_payload = JSON.parse payload
+        hash_payload = Philotic::Serialization::Serializer.load(payload, metadata)
 
         message = Class.new(Philotic::Message).new(metadata[:headers], hash_payload)
         message.delivery_info = delivery_info

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/philotic.gemspec

@@ -17,16 +17,18 @@ Gem::Specification.new do |gem|
   gem.licenses      = ['MIT']
 
   gem.add_development_dependency 'awesome_print', '~> 1.6'
-  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
   gem.add_development_dependency 'bundler', '~> 1.10'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
   gem.add_development_dependency 'pry', '~> 0.10'
   gem.add_development_dependency 'rake', '~> 10.4'
   gem.add_development_dependency 'rspec', '~>  3.3'
   gem.add_development_dependency 'rspec-its', '~> 1.2'
-  gem.add_development_dependency 'timecop', '~> 0.8'
   gem.add_development_dependency 'simplecov', '~> 0.10'
+  gem.add_development_dependency 'timecop', '~> 0.8'
 
   gem.add_dependency 'activesupport', '>= 3.2'
+  gem.add_dependency 'encryptor', '~> 1.3'
   gem.add_dependency 'bunny', '~> 2.2'
-  gem.add_dependency 'json', '>= 1.8'
-end
+  gem.add_dependency 'multi_json', '~> 1.11'
+  gem.add_dependency 'oj', '~> 2.12'
+end

data/philotic.yml.example

@@ -1,9 +1,6 @@
 defaults: &defaults
   #connection settings
   rabbit_host: localhost
-  # connection_failed_handler: method/proc
-  # connection_loss_handler: method/proc
-  timeout: 2
   
   #exchange settings
   exchange_name: philotic.headers
@@ -14,7 +11,6 @@ defaults: &defaults
   persistent: false
   immediate: false
   mandatory: false
-  content_type: ~
   content_encoding: ~
   priority: ~
   message_id: ~

data/spec/philotic/config_spec.rb

@@ -4,13 +4,37 @@ require 'philotic/connection'
 
 describe Philotic::Config do
 
-  describe '#defaults' do
-  end
+  describe '#load_file' do
+    let(:config_file_path) { './philotic.yml.example' }
+    let(:config) { YAML.load_file(config_file_path)['test'] }
+
+    subject { described_class.new(instance_double Philotic::Connection) }
 
-  describe '#load' do
+    it 'properly loads config' do
+      subject.load_file config_file_path, 'test'
+      expect(config.keys).to_not be :empty?
+      config.keys.each do |key|
+        expect(subject.send(key)).to eq config[key]
+      end
+    end
   end
 
-  describe '#load_file' do
+
+  describe '#message_return_handler' do
+    let(:logger) { instance_double(Logger) }
+    let(:basic_return) { instance_double(Bunny::ReturnInfo) }
+    let(:metadata) { instance_double(Bunny::Session) }
+    let(:payload) { {foo: 'bar'}.to_json }
+    let(:connection) { instance_double(Philotic::Connection, logger: logger) }
+
+    subject { described_class.new(connection) }
+
+    it 'logs a warning do' do
+
+      expect(logger).to receive(:warn)
+      subject.message_return_handler.call basic_return, metadata, payload
+    end
+
   end
 
   describe '#parse_rabbit_uri' do
@@ -24,20 +48,20 @@ describe Philotic::Config do
     it do
       should change {
                [
-                   config.rabbit_user,
-                   config.rabbit_password,
-                   config.rabbit_host,
-                   config.rabbit_port,
-                   config.rabbit_vhost,
+                 config.rabbit_user,
+                 config.rabbit_password,
+                 config.rabbit_host,
+                 config.rabbit_port,
+                 config.rabbit_vhost,
                ]
              }
-                 .to [
-                         'user',
-                         'pass',
-                         'host',
-                         12345,
-                         'vhost',
-                     ]
+               .to [
+                     'user',
+                     'pass',
+                     'host',
+                     12345,
+                     'vhost',
+                   ]
     end
   end
 end

data/spec/philotic/logging/serialization/encryptor_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+
+module Philotic
+  module Serialization
+    describe Encryptor do
+      let(:encryption_key) { 'super_secret_key' }
+
+      describe '.content_type' do
+        specify { expect(subject.content_type).to eq 'application/json' }
+      end
+
+      describe '.serialization' do
+        specify { expect(subject.serialization).to eq :encrypted }
+      end
+
+      describe '.default_encryption_key' do
+        it 'pulls the key from Philotic.config' do
+          expect(Philotic.config).to receive(:encryption_key) { encryption_key }
+          expect(subject.default_encryption_key).to eq encryption_key
+        end
+
+        describe 'encryption' do
+          let(:metadata) { {headers: {}} }
+          let(:payload) {'payload'}
+
+          it 'encrypts and decrypts the payload' do
+            expect(Philotic.config).to receive(:encryption_key) { encryption_key }
+
+            expect(subject.load(subject.dump(payload, metadata), metadata)).to eq payload
+          end
+        end
+      end
+    end
+  end
+end

data/spec/philotic/message_spec.rb

@@ -204,7 +204,9 @@ describe Philotic::Message do
   end
 
   describe '.publish' do
-    let (:connection) { double }
+    let (:connection) { instance_double Philotic::Connection }
+    let (:config) { instance_double Philotic::Config }
+    let (:serializations) { ['json'].to_json }
     let(:headers) do
       {
         header1: 'h1',
@@ -222,7 +224,10 @@ describe Philotic::Message do
     end
     subject { Philotic::Message }
     specify do
-      expect_any_instance_of(Philotic::Message).to receive(:connection).and_return(connection)
+      expect_any_instance_of(Philotic::Message).to receive(:connection).twice.and_return(connection)
+      expect(connection).to receive(:config).and_return(config)
+      expect(config).to receive(:serializations).and_return(serializations)
+
       expect(connection).to receive(:publish) do |message|
         expect(message.headers).to include(headers)
         expect(message.payload).to eq payloads

data/spec/philotic/publisher_spec.rb

@@ -22,21 +22,22 @@ describe Philotic::Publisher do
     it 'should call _publish with the right values' do
       Timecop.freeze
       expect(subject).to receive(:_publish).with(
-                             {
-                                 subject: 'Hello',
-                                 message: 'How are you?'
+                           {
+                             subject: 'Hello',
+                             message: 'How are you?'
+                           },
+                           {
+                             headers:   {
+                               philotic_firehose:       true,
+                               philotic_product:        nil,
+                               philotic_component:      nil,
+                               philotic_message_type:   nil,
+                               philotic_serializations: Philotic.config.serializations,
+                               hue:                     :M,
+                               available:               true,
                              },
-                             {
-                                 headers:   {
-                                     philotic_firehose:     true,
-                                     philotic_product:      nil,
-                                     philotic_component:    nil,
-                                     philotic_message_type: nil,
-                                     hue:                   :M,
-                                     available:             true,
-                                 },
-                                 timestamp: Time.now.to_i
-                             }
+                             timestamp: Time.now.to_i
+                           }
                          )
       expect(message).to_not be_published
       subject.publish(message)
@@ -80,38 +81,39 @@ describe Philotic::Publisher do
       expect(subject.connection).to receive(:connect!)
       expect(subject.connection).to receive(:connected?).and_return(true)
       metadata = {
-          routing_key:      nil,
-          persistent:       false,
-          immediate:        false,
-          mandatory:        false,
-          content_type:     'application/json',
-          content_encoding: nil,
-          priority:         nil,
-          message_id:       nil,
-          correlation_id:   nil,
-          reply_to:         nil,
-          type:             nil,
-          user_id:          nil,
-          app_id:           nil,
-          expiration:       nil,
-          headers:          {
-              philotic_firehose:     true,
-              philotic_product:      nil,
-              philotic_component:    nil,
-              philotic_message_type: nil,
-              hue:                   :M,
-              available:             true,
-          },
-          timestamp:        Time.now.to_i
+        routing_key:      nil,
+        persistent:       false,
+        immediate:        false,
+        mandatory:        false,
+        content_type:     'application/json',
+        content_encoding: nil,
+        priority:         nil,
+        message_id:       nil,
+        correlation_id:   nil,
+        reply_to:         nil,
+        type:             nil,
+        user_id:          nil,
+        app_id:           nil,
+        expiration:       nil,
+        headers:          {
+          philotic_firehose:       true,
+          philotic_product:        nil,
+          philotic_component:      nil,
+          philotic_message_type:   nil,
+          philotic_serializations: Philotic.config.serializations,
+          hue:                     :M,
+          available:               true,
+        },
+        timestamp:        Time.now.to_i
       }
 
 
       expect(exchange).to receive(:publish).with(
-                              {
-                                  subject: 'Hello',
-                                  message: 'How are you?'
-                              }.to_json,
-                              metadata
+                            {
+                              subject: 'Hello',
+                              message: 'How are you?'
+                            }.to_json,
+                            metadata
                           )
       expect(message).to_not be_published
       subject.publish(message)

data/spec/philotic/subscriber_spec.rb

@@ -7,6 +7,23 @@ require 'philotic/subscriber'
 
 describe Philotic::Subscriber do
 
+  describe '#logger' do
+    let(:logger) { instance_double(Logger) }
+    let(:connection) { instance_double(Philotic::Connection, logger: logger) }
+    subject { described_class.new connection }
+    it 'is the connection logger' do
+      expect(subject.logger).to be subject.connection.logger
+    end
+  end
+
+  describe '#config' do
+    let(:config) { instance_double(Philotic::Config) }
+    let(:connection) { instance_double(Philotic::Connection, config: config) }
+    subject { described_class.new connection }
+    it 'is the connection logger' do
+      expect(subject.config).to be subject.connection.config
+    end
+  end
 
   describe '#subscription_callback' do
 
@@ -18,7 +35,7 @@ describe Philotic::Subscriber do
     end
 
     let(:delivery_info) { double }
-    let(:metadata) { {headers: {header_1: 'foo'}} }
+    let(:metadata) { {headers: {header_1: 'foo', philotic_serializations: Philotic.config.serializations}} }
     let(:payload) { {message: 'body'} }
 
     it 'hydrates received messages' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philotic
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Nathan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: encryptor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.12'
 description: Lightweight, opinionated wrapper for using RabbitMQ headers exchanges
 email:
 - nkeyes@gmail.com
@@ -204,6 +232,7 @@ files:
 - examples/subscribing/named_queue.rb
 - lib/philotic.rb
 - lib/philotic/config.rb
+- lib/philotic/config/defaults.rb
 - lib/philotic/connection.rb
 - lib/philotic/constants.rb
 - lib/philotic/consumer.rb
@@ -213,6 +242,10 @@ files:
 - lib/philotic/logging/message.rb
 - lib/philotic/message.rb
 - lib/philotic/publisher.rb
+- lib/philotic/serialization.rb
+- lib/philotic/serialization/encryptor.rb
+- lib/philotic/serialization/json.rb
+- lib/philotic/serialization/serializer.rb
 - lib/philotic/singleton.rb
 - lib/philotic/subscriber.rb
 - lib/philotic/tasks.rb
@@ -226,6 +259,7 @@ files:
 - spec/philotic/connection_spec.rb
 - spec/philotic/consumer_spec.rb
 - spec/philotic/logging/logger_spec.rb
+- spec/philotic/logging/serialization/encryptor_spec.rb
 - spec/philotic/message_spec.rb
 - spec/philotic/publisher_spec.rb
 - spec/philotic/subscriber_spec.rb
@@ -261,6 +295,7 @@ test_files:
 - spec/philotic/connection_spec.rb
 - spec/philotic/consumer_spec.rb
 - spec/philotic/logging/logger_spec.rb
+- spec/philotic/logging/serialization/encryptor_spec.rb
 - spec/philotic/message_spec.rb
 - spec/philotic/publisher_spec.rb
 - spec/philotic/subscriber_spec.rb