promiscuous 0.11.2 → 0.12.0

data/lib/promiscuous/publisher/attributes.rb

@@ -9,7 +9,9 @@ module Promiscuous::Publisher::Attributes
 
   def payload_for(field)
     value = instance.__send__(field)
-    if value.class.respond_to?(:promiscuous_publisher)
+    if value.respond_to?(:promiscuous_publisher)
+      value.promiscuous_publisher.new(options.merge(:instance => value)).payload
+    elsif value.class.respond_to?(:promiscuous_publisher)
       value.class.promiscuous_publisher.new(options.merge(:instance => value)).payload
     else
       value

data/lib/promiscuous/publisher/mongoid.rb

@@ -2,6 +2,7 @@ class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Base
   autoload :Embedded,      'promiscuous/publisher/mongoid/embedded'
   autoload :DeferEmbedded, 'promiscuous/publisher/mongoid/defer_embedded'
   autoload :Defer,         'promiscuous/publisher/mongoid/defer'
+  autoload :EmbeddedMany,  'promiscuous/publisher/mongoid/embedded_many'
 
   include Promiscuous::Publisher::Class
   include Promiscuous::Publisher::Attributes

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

@@ -2,7 +2,11 @@ module Promiscuous::Publisher::Mongoid::DeferEmbedded
   extend ActiveSupport::Concern
 
   def payload
-    super.merge(:id => instance.id)
+    if instance.is_a?(Array)
+      Promiscuous::Publisher::Mongoid::EmbeddedMany.new(:instance => instance).payload
+    else
+      super.merge(:id => instance.id)
+    end
   end
 
   included do

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

@@ -0,0 +1,12 @@
+class Promiscuous::Publisher::Mongoid::EmbeddedMany < Promiscuous::Publisher::Base
+  module Payload
+    def payload
+      instance.map { |e| e.class.promiscuous_publisher.new(:instance => e).payload }
+    end
+  end
+  include Payload
+
+  include Promiscuous::Publisher::AMQP
+
+  publish :to => '__promiscuous__/embedded_many'
+end

data/lib/promiscuous/subscriber.rb

@@ -18,7 +18,7 @@ module Promiscuous::Subscriber
     Lint.lint(*args)
   end
 
-  def self.get_subscriber_from(payload)
+  def self.subscriber_class_for(payload)
     sub = AMQP.subscriber_from(payload)
     if sub && defined?(Polymorphic) && sub.include?(Polymorphic)
       sub = sub.polymorphic_subscriber_from(payload)
@@ -26,10 +26,12 @@ module Promiscuous::Subscriber
     sub || Base
   end
 
-  def self.process(payload, options={})
-    subscriber_klass = self.get_subscriber_from(payload)
+  def self.subscriber_for(payload, options={})
+    self.subscriber_class_for(payload).new(options.merge(:payload => payload))
+  end
 
-    sub = subscriber_klass.new(options.merge(:payload => payload))
+  def self.process(payload, options={})
+    sub = self.subscriber_for(payload, options)
     sub.process
     sub.instance
   end

data/lib/promiscuous/subscriber/amqp.rb

@@ -1,5 +1,6 @@
 module Promiscuous::Subscriber::AMQP
   extend ActiveSupport::Concern
+  include Promiscuous::Subscriber::Envelope
 
   mattr_accessor :subscribers
   self.subscribers = {}

data/lib/promiscuous/subscriber/attributes.rb

@@ -11,17 +11,13 @@ module Promiscuous::Subscriber::Attributes
         raise "Attribute '#{attr}' is missing from the payload"
       end
 
-      value = payload[attr]
+      options = {}
+      options[:parent]    = instance
+      options[:old_value] = instance.__send__(attr) if instance.respond_to?(attr)
+      sub = Promiscuous::Subscriber.subscriber_for(payload[attr], options)
 
-      if instance.respond_to?(attr)
-        old_value = instance.__send__(attr)
-        new_value = Promiscuous::Subscriber.process(payload[attr], :old_value => old_value)
-        instance.__send__("#{attr}=", new_value) if old_value != new_value
-      else
-        # TODO Add unit test
-        new_value = Promiscuous::Subscriber.process(payload[attr])
-        instance.__send__("#{attr}=", new_value)
-      end
+      sub.process
+      instance.__send__("#{attr}=", sub.instance) if sub.should_update_parent?
     end
   end
 

