avromatic 0.9.0.rc2 → 0.9.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349bd4de9cfdaffd91c737ef6330d9b9d20ff8ed
-  data.tar.gz: cc1b8f6f5275cea982902ce4ae5d055e504a69a5
+  metadata.gz: d494566e3d9e224fc731b7aacbfa179d53da3079
+  data.tar.gz: bd8c57dd841fac2aa38d3b577116738f11ab59ee
 SHA512:
-  metadata.gz: a1d4474e40c761995be5512600d9e84f6f743501b9f496901900686058cd4e5190c78712723125bf66d3e7a571cc786ea579fcc91021bcf35506a88f7ef69be7
-  data.tar.gz: 72e71deb56ff37c1f85a4c11b04d37f2672cc0d3b406ee574180257f690a6f7d057fe53250cfbd513610740120fe7e191d7d73970f7140be4c6b7b16d711c122
+  metadata.gz: b184df456bdd953ca9707304a098db1b739e55616e773dcddedb6b2e60a73fae937c2e91dac0649b3e523f06b73164116de4ff782e17e8a5b093366baed08289
+  data.tar.gz: 4d5021c10406881dfaf32d5392eef6fc87cd3c09667bb5a11e967717ee907b00d8456580810d0b362d7d63a6470c10c93b084e07dcb545969b5f3b7f086c6953

data/CHANGELOG.md

@@ -4,6 +4,7 @@
 - Experimental: Add support for more than one non-null type in a union.
 - Allow nested models to be referenced and reused.
 - Fix the serialization of nested complex types.
+- Add support for recursive models.
 
 ## v0.8.0
 - Add support for logical types. Currently this requires using the

data/lib/avromatic/model/attributes.rb

@@ -21,6 +21,8 @@ module Avromatic
 
       module ClassMethods
         def add_avro_fields
+          register!
+
           if key_avro_schema
             check_for_field_conflicts!
             define_avro_attributes(key_avro_schema)

data/lib/avromatic/model/nested_models.rb

@@ -9,18 +9,25 @@ module Avromatic
 
       module ClassMethods
         def build_nested_model(schema)
-          fullname = schema.fullname
+          fullname = nested_models.remove_prefix(schema.fullname)
 
           if nested_models.registered?(fullname)
             nested_models[fullname]
           else
             nested_model = Avromatic::Model.model(schema: schema,
-                                                  nested_models: nested_models)
+                                                  nested_models: nested_models,
+                                                  register: true)
             # Register the generated model with Axiom to prevent it being
             # treated as a BasicObject.
             # See https://github.com/solnic/virtus/issues/284#issuecomment-56405137
             Axiom::Types::Object.new { primitive(nested_model) }
-            nested_models.register(nested_model)
+          end
+        end
+
+        # Register this model if it can be used as a nested model.
+        def register!
+          if key_avro_schema.nil? && value_avro_schema.type_sym == :record
+            nested_models.register(self)
           end
         end
       end

data/lib/avromatic/model_registry.rb

@@ -18,7 +18,7 @@ module Avromatic
     def register(model)
       raise 'models with a key schema are not supported' if model.key_avro_schema
       name = model.avro_schema.fullname
-      name = remove_prefix(name) if @prefix
+      name = remove_prefix(name)
       @hash[name] = model
     end
 
@@ -26,13 +26,13 @@ module Avromatic
       @hash.key?(fullname)
     end
 
-    private
-
     def remove_prefix(name)
+      return name if @prefix.nil?
+
       value =
         case @prefix
         when String
-          name.from(@prefix.length) if name.start_with?(@prefix)
+          name.start_with?(@prefix) ? name.from(@prefix.length) : name
         when Regexp
           name.sub(@prefix, '')
         else

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.9.0.rc2'.freeze
+  VERSION = '0.9.0.rc3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc2
+  version: 0.9.0.rc3
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro