promiscuous 0.32.0 → 0.33.0

data/lib/promiscuous.rb

@@ -26,6 +26,16 @@ module Promiscuous
       desc.each { |klass| klass.setup_class_binding }
     end
 
+    def connect
+      AMQP.connect
+      Redis.connect
+    end
+
+    def disconnect
+      AMQP.disconnect
+      Redis.disconnect
+    end
+
     def healthy?
       AMQP.ensure_connected
       Redis.ensure_connected

data/lib/promiscuous/amqp.rb

@@ -21,6 +21,7 @@ module Promiscuous::AMQP
 
     def publish(options={})
       ensure_connected
+      Promiscuous.debug "[publish] (#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
       backend.publish(options)
     end
 

data/lib/promiscuous/amqp/bunny.rb

@@ -16,7 +16,6 @@ module Promiscuous::AMQP:: Bunny
   end
 
   def self.publish(options={})
-    Promiscuous.debug "[publish] (#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
     exchange(options[:exchange_name]).
       publish(options[:payload], :key => options[:key], :persistent => true)
   end

data/lib/promiscuous/amqp/ruby_amqp.rb

@@ -79,9 +79,6 @@ module Promiscuous::AMQP::RubyAMQP
   end
 
   def self.publish(options={})
-    info_msg = "(#{options[:exchange_name]}) #{options[:key]} -> #{options[:payload]}"
-    Promiscuous.debug "[publish] #{info_msg}"
-
     EM.next_tick do
       exchange(options[:exchange_name]).
         publish(options[:payload], :routing_key => options[:key], :persistent => true)

data/lib/promiscuous/cli.rb

@@ -12,9 +12,9 @@ class Promiscuous::CLI
   end
 
   def force_backend(backend)
-    Promiscuous::AMQP.disconnect
+    Promiscuous.disconnect
     Promiscuous::Config.backend = backend
-    Promiscuous::AMQP.connect
+    Promiscuous.connect
   end
 
   def trap_signals

data/lib/promiscuous/config.rb

@@ -16,7 +16,6 @@ module Promiscuous::Config
     self.queue_options ||= {:durable => true, :arguments => {'x-ha-policy' => 'all'}}
     self.heartbeat ||= 60
 
-    Promiscuous::AMQP.connect
-    Promiscuous::Redis.connect
+    Promiscuous.connect
   end
 end

data/lib/promiscuous/redis.rb

@@ -4,9 +4,15 @@ module Promiscuous::Redis
   mattr_accessor :master
 
   def self.connect
+    disconnect if self.master
     self.master = new_connection
   end
 
+  def self.disconnect
+    self.master.client.disconnect
+    self.master = nil
+  end
+
   def self.new_connection
     return Null.new if Promiscuous::Config.backend == :null
 

data/lib/promiscuous/subscriber.rb

@@ -1,7 +1,7 @@
 module Promiscuous::Subscriber
   extend Promiscuous::Autoload
   autoload :ActiveRecord, :AMQP, :Attributes, :Base, :Class, :Envelope, :Error,
-           :Lint, :Model, :Mongoid, :Polymorphic, :Upsert, :Observer, :Worker
+           :Lint, :Model, :Mongoid, :Polymorphic, :Upsert, :Observer, :Worker, :Dummy
 
   def self.lint(*args)
     Lint.lint(*args)

data/lib/promiscuous/subscriber/amqp.rb

@@ -7,10 +7,8 @@ module Promiscuous::Subscriber::AMQP
 
   def self.subscriber_from(payload)
     if key = payload.is_a?(Hash) ? payload['__amqp__'] : nil
-      unless self.subscribers.has_key?(key)
-        raise "Unknown binding: '#{key}'"
-      end
-      self.subscribers[key]
+      sub = self.subscribers[key]
+      sub ||= Promiscuous::Subscriber::Dummy
     end
   end
 

data/lib/promiscuous/subscriber/dummy.rb

@@ -0,0 +1,19 @@
+class Promiscuous::Subscriber::Dummy < Promiscuous::Subscriber::Base
+  include Promiscuous::Subscriber::Class
+  include Promiscuous::Subscriber::Attributes
+  include Promiscuous::Subscriber::AMQP
+  include Promiscuous::Subscriber::Envelope
+  include Promiscuous::Subscriber::Model
+
+  class DummyInstance
+    attr_accessor :id
+  end
+
+  def klass
+    DummyInstance
+  end
+
+  def operation
+    :dummy
+  end
+end

data/lib/promiscuous/subscriber/model.rb

@@ -93,6 +93,7 @@ module Promiscuous::Subscriber::Model
       when :create  then instance.save!
       when :update  then instance.save!
       when :destroy then instance.destroy
+      when :dummy   then nil
       end
     end
   end

data/lib/promiscuous/subscriber/worker.rb

@@ -29,10 +29,14 @@ class Promiscuous::Subscriber::Worker
   def stop
     return if self.stopped
     self.pump.stop
-    self.message_synchronizer.stop rescue Celluloid::Task::TerminatedError
-    self.message_synchronizer = nil
-    self.runners.terminate
-    self.runners = nil
+    if self.message_synchronizer
+      self.message_synchronizer.stop rescue Celluloid::Task::TerminatedError
+      self.message_synchronizer = nil
+    end
+    if self.runners
+      self.runners.terminate
+      self.runners = nil
+    end
     self.stopped = true
     # TODO wait for the runners to finish
   end

data/lib/promiscuous/subscriber/worker/pump.rb

@@ -37,7 +37,8 @@ class Promiscuous::Subscriber::Worker::Pump
       exchange_name += ".#{worker.options[:personality]}"
     end
 
-    bindings = Promiscuous::Subscriber::AMQP.subscribers.keys
+    # We need to subscribe to everything to keep up with the version tracking
+    bindings = ['*']
     {:exchange_name => exchange_name, :queue_name => queue_name, :bindings => bindings}
   end
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.32.0'
+  VERSION = '0.33.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
   prerelease: 
 platform: ruby
 authors:
@@ -182,8 +182,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/promiscuous/amqp/null.rb
-- lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/ruby_amqp.rb
+- lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/common/lint/base.rb
 - lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/options.rb
@@ -216,39 +216,40 @@ files:
 - lib/promiscuous/subscriber/lint/attributes.rb
 - lib/promiscuous/subscriber/mongoid/embedded_many.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
-- lib/promiscuous/subscriber/worker/pump.rb
 - lib/promiscuous/subscriber/worker/runner.rb
 - lib/promiscuous/subscriber/worker/message_synchronizer.rb
+- lib/promiscuous/subscriber/worker/pump.rb
 - lib/promiscuous/subscriber/worker/message.rb
 - lib/promiscuous/subscriber/active_record.rb
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/polymorphic.rb
-- lib/promiscuous/subscriber/amqp.rb
 - lib/promiscuous/subscriber/attributes.rb
 - lib/promiscuous/subscriber/base.rb
 - lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/lint.rb
 - lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/observer.rb
-- lib/promiscuous/subscriber/worker.rb
 - lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/amqp.rb
+- lib/promiscuous/subscriber/dummy.rb
+- lib/promiscuous/subscriber/worker.rb
 - lib/promiscuous/error/subscriber.rb
 - lib/promiscuous/error/publisher.rb
 - lib/promiscuous/error/connection.rb
 - lib/promiscuous/observer.rb
 - lib/promiscuous/ephemeral.rb
 - lib/promiscuous/autoload.rb
-- lib/promiscuous/subscriber.rb
 - lib/promiscuous/error.rb
 - lib/promiscuous/loader.rb
 - lib/promiscuous/railtie.rb
 - lib/promiscuous/common.rb
 - lib/promiscuous/publisher.rb
 - lib/promiscuous/worker.rb
-- lib/promiscuous/config.rb
 - lib/promiscuous/amqp.rb
+- lib/promiscuous/subscriber.rb
 - lib/promiscuous/redis.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/cli.rb
 - lib/promiscuous/version.rb
 - lib/promiscuous.rb