promiscuous 0.5.1 → 0.6

data/README.md

@@ -4,7 +4,7 @@ Promiscuous
 [![Build Status](https://secure.travis-ci.org/crowdtap/promiscuous.png?branch=master)](https://secure.travis-ci.org/crowdtap/promiscuous)
 
 Promiscuous offers an automatic way of propagating your model data across one or
-more applications.
+more applications. It supports Mongoid2, Mongoid3 and ActiveRecord.
 It uses [RabbitMQ](http://www.rabbitmq.com/).
 
 Usage
@@ -73,7 +73,8 @@ WARNING/TODO
 ------------
 
 Promiscuous does **not** handle:
-- Any of the atomic operatiors, such as inc, or add_to_set.
+- ActiveRecord polymorphism.
+- Any of the Mongoid atomic operatiors, such as inc, or add_to_set.
 - Association magic. Example:
   ```ruby
   # This will NOT replicate particiation_ids:
@@ -118,12 +119,7 @@ Compatibility
 
 Promiscuous is tested against MRI 1.9.2 and 1.9.3.
 
-Both Mongoid 2.4.x and Mongoid 3.0.x are supported.
-
-Acknowledgments
-----------------
-
-Inspired by [Service-Oriented Design with Ruby and Rails](http://www.amazon.com/Service-Oriented-Design-Addison-Wesley-Professional-Series/dp/0321659368)
+ActiveRecord, Mongoid 2.4.x and Mongoid 3.0.x are supported.
 
 License
 -------

data/lib/promiscuous.rb

@@ -2,9 +2,16 @@ require 'active_support/core_ext'
 require 'promiscuous/config'
 require 'promiscuous/amqp'
 require 'promiscuous/loader'
+require 'promiscuous/railtie' if defined?(Rails)
+
+begin
+  require 'mongoid'
+  require 'active_record'
+rescue LoadError
+end
+
 require 'promiscuous/publisher'
 require 'promiscuous/subscriber'
-require 'promiscuous/railtie' if defined?(Rails)
 
 module Promiscuous
   class << self

data/lib/promiscuous/publisher.rb

@@ -1,3 +1,4 @@
 module Promiscuous::Publisher
-  require 'promiscuous/publisher/mongoid'
+  require 'promiscuous/publisher/active_record' if defined?(ActiveRecord)
+  require 'promiscuous/publisher/mongoid' if defined?(Mongoid)
 end

data/lib/promiscuous/publisher/{generic.rb → active_record.rb}

@@ -1,14 +1,14 @@
-require 'promiscuous/publisher/class_bind'
 require 'promiscuous/publisher/base'
+require 'promiscuous/publisher/class_bind'
 require 'promiscuous/publisher/attributes'
-require 'promiscuous/publisher/polymorphic'
 require 'promiscuous/publisher/amqp'
 require 'promiscuous/publisher/envelope'
+require 'promiscuous/publisher/model'
 
-class Promiscuous::Publisher::Generic < Promiscuous::Publisher::Base
+class Promiscuous::Publisher::ActiveRecord < Promiscuous::Publisher::Base
   include Promiscuous::Publisher::ClassBind
   include Promiscuous::Publisher::Attributes
-  include Promiscuous::Publisher::Polymorphic
   include Promiscuous::Publisher::AMQP
   include Promiscuous::Publisher::Envelope
+  include Promiscuous::Publisher::Model
 end

data/lib/promiscuous/publisher/{mongoid/root.rb → model.rb}

@@ -1,5 +1,8 @@
-module Promiscuous::Publisher::Mongoid::Root
+require 'promiscuous/publisher/envelope'
+
+module Promiscuous::Publisher::Model
   extend ActiveSupport::Concern
+  include Promiscuous::Publisher::Envelope
 
   def operation
     options[:operation]
@@ -29,3 +32,4 @@ module Promiscuous::Publisher::Mongoid::Root
     end
   end
 end
+

data/lib/promiscuous/publisher/mongoid.rb

@@ -1,6 +1,17 @@
-require 'promiscuous/publisher/generic'
+require 'promiscuous/publisher/base'
+require 'promiscuous/publisher/class_bind'
+require 'promiscuous/publisher/attributes'
+require 'promiscuous/publisher/polymorphic'
+require 'promiscuous/publisher/amqp'
+require 'promiscuous/publisher/envelope'
+
+class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Base
+  include Promiscuous::Publisher::ClassBind
+  include Promiscuous::Publisher::Attributes
+  include Promiscuous::Publisher::Polymorphic
+  include Promiscuous::Publisher::AMQP
+  include Promiscuous::Publisher::Envelope
 
-class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Generic
   def self.publish(options)
     return super if options[:mongoid_loaded]
 
@@ -8,8 +19,8 @@ class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Generic
       require 'promiscuous/publisher/mongoid/embedded'
       include Promiscuous::Publisher::Mongoid::Embedded
     else
-      require 'promiscuous/publisher/mongoid/root'
-      include Promiscuous::Publisher::Mongoid::Root
+      require 'promiscuous/publisher/model'
+      include Promiscuous::Publisher::Model
     end
 
     self.publish(options.merge(:mongoid_loaded => true))

data/lib/promiscuous/subscriber.rb

@@ -1,6 +1,7 @@
 module Promiscuous::Subscriber
+  require 'promiscuous/subscriber/active_record' if defined?(ActiveRecord)
+  require 'promiscuous/subscriber/mongoid' if defined?(Mongoid)
   require 'promiscuous/subscriber/error'
-  require 'promiscuous/subscriber/mongoid'
   require 'promiscuous/subscriber/amqp'
 
   mattr_accessor :subscribers

data/lib/promiscuous/subscriber/active_record.rb

@@ -0,0 +1,23 @@
+require 'promiscuous/subscriber/base'
+require 'promiscuous/subscriber/custom_class'
+require 'promiscuous/subscriber/attributes'
+require 'promiscuous/subscriber/amqp'
+require 'promiscuous/subscriber/model'
+
+class Promiscuous::Subscriber::ActiveRecord < Promiscuous::Subscriber::Base
+  include Promiscuous::Subscriber::CustomClass
+  include Promiscuous::Subscriber::Attributes
+  include Promiscuous::Subscriber::AMQP
+  include Promiscuous::Subscriber::Model
+
+  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))
+  end
+end

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

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

data/lib/promiscuous/subscriber/model.rb

@@ -0,0 +1,38 @@
+require 'promiscuous/subscriber/envelope'
+
+module Promiscuous::Subscriber::Model
+  extend ActiveSupport::Concern
+  include Promiscuous::Subscriber::Envelope
+
+  def fetch
+    case operation
+    when :create
+      klass.new.tap { |o| o.id = id }
+    when :update
+      klass.find(id)
+    when :destroy
+      klass.find(id)
+    end
+  end
+
+  def process_attributes?
+    operation != :destroy
+  end
+
+  def process
+    super
+    case operation
+    when :create
+      instance.save!
+    when :update
+      instance.save!
+    when :destroy
+      instance.destroy
+    end
+  end
+
+  included do
+    use_payload_attribute :id
+    use_payload_attribute :operation, :symbolize => true
+  end
+end

data/lib/promiscuous/subscriber/mongoid.rb

@@ -1,6 +1,17 @@
-require 'promiscuous/subscriber/generic'
+require 'promiscuous/subscriber/base'
+require 'promiscuous/subscriber/custom_class'
+require 'promiscuous/subscriber/attributes'
+require 'promiscuous/subscriber/polymorphic'
+require 'promiscuous/subscriber/amqp'
+require 'promiscuous/subscriber/envelope'
+
+class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
+  include Promiscuous::Subscriber::CustomClass
+  include Promiscuous::Subscriber::Attributes
+  include Promiscuous::Subscriber::Polymorphic
+  include Promiscuous::Subscriber::AMQP
+  include Promiscuous::Subscriber::Envelope
 
-class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Generic
   def self.subscribe(options)
     return super if options[:mongoid_loaded]
 
@@ -11,8 +22,8 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Generic
       require 'promiscuous/subscriber/mongoid/embedded'
       include Promiscuous::Subscriber::Mongoid::Embedded
     else
-      require 'promiscuous/subscriber/mongoid/root'
-      include Promiscuous::Subscriber::Mongoid::Root
+      require 'promiscuous/subscriber/model'
+      include Promiscuous::Subscriber::Model
 
       if options[:upsert]
         require 'promiscuous/subscriber/mongoid/upsert'

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

@@ -1,35 +1,6 @@
+require 'promiscuous/publisher/model'
+
 module Promiscuous::Subscriber::Mongoid::Root
   extend ActiveSupport::Concern
-
-  def fetch
-    case operation
-    when :create
-      klass.new.tap { |o| o.id = id }
-    when :update
-      klass.find(id)
-    when :destroy
-      klass.find(id)
-    end
-  end
-
-  def process_attributes?
-    operation != :destroy
-  end
-
-  def process
-    super
-    case operation
-    when :create
-      instance.save!
-    when :update
-      instance.save!
-    when :destroy
-      instance.destroy
-    end
-  end
-
-  included do
-    use_payload_attribute :id
-    use_payload_attribute :operation, :symbolize => true
-  end
+  include Promiscuous::Subscriber::Model
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.5.1'
+  VERSION = '0.6'
 end

data/lib/promiscuous/worker.rb

@@ -4,11 +4,13 @@ module Promiscuous
       stop = false
       lock = Mutex.new
 
-      %w(SIGTERM SIGINT).each do |signal|
-        Signal.trap(signal) do
-          lock.synchronize do
-            stop = true
-            EM.stop
+      unless ENV['TEST_ENV']
+        %w(SIGTERM SIGINT).each do |signal|
+          Signal.trap(signal) do
+            lock.synchronize do
+              stop = true
+              EM.stop
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -92,7 +92,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Replicate data across your applications
+description: Replicate your Mongoid/ActiveRecord models across your applications
 email:
 - nicolas@viennot.biz
 - kareem@doubleonemedia.com
@@ -104,9 +104,9 @@ files:
 - lib/promiscuous/publisher/class_bind.rb
 - lib/promiscuous/publisher/attributes.rb
 - lib/promiscuous/publisher/mongoid.rb
-- lib/promiscuous/publisher/generic.rb
-- lib/promiscuous/publisher/mongoid/root.rb
 - lib/promiscuous/publisher/mongoid/embedded.rb
+- lib/promiscuous/publisher/active_record.rb
+- lib/promiscuous/publisher/model.rb
 - lib/promiscuous/publisher/envelope.rb
 - lib/promiscuous/publisher/amqp.rb
 - lib/promiscuous/publisher/base.rb
@@ -116,12 +116,15 @@ files:
 - lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/publisher.rb
 - lib/promiscuous/subscriber/attributes.rb
+- lib/promiscuous/subscriber/active_record/upsert.rb
 - lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/error.rb
 - lib/promiscuous/subscriber/generic.rb
 - lib/promiscuous/subscriber/mongoid/root.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
 - lib/promiscuous/subscriber/mongoid/upsert.rb
+- lib/promiscuous/subscriber/active_record.rb
+- lib/promiscuous/subscriber/model.rb
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/amqp.rb
 - lib/promiscuous/subscriber/custom_class.rb