lacerda 2.1.1.beta5 → 2.1.1.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee1e8886987900fedffd85aa80e7404486a57c4
-  data.tar.gz: d86b96ecfe16c57e379ad5b763211a34f5fbcfa1
+  metadata.gz: 890f74d8678e19e74e1acefa6b1484b9b46f8fb5
+  data.tar.gz: 9ed29db508e646395fefe47d2a49e894bffa2854
 SHA512:
-  metadata.gz: 6e0e6e660736ac2f82ca6db86f851cd238ad36f7b80e5a95095b951b6199f617bc6cad3299cd3b2deabb25ab42066bb66deb2e58af8d3bcb11b0abb111dee139
-  data.tar.gz: e24372b89d6cdedc29d834536d38b42343964be83d855e955ee7858703809c76e0388c634aa1e56833fd6ad521f4b7e1f1165e9a799628ea8f31f800ba8ccd8b
+  metadata.gz: 98f93e23f2135ed0de4cb92677e6d6403ac4cce83fd67f1e3f8a79f58b495a4eb6cdee9b02f3a0492df8c1eca3542fd704945aad2d1b94f7685ca55392282d27
+  data.tar.gz: 40985622b438b661246fbb54ce09e38ea9d832747d5d65e016e26b8be574cecb6bb4c9f0dc2f9f8b6d95c386c65344fb64f35e3a0e8a94190c68525bdfab514c

data/lib/lacerda/infrastructure.rb

@@ -37,13 +37,14 @@ module Lacerda
         consumers.each do |consumer|
           reporter.try(:check_consumer, consumer)
           consumer.consumed_objects.each do |object|
-            if object.publisher
-              reporter.try(:object_publisher_existing, object.name, object.publisher.name, true)
+            publisher_exists = !object.publisher.nil?
+            is_published = publisher_exists && object.publisher.publishes?(object.name)
+            reporter.try(:check_consumed_object, object.name, object.publisher_name.camelize, publisher_exists, is_published)
+            if publisher_exists
               next
             else
               missing_publishers[object.publisher_name.camelize] ||= []
               missing_publishers[object.publisher_name.camelize] << consumer.name.camelize
-              reporter.try(:object_publisher_existing, object.name, object.publisher_name.camelize, false)
             end
           end
         end

data/lib/lacerda/reporter.rb

@@ -29,7 +29,7 @@ module Lacerda
       # Called before all consumed objects are iterated
     end
 
-    def object_publisher_existing(consumed_object_name, publisher_name, is_published)
+    def check_published_object(consumed_object_name, publisher_name, publisher_exists, is_published)
       # Called after a consumed object was inspected (does a publish specification
       # for this object exist?)
     end

data/lib/lacerda/reporters/rspec.rb

@@ -19,15 +19,14 @@ module Lacerda
           "- #{error[:error]} in #{error[:location]}: #{error[:message]}"
         end
         msg = "expected #{@current_publisher.description} to satisfy "\
-              "#{consumer.name} but found these errors:\n"\
-              "  #{error_messages.join("\n")}"
+          "#{consumer.name} but found these errors:\n"\
+          "  #{error_messages.join("\n")}"
         @current_publisher.it "satisfies #{consumer.name}" do
           expect(error_messages).to be_empty, msg
         end
       end
 
       def check_publishing
-        @current_consumer.try(:run)
         @publish_group = @group.describe("publishers")
       end
 
@@ -40,13 +39,17 @@ module Lacerda
       end
 
       def check_consumer(service)
-        @current_consumer.try(:run)
         @current_consumer = @consume_group.describe("#{service.try(:name)} consuming")
       end
 
-      def object_publisher_existing(object_name, publisher_name, valid)
-        @current_consumer.it "#{object_name} from #{publisher_name}" do
-          expect(valid).to eq(true), "Publisher #{publisher_name} does not exist"
+      def check_consumed_object(consumed_object_name, publisher_name, publisher_exists, is_published)
+        error = if !publisher_exists
+                  "Publisher #{publisher_name} does not exist"
+                elsif !is_published
+                  "#{publisher_name} does not publish #{consumed_object_name}"
+                end
+        @current_consumer.it "#{consumed_object_name} from #{publisher_name}" do
+          expect(publisher_exists && is_published).to eq(true), error
         end
       end
 

data/lib/lacerda/reporters/stdout.rb

@@ -43,9 +43,22 @@ module Lacerda
         @io.print "\nObjects consumed by #{consuming_service.name.camelize}: "
       end
 
-      def object_publisher_existing(consumed_object_name, publisher_name, is_published)
+
+      def check_consumed_object(object)
+        error = if object.publisher.nil?
+                  "Publisher #{object.publisher_name} does not exist"
+                elsif !object.publisher.publishes?(object.name)
+                  "#{object.publisher.name} does not publish #{object.name}"
+                else
+                  nil
+                end
+        @current_consumer.it "#{object.name} from #{object.publisher_name}" do
+          expect(error).to(be_nil, error)
+        end
+      end
+      def check_consumed_object(consumed_object_name, publisher_name, publisher_exists, is_published)
         return unless @verbose
-        if is_published
+        if publisher_exists && is_published
           @io.print ".".green
         else
           @io.print "x".red

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '2.1.1.beta5'
+  VERSION = '2.1.1.beta6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 2.1.1.beta5
+  version: 2.1.1.beta6
 platform: ruby
 authors:
 - Jannis Hermanns