promiscuous 0.22 → 0.23

data/lib/promiscuous.rb

@@ -1,18 +1,12 @@
 require 'active_support/core_ext'
-require 'promiscuous/config'
-require 'promiscuous/amqp'
-require 'promiscuous/loader'
-require 'promiscuous/railtie' if defined?(Rails)
 
 module Promiscuous
-  autoload :Common,     'promiscuous/common'
-  autoload :Publisher,  'promiscuous/publisher'
-  autoload :Subscriber, 'promiscuous/subscriber'
-  autoload :Observer,   'promiscuous/observer'
-  autoload :Worker,     'promiscuous/worker'
-  autoload :Ephemeral,  'promiscuous/ephemeral'
-  autoload :CLI,        'promiscuous/cli'
-  autoload :Error,      'promiscuous/error'
+  require 'promiscuous/autoload'
+  require 'promiscuous/railtie' if defined?(Rails)
+
+  extend Promiscuous::Autoload
+  autoload :Common, :Publisher, :Subscriber, :Observer, :Worker, :Ephemeral,
+           :CLI, :Error, :Loader, :AMQP, :Config
 
   class << self
     def configure(&block)

data/lib/promiscuous/amqp.rb

@@ -1,7 +1,6 @@
 module Promiscuous::AMQP
-  autoload :Bunny,    'promiscuous/amqp/bunny'
-  autoload :RubyAMQP, 'promiscuous/amqp/rubyamqp'
-  autoload :Null,     'promiscuous/amqp/null'
+  extend Promiscuous::Autoload
+  autoload :Bunny, :RubyAMQP, :Null
 
   EXCHANGE = 'promiscuous'.freeze
 

data/lib/promiscuous/amqp/bunny.rb

@@ -1,35 +1,31 @@
-module Promiscuous
-  module AMQP
-    module Bunny
-      mattr_accessor :connection
+module Promiscuous::AMQP:: Bunny
+  mattr_accessor :connection
 
-      def self.connect
-        require 'bunny'
-        self.connection = ::Bunny.new(Promiscuous::Config.server_uri)
-        self.connection.start
-      end
+  def self.connect
+    require 'bunny'
+    self.connection = ::Bunny.new(Promiscuous::Config.server_uri)
+    self.connection.start
+  end
 
-      def self.disconnect
-        self.connection.stop
-      end
+  def self.disconnect
+    self.connection.stop
+  end
 
-      def self.connected?
-        !!self.connection.try(:connected?)
-      end
+  def self.connected?
+    !!self.connection.try(:connected?)
+  end
 
-      def self.publish(options={})
-        Promiscuous.info "[publish] (#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
-        exchange(options[:exchange_name]).
-          publish(options[:payload], :key => options[:key], :persistent => true)
-      end
+  def self.publish(options={})
+    Promiscuous.info "[publish] (#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
+    exchange(options[:exchange_name]).
+      publish(options[:payload], :key => options[:key], :persistent => true)
+  end
 
-      def self.open_queue(options={}, &block)
-        raise "Cannot open queue with bunny"
-      end
+  def self.open_queue(options={}, &block)
+    raise "Cannot open queue with bunny"
+  end
 
-      def self.exchange(name)
-        connection.exchange(name, :type => :topic, :durable => true)
-      end
-    end
+  def self.exchange(name)
+    connection.exchange(name, :type => :topic, :durable => true)
   end
 end

data/lib/promiscuous/amqp/null.rb

@@ -1,20 +1,16 @@
-module Promiscuous
-  module AMQP
-    module Null
-      def self.connect
-      end
+module Promiscuous::AMQP::Null
+  def self.connect
+  end
 
-      def self.disconnect
-      end
+  def self.disconnect
+  end
 
-      def self.connected?
-      end
+  def self.connected?
+  end
 
-      def self.publish(options={})
-      end
+  def self.publish(options={})
+  end
 
-      def self.open_queue(options={}, &block)
-      end
-    end
+  def self.open_queue(options={}, &block)
   end
 end

data/lib/promiscuous/amqp/ruby_amqp.rb

@@ -0,0 +1,89 @@
+module Promiscuous::AMQP::RubyAMQP
+  mattr_accessor :channel
+
+  def self.connect
+    require 'amqp'
+
+    amqp_options = if Promiscuous::Config.server_uri
+      uri = URI.parse(Promiscuous::Config.server_uri)
+      raise "Please use amqp://user:password@host:port/vhost" if uri.scheme != 'amqp'
+
+      {
+        :host   => uri.host,
+        :port   => uri.port,
+        :scheme => uri.scheme,
+        :user   => uri.user,
+        :pass   => uri.password,
+        :vhost  => uri.path.empty? ? "/" : uri.path,
+      }
+    end
+
+    connection = ::AMQP.connect(amqp_options)
+    self.channel = ::AMQP::Channel.new(connection, :auto_recovery => true, :prefetch => 100)
+
+    connection.on_tcp_connection_loss do |conn|
+      unless conn.reconnecting?
+        Promiscuous.warn "[connection] Lost connection. Reconnecting..."
+        conn.periodically_reconnect(2)
+
+        exception = Promiscuous::Error::Connection.new 'Lost connection'
+        Promiscuous::Worker.stop # TODO XXX This doesn't belong here. hooks ?
+        Promiscuous::Config.error_notifier.try(:call, exception)
+      end
+    end
+
+    connection.on_recovery do |conn|
+      Promiscuous.warn "[connection] Reconnected"
+      Promiscuous::Worker.resume # TODO XXX This doesn't belong here. hooks ?
+    end
+
+    connection.on_error do |conn, conn_close|
+      # No need to handle CONNECTION_FORCED since on_tcp_connection_loss takes
+      # care of it.
+      Promiscuous.warn "[connection] #{conn_close.reply_text}"
+    end
+  end
+
+  def self.disconnect
+    if self.channel && self.channel.connection.connected?
+      self.channel.connection.close
+      self.channel.close
+    end
+    self.channel = nil
+  end
+
+  # Always disconnect when shutting down to avoid reconnection
+  EM.add_shutdown_hook { Promiscuous::AMQP::RubyAMQP.disconnect }
+
+  def self.connected?
+    !!self.channel.try(:connection).try(:connected?)
+  end
+
+  def self.open_queue(options={}, &block)
+    queue_name = options[:queue_name]
+    bindings   = options[:bindings]
+
+    queue = self.channel.queue(queue_name, Promiscuous::Config.queue_options)
+    bindings.each do |binding|
+      queue.bind(exchange(options[:exchange_name]), :routing_key => binding)
+      Promiscuous.info "[bind] #{queue_name} -> #{binding}"
+    end
+    block.call(queue) if block
+  end
+
+  def self.publish(options={})
+    info_msg = "(#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
+
+    unless channel.connection.connected?
+      raise Promiscuous::Error::Connection.new 'Not connected'
+    end
+
+    Promiscuous.info "[publish] #{info_msg}"
+    exchange(options[:exchange_name]).
+      publish(options[:payload], :routing_key => options[:key], :persistent => true)
+  end
+
+  def self.exchange(name)
+    channel.topic(name, :durable => true)
+  end
+end

data/lib/promiscuous/autoload.rb

@@ -0,0 +1,7 @@
+module Promiscuous::Autoload
+  include ActiveSupport::Autoload
+
+  def autoload(*args)
+    args.each { |mod| super mod }
+  end
+end

data/lib/promiscuous/cli.rb

@@ -1,5 +1,3 @@
-require 'promiscuous'
-
 class Promiscuous::CLI
   def replicate(config_options={}, &block)
     require 'eventmachine'

data/lib/promiscuous/common.rb

@@ -1,6 +1,4 @@
 module Promiscuous::Common
-  autoload :Options,      'promiscuous/common/options'
-  autoload :Lint,         'promiscuous/common/lint'
-  autoload :ClassHelpers, 'promiscuous/common/class_helpers'
-  autoload :Worker,       'promiscuous/common/worker'
+  extend Promiscuous::Autoload
+  autoload :Options, :Lint, :ClassHelpers, :Worker
 end

data/lib/promiscuous/common/lint.rb

@@ -1,3 +1,4 @@
 module Promiscuous::Common::Lint
-  autoload :Base, 'promiscuous/common/lint/base'
+  extend Promiscuous::Autoload
+  autoload :Base
 end

data/lib/promiscuous/common/lint/base.rb

@@ -13,9 +13,11 @@ module Promiscuous::Common::Lint::Base
   end
 
   module ClassMethods
-    def use_option(attr)
-      define_method(attr) do
-        self.options[attr]
+    def use_option(*attrs)
+      attrs.each do |attr|
+        define_method(attr) do
+          self.options[attr]
+        end
       end
     end
   end

data/lib/promiscuous/config.rb

@@ -1,28 +1,26 @@
-module Promiscuous
-  module Config
-    mattr_accessor :app, :logger, :error_notifier, :backend, :server_uri, :queue_options
+module Promiscuous::Config
+  mattr_accessor :app, :logger, :error_notifier, :backend, :server_uri, :queue_options
 
-    def self.backend=(value)
-      @@backend = "Promiscuous::AMQP::#{value.to_s.camelize.gsub(/amqp/, 'AMQP')}".constantize unless value.nil?
-    end
+  def self.backend=(value)
+    @@backend = "Promiscuous::AMQP::#{value.to_s.camelize.gsub(/amqp/, 'AMQP')}".constantize unless value.nil?
+  end
 
-    def self.configure(&block)
-      class_variables.each { |var| class_variable_set(var, nil) }
+  def self.configure(&block)
+    class_variables.each { |var| class_variable_set(var, nil) }
 
-      block.call(self)
+    block.call(self)
 
-      self.backend ||= defined?(EventMachine) && EventMachine.reactor_running? ? :rubyamqp : :bunny
-      self.logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
-      self.queue_options ||= {:durable => true, :arguments => {'x-ha-policy' => 'all'}}
+    self.backend ||= defined?(EventMachine) && EventMachine.reactor_running? ? :rubyamqp : :bunny
+    self.logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
+    self.queue_options ||= {:durable => true, :arguments => {'x-ha-policy' => 'all'}}
 
-      Promiscuous::AMQP.connect
-    end
+    Promiscuous::AMQP.connect
+  end
 
-    # TODO backward compatibility. to be removed.
-    def self.error_handler=(value)
-      ActiveSupport::Deprecation.behavior = :stderr
-      ActiveSupport::Deprecation.warn "'error_handler' is deprecated, please use 'error_notifier'", caller
-      self.error_notifier = value
-    end
+  # TODO backward compatibility. to be removed.
+  def self.error_handler=(value)
+    ActiveSupport::Deprecation.behavior = :stderr
+    ActiveSupport::Deprecation.warn "'error_handler' is deprecated, please use 'error_notifier'", caller
+    self.error_notifier = value
   end
 end

data/lib/promiscuous/error.rb

@@ -1,5 +1,4 @@
 module Promiscuous::Error
-  autoload :Connection, 'promiscuous/error/connection'
-  autoload :Publisher,  'promiscuous/error/publisher'
-  autoload :Subscriber, 'promiscuous/error/subscriber'
+  extend Promiscuous::Autoload
+  autoload :Connection, :Publisher, :Subscriber
 end

data/lib/promiscuous/loader.rb

@@ -1,25 +1,23 @@
-module Promiscuous
-  module Loader
-    def self.load_descriptors(descriptors=[:publishers, :subscribers])
-      [descriptors].flatten.each do |descriptor|
-        dir, file_matcher = case descriptor
-          when :publishers then %w(publishers **_publisher.rb)
-          when :subscribers then %w(subscribers **_subscriber.rb)
-          end
-
-        Dir[Rails.root.join('app', dir, file_matcher)].map do |file|
-          File.basename(file, ".rb").camelize.constantize
+module Promiscuous::Loader
+  def self.load_descriptors(descriptors=[:publishers, :subscribers])
+    [descriptors].flatten.each do |descriptor|
+      dir, file_matcher = case descriptor
+        when :publishers then %w(publishers **_publisher.rb)
+        when :subscribers then %w(subscribers **_subscriber.rb)
         end
