rasti-model 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efc4252fe73eba82ba9eb35be17934864d7384a01428355706c401def3abb613
-  data.tar.gz: 2906e648b0c76fb766024a168a3c7cd09d2661a15283c5f3e6341ebe0f167c10
+  metadata.gz: f31f21d81848581016911f75ce3b781e7603ef7bb39c3ea52ba860c7d12a8f01
+  data.tar.gz: e0ce2ae0c8303f5d2f87b4b0b3d4437f9ff8117eac6e9f6e44c71e3e5d16c190
 SHA512:
-  metadata.gz: '08942eb37b0335bae2cc80f1cf17692cd9d736e6801d93b285be8fa34c1500d76e3129557425b858f47c449ba4e6a2e9588e3efd38793da3b0f9949a99a0a8a3'
-  data.tar.gz: 1cd16e7e5ce96a2ab0d7bd2c9ba22917451ceb90d7009e6c02d3c488d823a2712d7eaadd50597e9e4a4d81256d1b0ecbad17f872c76909ddcf41b332797060fa
+  metadata.gz: d6ffb39110babca82a4a714f2a08ad3fcc75028ebe083fd0b1386441a98a53e0d0d98d0e0b519eef91bc4e1f0da7e87b78dfae14cff8c41d6eae6db630ef6ac1
+  data.tar.gz: e5b31f2fbc7282d7ed3fb7757a4a8fb3e8b33f27e50c2c4d9c523bfa14b586fc5d65b53a8cc9f6befb568562295c704206c81426e1f5d882b04cc79cba25e9b1

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/rasti-model.svg)](https://rubygems.org/gems/rasti-model)
 [![CI](https://github.com/gabynaiman/rasti-model/actions/workflows/ci.yml/badge.svg)](https://github.com/gabynaiman/rasti-model/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/github/gabynaiman/rasti-model/badge.svg?branch=master)](https://coveralls.io/github/gabynaiman/rasti-model?branch=master)
-[![Code Climate](https://codeclimate.com/github/gabynaiman/rasti-model.svg)](https://codeclimate.com/github/gabynaiman/rasti-model)
 
 Domain models with typed attributes
 

data/lib/rasti/model/schema.rb

@@ -7,9 +7,9 @@ module Rasti
           type_serializers[type] = block || serialized_type
         end
 
-        def serialize(model_class)
+        def serialize(model_class, visited=Set.new)
           attributes = model_class.attributes.map do |attribute|
-            serialize_attribute(attribute).merge(name: attribute.name)
+            serialize_attribute(attribute, visited).merge(name: attribute.name)
           end
 
           {
@@ -24,8 +24,8 @@ module Rasti
           @type_serializers ||= {}
         end
 
-        def serialize_attribute(attribute)
-          serialization = serialize_type(attribute.type)
+        def serialize_attribute(attribute, visited)
+          serialization = serialize_type(attribute.type, visited)
           
           options = attribute.send(:options)
           serialization[:options] = options unless options.empty?
@@ -33,7 +33,7 @@ module Rasti
           serialization
         end
 
-        def serialize_type(type)
+        def serialize_type(type, visited=Set.new)
           if type.nil?
             return {type: :any}
           end
@@ -67,11 +67,17 @@ module Rasti
           elsif type.respond_to?(:values)
             {type: :enum, values: type.values}
           elsif type.is_a?(Types::Array)
-            {type: :array, items: serialize_type(type.type)}
+            {type: :array, items: serialize_type(type.type, visited)}
           elsif type.is_a?(Types::Hash)
-            {type: :hash, key_type: serialize_type(type.key_type), value_type: serialize_type(type.value_type)}
+            {type: :hash, key_type: serialize_type(type.key_type, visited), value_type: serialize_type(type.value_type, visited)}
           elsif type.is_a?(Types::Model)
-            {type: :model, model: type.model.name || type.model.to_s, schema: serialize(type.model)}
+            model = type.model
+            model_name = model.name || model.to_s
+            if visited.include?(model)
+              {type: :model, model: model_name, schema: {model: model_name, attributes: []}}
+            else
+              {type: :model, model: model_name, schema: serialize(model, visited | Set[model])}
+            end
           else
             {type: :unknown, details: type.to_s}
           end

data/lib/rasti/model/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   class Model
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

data/lib/rasti/model.rb

@@ -1,5 +1,6 @@
 require 'multi_require'
 require 'rasti-types'
+require 'set'
 
 module Rasti
   class Model

data/spec/model_spec.rb

@@ -364,6 +364,65 @@ describe Rasti::Model do
       })
     end
 
+    it 'Self-referential model' do
+      node_class = Class.new(Rasti::Model) do
+        attribute :name, T::String
+      end
+      node_class.send(:attribute, :child, T::Model[node_class])
+
+      node_name = node_class.to_s
+
+      node_class.to_schema.must_equal({
+        model: node_name,
+        attributes: [
+          {type: :string, name: :name},
+          {type: :model, model: node_name, schema: {
+            model: node_name,
+            attributes: [
+              {type: :string, name: :name},
+              {type: :model, model: node_name, schema: {model: node_name, attributes: []}, name: :child}
+            ]
+          }, name: :child}
+        ]
+      })
+    end
+
+    it 'Mutually recursive models' do
+      person_class = Class.new(Rasti::Model) do
+        attribute :name, T::String
+      end
+
+      company_class = Class.new(Rasti::Model) do
+        attribute :name, T::String
+      end
+
+      person_class.send(:attribute, :employer, T::Model[company_class])
+      company_class.send(:attribute, :ceo, T::Model[person_class])
+
+      person_name = person_class.to_s
+      company_name = company_class.to_s
+
+      person_class.to_schema.must_equal({
+        model: person_name,
+        attributes: [
+          {type: :string, name: :name},
+          {type: :model, model: company_name, schema: {
+            model: company_name,
+            attributes: [
+              {type: :string, name: :name},
+              {type: :model, model: person_name, schema: {
+                model: person_name,
+                attributes: [
+                  {type: :string, name: :name},
+                  {type: :model, model: company_name, schema: {model: company_name, attributes: []}, name: :employer}
+                ]
+              }, name: :ceo}
+            ]
+          }, name: :employer}
+        ]
+      })
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-model
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-03 00:00:00.000000000 Z
+date: 2026-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require