philotic 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: e9dfad8771c88891eb5d27d036172b7f8d5176ec
-  data.tar.gz: 99259fa7fa831adda68922583b3ce2aa908c0d0f
+  metadata.gz: 47b970f227032a30e680562ee09c41d2ba6f5a46
+  data.tar.gz: bbc36d33ee8bdd0c09b7b9a2af4a0b3dfe991f5d
 SHA512: 
-  metadata.gz: 9c937f8d0c61d0c5ba39fe03ccb43e1bb4ae43af609bb7c2c45f796c084601e34e43a2d73079d6438cd6145cabc2b5d7f13ce9e99e751a7fc87fd17b96b3c5ee
-  data.tar.gz: d64d6ae80d67e41e2c98175b297e670a63bb43647caac90843277ab323af799887084fa5e6187bb386e01b4c9c0790cd9e7f08fcedcacc87b7970bbe2bc78b6d
+  metadata.gz: a368f139afcdfa7e9516653cd8f9455ec7d6b24bc33eef603b129a5366f25b2e1fb9ac52f70d85dadbc35995b4b201678ba22046edc4da32cbf98aa5b9f97e08
+  data.tar.gz: ff47fae4fb59c8e39c4fe73974295780765e6239e7c9d6f25e2c6a296ea2149add58f8d628ce9eff0d207d0068899686e0a307983db0c1e52ba569720d95f958

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
 - 2.0.0
 - 2.1.0
 - rbx-2.2.10
-- rbx-2.3.0
+#- rbx-2.3.0
 - jruby-19mode
 - ruby-head
 - jruby-head

data/lib/philotic.rb

@@ -21,13 +21,13 @@ module Philotic
   end
 
   def self.initialize_named_queue!(queue_name, config)
-    raise "ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!" unless ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] == 'true'
+    raise 'Philotic::Config.initialize_named_queues must be true to run Philotic.initialize_named_queue!' unless Philotic::Config.initialize_named_queues
 
     Philotic.connect!
     queue_exists = Philotic::Connection.connection.queue_exists? queue_name
 
-    should_delete_queue = queue_exists && ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] == 'true'
-    should_create_queue = !queue_exists || ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] == 'true'
+    should_delete_queue = queue_exists && Philotic::Config.delete_existing_queues
+    should_create_queue = !queue_exists || Philotic::Config.delete_existing_queues
 
     if should_delete_queue
       Philotic::Connection.channel.queue(queue_name, passive: true).delete
@@ -39,7 +39,7 @@ module Philotic
       queue = queue_from_config(queue_name, config)
       bind_queue(queue, config)
     else
-      Philotic.logger.warn "Queue #{queue_name} not created; it already exists. ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] must equal 'true' to override."
+      Philotic.logger.warn "Queue #{queue_name} not created; it already exists. Philotic::Config.delete_existing_queues must be true to override."
     end
   end
 
@@ -94,6 +94,10 @@ module Philotic
   def self.connect!
     Philotic::Connection.connect!
   end
+
+  def self.close
+    Philotic::Connection.close
+  end
 end
 
 require 'philotic/version'

data/lib/philotic/config.rb

@@ -11,41 +11,42 @@ module Philotic
 
     ENV_PREFIX = 'PHILOTIC'
 
-    DEFAULT_DISABLE_PUBLISH = false
-
-    DEFAULT_RABBIT_SCHEME     = 'amqps'
-    DEFAULT_RABBIT_HOST      = 'localhost'
-    DEFAULT_RABBIT_PORT      = 5671
-    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       = true
+    DEFAULT_DISABLE_PUBLISH         = false
+    DEFAULT_INITIALIZE_NAMED_QUEUES = false
+    DEFAULT_DELETE_EXISTING_QUEUES  = false
+    DEFAULT_RABBIT_SCHEME           = 'amqps'
+    DEFAULT_RABBIT_HOST             = 'localhost'
+    DEFAULT_RABBIT_PORT             = 5671
+    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              = true
     # DEFAULT_IMMEDIATE = false
-    DEFAULT_MANDATORY        = true
-    DEFAULT_CONTENT_TYPE     = nil
-    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_MANDATORY               = true
+    DEFAULT_CONTENT_TYPE            = nil
+    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
 
     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
+                           key = c.slice(8..-1).downcase.to_sym
 
-        env_key = "#{ENV_PREFIX}_#{key}".upcase
+                           env_key = "#{ENV_PREFIX}_#{key}".upcase
 
-        [key, ENV[env_key] || Config.const_get(c)]
-      end
+                           [key, ENV[env_key] || Config.const_get(c)]
+                         end
       ]
     end
 

data/lib/philotic/connection.rb

@@ -44,6 +44,8 @@ module Philotic
     def close
       Philotic.logger.info "closing connection to RabbitMQ; host:#{config.rabbit_host}"
       connection.close if connected?
+      @channel = nil
+      @exchange = nil
     end
 
     def connected?

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/philotic/connection_spec.rb

@@ -15,7 +15,6 @@ describe Philotic::Connection do
           expect(subject).to receive(:set_exchange_return_handler!)
 
           subject.connect!
-
         end
       end
 
@@ -27,7 +26,6 @@ describe Philotic::Connection do
           expect(Philotic.logger).to receive(:error)
 
           subject.connect!
-
         end
       end
     end
@@ -40,7 +38,6 @@ describe Philotic::Connection do
           expect(subject).not_to receive(:set_exchange_return_handler!)
 
           subject.connect!
