promiscuous 0.6.3 → 0.6.4

data/README.md

@@ -69,6 +69,14 @@ Note that we use a single exchange to preserve the ordering of data updates
 across application so that subscribers always see a consistant state of the
 system.
 
+Synching databases
+-------------------
+
+Documents are created if not present when receiving an update on a non existing
+document.
+
+TODO: Explain how to sync databases.
+
 WARNING/TODO
 ------------
 

data/lib/promiscuous/subscriber/active_record.rb

@@ -3,21 +3,16 @@ require 'promiscuous/subscriber/custom_class'
 require 'promiscuous/subscriber/attributes'
 require 'promiscuous/subscriber/amqp'
 require 'promiscuous/subscriber/model'
+require 'promiscuous/subscriber/upsert'
 
 class Promiscuous::Subscriber::ActiveRecord < Promiscuous::Subscriber::Base
   include Promiscuous::Subscriber::CustomClass
   include Promiscuous::Subscriber::Attributes
   include Promiscuous::Subscriber::AMQP
   include Promiscuous::Subscriber::Model
+  include Promiscuous::Subscriber::Upsert
 
-  def self.subscribe(options)
-    return super if options[:active_record_loaded]
-
-    if options[:upsert]
-      require 'promiscuous/subscriber/active_record/upsert'
-      include Promiscuous::Subscriber::ActiveRecord::Upsert
-    end
-
-    self.subscribe(options.merge(:active_record_loaded => true))
+  def self.missing_record_exception
+    ActiveRecord::RecordNotFound
   end
 end

data/lib/promiscuous/subscriber/mongoid.rb

@@ -12,6 +12,10 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
   include Promiscuous::Subscriber::AMQP
   include Promiscuous::Subscriber::Envelope
 
+  def self.missing_record_exception
+    Mongoid::Errors::DocumentNotFound
+  end
+
   def self.subscribe(options)
     return super if options[:mongoid_loaded]
 
@@ -25,10 +29,8 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
       require 'promiscuous/subscriber/model'
       include Promiscuous::Subscriber::Model
 
-      if options[:upsert]
-        require 'promiscuous/subscriber/mongoid/upsert'
-        include Promiscuous::Subscriber::Mongoid::Upsert
-      end
+      require 'promiscuous/subscriber/upsert'
+      include Promiscuous::Subscriber::Upsert
     end
 
     self.subscribe(options.merge(:mongoid_loaded => true))

data/lib/promiscuous/subscriber/{active_record/upsert.rb → upsert.rb}

@@ -1,10 +1,10 @@
-module Promiscuous::Subscriber::ActiveRecord::Upsert
+module Promiscuous::Subscriber::Upsert
   extend ActiveSupport::Concern
 
   def fetch
     begin
       super
-    rescue ActiveRecord::RecordNotFound
+    rescue self.class.missing_record_exception
       Promiscuous.warn "[receive] upserting #{payload}"
       klass.new.tap { |o| o.id = id }
     end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -120,8 +120,6 @@ files:
 - lib/promiscuous/railtie.rb
 - lib/promiscuous/railtie/replicate.rake
 - lib/promiscuous/subscriber.rb
-- lib/promiscuous/subscriber/active_record.rb
-- lib/promiscuous/subscriber/active_record/upsert.rb
 - lib/promiscuous/subscriber/amqp.rb
 - lib/promiscuous/subscriber/attributes.rb
 - lib/promiscuous/subscriber/base.rb
@@ -129,12 +127,13 @@ files:
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/error.rb
 - lib/promiscuous/subscriber/generic.rb
-- lib/promiscuous/subscriber/model.rb
-- lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
 - lib/promiscuous/subscriber/mongoid/root.rb
-- lib/promiscuous/subscriber/mongoid/upsert.rb
 - lib/promiscuous/subscriber/polymorphic.rb
+- lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/active_record.rb
+- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/config.rb
 - lib/promiscuous/worker.rb
 - lib/promiscuous/version.rb

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

@@ -1,12 +0,0 @@
-module Promiscuous::Subscriber::Mongoid::Upsert
-  extend ActiveSupport::Concern
-
-  def fetch
-    begin
-      super
-    rescue Mongoid::Errors::DocumentNotFound
-      Promiscuous.warn "[receive] upserting #{payload}"
-      klass.new.tap { |o| o.id = id }
-    end
-  end
-end