philotic 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 47b970f227032a30e680562ee09c41d2ba6f5a46
-  data.tar.gz: bbc36d33ee8bdd0c09b7b9a2af4a0b3dfe991f5d
-SHA512: 
-  metadata.gz: a368f139afcdfa7e9516653cd8f9455ec7d6b24bc33eef603b129a5366f25b2e1fb9ac52f70d85dadbc35995b4b201678ba22046edc4da32cbf98aa5b9f97e08
-  data.tar.gz: ff47fae4fb59c8e39c4fe73974295780765e6239e7c9d6f25e2c6a296ea2149add58f8d628ce9eff0d207d0068899686e0a307983db0c1e52ba569720d95f958
+---
+SHA1:
+  metadata.gz: dd9e68a219e5e261cff5c93874204ee23ac50eff
+  data.tar.gz: 76474a8e73d1306e885161c8639043b1ad80d15f
+SHA512:
+  metadata.gz: 1cd304f11017c7e646a0ce22d7bf620613cdb73a5fff3e0cfc2e78d2c63750dd7ed28ec8cf216f59f273eeda92a77881c94894d9a0e07edbee49c37958be336c
+  data.tar.gz: c7db1f0ac754a5e76c0266957443b13cc1e25e52f9ce2aec2fe47723465881262214ac67342ee8cc5aa18e4f330cd1ab6cb843ccaca92c44efdc5766439a36d4

data/.travis.yml

@@ -18,3 +18,5 @@ notifications:
   hipchat:
     rooms:
       secure: akLY832/pt0+9Y2TFKpzW08bagPMY//AcQJ5JGzc0yd3hZbXTlkW4S8bMEclBeHBqLGCV6vaWeN90PiYwIBs4IWlxopPAop4BEWeqRvD8+B4fxarXYwejt54vH3v4iCnHhSNBpFJDbykyfL0f0g9fhvM48eHzhBXTxPZfpQ9nXs=
+    template:
+      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}'

data/README.md

