From 0118d57cb7651cc0cf721ab6e870d30aa0e46319 Mon Sep 17 00:00:00 2001 From: Muhammad Nawzad Date: Fri, 10 Nov 2023 19:50:26 +0300 Subject: [PATCH] Sets configuration by default --- lib/schemable/attribute_schema_generator.rb | 6 +++--- sig/schemable/attribute_schema_generator.rbs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/schemable/attribute_schema_generator.rb b/lib/schemable/attribute_schema_generator.rb index 57f3589..cdc4a5a 100644 --- a/lib/schemable/attribute_schema_generator.rb +++ b/lib/schemable/attribute_schema_generator.rb @@ -2,10 +2,10 @@ module Schemable class AttributeSchemaGenerator attr_accessor :model_definition, :configuration, :model, :schema_modifier, :response - def initialize(model_definition, configuration) + def initialize(model_definition) @model_definition = model_definition @model = model_definition.model - @configuration = configuration + @configuration = Schemable.configuration @schema_modifier = SchemaModifier.new @response = nil end @@ -14,7 +14,7 @@ module Schemable def generate_attributes_schema schema = { type: :object, - properties: @model_definition.attributes&.index_with do |attr| + properties: @model_definition.attributes.index_with do |attr| generate_attribute_schema(attr) end } diff --git a/sig/schemable/attribute_schema_generator.rbs b/sig/schemable/attribute_schema_generator.rbs index 4a05c64..e3013e0 100644 --- a/sig/schemable/attribute_schema_generator.rbs +++ b/sig/schemable/attribute_schema_generator.rbs @@ -6,7 +6,7 @@ module Schemable attr_accessor response: Hash[Symbol, any]? attr_accessor schema_modifier: SchemaModifier - def initialize: (Definition, Configuration) -> void + def initialize: (Definition) -> void def generate_attributes_schema: -> (Hash[Symbol, any] | Array[any]) def generate_attribute_schema: (Symbol) -> Hash[Symbol, any] end