promiscuous 0.14.0 → 0.15.0

data/lib/promiscuous/publisher/class.rb

@@ -5,7 +5,7 @@ module Promiscuous::Publisher::Class
   included { use_option :class, :as => :klass }
 
   module ClassMethods
-    def setup_binding
+    def setup_class_binding
       publisher_class = self
       klass.class_eval do
         class_attribute :promiscuous_publisher
@@ -13,14 +13,19 @@ module Promiscuous::Publisher::Class
       end if klass
     end
 
+    def self.publish(options)
+      super
+      setup_class_binding
+    end
+
     def inherited(subclass)
       super
-      subclass.setup_binding unless options[:class]
+      subclass.setup_class_binding unless options[:class]
     end
 
     def klass=(value)
       super
-      setup_binding
+      setup_class_binding
     end
 
     def klass

data/lib/promiscuous/publisher/model.rb

@@ -14,17 +14,9 @@ module Promiscuous::Publisher::Model
     operation != :destroy
   end
 
-  included do
-    hook_callbacks if published
-  end
-
   module ClassMethods
-    def publish(options)
+    def setup_class_binding
       super
-      hook_callbacks
-    end
-
-    def hook_callbacks
       klass.class_eval do
         cattr_accessor :publisher_operation_hooked
         return if self.publisher_operation_hooked
@@ -42,7 +34,7 @@ module Promiscuous::Publisher::Model
           self.class.promiscuous_publisher.new(options).publish
           true
         end
-      end
+      end if klass
     end
   end
 end

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

@@ -42,20 +42,23 @@ module Promiscuous::Publisher::Mongoid::Defer
     end
   end
 
-  included do
-    klass.class_eval do
-      cattr_accessor :publisher_defer_hooked
-      return if self.publisher_defer_hooked
-      self.publisher_defer_hooked = true
-
-      # TODO Make sure we are not overriding a field, although VERY unlikly
-      field :_psp, :type => Boolean
-      field :_psv, :type => Integer
-      index({:_psp => 1}, :background => true, :sparse => true)
-
-      Promiscuous::Publisher::Mongoid::Defer.hook_mongoid
-      Promiscuous::Publisher::Mongoid::Defer.klasses[self.to_s] = self
-      Promiscuous::Publisher::Mongoid::Defer.collections[collection.name] = true
+  module ClassMethods
+    def setup_class_binding
+      super
+      klass.class_eval do
+        cattr_accessor :publisher_defer_hooked
+        return if self.publisher_defer_hooked
+        self.publisher_defer_hooked = true
+
+        # TODO Make sure we are not overriding a field, although VERY unlikly
+        field :_psp, :type => Boolean
+        field :_psv, :type => Integer
+        index({:_psp => 1}, :background => true, :sparse => true)
+
+        Promiscuous::Publisher::Mongoid::Defer.hook_mongoid
+        Promiscuous::Publisher::Mongoid::Defer.klasses[self.to_s] = self
+        Promiscuous::Publisher::Mongoid::Defer.collections[collection.name] = true
+      end if klass
     end
   end
 end

data/lib/promiscuous/publisher/mongoid.rb

@@ -22,6 +22,8 @@ class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Base
       include Promiscuous::Publisher::Model
       include Promiscuous::Publisher::Mongoid::Defer if mongoid3?
     end
+
+    setup_class_binding
   end
 
   def self.mongoid3?

data/lib/promiscuous/subscriber/class.rb

@@ -9,6 +9,18 @@ module Promiscuous::Subscriber::Class
   included { use_option :class, :as => :klass }
 
   module ClassMethods
+    def setup_class_binding; end
+
+    def self.subscribe(options)
+      super
+      setup_class_binding
+    end
+
+    def klass=(value)
+      super
+      setup_class_binding
+    end
+
     def klass
       return nil if name.nil?
       "::#{super ? super : guess_class_name('Subscribers')}".constantize

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

@@ -29,8 +29,12 @@ module Promiscuous::Subscriber::Mongoid::Versioning
     instance.use_atomic_promiscuous_selector = false
   end
 