@@ -14,24 +14,26 @@ Check out the [examples](https://github.com/nkeyes/philotic/tree/master/examples
 require 'philotic'
 require 'awesome_print'
 
+philotic = Philotic::Connection.new
+
 # 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}"
+philotic.config.message_return_handler = lambda do |basic_return, metadata, message|
+  philotic.logger.warn "Message returned. reply_text: #{basic_return.reply_text}"
 end
 
-Philotic::Subscriber.subscribe(header_key: 'header_1') do |metadata, message|
+philotic.subscriber.subscribe(header_key: 'header_1') do |metadata, message|
   ap message[:attributes]
 end
 
 # normally we'd do:
 #
-# Philotic::Subscriber.endure
+# philotic.subscriber.endure
 #
 # to keep the parent thread alive while the subscribers do their thing
 # but this infinite publish loop takes care of that
 loop do
-  Philotic::Event.publish({header_key: "header_#{[1, 2].sample}"}, {payload_key: 'payload_value'})
-
+  event = Philotic::Event.new({header_key: "header_#{[1, 2].sample}"}, {payload_key: 'payload_value'})
+  philotic.publish event
   # only send a message every two seconds so we can see whats going on
   sleep 2
 end

data/examples/creating_named_queues/manually.rb

@@ -4,10 +4,13 @@ $stdout.sync = true
 
 require 'philotic'
 
+philotic = Philotic::Connection.new
+
 # explicitly create named queues for this example
-# ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] must equal 'true' to run Philotic.initialize_named_queue!
-ENV['PHILOTIC_INITIALIZE_NAMED_QUEUE'] = 'true'
-Philotic.initialize_named_queue!('male_queue', bindings: [{:'x-match' => 'all', gender: :M, available: true}])
-Philotic.initialize_named_queue!('female_queue', bindings: [{:'x-match' => 'all', gender: :F, available: true}])
-Philotic.initialize_named_queue!('test_queue', bindings: [{ :'x-match' => 'any', gender: :M, available: true }])
-Philotic.initialize_named_queue!('flaky_queue', bindings: [{ :'x-match' => 'any', gender: :M, available: true }])
+# philotic.config.initialize_named_queues must be truthy to run Philotic.initialize_named_queue!
+philotic.config.initialize_named_queues = true
+
+philotic.initialize_named_queue!('male_queue', bindings: [{:'x-match' => 'all', gender: :M, available: true}])
+philotic.initialize_named_queue!('female_queue', bindings: [{:'x-match' => 'all', gender: :F, available: true}])
+philotic.initialize_named_queue!('test_queue', bindings: [{ :'x-match' => 'any', gender: :M, available: true }])
+philotic.initialize_named_queue!('flaky_queue', bindings: [{ :'x-match' => 'any', gender: :M, available: true }])

data/examples/creating_named_queues/with_rake.rb

@@ -7,5 +7,5 @@ require 'rake'
 
 require 'philotic/tasks'
 # equivelant of:
-# rake eb:init_queues[examples/creating_named_queues/philotic_named_queues.yml]
-Rake::Task["eb:init_queues"].invoke(File.join(File.dirname(__FILE__), ".", "philotic_named_queues.yml"))
+# rake philotic:init_queues[examples/creating_named_queues/philotic_queues.yml]
+Rake::Task['philotic:init_queues'].invoke(File.join(File.dirname(__FILE__), 'philotic_queues.yml'))

data/examples/publishing/publish.rb

@@ -5,7 +5,9 @@ $stdout.sync = true
 require 'philotic'
 require 'philotic/dummy_event'
 
-Philotic.logger.level = Logger::WARN
+@philotic = Philotic::Connection.new
+
+@philotic.publisher.logger.level = Logger::WARN
 
 @event = Philotic::DummyEvent.new
 
@@ -24,7 +26,7 @@ def send_message number
   @event.gender  = [:F, :M].sample
   @event.message = "Message #{number}: Hey #{@event.gender == :M ? 'dude' : 'dudette'}"
 
-  @event.publish
+  @philotic.publish @event
 
 end
 

data/examples/simple_combined_example.rb

@@ -5,24 +5,26 @@ $stdout.sync = true
 require 'philotic'
 require 'awesome_print'
 
+philotic = Philotic::Connection.new
+
 # 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}"
+philotic.config.message_return_handler = lambda do |basic_return, metadata, message|
+  philotic.logger.warn "Message returned. reply_text: #{basic_return.reply_text}"
 end
 
-Philotic::Subscriber.subscribe(header_key: 'header_1') do |metadata, message|
+philotic.subscriber.subscribe(header_key: 'header_1') do |metadata, message|
   ap message[:attributes]
 end
 
 # normally we'd do:
 #
-# Philotic::Subscriber.endure
+# philotic.subscriber.endure
 #
 # to keep the parent thread alive while the subscribers do their thing
 # but this infinite publish loop takes care of that
 loop do
-  Philotic::Event.publish({header_key: "header_#{[1, 2].sample}"}, {payload_key: 'payload_value'})
-
+  event = Philotic::Event.new({header_key: "header_#{[1, 2].sample}"}, {payload_key: 'payload_value'})
+  philotic.publish event
   # only send a message every two seconds so we can see whats going on
   sleep 2
 end

data/examples/subscribing/acks.rb

@@ -5,21 +5,24 @@ $stdout.sync = true
 require 'philotic'
 require 'awesome_print'
 
+philotic = Philotic::Connection.new
+
+
 # sometimes ack
-Philotic::Subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
+philotic.subscriber.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 ? philotic.subscriber.acknowledge(message) : philotic.subscriber.reject(message)
 end
 
 # always ack
-Philotic::Subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
+philotic.subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
   ap message[:attributes]
-  Philotic::Subscriber.acknowledge(message, true)
+  philotic.subscriber.acknowledge(message, true)
 end
 
 # always reject
-Philotic::Subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
+philotic.subscriber.subscribe('flaky_queue', ack: true) do |metadata, message|
   ap message[:attributes]
-  Philotic::Subscriber.reject message
+  philotic.subscriber.reject message
 end
-Philotic::Subscriber.endure
+philotic.subscriber.endure

data/examples/subscribing/anonymous_queue.rb

@@ -5,11 +5,13 @@ $stdout.sync = true
 require 'philotic'
 require 'awesome_print'
 
-Philotic::Config.load_file(File.join(File.dirname(__FILE__), '../../', 'philotic.yml.example'))
+philotic = Philotic::Connection.new
 
+philotic.config.load_file(File.join(File.dirname(__FILE__), '../../', 'philotic.yml.example'))
 
-Philotic::Subscriber.subscribe(philotic_firehose: true) do |metadata, message|
+
+philotic.subscriber.subscribe(philotic_firehose: true) do |metadata, message|
   ap message[:attributes]
 end
 
-Philotic::Subscriber.endure
+philotic.subscriber.endure

data/examples/subscribing/multiple_named_queues.rb

@@ -4,15 +4,17 @@ $stdout.sync = true
 
 require 'philotic'
 require 'awesome_print'
+philotic = Philotic::Connection.new
 
-Philotic::Config.load_file(File.join(File.dirname(__FILE__), '../../', 'philotic.yml.example'))
 
-Philotic::Subscriber.subscribe('female_queue') do |metadata, message|
+philotic.config.load_file(File.join(File.dirname(__FILE__), '../../', 'philotic.yml.example'))
+
+philotic.subscriber.subscribe('female_queue') do |metadata, message|
   ap message[:attributes]
 end
 
-Philotic::Subscriber.subscribe('male_queue') do |metadata, message|
+philotic.subscriber.subscribe('male_queue') do |metadata, message|
   ap message[:attributes]
 end
 
-Philotic::Subscriber.endure
+philotic.subscriber.endure

data/examples/subscribing/named_queue.rb

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

data/lib/philotic.rb

@@ -1,12 +1,11 @@
 require 'active_support/all'
 require 'pathname'
-require 'logger'
 
 require 'philotic/constants'
+require 'philotic/connection'
+
 
 module Philotic
-  mattr_accessor :logger
-  mattr_accessor :log_event_handler
 
   def self.root
     ::Pathname.new File.expand_path('../../', __FILE__)
@@ -16,92 +15,12 @@ module Philotic
     ENV['SERVICE_ENV'] || 'development'
   end
 
-  def self.exchange
-    Philotic::Connection.exchange
-  end
-
-  def self.initialize_named_queue!(queue_name, config)
-    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 && 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
-      Philotic.logger.info "deleted old queue. queue: #{queue_name}"
-    end
-
-    if should_create_queue
-      config = config.deep_symbolize_keys
-      queue = queue_from_config(queue_name, config)
-      bind_queue(queue, config)
-    else
-      Philotic.logger.warn "Queue #{queue_name} not created; it already exists. Philotic::Config.delete_existing_queues must be true to override."
-    end
-  end
-
-  def self.bind_queue(queue, config)
-    queue_exchange = exchange_from_config(config)
-    bindings       = config[:bindings]
-    bindings.each do |arguments|
-      queue.bind(queue_exchange, {arguments: arguments})
-      Philotic.logger.info "Added binding to queue. queue: #{queue.name} binding: #{arguments}"
-    end
-
-    Philotic.logger.info "Finished adding bindings to queue. queue: #{queue.name}"
-  end
-
-  def self.exchange_from_config(config)
-    config[:exchange] ? Philotic::Connection.channel.headers(config[:exchange], durable: true) : exchange
-  end
-
-  def self.queue_from_config(queue_name, config)
-    queue_options = DEFAULT_NAMED_QUEUE_OPTIONS.dup
-    queue_options.merge!(config[:options] || {})
-
-    Philotic::Connection.channel.queue(queue_name, queue_options).tap do
-      Philotic.logger.info "Created queue. queue:#{queue_name}"
-    end
-  end
-
-  def self.logger
-    @@logger ||= init_logger
-  end
-
-  def self.init_logger
-    Logger.new(STDOUT)
-  end
-
-  def self.on_publish_event(&block)
-    @@log_event_handler = block
-  end
-
-  def self.log_event_published(severity, metadata, payload, message)
-    if @@log_event_handler
-      @@log_event_handler.call(severity, metadata, payload, message)
-    else
-      logger.send(severity, "#{message}; message_metadata:#{metadata}, payload:#{payload.to_json}")
-    end
-  end
-
-  def self.connected?
-    Philotic::Connection.connected?
-  end
-
-  def self.connect!
-    Philotic::Connection.connect!
-  end
-
-  def self.close
-    Philotic::Connection.close
+  def self.connection
+    @connection ||= Philotic::Connection.new
   end
 end
 
 require 'philotic/version'
-require 'philotic/connection'
 require 'philotic/config'
 require 'philotic/routable'
 require 'philotic/event'

data/lib/philotic/config.rb

@@ -4,19 +4,20 @@ require 'singleton'
 require 'forwardable'
 require 'cgi'
 require 'bunny/session'
+require 'logger'
 
 module Philotic
-  module Config
-    extend self
+  class Config
 
     ENV_PREFIX = 'PHILOTIC'
 
     DEFAULT_DISABLE_PUBLISH         = false
     DEFAULT_INITIALIZE_NAMED_QUEUES = false
     DEFAULT_DELETE_EXISTING_QUEUES  = false
-    DEFAULT_RABBIT_SCHEME           = 'amqps'
+    DEFAULT_LOG_LEVEL               = Logger::DEBUG
+    DEFAULT_RABBIT_SCHEME           = 'amqp'
     DEFAULT_RABBIT_HOST             = 'localhost'
-    DEFAULT_RABBIT_PORT             = 5671
+    DEFAULT_RABBIT_PORT             = 5672
     DEFAULT_RABBIT_USER             = 'guest'
     DEFAULT_RABBIT_PASSWORD         = 'guest'
     DEFAULT_RABBIT_VHOST            = '%2f' # '/'
@@ -39,6 +40,17 @@ module Philotic
     DEFAULT_TIMESTAMP               = nil
     DEFAULT_EXPIRATION              = nil
 
+    attr_accessor :connection
+
+    def initialize(connection, config={})
+      load_config config
+      @connection = connection
+    end
+
+    def logger
+      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
@@ -62,27 +74,30 @@ module Philotic
       end
     end
 
+    def log_level
+      @log_level ||= defaults[:log_level].to_i
+    end
     attr_writer :connection_failed_handler, :connection_loss_handler, :message_return_handler
 
     def connection_failed_handler
       @connection_failed_handler ||= lambda do |settings|
-        Philotic.logger.error "RabbitMQ connection failure; host:#{rabbit_host}"
+        logger.error "RabbitMQ connection failure; host:#{rabbit_host}"
       end
     end
 
     def connection_loss_handler
       @connection_loss_handler ||= lambda do |conn, settings|
-        Philotic.logger.warn "RabbitMQ connection loss; host:#{rabbit_host}"; conn.reconnect(false, 2)
+        logger.warn "RabbitMQ connection loss; host:#{rabbit_host}"; conn.reconnect(false, 2)
       end
     end
 
     def message_return_handler
       @message_return_handler ||= lambda do |basic_return, metadata, payload|
-        Philotic.logger.warn "Philotic message #{JSON.parse payload} was returned! reply_code = #{basic_return.reply_code}, reply_text = #{basic_return.reply_text} headers = #{metadata[:headers]}"
+        logger.warn "Philotic message #{JSON.parse payload} was returned! reply_code = #{basic_return.reply_code}, reply_text = #{basic_return.reply_text} headers = #{metadata[:headers]}"
       end
     end
 
-    def self.parse_rabbit_uri
+    def parse_rabbit_uri
       settings            = Bunny::Session.parse_uri(@rabbit_url || defaults[:rabbit_url])
       settings[:password] = settings.delete(:pass)
 
@@ -91,21 +106,19 @@ 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] && [const_get("default_rabbit_#{setting}".upcase), nil].include?(current_value)
+        if settings[setting] && [self.class.const_get("default_rabbit_#{setting}".upcase), nil].include?(current_value)
           send("rabbit_#{setting}=", settings[setting])
         end
       end
 
     end
 
-    def self.rabbit_url
-      self.parse_rabbit_uri
+    def rabbit_url
+      parse_rabbit_uri
       "#{rabbit_scheme}://#{rabbit_user}:#{rabbit_password}@#{rabbit_host}:#{rabbit_port}/#{CGI.escape rabbit_vhost}"
     end
 
-    def load(config)
-      Philotic.logger # ensure the logger can be created, so we crash early if it can't
-
+    def load_config(config)
       config.each do |k, v|
         mutator = "#{k}="
         send(mutator, v) if respond_to? mutator

data/lib/philotic/connection.rb

@@ -1,16 +1,28 @@
-require 'singleton'
 require 'json'
 require 'bunny'
+require 'logger'
 
 require 'philotic/config'
+require 'philotic/publisher'
+require 'philotic/subscriber'
 
 module Philotic
-  module Connection
-    extend self
+  class Connection
     attr_reader :connection
+    attr_accessor :logger
+
+    attr_writer :publisher, :subscriber
+
+    def publisher
+      @publisher ||= Philotic::Publisher.new self
+    end
+
+    def subscriber
+      @subscriber ||= Philotic::Subscriber.new self
+    end
 
     def config
-      Philotic::Config
+      @config ||= Philotic::Config.new self
     end
 
     def connect!
@@ -19,11 +31,11 @@ module Philotic
       start_connection!
 
       if connected?
-        Philotic.logger.info "connected to RabbitMQ: #{config.rabbit_host}:#{config.rabbit_port}"
+        logger.info "connected to RabbitMQ: #{config.rabbit_host}:#{config.rabbit_port}"
         set_exchange_return_handler!
         true
       else
-        Philotic.logger.error "failed connected to RabbitMQ; host:#{config.rabbit_host}"
+        logger.error "failed connected to RabbitMQ; host:#{config.rabbit_host}"
         false
       end
     end
@@ -42,9 +54,9 @@ module Philotic
     end
 
     def close
-      Philotic.logger.info "closing connection to RabbitMQ; host:#{config.rabbit_host}"
+      logger.info "closing connection to RabbitMQ; host:#{config.rabbit_host}"
       connection.close if connected?
-      @channel = nil
+      @channel  = nil
       @exchange = nil
     end
 
@@ -65,5 +77,64 @@ module Philotic
         config.message_return_handler.call(basic_return, metadata, payload)
       end
     end
+
+    def initialize_named_queue!(queue_name, config)
+      raise 'Philotic.config.initialize_named_queues must be true to run Philotic.initialize_named_queue!' unless self.config.initialize_named_queues
+
+      connect!
+      queue_exists = connection.queue_exists? queue_name
+
+      should_delete_queue = queue_exists && self.config.delete_existing_queues
+      should_create_queue = !queue_exists || self.config.delete_existing_queues
+
+      if should_delete_queue
+        channel.queue(queue_name, passive: true).delete
+        logger.info "deleted old queue. queue: #{queue_name}"
+      end
+
+      if should_create_queue
+        config = config.deep_symbolize_keys
+        queue  = queue_from_config(queue_name, config)
+        bind_queue(queue, config)
+      else
+        logger.warn "Queue #{queue_name} not created; it already exists. self.config.delete_existing_queues must be true to override."
+      end
+    end
+
+    def bind_queue(queue, config)
+      queue_exchange = exchange_from_config(config)
+      bindings       = config[:bindings]
+      bindings.each do |arguments|
+        queue.bind(queue_exchange, {arguments: arguments})
+        logger.info "Added binding to queue. queue: #{queue.name} binding: #{arguments}"
+      end
+
+      logger.info "Finished adding bindings to queue. queue: #{queue.name}"
+    end
+
+    def exchange_from_config(config)
+      config[:exchange] ? channel.headers(config[:exchange], durable: true) : exchange
+    end
+
+    def queue_from_config(queue_name, config)
+      queue_options = DEFAULT_NAMED_QUEUE_OPTIONS.dup
+      queue_options.merge!(config[:options] || {})
+
+      channel.queue(queue_name, queue_options).tap do
+        logger.info "Created queue. queue:#{queue_name}"
+      end
+    end
+
+    def logger
+      unless @logger
+        @logger = Logger.new(STDOUT)
+        @logger.level = config.log_level
+      end
+      @logger
+    end
+
+    def publish(event)
+      publisher.publish(event)
+    end
   end
 end