promiscuous 0.11.1 → 0.11.2

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

@@ -2,7 +2,9 @@ module Promiscuous::Publisher::Mongoid::Defer
   extend ActiveSupport::Concern
 
   mattr_accessor :klasses
+  mattr_accessor :collections
   self.klasses = {}
+  self.collections = {}
 
   def publish
     super unless should_defer?
@@ -23,8 +25,8 @@ module Promiscuous::Publisher::Mongoid::Defer
     Moped::Query.class_eval do
       alias_method :update_orig, :update
       def update(change, flags = nil)
-        if klass = Promiscuous::Publisher::Mongoid::Defer.klasses[@collection.name]
-          psp_field = klass.aliased_fields["promiscous_sync_pending"]
+        if Promiscuous::Publisher::Mongoid::Defer.collections[@collection.name]
+          psp_field = :_psp
           change = change.dup
           change['$set'] ||= {}
           change['$set'].merge!(psp_field => true)
@@ -41,12 +43,12 @@ module Promiscuous::Publisher::Mongoid::Defer
       self.publisher_defer_hooked = true
 
       # TODO Make sure we are not overriding a field, although VERY unlikly
-      psp_field = :_psp
-      field psp_field, :as => :promiscous_sync_pending, :type => Boolean
-      index({psp_field => 1}, :background => true, :sparse => true)
+      field :_psp, :type => Boolean
+      index({:_psp => 1}, :background => true, :sparse => true)
 
       Promiscuous::Publisher::Mongoid::Defer.hook_mongoid
-      Promiscuous::Publisher::Mongoid::Defer.klasses[collection.name] = self
+      Promiscuous::Publisher::Mongoid::Defer.klasses[self.to_s] = self
+      Promiscuous::Publisher::Mongoid::Defer.collections[collection.name] = true
     end
   end
 end

data/lib/promiscuous/publisher/worker.rb

@@ -42,8 +42,7 @@ class Promiscuous::Publisher::Worker
   def replicate_collection(klass)
     return if self.stop
     # TODO Check for indexes and if not there, bail out
-    psp_field = klass.aliased_fields["promiscous_sync_pending"]
-    while instance = klass.where(psp_field => true).find_and_modify({'$unset' => {psp_field => 1}})
+    while instance = klass.where(:_psp => true).find_and_modify({'$unset' => {:_psp => 1}})
       replicate_instance(instance)
     end
   end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,65 +103,65 @@ files:
 - lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/null.rb
 - lib/promiscuous/amqp/rubyamqp.rb
-- lib/promiscuous/publisher/envelope.rb
-- lib/promiscuous/publisher/mongoid/embedded.rb
-- lib/promiscuous/publisher/mongoid/defer.rb
-- lib/promiscuous/publisher/mongoid/defer_embedded.rb
+- lib/promiscuous/amqp.rb
+- lib/promiscuous/common/class_helpers.rb
+- lib/promiscuous/common/lint/base.rb
+- lib/promiscuous/common/lint.rb
+- lib/promiscuous/common/options.rb
+- lib/promiscuous/common/worker.rb
+- lib/promiscuous/common.rb
+- lib/promiscuous/config.rb
+- lib/promiscuous/ephemeral.rb
+- lib/promiscuous/loader.rb
+- lib/promiscuous/observer.rb
 - lib/promiscuous/publisher/active_record.rb
+- lib/promiscuous/publisher/amqp.rb
 - lib/promiscuous/publisher/attributes.rb
 - lib/promiscuous/publisher/base.rb
-- lib/promiscuous/publisher/lint.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/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/polymorphic.rb
-- lib/promiscuous/publisher/class.rb
+- lib/promiscuous/publisher/lint.rb
 - lib/promiscuous/publisher/mock.rb
-- lib/promiscuous/publisher/amqp.rb
-- lib/promiscuous/publisher/error.rb
 - lib/promiscuous/publisher/model.rb
-- lib/promiscuous/publisher/worker.rb
-- lib/promiscuous/publisher/ephemeral.rb
+- lib/promiscuous/publisher/mongoid/defer.rb
+- lib/promiscuous/publisher/mongoid/defer_embedded.rb
+- lib/promiscuous/publisher/mongoid/embedded.rb
 - lib/promiscuous/publisher/mongoid.rb
+- lib/promiscuous/publisher/polymorphic.rb
+- lib/promiscuous/publisher/worker.rb
+- lib/promiscuous/publisher.rb
 - lib/promiscuous/railtie/replicate.rake
+- lib/promiscuous/railtie.rb
+- lib/promiscuous/subscriber/active_record.rb
+- lib/promiscuous/subscriber/amqp.rb
+- lib/promiscuous/subscriber/attributes.rb
+- lib/promiscuous/subscriber/base.rb
+- lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/error.rb
-- lib/promiscuous/subscriber/mongoid/embedded.rb
-- lib/promiscuous/subscriber/active_record.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/lint/attributes.rb
-- lib/promiscuous/subscriber/base.rb
-- lib/promiscuous/subscriber/mongoid.rb
-- lib/promiscuous/subscriber/upsert.rb
+- lib/promiscuous/subscriber/lint.rb
 - lib/promiscuous/subscriber/model.rb
-- lib/promiscuous/subscriber/class.rb
+- lib/promiscuous/subscriber/mongoid/embedded.rb
+- lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/observer.rb
-- lib/promiscuous/subscriber/attributes.rb
-- lib/promiscuous/subscriber/amqp.rb
 - lib/promiscuous/subscriber/polymorphic.rb
+- lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/worker.rb
-- lib/promiscuous/config.rb
-- lib/promiscuous/amqp.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/loader.rb
-- lib/promiscuous/railtie.rb
-- lib/promiscuous/observer.rb
-- lib/promiscuous/common.rb
 - lib/promiscuous/subscriber.rb
-- lib/promiscuous/worker.rb
-- lib/promiscuous/publisher.rb
-- lib/promiscuous/ephemeral.rb
 - lib/promiscuous/version.rb
+- lib/promiscuous/worker.rb
 - lib/promiscuous.rb
 - README.md
 homepage: http://github.com/crowdtap/promiscuous