-  included do
-    klass.__send__(:include, AtomicSelector)
-    use_payload_attribute :version
+  included { use_payload_attribute :version }
+
+  module ClassMethods
+    def setup_class_binding
+      super
+      klass.__send__(:include, AtomicSelector) if klass
+    end
   end
 end

data/lib/promiscuous/subscriber/mongoid.rb

@@ -22,5 +22,7 @@ class Promiscuous::Subscriber::Mongoid < Promiscuous::Subscriber::Base
       include Promiscuous::Subscriber::Upsert
       include Promiscuous::Subscriber::Mongoid::Versioning
     end
+
+    setup_class_binding
   end
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/lib/promiscuous.rb

@@ -22,5 +22,12 @@ module Promiscuous
         Promiscuous::Config.logger.__send__(level, "[promiscuous] #{msg}")
       end
     end
+
+    def reload
+      desc  = Promiscuous::Publisher::Base.descendants
+      desc += Promiscuous::Subscriber::Base.descendants
+      desc.reject! { |klass| klass.name =~ /^Promiscuous::/ }
+      desc.each { |klass| klass.setup_class_binding }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,37 +116,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous/amqp/null.rb
 - lib/promiscuous/amqp/bunny.rb
+- lib/promiscuous/amqp/null.rb
 - lib/promiscuous/amqp/rubyamqp.rb
+- lib/promiscuous/common.rb
+- lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/lint.rb
 - lib/promiscuous/common/lint/base.rb
 - lib/promiscuous/common/options.rb
-- lib/promiscuous/common/class_helpers.rb
 - lib/promiscuous/common/worker.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/loader.rb
+- lib/promiscuous/observer.rb
+- lib/promiscuous/publisher.rb
 - lib/promiscuous/publisher/active_record.rb
-- lib/promiscuous/publisher/base.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/mock.rb
 - lib/promiscuous/publisher/mongoid/embedded.rb
 - lib/promiscuous/publisher/mongoid/defer_embedded.rb
 - lib/promiscuous/publisher/mongoid/embedded_many.rb
 - lib/promiscuous/publisher/mongoid/defer.rb
 - lib/promiscuous/publisher/polymorphic.rb
-- lib/promiscuous/publisher/class.rb
-- lib/promiscuous/publisher/mock.rb
-- lib/promiscuous/publisher/error.rb
-- lib/promiscuous/publisher/ephemeral.rb
 - lib/promiscuous/publisher/attributes.rb
-- lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/amqp.rb
 - lib/promiscuous/publisher/worker.rb
+- lib/promiscuous/publisher/base.rb
+- lib/promiscuous/publisher/mongoid.rb
+- lib/promiscuous/publisher/class.rb
 - lib/promiscuous/publisher/model.rb
 - lib/promiscuous/railtie.rb
 - lib/promiscuous/railtie/replicate.rake
@@ -155,31 +159,27 @@ files:
 - 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/attributes.rb
-- lib/promiscuous/subscriber/mongoid/embedded_many.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
+- lib/promiscuous/subscriber/mongoid/embedded_many.rb
 - lib/promiscuous/subscriber/mongoid/versioning.rb
-- lib/promiscuous/subscriber/upsert.rb
-- lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/observer.rb
 - lib/promiscuous/subscriber/polymorphic.rb
+- lib/promiscuous/subscriber/upsert.rb
 - lib/promiscuous/subscriber/amqp.rb
+- lib/promiscuous/subscriber/attributes.rb
 - lib/promiscuous/subscriber/base.rb
 - lib/promiscuous/subscriber/worker.rb
-- lib/promiscuous/subscriber/attributes.rb
 - lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/class.rb
 - lib/promiscuous/subscriber/mongoid.rb
-- lib/promiscuous/observer.rb
-- lib/promiscuous/common.rb
-- lib/promiscuous/publisher.rb
-- lib/promiscuous/config.rb
+- lib/promiscuous/subscriber.rb
+- lib/promiscuous/ephemeral.rb
 - lib/promiscuous/amqp.rb
 - lib/promiscuous/worker.rb
-- lib/promiscuous/ephemeral.rb
-- lib/promiscuous/subscriber.rb
 - lib/promiscuous/version.rb
 - lib/promiscuous.rb
 - README.md