philotic 0.2.4 → 0.3.0

data/spec/philotic/publisher_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 require 'philotic/dummy_event'
+require 'philotic/connection'
+require 'philotic/publisher'
 
 describe Philotic::Publisher do
   let(:event) do
@@ -11,16 +13,9 @@ describe Philotic::Publisher do
 
     event
   end
-  let(:publisher) { Philotic::Publisher }
+  let(:publisher) { Philotic::Connection.new.publisher }
   subject { publisher }
 
-  describe 'config' do
-    it 'should return the Philotic::Config singleton' do
-      expect(subject.config).to eq Philotic::Config
-    end
-  end
-
-
   describe 'publish' do
     it 'should call _publish with the right values' do
       Timecop.freeze
@@ -51,10 +46,10 @@ describe Philotic::Publisher 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(subject.connection).to receive(:exchange).and_return(exchange)
 
-      expect(Philotic).to receive(:connect!)
-      expect(Philotic::Connection).to receive(:connected?).and_return(true)
+      expect(subject.connection).to receive(:connect!)
+      expect(subject.connection).to receive(:connected?).and_return(true)
       metadata = {
           routing_key:      nil,
           persistent:       true,
@@ -94,10 +89,10 @@ describe Philotic::Publisher do
     it 'should log an error when there is no connection' do
 
 
-      expect(Philotic).to receive(:connect!)
-      expect(Philotic::Connection).to receive(:connected?).once.and_return(false)
+      expect(subject.connection).to receive(:connect!)
+      expect(subject.connection).to receive(:connected?).once.and_return(false)
 
-      expect(Philotic.logger).to receive(:error)
+      expect(subject.logger).to receive(:error)
       subject.publish(event)
     end
 

data/spec/philotic/routable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Philotic::Routable do
-  context "including the module on class" do
+  context 'including the module on class' do
     let(:routable_event_class) {
       Class.new do
         include Philotic::Routable
@@ -21,7 +21,7 @@ describe Philotic::Routable do
       specify { expect(subject.methods).to include method_name.to_sym }
     end
 
-    context " and then instantiating it" do
+    context ' and then instantiating it' do
       let(:routable_event_instance) { routable_event_class.new }
       subject { routable_event_instance }
 
@@ -37,16 +37,11 @@ describe Philotic::Routable do
         expect(subject.attributes).to eq({routable_attr: nil, payload_attr:  nil})
       end
 
-      it 'should call Philotic::Publisher.publish with subject' do
-        expect(Philotic::Publisher).to receive(:publish).with(subject)
-        subject.publish
-      end
-
       it 'should have empty message_metadata' do
         expect(subject.message_metadata).to eq({})
       end
 
-      context "overriding a value with message_metadata=" do
+      context 'overriding a value with message_metadata=' do
         before do
           routable_event_instance.message_metadata = {mandatory: false}
         end

data/spec/philotic/subscriber_spec.rb

@@ -1,12 +1,15 @@
 require 'spec_helper'
 require 'philotic/dummy_event'
+require 'philotic/connection'
 require 'philotic/constants'
+require 'philotic/subscriber'
 
 describe Philotic::Subscriber do
 
 
-  describe '.subscribe' do
+  describe '#subscribe' do
     let(:subscription) { 'some_queue' }
+    subject { Philotic::Connection.new.subscriber }
     context 'when options is a string' do
       it 'binds to a queue defined by the options' do
 
@@ -19,18 +22,18 @@ describe Philotic::Subscriber do
 
         callback = lambda { |metadata, message|}
 
-        expect(Philotic).to receive(:connect!)
+        expect(subject.connection).to receive(:connect!)
 
-        expect(Philotic::Connection).to receive(:exchange).and_return(exchange)
-        expect(Philotic::Connection).to receive(:channel).and_return(channel)
+        expect(subject.connection).to receive(:exchange).and_return(exchange)
+        expect(subject.connection).to receive(:channel).and_return(channel)
         expect(channel).to receive(:queue).and_return(queue)
 
         expect(queue).not_to receive(:bind)
         expect(queue).to receive(:subscribe).with({})
-        expect(Philotic::Subscriber).to receive(:subscription_callback).and_yield(metadata, message)
+        expect(subject).to receive(:subscription_callback).and_yield(metadata, message)
         expect(callback).to receive(:call).with(metadata, message)
 
-        Philotic::Subscriber.subscribe(subscription, &callback)
+        subject.subscribe(subscription, &callback)
       end
     end
 
@@ -51,23 +54,23 @@ describe Philotic::Subscriber do
 
         callback = lambda { |metadata, payload|}
 
-        expect(Philotic).to receive(:connect!)
+        expect(subject.connection).to receive(:connect!)
 
-        expect(Philotic::Connection).to receive(:exchange).and_return(exchange)
-        expect(Philotic::Connection).to receive(:channel).and_return(channel)
+        expect(subject.connection).to receive(:exchange).and_return(exchange)
+        expect(subject.connection).to receive(:channel).and_return(channel)
         expect(channel).to receive(:queue).and_return(queue)
 
         expect(queue).to receive(:bind).with(exchange, hash_including(arguments: subscription))
         expect(queue).to receive(:subscribe).with({})
-        expect(Philotic::Subscriber).to receive(:subscription_callback).and_yield(metadata, message)
+        expect(subject).to receive(:subscription_callback).and_yield(metadata, message)
         expect(callback).to receive(:call).with(metadata, message)
 
-        Philotic::Subscriber.subscribe(subscription, &callback)
+        subject.subscribe(subscription, &callback)
       end
     end
   end
 
-  describe '.subscribe_to_any' do
+  describe '#subscribe_to_any' do
     let(:headers) do
       {
           header1: 'h1',
@@ -75,37 +78,41 @@ describe Philotic::Subscriber do
           header3: 'h3',
       }
     end
+    subject { Philotic::Connection.new.subscriber }
+
     specify do
-      expect(Philotic::Subscriber).to receive(:subscribe).with(headers.merge(:'x-match' => :any))
-      Philotic::Subscriber.subscribe_to_any(headers) {}
+      expect(subject).to receive(:subscribe).with(headers.merge(:'x-match' => :any))
+      subject.subscribe_to_any(headers) {}
     end
   end
 
-  describe '.acknowledge' do
+  describe '#acknowledge' do
     let(:channel) { double }
     let(:delivery_tag) { double }
     let(:delivery_info) { double }
     let(:message) { {delivery_info: delivery_info} }
+    subject { Philotic::Connection.new.subscriber }
 
     specify do
-      expect(Philotic::Connection).to receive(:channel).and_return(channel)
+      expect(subject.connection).to receive(:channel).and_return(channel)
       expect(delivery_info).to receive(:delivery_tag).and_return(delivery_tag)
       expect(channel).to receive(:acknowledge).with(delivery_tag, false)
-      Philotic::Subscriber.acknowledge(message)
+      subject.acknowledge(message)
     end
   end
 
-  describe '.reject' do
+  describe '#reject' do
     let(:channel) { double }
     let(:delivery_tag) { double }
     let(:delivery_info) { double }
     let(:message) { {delivery_info: delivery_info} }
+    subject { Philotic::Connection.new.subscriber }
 
     specify do
-      expect(Philotic::Connection).to receive(:channel).and_return(channel)
+      expect(subject.connection).to receive(:channel).and_return(channel)
       expect(delivery_info).to receive(:delivery_tag).and_return(delivery_tag)
       expect(channel).to receive(:reject).with(delivery_tag, true)
-      Philotic::Subscriber.reject(message)
+      subject.reject(message)
     end
   end
 end

data/spec/philotic_spec.rb

@@ -1,85 +1,10 @@
 require 'spec_helper'
+require 'philotic'
 
 describe Philotic do
-
-  describe '.initialize_named_queue!' do
-
-    let(:test_queues) do
-      {
-          app_live_feed: {
-              exchange: 'philotic.headers.test_app.feed.live',
-              options:  {
-                  arguments: {
-                      :'x-dead-letter-exchange' => 'philotic.headers.test_app.feed.delayed',
-                      :'x-message-ttl'          => 600000 # ms
-                  }},
-              bindings:
-                        [
-                            {
-                                philotic_product:   'test_app',
-                                philotic_component: 'app_component',
-                                :'x-match:'         => 'all'
-                            },
-                        ],
-          }
-      }
-    end
-    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
-
-    end
-
-    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
-
-        expect(Philotic).to receive(:connect!)
-        expect(Philotic::Connection).to receive(:connection).and_return(connection)
-        expect(connection).to receive(:queue_exists?).and_return(true)
-
-        expect(Philotic.logger).to receive(:warn)
-
-        Philotic.initialize_named_queue! queue_name, config
-      end
-    end
-
-    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|
-
-        queue_options = Philotic::DEFAULT_NAMED_QUEUE_OPTIONS.dup
-        queue_options.merge!(config[:options] || {})
-
-        channel    = double
-        queue      = double
-        exchange   = double
-        connection = double
-
-        expect(Philotic).to receive(:connect!)
-        expect(Philotic::Connection).to receive(:connection).and_return(connection)
-        expect(connection).to receive(:queue_exists?).and_return(true)
-        expect(Philotic::Connection).to receive(:channel).and_return(channel).exactly(3).times
-        expect(channel).to receive(:queue).with(queue_name, {passive: true}).and_return(queue)
-        expect(queue).to receive(:delete)
-        expect(channel).to receive(:queue).with(queue_name, queue_options).and_return(queue)
-        expect(channel).to receive(:headers).with(config[:exchange], durable: true) { exchange }
-        expect(queue).to receive(:name).and_return(queue_name).exactly(2).times
-
-        config[:bindings].each do |arguments|
-          expect(queue).to receive(:bind).with(exchange, {arguments: arguments})
-        end
-        Philotic.initialize_named_queue! queue_name, config
-      end
+  describe '.connection' do
+    specify do
+      expect(Philotic.connection.class).to eq(Philotic::Connection)
     end
   end
 end

data/spec/spec_helper.rb

@@ -27,4 +27,5 @@ RSpec.configure do |config|
     Timecop.return
   end
 end
-Philotic.logger = Logger.new("/dev/null")
+
+ENV['PHILOTIC_LOG_LEVEL'] = "#{Logger::FATAL}"

metadata

@@ -1,164 +1,218 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: philotic
-version: !ruby/object:Gem::Version 
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Nathan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-12-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id009 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: evented-spec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: evented-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.10"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10.3"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.3'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec-its
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id009
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - &id012 !ruby/object:Gem::Version 
-        version: "3.2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - *id012
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: bunny
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.8"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
-  version_requirements: *id016
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: Lightweight, opinionated wrapper for using RabbitMQ headers exchanges
-email: 
+email:
 - nkeyes@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -166,9 +220,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- examples/README.md
 - examples/creating_named_queues/manually.rb
-- examples/creating_named_queues/philotic_named_queues.yml
 - examples/creating_named_queues/with_rake.rb
 - examples/publishing/publish.rb
 - examples/simple_combined_example.rb
@@ -206,29 +258,30 @@ files:
 - spec/spec_helper.rb
 - tasks/bump.rake
 homepage: https://github.com/nkeyes/philotic
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id009
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id009
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Lightweight, opinionated wrapper for using RabbitMQ headers exchanges
-test_files: 
+test_files:
 - spec/philotic/config_spec.rb
 - spec/philotic/connection_spec.rb
 - spec/philotic/event_spec.rb
@@ -238,3 +291,4 @@ test_files:
 - spec/philotic/subscriber_spec.rb
 - spec/philotic_spec.rb
 - spec/spec_helper.rb
+has_rdoc: