lacerda 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e13fe3981ad5e7dc33070f0343f43745d032269
-  data.tar.gz: 527ce7ff8b9e0a89a5d4e0d1f8c50a506b9b4cb5
+  metadata.gz: eaf17955acd73740444ef9eadfb624649845878c
+  data.tar.gz: 95faea39afed8806d21c1a38c03f690ed702154c
 SHA512:
-  metadata.gz: 4ac94e6e2c6681138aa1dc83d6beb03d234ca0b8325e4c4aa5deb37967814ced69b38c866a77f98bbaed1051438a30a8ece9d59ae193d98740bc9a6b22ca515c
-  data.tar.gz: cc41f55260d38599b36e4403f567c9ba09483452d3890b99fa722f75211b638603631aa653ab9f328e0ea3c5f2e4ab937cc8f3a027ee2e136c8016a4ba512f57
+  metadata.gz: 4706bfcb9a42d7c2b1eb0920d8b96ff83544fb2f6870f78b318b8ada1fc096d0f9b1fb947ceebb7fbcc459b2161db2988d8717544127b093f8c7d3f533384fd8
+  data.tar.gz: a1b8da1d419825b8718e68b001d7f52b19325937ddfaa98a5ceab8cbb3c7ed5ea96b4a44a2f2a0eae9061aede8a73c07286932e656237fe85e4d0f76b346b4ab

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.1.0
+- Allow to validate objects without scopes
+- Fix RSpec reporter, so it displayes publisher errors
+
 # 2.0.1
 - Merge (for real) add enum support to master
 

data/lib/lacerda/publish_specification.rb

@@ -16,6 +16,7 @@ module Lacerda
       Lacerda.validate_reporter(reporter)
       @comparator = Compare::JsonSchema.new(@schema)
       result = @comparator.contains?(consumer.consume.scoped_schema(service), consumer.name)
+      reporter.try(:consume_specification_errors,consumer, errors)
       reporter.try(:consume_specification_satisfied, consumer, result)
       result
     end
@@ -25,16 +26,16 @@ module Lacerda
       !!@schema[:definitions][scoped_name]
     end
 
-    def object(name)
-      scoped_name = scopify_name(name)
+    def object(name, scoped: true)
+      object_name = scoped ? scopify_name(name) : Lacerda.underscore(name.to_s)
       schema_dup = Lacerda.deep_copy(@schema)
 
       # It's critical to delete this object from the definitions
       # or else the json validator gem will go into an endless loop
-      object_schema = schema_dup['definitions'].delete scoped_name.to_s
+      object_schema = schema_dup['definitions'].delete object_name.to_s
 
       unless object_schema
-        msg = "Unknown object type: #{scoped_name.to_s.to_json} not in #{schema['definitions'].keys.to_json} - did you specify it in publish.mson?"
+        msg = "Unknown object type: #{object_name.to_s.to_json} not in #{schema['definitions'].keys.to_json} - did you specify it in publish.mson?"
         raise Lacerda::Service::InvalidObjectTypeError.new(msg)
       end
 
@@ -42,7 +43,7 @@ module Lacerda
       # object in case its properties include json pointers
       object_schema['definitions'] = schema_dup['definitions']
 
-      Lacerda::PublishedObject.new(service, scoped_name, object_schema)
+      Lacerda::PublishedObject.new(service, object_name, object_schema)
     end
 
     private

data/lib/lacerda/reporter.rb

@@ -13,9 +13,11 @@ module Lacerda
       # Called before one single publisher is checked against its consumers
     end
 
-    def object_publish_specification_valid(consumed_object, is_valid)
+
+    def object_publish_specification_errors(consumed_object, errors)
       # Called after a consumed object's specification has been checked against
-      # the publisher's specification of that object.
+      # the publisher's specification of that object. It returns an array of
+      # errors
     end
 
     def check_consuming

data/lib/lacerda/reporters/rspec.rb

@@ -7,21 +7,40 @@ module Lacerda
         @group = group
       end
 
+      def consume_specification_satisfied(consumer, is_valid)
+        @current_publisher.it "satisfies #{consumer.name}" do
+          expect(is_valid).to be true
+        end
+      end
+
+      # errors is a hash with the following structure:
+      #   { "publisher_name -> consumer_name" => [
+      #      { :error => :ERR_MISSING_DEFINITION,
+      #        :message =>"Some text",
+      #        :location => 'consumer_name/publisher_name::object_name
+      #      }]
+      #   }
+      def consume_specification_errors(consumer, errors)
+        error_messages = errors.map do |error|
+          "- #{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")}"
+        @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
 
       def check_publisher(service)
-        @current_publisher.try(:run)
         @current_publisher = @publish_group.describe(service.try(:name))
       end
 
-      def object_publish_specificaiton_valid(object, valid)
-        @current_publisher.it "-> #{object.try(:consumer).try(:name)}" do
-          expect(valid).to be true
-        end
-      end
-
       def check_consuming
         @current_publisher.try(:run)
         @consume_group = @group.describe("consumers")
@@ -39,8 +58,6 @@ module Lacerda
       end
 
       def result(errors)
-        @current_consumer.try(:run)
-        @group.run
       end
 
     end

data/lib/lacerda/service.rb

@@ -78,6 +78,11 @@ module Lacerda
       object_description.validate_data!(data)
     end
 
+    def validate_internal_publish_object!(type, data)
+      object_description = @publish.object(type, scoped: false)
+      object_description.validate_data!(data)
+    end
+
     def validate_object_to_consume(type, data)
       validate_object_to_consume!(type, data)
       true

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport