promiscuous 0.7.6 → 0.8

data/README.md

@@ -45,8 +45,9 @@ Promiscuous::AMQP.configure(:app => 'sniper',
 # subscriber
 class ModelSubscriber < Promiscuous::Subscriber::Mongoid
   subscribe :from => 'crowdtap/model',
-            :class => Model,
-            :attributes => [:field_1, :field_2, :field_3]
+            :attributes => [:field_1, :field_2, :field_3],
+            :class => Model, # optional
+            :foreign_key => :publisher_id # optional
 end
 ```
 
@@ -83,7 +84,6 @@ WARNING/TODO
 Promiscuous does **not** handle:
 - ActiveRecord polymorphism.
 - Any of the Mongoid atomic operatiors, such as inc, or add_to_set.
-- Mixing databases (ActiveRecord <=> Mongoid) because of the id format mismatch.
 - Association magic. Example:
   ```ruby
   # This will NOT replicate particiation_ids:

data/lib/promiscuous/common/options.rb

@@ -2,10 +2,12 @@ module Promiscuous::Common::Options
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :options, :options_mappings,
+    class_attribute :raw_options, :options, :options_mappings,
                     :instance_reader => false,
                     :instance_writer => false
-    self.options = self.options_mappings = {}
+    self.raw_options = {}
+    self.options = {}
+    self.options_mappings = {}
   end
 
   module ClassMethods
@@ -32,9 +34,14 @@ module Promiscuous::Common::Options
       if instance_reader
         define_method("#{attr_alias}") { self.class.__send__("#{attr_alias}") }
       end
+
+      self.__send__("#{attr_alias}=", raw_options[attr]) if raw_options[attr]
     end
 
     def load_options(options)
+      self.raw_options = self.raw_options.dup
+      self.raw_options.merge!(options)
+
       options.each do |attr, value|
         attr_alias = self.options_mappings[attr]
         self.__send__("#{attr_alias}=", value) if attr_alias

data/lib/promiscuous/subscriber/lint/attributes.rb

@@ -5,9 +5,10 @@ module Promiscuous::Subscriber::Lint::Attributes
     super
 
     instance = subscriber.klass.new
-    subscriber.attributes.each do |attr|
-      instance.respond_to?("#{attr}=") or instance.__send__("#{attr}=")
-    end
+    attributes = subscriber.attributes
+    attributes += [subscriber.foreign_key] if subscriber.foreign_key
+
+    attributes.each { |attr| instance.respond_to?("#{attr}=") or instance.__send__("#{attr}=") }
 
     if check_publisher
       missing_attributes = subscriber.attributes - publisher.attributes

data/lib/promiscuous/subscriber/model.rb

@@ -2,17 +2,38 @@ module Promiscuous::Subscriber::Model
   extend ActiveSupport::Concern
   include Promiscuous::Subscriber::Envelope
 
-  def fetch
-    case operation
-    when :create
+  def fetch_new
+    if foreign_key
+      klass.new(foreign_key => id)
+    else
       klass.new.tap { |o| o.id = id }
-    when :update
-      klass.find(id)
-    when :destroy
+    end
+  end
+
+  def fetch_existing
+    if foreign_key
+      if klass.respond_to?("find_by_#{foreign_key}!")
+        klass.__send__("find_by_#{foreign_key}!", id)
+      elsif klass.respond_to?("find_by")
+        klass.find_by(foreign_key => id)
+      else
+        record = klass.where(foreign_key => id).first
+        raise self.class.missing_record_exception.new(klass, id) if record.nil?
+        record
+      end
+    else
       klass.find(id)
     end
   end
 
+  def fetch
+    case operation
+    when :create  then fetch_new
+    when :update  then fetch_existing
+    when :destroy then fetch_existing
+    end
+  end
+
   def process_attributes?
     operation != :destroy
   end
@@ -20,16 +41,15 @@ module Promiscuous::Subscriber::Model
   def process
     super
     case operation
-    when :create
-      instance.save!
-    when :update
-      instance.save!
-    when :destroy
-      instance.destroy
+    when :create  then instance.save!
+    when :update  then instance.save!
+    when :destroy then instance.destroy
     end
   end
 
   included do
+    use_option :foreign_key
+
     use_payload_attribute :id
     use_payload_attribute :operation, :symbolize => true
   end

data/lib/promiscuous/subscriber/upsert.rb

@@ -6,7 +6,7 @@ module Promiscuous::Subscriber::Upsert
       super
     rescue self.class.missing_record_exception
       Promiscuous.warn "[receive] upserting #{payload}"
-      klass.new.tap { |o| o.id = id }
+      fetch_new
     end
   end
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.7.6'
+  VERSION = '0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -116,57 +116,57 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous/version.rb
-- lib/promiscuous/common.rb
-- lib/promiscuous/publisher/lint.rb
+- 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/active_record.rb
+- lib/promiscuous/publisher/amqp.rb
 - lib/promiscuous/publisher/attributes.rb
+- lib/promiscuous/publisher/base.rb
 - lib/promiscuous/publisher/class.rb
-- lib/promiscuous/publisher/mongoid.rb
-- lib/promiscuous/publisher/lint/attributes.rb
-- lib/promiscuous/publisher/lint/class.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/mongoid/embedded.rb
-- lib/promiscuous/publisher/active_record.rb
-- lib/promiscuous/publisher/model.rb
-- lib/promiscuous/publisher/envelope.rb
 - lib/promiscuous/publisher/mock.rb
-- lib/promiscuous/publisher/amqp.rb
-- lib/promiscuous/publisher/base.rb
+- lib/promiscuous/publisher/model.rb
+- lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/polymorphic.rb
-- lib/promiscuous/amqp/null.rb
-- lib/promiscuous/amqp/rubyamqp.rb
-- lib/promiscuous/amqp/bunny.rb
-- lib/promiscuous/publisher.rb
-- lib/promiscuous/subscriber/lint.rb
+- lib/promiscuous/railtie/replicate.rake
+- 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/amqp.rb
 - lib/promiscuous/subscriber/attributes.rb
 - lib/promiscuous/subscriber/class.rb
-- lib/promiscuous/subscriber/mongoid.rb
-- lib/promiscuous/subscriber/error.rb
-- lib/promiscuous/subscriber/lint/attributes.rb
-- lib/promiscuous/subscriber/lint/class.rb
+- lib/promiscuous/subscriber/lint.rb
 - lib/promiscuous/subscriber/lint/amqp.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/active_record.rb
-- lib/promiscuous/subscriber/upsert.rb
-- lib/promiscuous/subscriber/model.rb
-- lib/promiscuous/subscriber/envelope.rb
-- lib/promiscuous/subscriber/amqp.rb
-- lib/promiscuous/subscriber/base.rb
+- lib/promiscuous/subscriber/lint/attributes.rb
 - lib/promiscuous/subscriber/polymorphic.rb
+- lib/promiscuous/subscriber/base.rb
+- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/upsert.rb
+- lib/promiscuous/config.rb
+- lib/promiscuous/amqp.rb
+- lib/promiscuous/common.rb
 - lib/promiscuous/common/lint.rb
-- lib/promiscuous/common/options.rb
 - lib/promiscuous/common/lint/base.rb
-- lib/promiscuous/worker.rb
-- lib/promiscuous/railtie/replicate.rake
-- lib/promiscuous/railtie.rb
+- lib/promiscuous/common/options.rb
 - lib/promiscuous/loader.rb
-- lib/promiscuous/amqp.rb
-- lib/promiscuous/config.rb
+- lib/promiscuous/publisher.rb
+- lib/promiscuous/railtie.rb
 - lib/promiscuous/subscriber.rb
+- lib/promiscuous/worker.rb
+- lib/promiscuous/version.rb
 - lib/promiscuous.rb
 - README.md
 homepage: http://github.com/crowdtap/promiscuous