promiscuous 0.7.1 → 0.7.2

data/lib/promiscuous/common/options.rb

@@ -0,0 +1,44 @@
+module Promiscuous::Common::Options
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :options, :options_mappings,
+                    :instance_reader => false,
+                    :instance_writer => false
+    self.options = self.options_mappings = {}
+  end
+
+  module ClassMethods
+    def inherited(subclass)
+      super
+      subclass.options = self.options.dup
+    end
+
+    def use_option(attr, options={})
+      instance_reader = options.fetch(:instance_reader, true)
+      attr_alias = options.fetch(:as, attr)
+
+      self.options_mappings[attr] = attr_alias
+
+      base = self.ancestors[self.ancestors.index(Promiscuous::Common::Options) - 1]
+
+      # We need to let all the modules overload these methods, which is
+      # why we are injecting at the base level.
+      base.singleton_class.class_eval do
+        define_method("#{attr_alias}")  { self.options[attr] }
+        define_method("#{attr_alias}=") { |value| self.options[attr] = value }
+      end
+
+      if instance_reader
+        define_method("#{attr_alias}") { self.class.__send__("#{attr_alias}") }
+      end
+    end
+
+    def load_options(options)
+      options.each do |attr, value|
+        attr_alias = self.options_mappings[attr]
+        self.__send__("#{attr_alias}=", value) if attr_alias
+      end
+    end
+  end
+end

data/lib/promiscuous/common.rb

@@ -0,0 +1,7 @@
+module Promiscuous::Common
+  autoload :Options, 'promiscuous/common/options'
+
+  def self.lint(*args)
+    Lint.lint(*args)
+  end
+end

data/lib/promiscuous/publisher/active_record.rb

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

data/lib/promiscuous/publisher/amqp.rb

@@ -1,5 +1,3 @@
-require 'promiscuous/publisher/envelope'
-
 module Promiscuous::Publisher::AMQP
   extend ActiveSupport::Concern
   include Promiscuous::Publisher::Envelope

data/lib/promiscuous/publisher/attributes.rb

@@ -23,13 +23,8 @@ module Promiscuous::Publisher::Attributes
   included { use_option :attributes }
 
   module ClassMethods
-    def publish(options)
-      if self.options[:attributes] and options[:attributes]
-        options = options.dup
-        options[:attributes] = (self.options[:attributes] + options[:attributes]).uniq
-      end
-
-      super(options)
+    def attributes=(value)
+      super(superclass.attributes.to_a + value)
     end
   end
 end

data/lib/promiscuous/publisher/base.rb

@@ -1,7 +1,8 @@
 class Promiscuous::Publisher::Base
+  include Promiscuous::Common::Options
+
+  cattr_accessor :published
   attr_accessor :options
-  class_attribute :options, :published
-  self.options = {}
 
   def initialize(options)
     self.options = options
@@ -12,13 +13,7 @@ class Promiscuous::Publisher::Base
   end
 
   def self.publish(options)
-    self.options = self.options.merge(options)
+    load_options(options)
     self.published = true
   end
-
-  def self.use_option(attr)
-    define_method(attr) do
-      self.class.options[attr]
-    end
-  end
 end

data/lib/promiscuous/publisher/class.rb

@@ -0,0 +1,35 @@
+module Promiscuous::Publisher::Class
+  extend ActiveSupport::Concern
+
+  included { use_option :class, :as => :klass }
+
+  module ClassMethods
+    def setup_binding
+      publisher_class = self
+      klass.class_eval do
+        class_attribute :promiscuous_publisher
+        self.promiscuous_publisher = publisher_class
+      end if klass
+    end
+
+    def inherited(subclass)
+      super
+      subclass.setup_binding unless options[:class]
+    end
+
+    def klass=(value)
+      super
+      setup_binding
+    end
+
+    def klass
+      if super
+        "::#{super}".constantize
+      elsif name
+        class_name = "::#{name.split('::').last}"
+        class_name = $1 if class_name =~ /^(.+)Publisher$/
+        class_name.constantize
+      end
+    end
+  end
+end

data/lib/promiscuous/publisher/lint/amqp.rb

@@ -10,5 +10,5 @@ module Promiscuous::Publisher::Lint::AMQP
     end
   end
 
-  included { use_option(:to) }
+  included { use_option :to }
 end

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

@@ -5,10 +5,8 @@ module Promiscuous::Publisher::Lint::Attributes
     super
 
     instance = klass.new
-    publisher.options[:attributes].each do |attr|
+    publisher.attributes.each do |attr|
       instance.respond_to?(attr) or instance.__send__(attr)
     end
   end
-
-  included { use_option(:klass) }
 end

data/lib/promiscuous/publisher/lint/class_bind.rb

@@ -9,6 +9,6 @@ module Promiscuous::Publisher::Lint::ClassBind
     end
   end
 
-  included { use_option(:klass) }
+  included { use_option :klass }
 end
 

data/lib/promiscuous/publisher/lint/polymorphic.rb

@@ -15,7 +15,7 @@ module Promiscuous::Publisher::Lint::Polymorphic
   end
 
   included do
-    use_option(:klass)
-    use_option(:skip_polymorphic)
+    use_option :klass
+    use_option :skip_polymorphic
   end
 end

data/lib/promiscuous/publisher/model.rb

@@ -1,5 +1,3 @@
-require 'promiscuous/publisher/envelope'
-
 module Promiscuous::Publisher::Model
   extend ActiveSupport::Concern
   include Promiscuous::Publisher::Envelope
@@ -27,13 +25,15 @@ module Promiscuous::Publisher::Model
     end
 
     def hook_callbacks
-      unless respond_to?(:promiscuous_publish_update)
-        klass.class_eval do
-          [:create, :update, :destroy].each do |operation|
-            __send__("after_#{operation}", "promiscuous_publish_#{operation}".to_sym)
-            define_method "promiscuous_publish_#{operation}" do
-              self.class.promiscuous_publisher.new(:instance => self, :operation => operation).amqp_publish
-            end
+      klass.class_eval do
+        cattr_accessor :publisher_operation_hooked
+        return if self.publisher_operation_hooked
+        self.publisher_operation_hooked = true
+
+        [:create, :update, :destroy].each do |operation|
+          __send__("after_#{operation}", "promiscuous_publish_#{operation}".to_sym)
+          define_method "promiscuous_publish_#{operation}" do
+            self.class.promiscuous_publisher.new(:instance => self, :operation => operation).amqp_publish
           end
         end
       end

data/lib/promiscuous/publisher/mongoid.rb

@@ -1,25 +1,17 @@
-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
+  autoload :Embedded, 'promiscuous/publisher/mongoid/embedded'
+
+  include Promiscuous::Publisher::Class
   include Promiscuous::Publisher::Attributes
   include Promiscuous::Publisher::Polymorphic
   include Promiscuous::Publisher::AMQP
-  include Promiscuous::Publisher::Envelope
 
   def self.publish(options)
     super
 
     if klass.embedded?
-      require 'promiscuous/publisher/mongoid/embedded'
       include Promiscuous::Publisher::Mongoid::Embedded
     else
-      require 'promiscuous/publisher/model'
       include Promiscuous::Publisher::Model
     end
   end

data/lib/promiscuous/publisher/polymorphic.rb

@@ -1,5 +1,3 @@
-require 'promiscuous/publisher/envelope'
-
 module Promiscuous::Publisher::Polymorphic
   extend ActiveSupport::Concern
   include Promiscuous::Publisher::Envelope
@@ -7,16 +5,4 @@ module Promiscuous::Publisher::Polymorphic
   def payload
     super.merge(:type => instance.class.to_s)
   end
-
-  module ClassMethods
-    def publish(options)
-      super
-      self.descendants.each { |subclass| inherited(subclass) }
-    end
-
-    def inherited(subclass)
-      super
-      subclass.publish(options.merge(:inherited => true)) if published
-    end
-  end
 end

data/lib/promiscuous/publisher.rb

@@ -1,8 +1,15 @@
 module Promiscuous::Publisher
   autoload :ActiveRecord, 'promiscuous/publisher/active_record'
-  autoload :Mongoid,      'promiscuous/publisher/mongoid'
-  autoload :Mock,         'promiscuous/publisher/mock'
+  autoload :AMQP,         'promiscuous/publisher/amqp'
+  autoload :Attributes,   'promiscuous/publisher/attributes'
+  autoload :Base,         'promiscuous/publisher/base'
+  autoload :Class,        'promiscuous/publisher/class'
+  autoload :Envelope,     'promiscuous/publisher/envelope'
   autoload :Lint,         'promiscuous/publisher/lint'
+  autoload :Mock,         'promiscuous/publisher/mock'
+  autoload :Model,        'promiscuous/publisher/model'
+  autoload :Mongoid,      'promiscuous/publisher/mongoid'
+  autoload :Polymorphic,  'promiscuous/publisher/polymorphic'
 
   def self.lint(*args)
     Lint.lint(*args)

data/lib/promiscuous/subscriber/active_record.rb

@@ -1,12 +1,5 @@
-require 'promiscuous/subscriber/base'
-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::Class
   include Promiscuous::Subscriber::Attributes
   include Promiscuous::Subscriber::AMQP
   include Promiscuous::Subscriber::Model

data/lib/promiscuous/subscriber/amqp.rb

@@ -1,5 +1,3 @@
-require 'promiscuous/subscriber/envelope'
-
 module Promiscuous::Subscriber::AMQP
   extend ActiveSupport::Concern
 

data/lib/promiscuous/subscriber/base.rb

@@ -1,8 +1,7 @@
 class Promiscuous::Subscriber::Base
-  attr_accessor :options
-  class_attribute :options, :options_mappings, :instance_reader => false, :instance_writer => false
+  include Promiscuous::Common::Options
 
-  self.options = self.options_mappings = {}
+  attr_accessor :options
 
   def initialize(options)
     self.options = options
@@ -21,26 +20,6 @@ class Promiscuous::Subscriber::Base
   end
 
   def self.subscribe(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={})
-    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
+    load_options(options)
   end
 end

data/lib/promiscuous/subscriber/{custom_class.rb → class.rb}

@@ -1,12 +1,6 @@
-require 'promiscuous/subscriber/envelope'
-
-module Promiscuous::Subscriber::CustomClass
+module Promiscuous::Subscriber::Class
   extend ActiveSupport::Concern
 
-  def klass
-    self.class.klass
-  end
-
   def instance
     @instance ||= fetch
   end
@@ -17,7 +11,7 @@ module Promiscuous::Subscriber::CustomClass
     def klass
       if super
         "::#{super}".constantize
-      else
+      elsif name
         class_name = "::#{name.split('::').last}"
         class_name = $1 if class_name =~ /^(.+)Subscriber$/
         class_name.constantize

data/lib/promiscuous/subscriber/model.rb

@@ -1,5 +1,3 @@
-require 'promiscuous/subscriber/envelope'
-
 module Promiscuous::Subscriber::Model
   extend ActiveSupport::Concern
   include Promiscuous::Subscriber::Envelope

data/lib/promiscuous/subscriber/mongoid.rb

@@ -1,16 +1,10 @@
-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
+  autoload :Embedded, 'promiscuous/subscriber/mongoid/embedded'
+
+  include Promiscuous::Subscriber::Class
   include Promiscuous::Subscriber::Attributes
   include Promiscuous::Subscriber::Polymorphic
   include Promiscuous::Subscriber::AMQP
-  include Promiscuous::Subscriber::Envelope
 
   def self.missing_record_exception
     Mongoid::Errors::DocumentNotFound
@@ -20,13 +14,9 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
     super
 
     if klass.embedded?
-      require 'promiscuous/subscriber/mongoid/embedded'
       include Promiscuous::Subscriber::Mongoid::Embedded
     else
-      require 'promiscuous/subscriber/model'
       include Promiscuous::Subscriber::Model
-
-      require 'promiscuous/subscriber/upsert'
       include Promiscuous::Subscriber::Upsert
     end
   end