+
+      Dir[Rails.root.join('app', dir, file_matcher)].map do |file|
+        File.basename(file, ".rb").camelize.constantize
       end
     end
+  end
 
-    def self.unload_descriptors(descriptors=[:publishers, :subscribers])
-      [descriptors].flatten.each do |descriptor|
-        dir, file_matcher = case descriptor
-          when :publishers then # TODO Cleanup publishers
-          when :subscribers then Promiscuous::Subscriber::AMQP.subscribers.clear
-          end
-      end
+  def self.unload_descriptors(descriptors=[:publishers, :subscribers])
+    [descriptors].flatten.each do |descriptor|
+      dir, file_matcher = case descriptor
+        when :publishers then # TODO Cleanup publishers
+        when :subscribers then Promiscuous::Subscriber::AMQP.subscribers.clear
+        end
     end
   end
 end

data/lib/promiscuous/publisher.rb

@@ -1,18 +1,7 @@
 module Promiscuous::Publisher
-  autoload :ActiveRecord, 'promiscuous/publisher/active_record'
-  autoload :AMQP,         'promiscuous/publisher/amqp'
-  autoload :Attributes,   'promiscuous/publisher/attributes'
-  autoload :Base,         'promiscuous/publisher/base'
-  autoload :Class,        'promiscuous/publisher/class'
-  autoload :Envelope,     'promiscuous/publisher/envelope'
-  autoload :Lint,         'promiscuous/publisher/lint'
-  autoload :Mock,         'promiscuous/publisher/mock'
-  autoload :Model,        'promiscuous/publisher/model'
-  autoload :Mongoid,      'promiscuous/publisher/mongoid'
-  autoload :Polymorphic,  'promiscuous/publisher/polymorphic'
-  autoload :Worker,       'promiscuous/publisher/worker'
-  autoload :Error,        'promiscuous/publisher/error'
-  autoload :Ephemeral,    'promiscuous/publisher/ephemeral'
+  extend Promiscuous::Autoload
+  autoload :ActiveRecord, :AMQP, :Attributes, :Base, :Class, :Envelope, :Lint,
+           :Mock, :Model, :Mongoid, :Polymorphic, :Worker, :Error, :Ephemeral
 
   def self.lint(*args)
     Lint.lint(*args)

data/lib/promiscuous/publisher/lint.rb

@@ -1,9 +1,6 @@
 module Promiscuous::Publisher::Lint
-  autoload :Base,        'promiscuous/publisher/lint/base'
-  autoload :Class,       'promiscuous/publisher/lint/class'
-  autoload :Attributes,  'promiscuous/publisher/lint/attributes'
-  autoload :Polymorphic, 'promiscuous/publisher/lint/polymorphic'
-  autoload :AMQP,        'promiscuous/publisher/lint/amqp'
+  extend Promiscuous::Autoload
+  autoload :Base, :Class, :Attributes, :Polymorphic, :AMQP
 
   def self.get_publisher(klass)
     unless klass.respond_to?(:promiscuous_publisher)
@@ -13,8 +10,17 @@ module Promiscuous::Publisher::Lint
     klass.promiscuous_publisher
   end
 
-  def self.lint(classes)
-    classes.each do |klass, to|
+  def self.lint(class_bindings={})
+    if class_bindings.empty?
+      class_bindings = Promiscuous::Publisher::Mongoid::Defer.klasses.values.reduce({}) do |res, klass|
+        res[klass] = klass.promiscuous_publisher.to
+        res
+      end
+
+      raise "No publishers found" if class_bindings.empty?
+    end
+
+    class_bindings.each do |klass, to|
       pub = get_publisher(klass)
 
       lint = ::Class.new(Base)

data/lib/promiscuous/publisher/lint/class.rb

@@ -5,9 +5,11 @@ module Promiscuous::Publisher::Lint::Class
     super
 
     if publisher.klass != klass
-      raise "Define a publisher for #{klass}"
+      msg = "Please define a publisher for #{klass}"
+      msg = "#{msg} because #{parent} is published and you need to cover subclasses" if parent
+      raise msg
     end
   end
 
-  included { use_option :klass }
+  included { use_option :klass, :parent }
 end

