promiscuous 0.6.6 → 0.7

data/README.md

@@ -29,7 +29,7 @@ Promiscuous::AMQP.configure(:app => 'crowdtap',
 # publisher
 class ModelPublisher < Promiscuous::Publisher::Mongoid
   publish :to => 'crowdtap/model',
-          :class => Model,
+          :class => :Model,
           :attributes => [:field_1, :field_2, :field_3]
 end
 ```

data/lib/promiscuous/loader.rb

@@ -3,12 +3,8 @@ module Promiscuous
     def self.load_descriptors(descriptors=[:publishers, :subscribers])
       [descriptors].flatten.each do |descriptor|
         dir, file_matcher = case descriptor
-          when :publishers
-            # TODO Cleanup publishers
-            %w(publishers **_publisher.rb)
-          when :subscribers
-            Promiscuous::Subscriber.subscribers.clear
-            %w(subscribers **_subscriber.rb)
+          when :publishers then %w(publishers **_publisher.rb)
+          when :subscribers then %w(subscribers **_subscriber.rb)
           end
 
         Dir[Rails.root.join('app', dir, file_matcher)].map do |file|
@@ -16,5 +12,14 @@ module Promiscuous
         end
       end
     end
+
+    def self.unload_descriptors(descriptors=[:publishers, :subscribers])
+      [descriptors].flatten.each do |descriptor|
+        dir, file_matcher = case descriptor
+          when :publishers then # TODO Cleanup publishers
+          when :subscribers then Promiscuous::Subscriber.subscribers.clear
+          end
+      end
+    end
   end
 end

data/lib/promiscuous/publisher.rb

@@ -2,4 +2,9 @@ module Promiscuous::Publisher
   autoload :ActiveRecord, 'promiscuous/publisher/active_record'
   autoload :Mongoid,      'promiscuous/publisher/mongoid'
   autoload :Mock,         'promiscuous/publisher/mock'
+  autoload :Lint,         'promiscuous/publisher/lint'
+
+  def self.lint(*args)
+    Lint.lint(*args)
+  end
 end

data/lib/promiscuous/publisher/attributes.rb

@@ -4,11 +4,7 @@ module Promiscuous::Publisher::Attributes
   def payload
     return nil unless include_attributes?
 
-    Hash[attributes.map do |field|
-      optional = field.to_s[-1] == '?'
-      field = field.to_s[0...-1].to_sym if optional
-      [field, payload_for(field)] if !optional || instance.respond_to?(field)
-    end]
+    Hash[attributes.map { |field| [field, payload_for(field)] }]
   end
 
   def payload_for(field)
@@ -25,4 +21,15 @@ module Promiscuous::Publisher::Attributes
   end
 
   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)
+    end
+  end
 end

data/lib/promiscuous/publisher/base.rb

@@ -1,6 +1,7 @@
 class Promiscuous::Publisher::Base
   attr_accessor :options
-  class_attribute :options
+  class_attribute :options, :published
+  self.options = {}
 
   def initialize(options)
     self.options = options
@@ -11,7 +12,8 @@ class Promiscuous::Publisher::Base
   end
 
   def self.publish(options)
-    self.options = options
+    self.options = self.options.merge(options)
+    self.published = true
   end
 
   def self.use_option(attr)

data/lib/promiscuous/publisher/class_bind.rb

@@ -5,10 +5,22 @@ module Promiscuous::Publisher::ClassBind
     def publish(options)
       super
 
-      publisher_class = self
-      options[:class].class_eval do
-        class_attribute :promiscuous_publisher
-        self.promiscuous_publisher = publisher_class
+      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].to_s.constantize
+      else
+        class_name = "::#{name.split('::').last}"
+        class_name = $1 if class_name =~ /^(.+)Publisher$/
+        class_name.constantize
       end
     end
   end

data/lib/promiscuous/publisher/lint.rb

@@ -0,0 +1,29 @@
+module Promiscuous::Publisher::Lint
+  autoload :Base,        'promiscuous/publisher/lint/base'
+  autoload :ClassBind,   'promiscuous/publisher/lint/class_bind'
+  autoload :Attributes,  'promiscuous/publisher/lint/attributes'
+  autoload :Polymorphic, 'promiscuous/publisher/lint/polymorphic'
+  autoload :AMQP,        'promiscuous/publisher/lint/amqp'
+
+  def self.get_publisher(klass)
+    unless klass.respond_to?(:promiscuous_publisher)
+      raise "#{klass} has no publisher"
+    end
+
+    klass.promiscuous_publisher
+  end
+
+  def self.lint(classes)
+    classes.each do |klass, to|
+      pub = get_publisher(klass)
+
+      lint = Class.new(Base)
+      lint.__send__(:include, ClassBind)   if pub.include?(Promiscuous::Publisher::ClassBind)
+      lint.__send__(:include, Attributes)  if pub.include?(Promiscuous::Publisher::Attributes)
+      lint.__send__(:include, Polymorphic) if pub.include?(Promiscuous::Publisher::Polymorphic)
+      lint.__send__(:include, AMQP)        if pub.include?(Promiscuous::Publisher::AMQP)
+      lint.new(:klass => klass, :publisher => pub, :to => to).lint
+    end
+    true
+  end
+end

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

@@ -0,0 +1,14 @@
+module Promiscuous::Publisher::Lint::AMQP
+  extend ActiveSupport::Concern
+
+  def lint
+    super
+
+    pub_to = publisher_instance.to
+    if pub_to != to
+      raise "#{publisher} publishes #{klass} to #{pub_to} instead of #{to}"
+    end
+  end
+
+  included { use_option(:to) }
+end

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

@@ -0,0 +1,14 @@
+module Promiscuous::Publisher::Lint::Attributes
+  extend ActiveSupport::Concern
+
+  def lint
+    super
+
+    instance = klass.new
+    publisher.options[:attributes].each do |attr|
+      instance.respond_to?(attr) or instance.__send__(attr)
+    end
+  end
+
+  included { use_option(:klass) }
+end

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

@@ -0,0 +1,22 @@
+class Promiscuous::Publisher::Lint::Base
+  attr_accessor :options
+
+  def initialize(options)
+    self.options = options
+  end
+
+  def publisher_instance
+    @publisher_instance ||= publisher.new({})
+  end
+
+  def lint
+  end
+
+  def self.use_option(attr)
+    define_method(attr) do
+      self.options[attr]
+    end
+  end
+
+  use_option(:publisher)
+end

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

@@ -0,0 +1,14 @@
+module Promiscuous::Publisher::Lint::ClassBind
+  extend ActiveSupport::Concern
+
+  def lint
+    super
+
+    if publisher.klass != klass
+      raise "Define a publisher for #{klass}"
+    end
+  end
+
+  included { use_option(:klass) }
+end
+

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

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

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

@@ -0,0 +1,21 @@
+module Promiscuous::Publisher::Lint::Polymorphic
+  extend ActiveSupport::Concern
+
+  def lint
+    super
+
+    unless skip_polymorphic
+      klass.descendants.each do |subclass|
+        pub = Promiscuous::Publisher::Lint.get_publisher(subclass)
+        self.class.new(options.merge(:klass => subclass,
+                                     :publisher => pub,
+                                     :skip_polymorphic => true)).lint
+      end
+    end
+  end
+
+  included do
+    use_option(:klass)
+    use_option(:skip_polymorphic)
+  end
+end

data/lib/promiscuous/publisher/model.rb

@@ -16,20 +16,27 @@ module Promiscuous::Publisher::Model
     operation != :destroy
   end
 
+  included do
+    hook_callbacks if published
+  end
+
   module ClassMethods
     def publish(options)
       super
+      hook_callbacks
+    end
 
-      options[:class].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
+    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
           end
         end
       end
     end
   end
 end
-

data/lib/promiscuous/publisher/mongoid.rb

@@ -13,16 +13,14 @@ class Promiscuous::Publisher::Mongoid < Promiscuous::Publisher::Base
   include Promiscuous::Publisher::Envelope
 
   def self.publish(options)
-    return super if options[:mongoid_loaded]
+    super
 
-    if options[:class].embedded?
+    if klass.embedded?
       require 'promiscuous/publisher/mongoid/embedded'
       include Promiscuous::Publisher::Mongoid::Embedded
     else
       require 'promiscuous/publisher/model'
       include Promiscuous::Publisher::Model
     end
-
-    self.publish(options.merge(:mongoid_loaded => true))
   end
 end

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

@@ -5,23 +5,19 @@ module Promiscuous::Publisher::Mongoid::Embedded
     super.merge(:id => instance.id)
   end
 
-  module ClassMethods
-    def publish(options)
-      super
-
-      options[:class].class_eval do
-        callback = proc do
-          if _parent.respond_to?(:promiscuous_publish_update)
-            _parent.save
-            _parent.reload # mongoid is not that smart, so we need to reload here.
-            _parent.promiscuous_publish_update
-          end
+  included do
+    klass.class_eval do
+      callback = proc do
+        if _parent.respond_to?(:promiscuous_publish_update)
+          _parent.save
+          _parent.reload # mongoid is not that smart, so we need to reload here.
+          _parent.promiscuous_publish_update
         end
-
-        after_create callback
-        after_update callback
-        after_destroy callback
       end
+
+      after_create callback
+      after_update callback
+      after_destroy callback
     end
   end
 end

data/lib/promiscuous/publisher/polymorphic.rb

@@ -7,4 +7,16 @@ 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/railtie.rb

@@ -6,7 +6,10 @@ module Promiscuous
       config.after_initialize do
         Promiscuous::Loader.load_descriptors(:publishers)
         ActionDispatch::Reloader.to_prepare do
-          Promiscuous::Loader.load_descriptors(:publishers)
+          Promiscuous::Loader.load_descriptors
+        end
+        ActionDispatch::Reloader.to_cleanup do
+          Promiscuous::Loader.unload_descriptors
         end
       end
     end

data/lib/promiscuous/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -118,8 +118,15 @@ extra_rdoc_files: []
 files:
 - lib/promiscuous/version.rb
 - lib/promiscuous/publisher/class_bind.rb
+- lib/promiscuous/publisher/lint.rb
 - lib/promiscuous/publisher/attributes.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
 - lib/promiscuous/publisher/mongoid/embedded.rb
 - lib/promiscuous/publisher/active_record.rb
 - lib/promiscuous/publisher/model.rb
@@ -135,8 +142,6 @@ files:
 - lib/promiscuous/subscriber/attributes.rb
 - lib/promiscuous/subscriber/mongoid.rb
 - lib/promiscuous/subscriber/error.rb
-- lib/promiscuous/subscriber/generic.rb
-- lib/promiscuous/subscriber/mongoid/root.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
 - lib/promiscuous/subscriber/active_record.rb
 - lib/promiscuous/subscriber/upsert.rb
@@ -175,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Model replication over RabbitMQ

data/lib/promiscuous/subscriber/generic.rb

@@ -1,14 +0,0 @@
-require 'promiscuous/subscriber/custom_class'
-require 'promiscuous/subscriber/base'
-require 'promiscuous/subscriber/attributes'
-require 'promiscuous/subscriber/polymorphic'
-require 'promiscuous/subscriber/amqp'
-require 'promiscuous/subscriber/envelope'
-
-class Promiscuous::Subscriber::Generic < Promiscuous::Subscriber::Base
-  include Promiscuous::Subscriber::CustomClass
-  include Promiscuous::Subscriber::Attributes
-  include Promiscuous::Subscriber::Polymorphic
-  include Promiscuous::Subscriber::AMQP
-  include Promiscuous::Subscriber::Envelope
-end

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

@@ -1,6 +0,0 @@
-require 'promiscuous/publisher/model'
-
-module Promiscuous::Subscriber::Mongoid::Root
-  extend ActiveSupport::Concern
-  include Promiscuous::Subscriber::Model
-end