api_schema 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cff8687bdc853cb34bb933797a9b4a473e4bca9
-  data.tar.gz: 35d16cbfe9164e5543036d281d16986bd7e8b2be
+  metadata.gz: 759b1621326cb4e389d1d206caa8b46bdaca8ab5
+  data.tar.gz: 77d40d48136c9cc920b7144f8c0c14f5aa477456
 SHA512:
-  metadata.gz: 9855664484e98ae0b87980d844530ddde94efb0223fcc6f54e081a0fef7ea10afbba24cb3ea1a749a6036e58e8cc90500903a84a2c9b07f1449f16b62bb07d49
-  data.tar.gz: bc7d283475496e8c355250a6ee14154cb23c8ce2447b243f52d167812ae701012827758d1f2b1fcd08eeb34c3e3d0262b66997814b1f503a688f306d4425cbea
+  metadata.gz: da31dd7f8468d0837dbf581d8076ae54f48ba3e834b74507a48d224d1994f9d6c4b1b7b03cb42072bb629b9444334326a8a3d493c929c64b002e73e2f63cc18b
+  data.tar.gz: 02e0d8027769603ed3ec147d14c03750bd8abe001bbd69dd617ed110f62a549c76437377cac98c04273e0955d5f9a601e3e928df132905b2a5e8dee0ea959e0b

data/lib/api_schema/root_methods.rb

@@ -6,8 +6,6 @@ module ApiSchema
       subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
       instance_var_neighbors = "@version_resources"
       subclass.instance_variable_set(instance_var_neighbors, instance_variable_get(instance_var_neighbors))
-      instance_var_neighbors = "@version_serializers"
-      subclass.instance_variable_set(instance_var_neighbors, instance_variable_get(instance_var_neighbors))
     end
 
     def configure
@@ -37,11 +35,8 @@ module ApiSchema
 
     def generate_json
       @api_version.configuration.build
-      @api_version.serializers.each { |s| s.build_references(version_serializers) }
-
       @api_version.check_consistency
-
-      @api_version.serializers.each { |s| s.build(version_serializers) }
+      @api_version.serializers.each { |s| s.build }
       @api_version.resources.each { |r| r.build(version_resources) }
 
       nodes = [@api_version.configuration] +  @api_version.serializers + @api_version.resources

data/lib/api_schema/serializer_definition.rb

@@ -4,19 +4,18 @@ module ApiSchema
 
     PriorReference = ::Struct.new(:id, :type, :desc)
 
-    attr_reader :id, :fields, :references, :parent
+    attr_reader :id, :fields, :references, :parent, :api_version
     attr_accessor :type, :name, :description, :prior_references
 
-    def initialize(id, type, serializers, name=nil, parent_id = nil)
+    def initialize(id, type, api_version, name=nil, parent_id = nil)
       @id = id
       @type = type
       @name = name || id
-      @parent = serializers[parent_id]
+      @api_version = api_version
+      @parent = api_version.serializers.detect { |s| s.id == parent_id } if parent_id
       @fields = parent&.fields || []
       @prior_references = parent&.prior_references || []
       @references = []
-
-      serializers[id] = self
     end
 
     def required_fields
@@ -27,16 +26,15 @@ module ApiSchema
       @prior_references << PriorReference.new(refernce_id, type, desc)
     end
 
-    def build(serializers)
-      build_references(serializers)
+    def build
+      build_references
       sd = self
       swagger_schema(id) { schema_for(sd) }
     end
 
-    def build_references(serializers)
+    def build_references
       @prior_references.each do |pr|
-        raise "Model #{pr.id} is not defined" unless serializers[pr.id]
-        reference = serializers[pr.id].clone
+        reference = api_version.serializers.detect { |s| s.id == pr.id }
         reference.type = pr.type
         reference.description = pr.desc
         reference.name = reference.name.to_s.pluralize if reference.type == :array

data/lib/api_schema/serializer_methods.rb

@@ -4,13 +4,13 @@ module ApiSchema
     private
 
     def serializer(id, structure: :object, name: nil, parent: nil)
-      serializer = SerializerDefinition.new(id, structure, version_serializers, name, parent)
+      serializer = SerializerDefinition.new(id, structure, api_version, name, parent)
       yield serializer if block_given?
       api_version.serializers << serializer
     end
 
     def array_serializer(id, name: nil, parent: nil)
-      serializer = SerializerDefinition.new(id, :array, version_serializers, name, parent)
+      serializer = SerializerDefinition.new(id, :array, api_version, name, parent)
       yield serializer if block_given?
       api_version.serializers << serializer
     end

data/lib/api_schema/version.rb

@@ -1,3 +1,3 @@
 module ApiSchema
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dmitry Chopey