promiscuous 0.7 → 0.7.1

data/lib/promiscuous/loader.rb

@@ -17,7 +17,7 @@ module Promiscuous
       [descriptors].flatten.each do |descriptor|
         dir, file_matcher = case descriptor
           when :publishers then # TODO Cleanup publishers
-          when :subscribers then Promiscuous::Subscriber.subscribers.clear
+          when :subscribers then Promiscuous::Subscriber::AMQP.subscribers.clear
           end
       end
     end

data/lib/promiscuous/publisher/class_bind.rb

@@ -16,7 +16,7 @@ module Promiscuous::Publisher::ClassBind
 
     def klass
       if options[:class]
-        options[:class].to_s.constantize
+        "::#{options[:class]}".constantize
       else
         class_name = "::#{name.split('::').last}"
         class_name = $1 if class_name =~ /^(.+)Publisher$/

data/lib/promiscuous/subscriber.rb

@@ -2,31 +2,17 @@ module Promiscuous::Subscriber
   autoload :ActiveRecord, 'promiscuous/subscriber/active_record'
   autoload :Mongoid,      'promiscuous/subscriber/mongoid'
   autoload :Error,        'promiscuous/subscriber/error'
-  autoload :AMQP,         'promiscuous/subscriber/amqp'
 
-  mattr_accessor :subscribers
-  self.subscribers = {}
-
-  def self.bind(key, subscriber)
-    if self.subscribers.has_key?(key)
-      raise "The subscriber '#{self.subscribers[key]}' already listen on '#{key}'"
-    end
-    self.subscribers[key] = subscriber
-  end
-
-  def self.get_subscriber(payload, options={})
-    key = Promiscuous::Subscriber::AMQP.subscriber_key(payload)
-
-    if key
-      raise "FATAL: Unknown binding: '#{key}'" unless self.subscribers.has_key?(key)
-      self.subscribers[key]
-    else
-      Promiscuous::Subscriber::Base
+  def self.get_subscriber_from(payload)
+    sub = AMQP.subscriber_from(payload)
+    if sub && defined?(Polymorphic) && sub.include?(Polymorphic)
+      sub = sub.polymorphic_subscriber_from(payload)
     end
+    sub || Base
   end
 
   def self.process(payload, options={})
-    subscriber_klass = get_subscriber(payload)
+    subscriber_klass = self.get_subscriber_from(payload)
 
     sub = subscriber_klass.new(options.merge(:payload => payload))
     sub.process

data/lib/promiscuous/subscriber/amqp.rb

@@ -3,14 +3,26 @@ require 'promiscuous/subscriber/envelope'
 module Promiscuous::Subscriber::AMQP
   extend ActiveSupport::Concern
 
-  def self.subscriber_key(payload)
-    payload.is_a?(Hash) ? payload['__amqp__'] : nil
+  mattr_accessor :subscribers
+  self.subscribers = {}
+
+  def self.subscriber_from(payload)
+    if key = payload.is_a?(Hash) ? payload['__amqp__'] : nil
+      unless self.subscribers.has_key?(key)
+        raise "Unknown binding: '#{key}'"
+      end
+      self.subscribers[key]
+    end
   end
 
+  included { use_option :from }
+
   module ClassMethods
-    def subscribe(options)
+    def from=(value)
       super
-      Promiscuous::Subscriber.bind(options[:from], self)
+      old_sub = Promiscuous::Subscriber::AMQP.subscribers[from]
+      raise "The subscriber '#{old_sub}' already listen on '#{from}'" if old_sub
+      Promiscuous::Subscriber::AMQP.subscribers[from] = self
     end
   end
 end

data/lib/promiscuous/subscriber/attributes.rb

@@ -5,20 +5,16 @@ module Promiscuous::Subscriber::Attributes
     super
     return unless process_attributes?
 
-    attributes.each do |attr|
+    self.class.attributes.each do |attr|
       attr = attr.to_s
-      optional = attr[-1] == '?'
-      attr = attr[0...-1] if optional
-      setter = "#{attr}="
-
-      if payload.has_key?(attr)
-        value = payload[attr]
-        old_value = instance.__send__(attr)
-        new_value = Promiscuous::Subscriber.process(payload[attr], :old_value => old_value)
-        instance.__send__(setter, new_value) if old_value != new_value
-      else
-        raise "Unknown attribute '#{attr}'" unless optional
+      unless payload.has_key?(attr)
+        raise "Attribute '#{attr}' is missing from the payload"
       end