data/lib/promiscuous/subscriber/polymorphic.rb

@@ -1,5 +1,3 @@
-require 'promiscuous/subscriber/envelope'
-
 module Promiscuous::Subscriber::Polymorphic
   extend ActiveSupport::Concern
   include Promiscuous::Subscriber::Envelope

data/lib/promiscuous/subscriber.rb

@@ -1,7 +1,15 @@
 module Promiscuous::Subscriber
   autoload :ActiveRecord, 'promiscuous/subscriber/active_record'
-  autoload :Mongoid,      'promiscuous/subscriber/mongoid'
+  autoload :AMQP,         'promiscuous/subscriber/amqp'
+  autoload :Attributes,   'promiscuous/subscriber/attributes'
+  autoload :Base,         'promiscuous/subscriber/base'
+  autoload :Class,        'promiscuous/subscriber/class'
+  autoload :Envelope,     'promiscuous/subscriber/envelope'
   autoload :Error,        'promiscuous/subscriber/error'
+  autoload :Model,        'promiscuous/subscriber/model'
+  autoload :Mongoid,      'promiscuous/subscriber/mongoid'
+  autoload :Polymorphic,  'promiscuous/subscriber/polymorphic'
+  autoload :Upsert,       'promiscuous/subscriber/upsert'
 
   def self.get_subscriber_from(payload)
     sub = AMQP.subscriber_from(payload)

data/lib/promiscuous/version.rb

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

data/lib/promiscuous.rb

@@ -5,6 +5,7 @@ require 'promiscuous/loader'
 require 'promiscuous/railtie' if defined?(Rails)
 
 module Promiscuous
+  autoload :Common,     'promiscuous/common'
   autoload :Publisher,  'promiscuous/publisher'
   autoload :Subscriber, 'promiscuous/subscriber'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -117,13 +117,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/promiscuous/version.rb
-- lib/promiscuous/publisher/class_bind.rb
+- lib/promiscuous/common.rb
 - lib/promiscuous/publisher/lint.rb
 - lib/promiscuous/publisher/attributes.rb
+- lib/promiscuous/publisher/class.rb
 - lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/lint/class_bind.rb
 - lib/promiscuous/publisher/lint/attributes.rb
-- lib/promiscuous/publisher/lint/model.rb
 - lib/promiscuous/publisher/lint/amqp.rb
 - lib/promiscuous/publisher/lint/base.rb
 - lib/promiscuous/publisher/lint/polymorphic.rb
@@ -140,6 +140,7 @@ files:
 - lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/publisher.rb
 - lib/promiscuous/subscriber/attributes.rb
+- lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/error.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
@@ -148,9 +149,9 @@ files:
 - lib/promiscuous/subscriber/model.rb
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/amqp.rb
-- lib/promiscuous/subscriber/custom_class.rb
 - lib/promiscuous/subscriber/base.rb
 - lib/promiscuous/subscriber/polymorphic.rb
+- lib/promiscuous/common/options.rb
 - lib/promiscuous/worker.rb
 - lib/promiscuous/railtie/replicate.rake
 - lib/promiscuous/railtie.rb

data/lib/promiscuous/publisher/class_bind.rb

@@ -1,27 +0,0 @@
-module Promiscuous::Publisher::ClassBind
-  extend ActiveSupport::Concern
-
-  module ClassMethods
-    def publish(options)
-      super
-
-      unless options[:inherited] and options[:class]
-        publisher_class = self
-        klass.class_eval do
-          class_attribute :promiscuous_publisher
-          self.promiscuous_publisher = publisher_class
-        end
-      end
-    end
-
-    def klass
-      if options[:class]
-        "::#{options[:class]}".constantize
-      else
-        class_name = "::#{name.split('::').last}"
-        class_name = $1 if class_name =~ /^(.+)Publisher$/
-        class_name.constantize
-      end
-    end
-  end
-end

data/lib/promiscuous/publisher/lint/model.rb

@@ -1,3 +0,0 @@
-
-  # 1. all the dep are covered
-  # 2. all the attributes are covered