data/lib/promiscuous/publisher/lint/polymorphic.rb

@@ -9,6 +9,7 @@ module Promiscuous::Publisher::Lint::Polymorphic
         pub = Promiscuous::Publisher::Lint.get_publisher(subclass)
         self.class.new(options.merge(:klass => subclass,
                                      :publisher => pub,
+                                     :parent => klass,
                                      :skip_polymorphic => true)).lint
       end
     end

data/lib/promiscuous/publisher/mongoid.rb

@@ -1,8 +1,6 @@
 class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Base
-  autoload :Embedded,      'promiscuous/publisher/mongoid/embedded'
-  autoload :DeferEmbedded, 'promiscuous/publisher/mongoid/defer_embedded'
-  autoload :Defer,         'promiscuous/publisher/mongoid/defer'
-  autoload :EmbeddedMany,  'promiscuous/publisher/mongoid/embedded_many'
+  extend Promiscuous::Autoload
+  autoload :Embedded, :DeferEmbedded, :Defer, :EmbeddedMany
 
   include Promiscuous::Publisher::Class
   include Promiscuous::Publisher::Attributes

data/lib/promiscuous/railtie.rb

@@ -1,14 +1,12 @@
-module Promiscuous
-  class Railtie < Rails::Railtie
-    initializer 'load promiscuous' do
-      config.after_initialize do
-        Promiscuous::Loader.load_descriptors(:publishers)
-        ActionDispatch::Reloader.to_prepare do
-          Promiscuous::Loader.load_descriptors
-        end
-        ActionDispatch::Reloader.to_cleanup do
-          Promiscuous::Loader.unload_descriptors
-        end
+class Promiscuous::Railtie < Rails::Railtie
+  initializer 'load promiscuous' do
+    config.after_initialize do
+      Promiscuous::Loader.load_descriptors(:publishers)
+      ActionDispatch::Reloader.to_prepare do
+        Promiscuous::Loader.load_descriptors
+      end
+      ActionDispatch::Reloader.to_cleanup do
+        Promiscuous::Loader.unload_descriptors
       end
     end
   end

data/lib/promiscuous/subscriber.rb

@@ -1,18 +1,7 @@
 module Promiscuous::Subscriber
-  autoload :ActiveRecord, 'promiscuous/subscriber/active_record'
-  autoload :AMQP,         'promiscuous/subscriber/amqp'
-  autoload :Attributes,   'promiscuous/subscriber/attributes'
-  autoload :Base,         'promiscuous/subscriber/base'
-  autoload :Class,        'promiscuous/subscriber/class'
-  autoload :Envelope,     'promiscuous/subscriber/envelope'
-  autoload :Error,        'promiscuous/subscriber/error'
-  autoload :Lint,         'promiscuous/subscriber/lint'
-  autoload :Model,        'promiscuous/subscriber/model'
-  autoload :Mongoid,      'promiscuous/subscriber/mongoid'
-  autoload :Polymorphic,  'promiscuous/subscriber/polymorphic'
-  autoload :Upsert,       'promiscuous/subscriber/upsert'
-  autoload :Observer,     'promiscuous/subscriber/observer'
-  autoload :Worker,       'promiscuous/subscriber/worker'
+  extend Promiscuous::Autoload
+  autoload :ActiveRecord, :AMQP, :Attributes, :Base, :Class, :Envelope, :Error,
+           :Lint, :Model, :Mongoid, :Polymorphic, :Upsert, :Observer, :Worker
 
   def self.lint(*args)
     Lint.lint(*args)

data/lib/promiscuous/subscriber/lint.rb

@@ -1,13 +1,19 @@
 module Promiscuous::Subscriber::Lint
-  autoload :Base,        'promiscuous/subscriber/lint/base'
-  autoload :Class,       'promiscuous/subscriber/lint/class'
-  autoload :Attributes,  'promiscuous/subscriber/lint/attributes'
-  autoload :Polymorphic, 'promiscuous/subscriber/lint/polymorphic'
-  autoload :AMQP,        'promiscuous/subscriber/lint/amqp'
+  extend Promiscuous::Autoload
+  autoload :Base, :Class, :Attributes, :Polymorphic, :AMQP
 
