lacerda 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df7a0e578ebe770967b35f9a0e2bb6279a12f721
-  data.tar.gz: fc7b2c819b292131386d96ee82ef074f564c9a7e
+  metadata.gz: ff23a2681e40e382e4e01fb4ce0b67aaab1c24ce
+  data.tar.gz: 605bd530f4bc51914bbc2f6e513156e4e7eedc20
 SHA512:
-  metadata.gz: 304c14f4567c78f02454ac992ab2d512a5fa8b7a2bcdfdf6559535462e01fa33c31227ee7f0ada642a2dc2e4a002b617018646f7b08c007316933b642d56c718
-  data.tar.gz: 3f226bd986dde94bd80ebdbec1efb8f0848a8dfe08d0bde1a94cb0880c2eea0dbaabc82543bf595f66c3bcf5b88c47e527f0741168c6b7b71cb87b5d811d1e4d
+  metadata.gz: 131589ccbb3c6ff9ada1e8498ce3836ad151eaa0cb778675086c67f23f5b3e36494c8914f7bcbf041156f4c0b49d23738ef8f6a424e186b1504fa5310fe4b9e4
+  data.tar.gz: d7d6ae3c7d5506772fe8eb787dc73365b8fa1337afc36977cf5685936007291f7aa9232da56512904bdf679e6f883cf07ee65f923959376c0a948aee35621c06

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.11.0 (04-Nov-15)
+- rename ConsumeContract and PublishContract to ConsumeSpecification and PublishSpecification
+- omit redundant service name in model names of publish contracts
+
 # 0.10.2 (04-Nov-15)
 - report all missing definitions instead of just the first (fixes #8)
 

data/README.md

@@ -37,10 +37,10 @@ and smoke it:
 ```shell
 /home/dev/lacerda$ DATA_DIR=contracts/ rake lacerda:mson_to_json_schema
 Converting 4 files:
-OK /home/dev/lacerda/contracts/consumer/consume.mson
-OK /home/dev/lacerda/contracts/invalid_property/consume.mson
-OK /home/dev/lacerda/contracts/missing_required/consume.mson
-OK /home/dev/lacerda/contracts/publisher/publish.mson
+OK /home/dev/lacerda/specifications/consumer/consume.mson
+OK /home/dev/lacerda/specifications/invalid_property/consume.mson
+OK /home/dev/lacerda/specifications/missing_required/consume.mson
+OK /home/dev/lacerda/specifications/publisher/publish.mson
 /home/dev/lacerda$
 ```
 
@@ -59,9 +59,9 @@ By converting all files in a directory this gem will build up the following rela
 - Infrastructure
   - Service
     - Contracts
-      - Publish contract
+      - Publish specification
         - PublishedObjects
-      - Consume contract
+      - Consume specification
         - ConsumedObjects
 
 # References

data/lib/lacerda.rb

@@ -1,6 +1,6 @@
 require 'lacerda/conversion'
-require 'lacerda/publish_contract'
-require 'lacerda/consume_contract'
+require 'lacerda/publish_specification'
+require 'lacerda/consume_specification'
 require 'lacerda/service'
 require 'lacerda/infrastructure'
 require 'lacerda/compare/json_schema'

data/lib/lacerda/{consume_contract.rb → consume_specification.rb}

@@ -1,7 +1,7 @@
-require 'lacerda/contract'
+require 'lacerda/specification'
 
 module Lacerda
-  class ConsumeContract < Lacerda::Contract
+  class ConsumeSpecification < Lacerda::Specification
     def object_description_class
       Lacerda::ConsumedObject
     end

data/lib/lacerda/conversion/data_structure.rb

@@ -6,6 +6,26 @@ module Lacerda
       PRIMITIVES = %w{boolean string number array enum object}
 
       def self.scope(scope, string)
+        # This allows users to enter either
+        #
+        #     # Message
+        #     - id (number, required)
+        #     - ...
+        #
+        # or
+        #
+        #     # MessageService::Message
+        #     - id (number, required)
+        #     - ...
+        #
+        # in their publish.mson specification files. Including the service name in
+        # a publish specification is redundant and not necessary, but let's let our
+        # friendly users do this if they wish.
+        #
+        scope = nil if Lacerda.underscore(string.to_s).start_with?(Lacerda.underscore(scope.to_s))
+
+        # Now that this is out of the way, let's put a
+        # scope in front and return the string.
         Lacerda.underscore(
           [scope, string.to_s].compact.join(Lacerda::SCOPE_SEPARATOR)
         )

data/lib/lacerda/{publish_contract.rb → publish_specification.rb}

@@ -1,7 +1,11 @@
-require 'lacerda/contract'
+require 'lacerda/specification'
 
 module Lacerda
-  class PublishContract < Lacerda::Contract
+  class PublishSpecification < Lacerda::Specification
+
+    def initialize(service, schema_or_file)
+      super
+    end
 
     def errors
       return [] unless @comparator

data/lib/lacerda/service.rb

@@ -85,8 +85,8 @@ module Lacerda
     private
 
     def load_contracts
-      @publish = Lacerda::PublishContract.new(self, File.join(@data_dir, "publish.schema.json"))
-      @consume = Lacerda::ConsumeContract.new(self, File.join(@data_dir, "consume.schema.json"))
+      @publish = Lacerda::PublishSpecification.new(self, File.join(@data_dir, "publish.schema.json"))
+      @consume = Lacerda::ConsumeSpecification.new(self, File.join(@data_dir, "consume.schema.json"))
     end
   end
 end

data/lib/lacerda/{contract.rb → specification.rb}

@@ -3,7 +3,7 @@ require 'lacerda/published_object'
 require 'lacerda/consumed_object'
 
 module Lacerda
-  class Contract
+  class Specification
     attr_reader :service, :schema
 
     def initialize(service, schema_or_file)

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Jannis Hermanns
@@ -213,16 +213,15 @@ files:
 - lacerda.gemspec
 - lib/lacerda.rb
 - lib/lacerda/compare/json_schema.rb
-- lib/lacerda/consume_contract.rb
+- lib/lacerda/consume_specification.rb
 - lib/lacerda/consumed_object.rb
-- lib/lacerda/contract.rb
 - lib/lacerda/conversion.rb
 - lib/lacerda/conversion/apiary_to_json_schema.rb
 - lib/lacerda/conversion/data_structure.rb
 - lib/lacerda/conversion/error.rb
 - lib/lacerda/infrastructure.rb
 - lib/lacerda/object_description.rb
-- lib/lacerda/publish_contract.rb
+- lib/lacerda/publish_specification.rb
 - lib/lacerda/published_object.rb
 - lib/lacerda/reporter.rb
 - lib/lacerda/reporters/multi.rb
@@ -231,6 +230,7 @@ files:
 - lib/lacerda/rspec_integration.rb
 - lib/lacerda/service.rb
 - lib/lacerda/service/error.rb
+- lib/lacerda/specification.rb
 - lib/lacerda/tasks.rb
 - lib/lacerda/version.rb
 homepage: https://github.com/moviepilot/lacerda