+
+      value = payload[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
     end
   end
 
@@ -27,4 +23,10 @@ module Promiscuous::Subscriber::Attributes
   end
 
   included { use_option :attributes }
+
+  module ClassMethods
+    def attributes=(value)
+      super(superclass.attributes.to_a + value)
+    end
+  end
 end

data/lib/promiscuous/subscriber/base.rb

@@ -1,6 +1,8 @@
 class Promiscuous::Subscriber::Base
   attr_accessor :options
-  class_attribute :options
+  class_attribute :options, :options_mappings, :instance_reader => false, :instance_writer => false
+
+  self.options = self.options_mappings = {}
 
   def initialize(options)
     self.options = options
@@ -19,13 +21,26 @@ class Promiscuous::Subscriber::Base
   end
 
   def self.subscribe(options)
-    self.options = options
+    options.each do |attr, value|
+      attr_alias = self.options_mappings[attr]
+      self.__send__("#{attr_alias}=", value) if attr_alias
+    end
+  end
+
+  def self.inherited(subclass)
+    super
+    subclass.options = self.options.dup
   end
 
   def self.use_option(attr, options={})
-    as = options[:as].nil? ? attr : options[:as]
-    define_method(as) do
-      self.class.options[attr]
+    attr_alias = options[:as].nil? ? attr : options[:as]
+    self.options_mappings[attr] = attr_alias
+
+    # We need to let all the modules overload these methods, which is
+    # why we are injecting at the base level.
+    Promiscuous::Subscriber::Base.singleton_class.class_eval do
+      define_method("#{attr_alias}")  { self.options[attr] }
+      define_method("#{attr_alias}=") { |value| self.options[attr] = value }
     end
   end
 end

data/lib/promiscuous/subscriber/custom_class.rb

@@ -4,14 +4,24 @@ module Promiscuous::Subscriber::CustomClass
   extend ActiveSupport::Concern
 
   def klass
-    unless subscribe_options[:class]
-      raise "I don't want to be rude or anything, " +
-            "but have you defined the class to deserialize?"
-    end
-    subscribe_options[:class]
+    self.class.klass
   end
 
   def instance
     @instance ||= fetch
   end
+
+  included { use_option :class, :as => :klass }
+
+  module ClassMethods
+    def klass
+      if super
+        "::#{super}".constantize
+      else
+        class_name = "::#{name.split('::').last}"
+        class_name = $1 if class_name =~ /^(.+)Subscriber$/
+        class_name.constantize
+      end
+    end
+  end
 end

data/lib/promiscuous/subscriber/mongoid.rb

@@ -17,10 +17,7 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
   end
 
   def self.subscribe(options)
-    return super if options[:mongoid_loaded]
-
-    klass = options[:class]
-    klass = options[:classes].values.first if klass.nil?
+    super
 
     if klass.embedded?
       require 'promiscuous/subscriber/mongoid/embedded'
@@ -32,7 +29,5 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
       require 'promiscuous/subscriber/upsert'
       include Promiscuous::Subscriber::Upsert
     end
-
-    self.subscribe(options.merge(:mongoid_loaded => true))
   end
 end

data/lib/promiscuous/subscriber/polymorphic.rb

@@ -4,10 +4,41 @@ module Promiscuous::Subscriber::Polymorphic
   extend ActiveSupport::Concern
   include Promiscuous::Subscriber::Envelope
 
-  def klass
-    klass = (subscribe_options[:classes] || {})[type]
-    klass.nil? ? super : klass
+  included do
+    class_attribute :polymorphic_map
+    use_option :from_type
   end
 
-  included { use_payload_attribute :type }
+  module ClassMethods
+    def from_type
+      return super if super
+
+      if name
+        class_name = "#{name.split('::').last}"
+        class_name = $1 if class_name =~ /^(.+)Subscriber$/
+        class_name
+      end
+    end
+
+    def from_type=(value)
+      super
+      setup_polymorphic_mapping
+    end
+
+    def setup_polymorphic_mapping
+      self.polymorphic_map ||= {}
+      polymorphic_map[from_type.to_s] = self if from_type
+    end
+
+    def inherited(subclass)
+      super
+      subclass.setup_polymorphic_mapping unless options.has_key?(:class)
+    end
+
+    def polymorphic_subscriber_from(payload)
+      type = payload.is_a?(Hash) ? payload['type'] : nil
+      raise "The payload is missing the type information'" if type.nil?
+      polymorphic_map[type] || self
+    end
+  end
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.7'
+  VERSION = '0.7.1'
 end

data/lib/promiscuous/worker.rb

@@ -44,7 +44,7 @@ module Promiscuous
 
     def self.subscribe_options
       queue_name = "#{Promiscuous::Config.app}.promiscuous"
-      bindings = Promiscuous::Subscriber.subscribers.keys
+      bindings = Promiscuous::Subscriber::AMQP.subscribers.keys
       {:queue_name => queue_name, :bindings => bindings}
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors: