promiscuous 0.1 → 0.5

data/README.md

@@ -23,8 +23,8 @@ Example
 
 ```ruby
 # initializer
-Promiscuous::AMQP.configure(:backend => :bunny, :app => 'crowdtap', :logger => Rails.logger,
-                           :server_uri => 'amqp://user:password@host:port/vhost')
+Promiscuous::AMQP.configure(:app => 'crowdtap',
+                            :server_uri => 'amqp://user:password@host:port/vhost')
 
 # publisher
 class ModelPublisher < Promiscuous::Publisher::Mongoid
@@ -38,10 +38,9 @@ end
 
 ```ruby
 # initializer
-Promiscuous::AMQP.configure(:backend => :rubyamqp, :app => 'sniper', :logger => Rails.logger,
-                           :server_uri => 'amqp://user:password@host:port/vhost',
-                           :queue_options => {:durable => true, :arguments => {'x-ha-policy' => 'all'}},
-                           :error_handler => some_proc)
+Promiscuous::AMQP.configure(:app => 'sniper',
+                            :server_uri => 'amqp://user:password@host:port/vhost',
+                            :error_handler => some_proc)
 
 # subscriber
 class ModelSubscriber < Promiscuous::Subscriber::Mongoid
@@ -53,7 +52,7 @@ end
 
 ### Starting the subscriber worker
 
-    rake promiscuous:run[./path/to/promiscuous_initializer.rb]
+    rake promiscuous:replicate
 
 How does it work ?
 ------------------

data/lib/promiscuous/amqp/bunny.rb

@@ -3,20 +3,24 @@ module Promiscuous
     module Bunny
       mattr_accessor :connection
 
-      def self.configure(options)
+      def self.connect
         require 'bunny'
-        self.connection = ::Bunny.new(options[:server_uri])
+        self.connection = ::Bunny.new(Promiscuous::Config.server_uri)
         self.connection.start
       end
 
+      def self.disconnect
+        self.connection.stop
+      end
+
       def self.publish(msg)
-        AMQP.info "[publish] #{msg[:key]} -> #{msg[:payload]}"
+        Promiscuous.info "[publish] #{msg[:key]} -> #{msg[:payload]}"
         exchange = connection.exchange('promiscuous', :type => :topic, :durable => true)
         exchange.publish(msg[:payload], :key => msg[:key], :persistent => true)
       end
 
-      def self.close
-        self.connection.stop
+      def self.subscribe(options={}, &block)
+        raise "Cannot subscribe with bunny"
       end
     end
   end

data/lib/promiscuous/amqp/null.rb

@@ -1,19 +1,16 @@
 module Promiscuous
   module AMQP
     module Null
-      def self.configure(options)
+      def self.connect
       end
 
-      def self.publish(msg)
-      end
-
-      def self.subscribe(options={}, &block)
+      def self.disconnect
       end
 
-      def self.clear
+      def self.publish(msg)
       end
 
-      def self.close
+      def self.subscribe(options={}, &block)
       end
     end
   end

data/lib/promiscuous/amqp/{ruby-amqp.rb → rubyamqp.rb}

@@ -3,16 +3,11 @@ module Promiscuous
     module RubyAMQP
       mattr_accessor :channel, :queue_options
 
-      def self.configure(options)
+      def self.connect
         require 'amqp'
-        connection = ::AMQP.connect(build_connection_options(options))
-        self.channel = ::AMQP::Channel.new(connection)
-        self.queue_options = options[:queue_options] || {}
-      end
 
-      def self.build_connection_options(options)
-        if options[:server_uri]
-          uri = URI.parse(options[:server_uri])
+        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'
 
           {
@@ -24,6 +19,14 @@ module Promiscuous
             :vhost => uri.path.empty? ? "/" : uri.path,
          }
         end
+
+        connection = ::AMQP.connect(amqp_options)
+        self.channel = ::AMQP::Channel.new(connection)
+        self.queue_options = Promiscuous::Config.queue_options
+      end
+
+      def self.disconnect
+        channel.close
       end
 
       def self.subscribe(options={}, &block)
@@ -34,20 +37,16 @@ module Promiscuous
         exchange = channel.topic('promiscuous', :durable => true)
         bindings.each do |binding|
           queue.bind(exchange, :routing_key => binding)
-          AMQP.info "[bind] #{queue_name} -> #{binding}"
+          Promiscuous.info "[bind] #{queue_name} -> #{binding}"
         end
         queue.subscribe(:ack => true, &block)
       end
 
       def self.publish(msg)
-        AMQP.info "[publish] #{msg[:key]} -> #{msg[:payload]}"
+        Promiscuous.info "[publish] #{msg[:key]} -> #{msg[:payload]}"
         exchange = channel.topic('promiscuous', :durable => true)
         exchange.publish(msg[:payload], :routing_key => msg[:key], :persistent => true)
       end
-
-      def self.close
-        channel.close
-      end
     end
   end
 end

data/lib/promiscuous/amqp.rb

@@ -1,34 +1,15 @@
 require 'promiscuous/amqp/bunny'
-require 'promiscuous/amqp/fake'
-require 'promiscuous/amqp/ruby-amqp'
+require 'promiscuous/amqp/rubyamqp'
 require 'promiscuous/amqp/null'
 
 module Promiscuous
   module AMQP
-    mattr_accessor :backend, :app, :logger, :error_handler
-
-    def self.configure(options={}, &block)
-      options.symbolize_keys!
-
-      self.backend = "Promiscuous::AMQP::#{options[:backend].to_s.camelize.gsub(/amqp/, 'AMQP')}".constantize
-      self.backend.configure(options, &block)
-      self.app           = options[:app]
-      self.logger        = options[:logger] || Logger.new(STDOUT).tap { |l| l.level = Logger::WARN }
-      self.error_handler = options[:error_handler]
-      self
-    end
-
     class << self
-      [:info, :error, :warn, :fatal].each do |level|
-        define_method(level) do |msg|
-          self.logger.__send__(level, "[AMQP] #{msg}")
-        end
+      def backend
+        Promiscuous::Config.backend
       end
-    end
 
-    # TODO Evaluate the performance hit of method_missing
-    def self.method_missing(method, *args, &block)
-      self.backend.__send__(method, *args, &block)
+      delegate :connect, :disconnect, :publish, :subscribe, :to => :backend
     end
   end
 end

data/lib/promiscuous/config.rb

@@ -0,0 +1,20 @@
+module Promiscuous
+  module Config
+    mattr_accessor :app, :logger, :error_handler, :backend, :server_uri, :queue_options
+
+    def self.backend=(value)
+      @@backend = "Promiscuous::AMQP::#{value.to_s.camelize.gsub(/amqp/, 'AMQP')}".constantize
+    end
+
+    def self.configure(&block)
+      class_variables.each { |var| class_variable_set(var, nil) }
+
+      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'}}
+
+      Promiscuous::AMQP.connect
+    end
+  end
+end

data/lib/promiscuous/loader.rb

@@ -0,0 +1,22 @@
+module Promiscuous
+  module Loader
+    def self.load_descriptors(descriptors=[:publishers, :subscribers])
+      [descriptors].flatten.each do |descriptor|
+        dir, file_matcher = case descriptor
+          when :publishers
+            require 'promiscuous/publisher'
+            # TODO Cleanup publishers
+            %w(publishers **_publisher.rb)
+          when :subscribers
+            require 'promiscuous/subscriber'
+            Promiscuous::Subscriber.subscribers.clear
+            %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
+  end
+end

data/lib/promiscuous/railtie/replicate.rake

@@ -1,12 +1,18 @@
-namespace :replicable do
+namespace :promiscuous do
   desc 'Run the subscribers worker'
-  task :run, [:initializer] => :environment do |t, args|
-    require 'replicable/worker'
+  task :replicate => :environment do |t|
+    require 'promiscuous/worker'
     require 'eventmachine'
     require 'em-synchrony'
+
     EM.synchrony do
-      load args.initializer
-      Replicable::Worker.run
+      Promiscuous::Loader.load_descriptors :subscribers
+      Promiscuous::AMQP.disconnect
+      Promiscuous::Config.backend = :rubyamqp
+      Promiscuous::AMQP.connect
+
+      Promiscuous::Worker.replicate
+      puts "Replicating with #{Promiscuous::Subscriber.subscribers.count} subscribers"
     end
   end
 end

data/lib/promiscuous/railtie.rb

@@ -3,24 +3,10 @@ module Promiscuous
     rake_tasks { load 'promiscuous/railtie/replicate.rake' }
 
     initializer 'load promiscuous' do
-      # TODO clean that up
       config.after_initialize do
-        Dir[Rails.root.join('app', 'publishers', '**_publisher.rb')].map do |file|
-          file.split('/')[-1].split('.')[0].camelize.constantize
-        end
-        ActionDispatch::Reloader.to_prepare do
-          Dir[Rails.root.join('app', 'publishers', '**_publisher.rb')].map do |file|
-            file.split('/')[-1].split('.')[0].camelize.constantize
-          end
-        end
-
-        Dir[Rails.root.join('app', 'subscribers', '**_subscriber.rb')].map do |file|
-          file.split('/')[-1].split('.')[0].camelize.constantize
-        end
+        Promiscuous::Loader.load_descriptors(:publishers)
         ActionDispatch::Reloader.to_prepare do
-          Dir[Rails.root.join('app', 'subscribers', '**_subscriber.rb')].map do |file|
-            file.split('/')[-1].split('.')[0].camelize.constantize
-          end
+          Promiscuous::Loader.load_descriptors(:publishers)
         end
       end
     end

data/lib/promiscuous/subscriber/amqp.rb

@@ -3,30 +3,14 @@ require 'promiscuous/subscriber/envelope'
 module Promiscuous::Subscriber::AMQP
   extend ActiveSupport::Concern
 
-  mattr_accessor :subscribers
-  self.subscribers = {}
-
-  def self.subscriber_for(payload)
-    origin = payload.is_a?(Hash) ? payload['__amqp__'] : nil
-    if origin
-      unless subscribers.has_key?(origin)
-        raise "FATAL: Unknown binding: '#{origin}'"
-      end
-      subscribers[origin]
-    end
+  def self.subscriber_key(payload)
+    payload.is_a?(Hash) ? payload['__amqp__'] : nil
   end
 
   module ClassMethods
     def subscribe(options)
       super
-
-      subscribers = Promiscuous::Subscriber::AMQP.subscribers
-      from = options[:from]
-
-      if subscribers.has_key?(from)
-        raise "The subscriber '#{subscribers[from]}' already listen on '#{from}'"
-      end
-      subscribers[from] = self
+      Promiscuous::Subscriber.bind(options[:from], self)
     end
   end
 end

data/lib/promiscuous/subscriber/mongoid/upsert.rb

@@ -5,7 +5,7 @@ module Promiscuous::Subscriber::Mongoid::Upsert
     begin
       super
     rescue Mongoid::Errors::DocumentNotFound
-      Promiscuous::AMQP.warn "[receive] upserting #{payload}"
+      Promiscuous.warn "[receive] upserting #{payload}"
       klass.new.tap { |o| o.id = id }
     end
   end

data/lib/promiscuous/subscriber.rb

@@ -3,12 +3,32 @@ module Promiscuous::Subscriber
   require 'promiscuous/subscriber/mongoid'
   require 'promiscuous/subscriber/amqp'
 
+  mattr_accessor :subscribers
+  self.subscribers = {}
+
+  def self.bind(key, subscriber)
+    if self.subscribers.has_key?(key)
+      raise "The subscriber '#{self.subscribers[key]}' already listen on '#{key}'"
+    end
+    self.subscribers[key] = subscriber
+  end
+
+  def self.get_subscriber(payload, options={})
+    key = Promiscuous::Subscriber::AMQP.subscriber_key(payload)
+
+    if key
+      raise "FATAL: Unknown binding: '#{key}'" unless self.subscribers.has_key?(key)
+      self.subscribers[key]
+    else
+      Promiscuous::Subscriber::Base
+    end
+  end
+
   def self.process(payload, options={})
-    subscriber = Promiscuous::Subscriber::AMQP.subscriber_for(payload)
-    return payload if subscriber.nil?
+    subscriber_klass = get_subscriber(payload)
 
-    sub = subscriber.new(options.merge(:payload => payload))
-    sub.process if sub.respond_to?(:process)
+    sub = subscriber_klass.new(options.merge(:payload => payload))
+    sub.process
     sub.instance
   end
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.1'
+  VERSION = '0.5'
 end

data/lib/promiscuous/worker.rb

@@ -1,25 +1,42 @@
 module Promiscuous
   module Worker
-    def self.run
-      queue_name = "#{Promiscuous::AMQP.app}.promiscuous"
-
+    def self.replicate
       stop = false
-      Promiscuous::AMQP.subscribe(:queue_name => queue_name,
-                                 :bindings   => Promiscuous::Subscriber::AMQP.subscribers.keys) do |metadata, payload|
+      lock = Mutex.new
+
+      %w(SIGTERM SIGINT).each do |signal|
+        Signal.trap(signal) do
+          lock.synchronize do
+            stop = true
+            EM.stop
+          end
+        end
+      end
+
+      Promiscuous::AMQP.subscribe(subscribe_options) do |metadata, payload|
         begin
-          unless stop
-            Promiscuous::AMQP.info "[receive] #{payload}"
-            Promiscuous::Subscriber.process(JSON.parse(payload))
-            metadata.ack
+          lock.synchronize do
+            unless stop
+              Promiscuous.info "[receive] #{payload}"
+              Promiscuous::Subscriber.process(JSON.parse(payload))
+              metadata.ack
+            end
           end
         rescue Exception => e
           e = Promiscuous::Subscriber::Error.new(e, payload)
+
           stop = true
-          Promiscuous::AMQP.close
-          Promiscuous::AMQP.error "[receive] FATAL #{e}"
-          Promiscuous::AMQP.error_handler.call(e) if Promiscuous::AMQP.error_handler
+          Promiscuous::AMQP.disconnect
+          Promiscuous.error "[receive] FATAL #{e}"
+          Promiscuous::Config.error_handler.call(e) if Promiscuous::Config.error_handler
         end
       end
     end
+
+    def self.subscribe_options
+      queue_name = "#{Promiscuous::Config.app}.promiscuous"
+      bindings = Promiscuous::Subscriber.subscribers.keys
+      {:queue_name => queue_name, :bindings => bindings}
+    end
   end
 end

data/lib/promiscuous.rb

@@ -1,5 +1,19 @@
 require 'active_support/core_ext'
+require 'promiscuous/config'
 require 'promiscuous/amqp'
-require 'promiscuous/publisher'
-require 'promiscuous/subscriber'
+require 'promiscuous/loader'
 require 'promiscuous/railtie' if defined?(Rails)
+
+module Promiscuous
+  class << self
+    def configure(&block)
+      Config.configure(&block)
+    end
+
+    [:info, :error, :warn, :fatal].each do |level|
+      define_method(level) do |msg|
+        Promiscuous::Config.logger.__send__(level, "[promiscuous] #{msg}")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -100,39 +100,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous/amqp/fake.rb
-- lib/promiscuous/amqp/null.rb
-- lib/promiscuous/amqp/bunny.rb
-- lib/promiscuous/amqp/ruby-amqp.rb
-- lib/promiscuous/railtie/replicate.rake
-- lib/promiscuous/publisher/mongoid/embedded.rb
-- lib/promiscuous/publisher/mongoid/root.rb
-- lib/promiscuous/publisher/base.rb
+- lib/promiscuous/version.rb
 - lib/promiscuous/publisher/class_bind.rb
-- lib/promiscuous/publisher/envelope.rb
-- lib/promiscuous/publisher/mongoid.rb
-- lib/promiscuous/publisher/polymorphic.rb
 - lib/promiscuous/publisher/attributes.rb
+- lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/generic.rb
+- lib/promiscuous/publisher/mongoid/root.rb
+- lib/promiscuous/publisher/mongoid/embedded.rb
+- lib/promiscuous/publisher/envelope.rb
 - lib/promiscuous/publisher/amqp.rb
+- lib/promiscuous/publisher/base.rb
+- lib/promiscuous/publisher/polymorphic.rb
+- lib/promiscuous/amqp/null.rb
+- lib/promiscuous/amqp/rubyamqp.rb
+- lib/promiscuous/amqp/bunny.rb
+- lib/promiscuous/publisher.rb
+- lib/promiscuous/subscriber/attributes.rb
+- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/subscriber/error.rb
+- lib/promiscuous/subscriber/generic.rb
+- lib/promiscuous/subscriber/mongoid/root.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
 - lib/promiscuous/subscriber/mongoid/upsert.rb
-- lib/promiscuous/subscriber/mongoid/root.rb
-- lib/promiscuous/subscriber/attributes.rb
-- lib/promiscuous/subscriber/base.rb
-- lib/promiscuous/subscriber/custom_class.rb
 - lib/promiscuous/subscriber/envelope.rb
-- lib/promiscuous/subscriber/generic.rb
-- lib/promiscuous/subscriber/polymorphic.rb
-- lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/amqp.rb
-- lib/promiscuous/subscriber/error.rb
-- lib/promiscuous/version.rb
-- lib/promiscuous/publisher.rb
+- lib/promiscuous/subscriber/custom_class.rb
+- lib/promiscuous/subscriber/base.rb
+- lib/promiscuous/subscriber/polymorphic.rb
+- lib/promiscuous/worker.rb
+- lib/promiscuous/railtie/replicate.rake
 - lib/promiscuous/railtie.rb
+- lib/promiscuous/loader.rb
 - lib/promiscuous/amqp.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/subscriber.rb
-- lib/promiscuous/worker.rb
 - lib/promiscuous.rb
 - README.md
 homepage: http://github.com/crowdtap/promiscuous
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Model replication over RabbitMQ

data/lib/promiscuous/amqp/fake.rb

@@ -1,27 +0,0 @@
-module Promiscuous
-  module AMQP
-    module Fake
-      mattr_accessor :messages, :subscribe_options
-      self.messages = []
-
-      def self.configure(options)
-      end
-
-      def self.publish(msg)
-        self.messages << msg
-      end
-
-      def self.subscribe(options={}, &block)
-        self.subscribe_options = options
-      end
-
-      def self.clear
-        self.messages.clear
-        self.subscribe_options = nil
-      end
-
-      def self.close
-      end
-    end
-  end
-end