promiscuous 0.13.0 → 0.14.0

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

@@ -1,5 +1,6 @@
 module Promiscuous::Publisher::Mongoid::Defer
   extend ActiveSupport::Concern
+  include Promiscuous::Publisher::Envelope
 
   mattr_accessor :klasses
   mattr_accessor :collections
@@ -10,6 +11,10 @@ module Promiscuous::Publisher::Mongoid::Defer
     super unless should_defer?
   end
 
+  def payload
+    super.merge(:version => instance._psv)
+  end
+
   def should_defer?
     if options.has_key?(:defer)
       options[:defer]
@@ -26,10 +31,11 @@ module Promiscuous::Publisher::Mongoid::Defer
       alias_method :update_orig, :update
       def update(change, flags = nil)
         if Promiscuous::Publisher::Mongoid::Defer.collections[@collection.name]
-          psp_field = :_psp
           change = change.dup
           change['$set'] ||= {}
-          change['$set'].merge!(psp_field => true)
+          change['$inc'] ||= {}
+          change['$set'].merge!(:_psp => true)
+          change['$inc'].merge!(:_psv => 1)
         end
         update_orig(change, flags)
       end
@@ -44,6 +50,7 @@ module Promiscuous::Publisher::Mongoid::Defer
 
       # TODO Make sure we are not overriding a field, although VERY unlikly
       field :_psp, :type => Boolean
+      field :_psv, :type => Integer
       index({:_psp => 1}, :background => true, :sparse => true)
 
       Promiscuous::Publisher::Mongoid::Defer.hook_mongoid

data/lib/promiscuous/subscriber/model.rb

@@ -41,12 +41,20 @@ module Promiscuous::Subscriber::Model
   def process
     super
     case operation
-    when :create  then instance.save!
-    when :update  then instance.save!
-    when :destroy then instance.destroy
+    when :create  then save_instance
+    when :update  then save_instance
+    when :destroy then destroy_instance
     end
   end
 
+  def save_instance
+    instance.save!
+  end
+
+  def destroy_instance
+    instance.destroy
+  end
+
   included do
     use_option :foreign_key
 

data/lib/promiscuous/subscriber/mongoid.rb

@@ -1,5 +1,6 @@
 class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
-  autoload :Embedded, 'promiscuous/subscriber/mongoid/embedded'
+  autoload :Embedded,   'promiscuous/subscriber/mongoid/embedded'
+  autoload :Versioning, 'promiscuous/subscriber/mongoid/versioning'
 
   include Promiscuous::Subscriber::Class
   include Promiscuous::Subscriber::Attributes
@@ -19,6 +20,7 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
     else
       include Promiscuous::Subscriber::Model
       include Promiscuous::Subscriber::Upsert
+      include Promiscuous::Subscriber::Mongoid::Versioning
     end
   end
 end

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

@@ -0,0 +1,36 @@
+module Promiscuous::Subscriber::Mongoid::Versioning
+  extend ActiveSupport::Concern
+
+  module AtomicSelector
+    extend ActiveSupport::Concern
+
+    def atomic_selector
+      if use_atomic_promiscuous_selector
+        super.merge({ '$or' => [{'_psv' => { '$lt'     => self._psv }},
+                                {'_psv' => { '$exists' => false     }}]})
+      else
+        super
+      end
+    end
+
+    included do
+      attr_accessor :use_atomic_promiscuous_selector
+      field :_psv, :type => Integer
+    end
+  end
+
+  def save_instance
+    if version
+      instance._psv = version
+      instance.use_atomic_promiscuous_selector = true
+    end
+    super
+  ensure
+    instance.use_atomic_promiscuous_selector = false
+  end
+
+  included do
+    klass.__send__(:include, AtomicSelector)
+    use_payload_attribute :version
+  end
+end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,71 +116,72 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous.rb
-- 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/loader.rb
-- lib/promiscuous/observer.rb
-- lib/promiscuous/publisher.rb
 - lib/promiscuous/publisher/active_record.rb
 - lib/promiscuous/publisher/base.rb
-- lib/promiscuous/publisher/class.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.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/class.rb
+- lib/promiscuous/publisher/mock.rb
+- lib/promiscuous/publisher/error.rb
+- lib/promiscuous/publisher/ephemeral.rb
 - lib/promiscuous/publisher/attributes.rb
 - lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/amqp.rb
-- lib/promiscuous/publisher/model.rb
 - lib/promiscuous/publisher/worker.rb
+- lib/promiscuous/publisher/model.rb
 - lib/promiscuous/railtie.rb
 - lib/promiscuous/railtie/replicate.rake
 - lib/promiscuous/subscriber/active_record.rb
-- lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/envelope.rb
 - 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/model.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/class.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/mongoid.rb
 - lib/promiscuous/subscriber/worker.rb
-- lib/promiscuous/subscriber.rb
-- lib/promiscuous/ephemeral.rb
+- lib/promiscuous/subscriber/attributes.rb
+- lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/observer.rb
+- lib/promiscuous/common.rb
+- lib/promiscuous/publisher.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/amqp.rb
 - lib/promiscuous/worker.rb
+- lib/promiscuous/ephemeral.rb
+- lib/promiscuous/subscriber.rb
 - lib/promiscuous/version.rb
+- lib/promiscuous.rb
 - README.md
 homepage: http://github.com/crowdtap/promiscuous
 licenses: []