data/lib/promiscuous/subscriber/base.rb

@@ -15,6 +15,10 @@ class Promiscuous::Subscriber::Base
   def process
   end
 
+  def should_update_parent?
+    true
+  end
+
   def subscribe_options
     self.class.options
   end

data/lib/promiscuous/subscriber/mongoid.rb

@@ -14,6 +14,7 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
     super
 
     if klass.embedded?
+      require 'promiscuous/subscriber/mongoid/embedded_many'
       include Promiscuous::Subscriber::Mongoid::Embedded
     else
       include Promiscuous::Subscriber::Model

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

@@ -5,6 +5,10 @@ module Promiscuous::Subscriber::Mongoid::Embedded
     (old_value || klass.new).tap { |m| m.id = id }
   end
 
+  def should_update_parent?
+    old_value.nil?
+  end
+
   def old_value
     options[:old_value]
   end

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

@@ -0,0 +1,44 @@
+class Promiscuous::Subscriber::Mongoid::EmbeddedMany < Promiscuous::Subscriber::Base
+  include Promiscuous::Subscriber::AMQP
+
+  subscribe :from => '__promiscuous__/embedded_many'
+
+  def old_embeddeds
+    options[:old_value]
+  end
+
+  def parent
+    options[:parent]
+  end
+
+  alias :new_embeddeds :payload
+
+  def process
+    # XXX Reordering is not supported
+
+    # find all updatable docs
+    new_embeddeds.each do |new_e|
+      old_e = old_embeddeds.select { |e| e.id.to_s == new_e['id'] }.first
+      if old_e
+        new_e['existed'] = true
+        old_e.instance_variable_set(:@keep, true)
+        Promiscuous::Subscriber.process(new_e, :old_value => old_e)
+      end
+    end
+
+    # delete all the old ones
+    old_embeddeds.each do |old_e|
+      old_e.destroy unless old_e.instance_variable_get(:@keep)
+    end
+
+    # create all the new ones
+    new_embeddeds.reject { |new_e| new_e['existed'] }.each do |new_e|
+      new_e_instance = Promiscuous::Subscriber.process(new_e)
+      parent.__send__(old_embeddeds.metadata[:name]) << new_e_instance
+    end
+  end
+
+  def should_update_parent?
+    false
+  end
+end

data/lib/promiscuous/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,69 +100,71 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/promiscuous.rb
+- lib/promiscuous/amqp.rb
 - lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/null.rb
 - lib/promiscuous/amqp/rubyamqp.rb
-- lib/promiscuous/amqp.rb
+- lib/promiscuous/common.rb
 - lib/promiscuous/common/class_helpers.rb
-- lib/promiscuous/common/lint/base.rb
 - lib/promiscuous/common/lint.rb
+- lib/promiscuous/common/lint/base.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.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/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/lint.rb
 - lib/promiscuous/publisher/mock.rb
 - lib/promiscuous/publisher/model.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.rb
-- lib/promiscuous/publisher/mongoid.rb
+- lib/promiscuous/publisher/mongoid/embedded_many.rb
 - lib/promiscuous/publisher/polymorphic.rb
 - lib/promiscuous/publisher/worker.rb
-- lib/promiscuous/publisher.rb
-- lib/promiscuous/railtie/replicate.rake
+- lib/promiscuous/publisher/attributes.rb
+- lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/railtie.rb
+- lib/promiscuous/railtie/replicate.rake
 - 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/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.rb
 - lib/promiscuous/subscriber/model.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
-- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/subscriber/mongoid/embedded_many.rb
 - lib/promiscuous/subscriber/observer.rb
 - lib/promiscuous/subscriber/polymorphic.rb
 - lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/worker.rb
+- lib/promiscuous/subscriber/amqp.rb
+- lib/promiscuous/subscriber/attributes.rb
+- lib/promiscuous/subscriber/base.rb
+- lib/promiscuous/subscriber/mongoid.rb
+- lib/promiscuous/worker.rb
 - lib/promiscuous/subscriber.rb
 - lib/promiscuous/version.rb
-- lib/promiscuous/worker.rb
-- lib/promiscuous.rb
 - README.md
 homepage: http://github.com/crowdtap/promiscuous
 licenses: []