lacerda 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6428616b8b151e935f781acb33f2035eeb80d005
-  data.tar.gz: 794fb69705f42044d7429ebf3b655726af8b3312
+  metadata.gz: b79f31c341b389ee76539bade775431468b9bd50
+  data.tar.gz: 4cfc0aaf1282b2b0cfe6982c0f33299fafefeb6e
 SHA512:
-  metadata.gz: 916d0c9a2b9fbcf502a5f0f9f5786cad20a8f9c09b5f7cc343b0712554fc554ad820062c8aefbf0965addc1caaa8db32a0817e9532b1fa562ab0bddbda2b9cca
-  data.tar.gz: 0d583d8e1d7c67de052f470dfc28d11a24a48ae807ba2d760b8a1ae84e7c68c61ad1c99b400c5ce395495ad7073af27a3ccf12e6361d56daf603f14df831bcc0
+  metadata.gz: 7d5be7e36ab570f3a860a52a91d7006248ddbf48751e44f7b8cf2437e5db8dea4aeee63c5583d6b301e533c02b12cd6c4b7337f75b003b3822362d7e30370e43
+  data.tar.gz: 90847e492f4b7bbede6bc1ca00a09a008fd89cdb3f07e6e6ed0e462e72a44d57ee0a5734ff5250e05dd4f867474bcaaa4a5eda1891c9796fb6c8735337945b85

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+# 0.7.0 (30-Oct-15)
+- change ServiceName:ObjectName to ServiceName::ObjectName
+
 # 0.6.2 (30-Oct-15)
 - fix some forgotten ruby 2.0 syntax
 - my name is Jannis and I am a compulsive obsessive rake releaser

data/README.md

@@ -66,4 +66,4 @@ By converting all files in a directory this gem will build up the following rela
 
 # References
 
-[1] This quote in French quotation marks is from "Fear and Loathing in Las Vegas". Since I can't link to the book, a link to the [movie script](http://www.dailyscript.com/scripts/fearandloathing.html) shall suffice. 
+[1] This quote in French quotation marks is from "Fear and Loathing in Las Vegas". Since I can't link to the book, a link to the [movie script](http://www.dailyscript.com/scripts/fearandloathing.html) shall suffice.

data/lib/lacerda.rb

@@ -6,5 +6,12 @@ require "lacerda/infrastructure"
 require "lacerda/compare/json_schema"
 
 module Lacerda
-  SCOPE_SEPARATOR = ':'
+  SCOPE_SEPARATOR = '::'
+
+  # An underscore that doesn't turn :: into /
+  def self.underscore(string)
+    string.gsub(/#{SCOPE_SEPARATOR}/, ':')
+          .underscore
+          .gsub(/:/, SCOPE_SEPARATOR)
+  end
 end

data/lib/lacerda/consume_contract.rb

@@ -7,17 +7,20 @@ module Lacerda
     end
 
     def scoped_schema(service)
+      service_name_prefix = Lacerda.underscore(service.name + Lacerda::SCOPE_SEPARATOR)
+
       # Poor man's deep clone: json 🆗 🆒
       filtered_schema = JSON.parse(schema.to_json)
       filtered_schema['definitions'].select! do |k|
-        k.underscore.start_with?(service.name.underscore+Lacerda::SCOPE_SEPARATOR)
+        Lacerda.underscore(k).start_with?(service_name_prefix)
       end
       filtered_schema
     end
 
     def object(name)
-      schema = @schema[:definitions][name.to_s.underscore]
-      raise Lacerda::Service::InvalidObjectTypeError.new(name.to_s.underscore) unless schema
+      underscored_name = Lacerda.underscore(name)
+      schema = @schema[:definitions][underscored_name]
+      raise Lacerda::Service::InvalidObjectTypeError.new(underscored_name) unless schema
       Lacerda::ConsumedObject.new(service, name, schema)
     end
   end

data/lib/lacerda/consumed_object.rb

@@ -11,7 +11,7 @@ module Lacerda
     def publisher_name
       i = @scoped_name.index(Lacerda::SCOPE_SEPARATOR)
       return unless i
-      @scoped_name[0...i].underscore
+      Lacerda.underscore(@scoped_name[0...i])
     end
 
     def consumer

data/lib/lacerda/conversion/data_structure.rb

@@ -6,7 +6,9 @@ module Lacerda
       PRIMITIVES = %w{boolean string number array enum object}
 
       def self.scope(scope, string)
-        [scope, string.to_s].compact.join(Lacerda::SCOPE_SEPARATOR).underscore
+        Lacerda.underscore(
+          [scope, string.to_s].compact.join(Lacerda::SCOPE_SEPARATOR)
+        )
       end
 
       def initialize(id, data, scope = nil)
@@ -41,7 +43,7 @@ module Lacerda
           type = type_definition['typeSpecification']['name']
 
           spec = {}
-          name = content['name']['literal'].underscore
+          name = Lacerda.underscore(content['name']['literal'])
 
           # This is either type: primimtive or $ref: reference_name
           spec.merge!(primitive_or_reference(type))

data/lib/lacerda/object_description.rb

@@ -31,7 +31,9 @@ module Lacerda
     private
 
     def remove_service_from_scoped_name(n)
-      n[n.index(Lacerda::SCOPE_SEPARATOR)+1..-1]
+      i = n.index(Lacerda::SCOPE_SEPARATOR)
+      return n unless i
+      n[i+Lacerda::SCOPE_SEPARATOR.length..-1]
     end
 
   end

data/lib/lacerda/publish_contract.rb

@@ -14,11 +14,11 @@ module Lacerda
     end
 
     def object(name)
-      scoped_name = name.to_s.underscore
+      scoped_name = Lacerda.underscore(name.to_s)
 
       # Add our own prefix automatically if necessary
-      unless scoped_name.start_with?(service.name.underscore)
-        scoped_name = [service.name.underscore, scoped_name].join(Lacerda::SCOPE_SEPARATOR)
+      unless scoped_name.start_with?(Lacerda.underscore(service.name))
+        scoped_name = [Lacerda.underscore(service.name), scoped_name].join(Lacerda::SCOPE_SEPARATOR)
       end
 
       schema = @schema[:definitions][scoped_name]

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Jannis Hermanns