-
         end
       end
     end
@@ -55,4 +52,16 @@ describe Philotic::Connection do
       Philotic::Connection.start_connection!
     end
   end
+
+  describe '.close' do
+    let(:connection) { double }
+    specify do
+      allow(Philotic::Connection).to receive(:connection).and_return(connection)
+      expect(connection).to receive(:connected?).and_return(true)
+      expect(connection).to receive(:close)
+      expect(Philotic::Connection.instance_variable_get(:@channel)).to eq(nil)
+      expect(Philotic::Connection.instance_variable_get(:@exchange)).to eq(nil)
+      Philotic::Connection.close
+    end
+  end
 end

data/spec/philotic/publisher_spec.rb

@@ -2,12 +2,14 @@ require 'spec_helper'
 require 'philotic/dummy_event'
 
 describe Philotic::Publisher do
-  before(:each) do
-    @event           = Philotic::DummyEvent.new
-    @event.subject   = 'Hello'
-    @event.message   = 'How are you?'
-    @event.gender    = :M
-    @event.available = true
+  let(:event) do
+    event           = Philotic::DummyEvent.new
+    event.subject   = 'Hello'
+    event.message   = 'How are you?'
+    event.gender    = :M
+    event.available = true
+
+    event
   end
   let(:publisher) { Philotic::Publisher }
   subject { publisher }
@@ -21,6 +23,7 @@ describe Philotic::Publisher do
 
   describe 'publish' do
     it 'should call _publish with the right values' do
+      Timecop.freeze
       expect(subject).to receive(:_publish).with(
                              {
                                  subject: 'Hello',
@@ -38,7 +41,7 @@ describe Philotic::Publisher do
                                  timestamp: Time.now.to_i
                              }
                          )
-      subject.publish(@event)
+      subject.publish(event)
     end
 
   end
@@ -46,43 +49,46 @@ describe Philotic::Publisher do
   describe 'raw_publish' do
 
     it 'should call exchange.publish with the right values' do
+      Timecop.freeze
       exchange = double
       expect(Philotic::Connection).to receive(:exchange).and_return(exchange)
 
       expect(Philotic).to receive(:connect!)
       expect(Philotic::Connection).to receive(:connected?).and_return(true)
+      metadata = {
+          routing_key:      nil,
+          persistent:       true,
+          mandatory:        true,
+          content_type:     nil,
+          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_event_type: nil,
+              gender:              :M,
+              available:           true
+          },
+          timestamp:        Time.now.to_i
+      }
+
 
       expect(exchange).to receive(:publish).with(
                               {
                                   subject: 'Hello',
                                   message: 'How are you?'
                               }.to_json,
-                              {
-                                  routing_key:      nil,
-                                  persistent:       true,
-                                  mandatory:        true,
-                                  content_type:     nil,
-                                  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_event_type: nil,
-                                      gender:              :M,
-                                      available:           true
-                                  },
-                                  timestamp:        Time.now.to_i
-                              }
+                              metadata
                           )
-      subject.publish(@event)
+      subject.publish(event)
     end
 
     it 'should log an error when there is no connection' do
@@ -92,7 +98,7 @@ describe Philotic::Publisher do
       expect(Philotic::Connection).to receive(:connected?).once.and_return(false)
 
       expect(Philotic.logger).to receive(:error)
-      subject.publish(@event)
+      subject.publish(event)
     end
 
   end

data/spec/philotic_spec.rb

@@ -24,17 +24,19 @@ describe Philotic do
           }
       }
     end
-    it "should throw an error when ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] is not set to 'true'" do
-      ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = nil
+    it 'should throw an error when Philotic::Config.initialize_named_queues is falsey' do
+      allow(Philotic::Config).to receive(:initialize_named_queues).and_return(nil)
       queue_name                             = test_queues.keys.first
       config                                 = test_queues[queue_name]
       expect(Philotic).not_to receive(:connect!)
-      expect { Philotic.initialize_named_queue! queue_name, config }.to raise_error("ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!")
+      expect { Philotic.initialize_named_queue! queue_name, config }.to raise_error
 
     end
 
-    it "should log a warning when ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] is not set to 'true' and the queue already exists" do
-      ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
+    it 'should log a warning when Philotic::Config.delete_existing_queues is falsey and the queue already exists' do
+      allow(Philotic::Config).to receive(:initialize_named_queues).and_return(true)
+      allow(Philotic::Config).to receive(:delete_existing_queues).and_return(nil)
+
       test_queues.each_pair do |queue_name, config|
 
         connection = double
@@ -49,9 +51,9 @@ describe Philotic do
       end
     end
 
-    it "should delete the queue first when ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] is set to 'true' and the queue already exists" do
-      ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
-      ENV['PHILOTIC_DELETE_EXISTING_QUEUE'] = 'true'
+    it 'should delete the queue first when Philotic::Config.delete_existing_queues is truthy and the queue already exists' do
+      allow(Philotic::Config).to receive(:initialize_named_queues).and_return(true)
+      allow(Philotic::Config).to receive(:delete_existing_queues).and_return(true)
 
       test_queues.each_pair do |queue_name, config|
 

data/spec/spec_helper.rb

@@ -26,6 +26,5 @@ RSpec.configure do |config|
   config.after do
     Timecop.return
   end
-
 end
 Philotic.logger = Logger.new("/dev/null")

metadata

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