promiscuous 0.15.0 → 0.16.0

data/lib/promiscuous/common/worker.rb

@@ -14,5 +14,9 @@ module Promiscuous::Common::Worker
     end
   end
 
+  def bareback?
+    !!ENV['BAREBACK']
+  end
+
   included { attr_accessor :stop, :options }
 end

data/lib/promiscuous/publisher/mongoid/defer.rb

@@ -30,6 +30,17 @@ module Promiscuous::Publisher::Mongoid::Defer
     Moped::Query.class_eval do
       alias_method :update_orig, :update
       def update(change, flags = nil)
+        change = promiscuous_seasoning(change)
+        update_orig(change, flags)
+      end
+
+      alias_method :modify_orig, :modify
+      def modify(change, options={})
+        change = promiscuous_seasoning(change) unless options[:bypass_promiscuous]
+        modify_orig(change, options)
+      end
+
+      def promiscuous_seasoning(change)
         if Promiscuous::Publisher::Mongoid::Defer.collections[@collection.name]
           change = change.dup
           change['$set'] ||= {}
@@ -37,7 +48,7 @@ module Promiscuous::Publisher::Mongoid::Defer
           change['$set'].merge!(:_psp => true)
           change['$inc'].merge!(:_psv => 1)
         end
-        update_orig(change, flags)
+        change
       end
     end
   end

data/lib/promiscuous/publisher/worker.rb

@@ -30,7 +30,8 @@ class Promiscuous::Publisher::Worker
         end
       end
     rescue Exception => e
-      self.stop = true
+      self.stop = true unless bareback?
+
       unless e.is_a?(Promiscuous::Publisher::Error)
         e = Promiscuous::Publisher::Error.new(e, nil)
       end
@@ -42,7 +43,8 @@ class Promiscuous::Publisher::Worker
   def replicate_collection(klass)
     return if self.stop
     # TODO Check for indexes and if not there, bail out
-    while instance = klass.where(:_psp => true).find_and_modify({'$unset' => {:_psp => 1}})
+    while instance = klass.where(:_psp => true).find_and_modify(
+                       {'$unset' => {:_psp => 1}}, :bypass_promiscuous => true)
       replicate_instance(instance)
     end
   end

data/lib/promiscuous/subscriber/worker.rb

@@ -15,10 +15,13 @@ class Promiscuous::Subscriber::Worker
         rescue Exception => e
           e = Promiscuous::Subscriber::Error.new(e, payload)
 
-          self.stop = true
-          Promiscuous::AMQP.disconnect
-          Promiscuous.error "[receive] FATAL #{e} #{e.backtrace.join("\n")}"
-          Promiscuous.error "[receive] FATAL #{e}"
+          if bareback?
+            metadata.ack
+          else
+            self.stop = true
+            Promiscuous::AMQP.disconnect
+          end
+          Promiscuous.error "[receive] FATAL #{"skipping " if bareback?}#{e} #{e.backtrace.join("\n")}"
           Promiscuous::Config.error_handler.try(:call, e)
         end
       end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,42 +116,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/null.rb
+- lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/rubyamqp.rb
-- lib/promiscuous/common.rb
-- lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/lint.rb
 - lib/promiscuous/common/lint/base.rb
-- lib/promiscuous/common/options.rb
+- lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/worker.rb
-- lib/promiscuous/config.rb
+- lib/promiscuous/common/options.rb
 - lib/promiscuous/loader.rb
-- lib/promiscuous/observer.rb
-- lib/promiscuous/publisher.rb
-- lib/promiscuous/publisher/active_record.rb
 - lib/promiscuous/publisher/envelope.rb
-- lib/promiscuous/publisher/ephemeral.rb
-- lib/promiscuous/publisher/error.rb
 - lib/promiscuous/publisher/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/mock.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/polymorphic.rb
+- lib/promiscuous/publisher/mock.rb
+- lib/promiscuous/publisher/error.rb
 - lib/promiscuous/publisher/attributes.rb
 - lib/promiscuous/publisher/amqp.rb
-- lib/promiscuous/publisher/worker.rb
+- lib/promiscuous/publisher/model.rb
+- lib/promiscuous/publisher/active_record.rb
 - lib/promiscuous/publisher/base.rb
-- lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/class.rb
-- lib/promiscuous/publisher/model.rb
+- lib/promiscuous/publisher/ephemeral.rb
+- lib/promiscuous/publisher/mongoid.rb
+- lib/promiscuous/publisher/worker.rb
 - lib/promiscuous/railtie.rb
 - lib/promiscuous/railtie/replicate.rake
 - lib/promiscuous/subscriber/active_record.rb
@@ -159,27 +155,31 @@ files:
 - lib/promiscuous/subscriber/error.rb
 - lib/promiscuous/subscriber/lint.rb
 - lib/promiscuous/subscriber/lint/amqp.rb
-- lib/promiscuous/subscriber/lint/attributes.rb
 - lib/promiscuous/subscriber/lint/base.rb
 - lib/promiscuous/subscriber/lint/class.rb
 - lib/promiscuous/subscriber/lint/polymorphic.rb
-- lib/promiscuous/subscriber/mongoid/embedded.rb
+- lib/promiscuous/subscriber/lint/attributes.rb
 - lib/promiscuous/subscriber/mongoid/embedded_many.rb
+- lib/promiscuous/subscriber/mongoid/embedded.rb
 - lib/promiscuous/subscriber/mongoid/versioning.rb
+- lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/observer.rb
 - lib/promiscuous/subscriber/polymorphic.rb
-- lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/amqp.rb
 - lib/promiscuous/subscriber/attributes.rb
-- lib/promiscuous/subscriber/base.rb
-- lib/promiscuous/subscriber/worker.rb
 - lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/base.rb
 - lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/mongoid.rb
-- lib/promiscuous/subscriber.rb
-- lib/promiscuous/ephemeral.rb
+- lib/promiscuous/subscriber/worker.rb
+- lib/promiscuous/observer.rb
+- lib/promiscuous/common.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/amqp.rb
 - lib/promiscuous/worker.rb
+- lib/promiscuous/ephemeral.rb
+- lib/promiscuous/subscriber.rb
+- lib/promiscuous/publisher.rb
 - lib/promiscuous/version.rb
 - lib/promiscuous.rb
 - README.md