-  def self.lint(binding_classes)
+  def self.lint(binding_classes={})
     Base.reload_publishers
 
+    if binding_classes.empty?
+      binding_classes = Promiscuous::Subscriber::AMQP.subscribers.reduce({}) do |res, e|
+        from, sub = e
+        res[from] = sub.klass unless from =~ /^__promiscuous__/
+        res
+      end
+      raise "No subscribers found" if binding_classes.empty?
+    end
+
     binding_classes.each do |from, klass|
       sub = Promiscuous::Subscriber::AMQP.subscribers[from]
       raise "#{from} has no subscriber" if sub.nil?

data/lib/promiscuous/subscriber/mongoid.rb

@@ -1,6 +1,6 @@
 class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
-  autoload :Embedded,   'promiscuous/subscriber/mongoid/embedded'
-  autoload :Versioning, 'promiscuous/subscriber/mongoid/versioning'
+  extend Promiscuous::Autoload
+  autoload :Embedded, :Versioning
 
   include Promiscuous::Subscriber::Class
   include Promiscuous::Subscriber::Attributes

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.22'
+  VERSION = '0.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: '0.22'
+  version: '0.23'
   prerelease: 
 platform: ruby
 authors:
@@ -117,25 +117,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous/amqp/null.rb
 - lib/promiscuous/amqp/bunny.rb
-- lib/promiscuous/amqp/rubyamqp.rb
+- lib/promiscuous/amqp/null.rb
+- lib/promiscuous/amqp/ruby_amqp.rb
 - lib/promiscuous/common/lint/base.rb
-- lib/promiscuous/common/lint.rb
 - lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/options.rb
 - lib/promiscuous/common/worker.rb
+- lib/promiscuous/common/lint.rb
 - lib/promiscuous/publisher/lint/amqp.rb
 - lib/promiscuous/publisher/lint/attributes.rb
 - lib/promiscuous/publisher/lint/base.rb
-- lib/promiscuous/publisher/lint/class.rb
 - lib/promiscuous/publisher/lint/polymorphic.rb
+- lib/promiscuous/publisher/lint/class.rb
 - lib/promiscuous/publisher/mongoid/embedded.rb
 - lib/promiscuous/publisher/mongoid/defer_embedded.rb
 - lib/promiscuous/publisher/mongoid/embedded_many.rb
 - lib/promiscuous/publisher/mongoid/defer.rb
 - lib/promiscuous/publisher/envelope.rb
-- lib/promiscuous/publisher/lint.rb
 - lib/promiscuous/publisher/polymorphic.rb
 - lib/promiscuous/publisher/mock.rb
 - lib/promiscuous/publisher/attributes.rb
@@ -144,9 +143,10 @@ files:
 - lib/promiscuous/publisher/base.rb
 - lib/promiscuous/publisher/class.rb
 - lib/promiscuous/publisher/ephemeral.rb
-- lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/amqp.rb
 - lib/promiscuous/publisher/worker.rb
+- lib/promiscuous/publisher/mongoid.rb
+- lib/promiscuous/publisher/lint.rb
 - lib/promiscuous/subscriber/lint/amqp.rb
 - lib/promiscuous/subscriber/lint/base.rb
 - lib/promiscuous/subscriber/lint/class.rb
@@ -157,7 +157,6 @@ files:
 - lib/promiscuous/subscriber/mongoid/versioning.rb
 - lib/promiscuous/subscriber/active_record.rb
 - lib/promiscuous/subscriber/envelope.rb
-- lib/promiscuous/subscriber/lint.rb
 - lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/observer.rb
 - lib/promiscuous/subscriber/polymorphic.rb
@@ -166,23 +165,25 @@ files:
 - lib/promiscuous/subscriber/model.rb
 - lib/promiscuous/subscriber/base.rb
 - lib/promiscuous/subscriber/class.rb
-- lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/worker.rb
+- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/subscriber/lint.rb
 - lib/promiscuous/error/connection.rb
 - lib/promiscuous/error/publisher.rb
 - lib/promiscuous/error/subscriber.rb
-- lib/promiscuous/loader.rb
 - lib/promiscuous/observer.rb
-- lib/promiscuous/common.rb
 - lib/promiscuous/ephemeral.rb
+- lib/promiscuous/worker.rb
+- lib/promiscuous/autoload.rb
 - lib/promiscuous/subscriber.rb
 - lib/promiscuous/publisher.rb
-- lib/promiscuous/railtie.rb
-- lib/promiscuous/amqp.rb
 - lib/promiscuous/error.rb
-- lib/promiscuous/config.rb
+- lib/promiscuous/common.rb
+- lib/promiscuous/amqp.rb
+- lib/promiscuous/loader.rb
+- lib/promiscuous/railtie.rb
 - lib/promiscuous/cli.rb
-- lib/promiscuous/worker.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/version.rb
 - lib/promiscuous.rb
 - bin/promiscuous

data/lib/promiscuous/amqp/rubyamqp.rb

@@ -1,93 +0,0 @@
-module Promiscuous
-  module AMQP
-    module RubyAMQP
-      mattr_accessor :channel
-
-      def self.connect
-        require 'amqp'
-
-        amqp_options = if Promiscuous::Config.server_uri
-          uri = URI.parse(Promiscuous::Config.server_uri)
-          raise "Please use amqp://user:password@host:port/vhost" if uri.scheme != 'amqp'
-
-          {
-            :host   => uri.host,
-            :port   => uri.port,
-            :scheme => uri.scheme,
-            :user   => uri.user,
-            :pass   => uri.password,
-            :vhost  => uri.path.empty? ? "/" : uri.path,
-          }
-        end
-
-        connection = ::AMQP.connect(amqp_options)
-        self.channel = ::AMQP::Channel.new(connection, :auto_recovery => true, :prefetch => 100)
-
-        connection.on_tcp_connection_loss do |conn|
-          unless conn.reconnecting?
-            Promiscuous.warn "[connection] Lost connection. Reconnecting..."
-            conn.periodically_reconnect(2)
-
-            exception = Promiscuous::Error::Connection.new 'Lost connection'
-            Promiscuous::Worker.stop # TODO XXX This doesn't belong here. hooks ?
-            Promiscuous::Config.error_notifier.try(:call, exception)
-          end
-        end
-
-        connection.on_recovery do |conn|
-          Promiscuous.warn "[connection] Reconnected"
-          Promiscuous::Worker.resume # TODO XXX This doesn't belong here. hooks ?
-        end
-
-        connection.on_error do |conn, conn_close|
-          # No need to handle CONNECTION_FORCED since on_tcp_connection_loss takes
-          # care of it.
-          Promiscuous.warn "[connection] #{conn_close.reply_text}"
-        end
-      end
-
-      def self.disconnect
-        if self.channel && self.channel.connection.connected?
-          self.channel.connection.close
-          self.channel.close
-        end
-        self.channel = nil
-      end
-
-      # Always disconnect when shutting down to avoid reconnection
-      EM.add_shutdown_hook { Promiscuous::AMQP::RubyAMQP.disconnect }
-
-      def self.connected?
-        !!self.channel.try(:connection).try(:connected?)
-      end
-
-      def self.open_queue(options={}, &block)
-        queue_name = options[:queue_name]
-        bindings   = options[:bindings]
-
-        queue = self.channel.queue(queue_name, Promiscuous::Config.queue_options)
-        bindings.each do |binding|
-          queue.bind(exchange(options[:exchange_name]), :routing_key => binding)
-          Promiscuous.info "[bind] #{queue_name} -> #{binding}"
-        end
-        block.call(queue) if block
-      end
-
-      def self.publish(options={})
-        info_msg = "(#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
-
-        unless channel.connection.connected?
-          raise Promiscuous::Error::Connection.new 'Not connected'
-        end
-
-        Promiscuous.info "[publish] #{info_msg}"
-        exchange(options[:exchange_name]).
-          publish(options[:payload], :routing_key => options[:key], :persistent => true)
-      end
-
-      def self.exchange(name)
-        channel.topic(name, :durable => true)
-      end
-    end
-  end
-end