promiscuous 0.7.4 → 0.7.5

data/lib/promiscuous/publisher/lint.rb

@@ -20,8 +20,8 @@ module Promiscuous::Publisher::Lint
       lint = ::Class.new(Base)
       lint.__send__(:include, Class)       if pub.include?(Promiscuous::Publisher::Class)
       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.__send__(:include, Polymorphic) if pub.include?(Promiscuous::Publisher::Polymorphic)
       lint.new(:klass => klass, :publisher => pub, :to => to).lint
     end
     true

data/lib/promiscuous/subscriber/lint.rb

@@ -6,6 +6,8 @@ module Promiscuous::Subscriber::Lint
   autoload :AMQP,        'promiscuous/subscriber/lint/amqp'
 
   def self.lint(binding_classes)
+    Base.reload_publishers
+
     binding_classes.each do |from, klass|
       sub = Promiscuous::Subscriber::AMQP.subscribers[from]
       raise "#{from} has no subscriber" if sub.nil?
@@ -13,8 +15,8 @@ module Promiscuous::Subscriber::Lint
       lint = ::Class.new(Base)
       lint.__send__(:include, Class)       if sub.include?(Promiscuous::Subscriber::Class)
       lint.__send__(:include, Attributes)  if sub.include?(Promiscuous::Subscriber::Attributes)
-      lint.__send__(:include, Polymorphic) if sub.include?(Promiscuous::Subscriber::Polymorphic)
       lint.__send__(:include, AMQP)        if sub.include?(Promiscuous::Subscriber::AMQP)
+      lint.__send__(:include, Polymorphic) if sub.include?(Promiscuous::Subscriber::Polymorphic)
       lint.new(:klass => klass, :subscriber => sub, :from => from).lint
     end
     true

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

@@ -2,7 +2,7 @@ module Promiscuous::Subscriber::Lint::AMQP
   extend ActiveSupport::Concern
 
   def publisher
-    Promiscuous::Publisher::Mock.descendants.
+    publishers.
       select { |pub| pub.superclass == Promiscuous::Publisher::Mock }.
       select { |pub| pub.to == from }.
       tap { |pubs| raise "#{from} has multiple publishers: #{pubs}" if pubs.size > 1 }.

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

@@ -1,8 +1,14 @@
 class Promiscuous::Subscriber::Lint::Base
   include Promiscuous::Common::Lint::Base
 
-  class_attribute :check_publisher
-  self.check_publisher = Promiscuous::Publisher::Mock.descendants.present?
+  class_attribute :publishers
+  def self.reload_publishers
+    self.publishers = Promiscuous::Publisher::Mock.descendants
+  end
+
+  def check_publisher
+    self.class.publishers.present?
+  end
 
   use_option(:subscriber)
 end

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

@@ -1,17 +1,16 @@
 module Promiscuous::Subscriber::Lint::Polymorphic
   extend ActiveSupport::Concern
 
-  def parent_publisher
-    publisher
-    @parent_publisher
-  end
-
   def publisher
-    @parent_publisher = super
-    if @parent_publisher
-      ([parent_publisher] + parent_publisher.descendants).
-        select { |pub| pub.class_name == subscriber.from_type }.
-        first
+    parent_publisher = super
+    if parent_publisher
+      if parent_publisher.class_name == subscriber.from_type
+        parent_publisher
+      else
+        parent_publisher.descendants.
+          select { |pub| pub.class_name == subscriber.from_type }.
+          first
+      end
     end
   end
 
@@ -29,7 +28,8 @@ module Promiscuous::Subscriber::Lint::Polymorphic
 
     unless skip_polymorphic
       subscriber.descendants.each do |pub|
-        self.class.new(options.merge(:publisher => pub,
+        self.class.new(options.merge(:subscriber => pub,
+                                     :klass => nil,
                                      :skip_polymorphic => true)).lint
       end
     end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

metadata

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