diff --git a/modules/openapi-generator/src/main/resources/ruby-nextgen/validations.mustache b/modules/openapi-generator/src/main/resources/ruby-nextgen/validations.mustache index 5e563ea2793a..b9ce784781a5 100644 --- a/modules/openapi-generator/src/main/resources/ruby-nextgen/validations.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-nextgen/validations.mustache @@ -80,7 +80,7 @@ module {{moduleName}} out << "\"#{name}\" must be >= #{rules[:minimum]}" if rules[:minimum] && value.is_a?(Numeric) && value < rules[:minimum] out << "\"#{name}\" too many items (max #{rules[:max_items]})" if rules[:max_items] && value.respond_to?(:length) && value.length > rules[:max_items] out << "\"#{name}\" too few items (min #{rules[:min_items]})" if rules[:min_items] && value.respond_to?(:length) && value.length < rules[:min_items] - out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && value !~ rules[:pattern] + out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && (!value.is_a?(String) || value !~ rules[:pattern]) out end end diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java index 9132e70bb442..40ed79d85a75 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/rubynextgen/RubyNextgenClientCodegenTest.java @@ -556,4 +556,28 @@ public void testResourceAccessorsUseFinalOperationIdsAndAvoidObjectMethods() thr org.openapitools.codegen.TestUtils.assertFileContains( target.resolve("lib/petstore/api/stables/ponies.rb"), "class Stables::Ponies"); } + + @Test + public void testPatternValidationGuardsNonStringValue() throws Exception { + Path target = Files.createTempDirectory("test"); + target.toFile().deleteOnExit(); + ClientOptInput input = + new CodegenConfigurator() + .setGeneratorName("ruby-nextgen") + .setInputSpec( + "src/test/resources/3_0/ruby-nextgen/pattern-validation.yaml") + .setOutputDir(target.toString()) + .addAdditionalProperty("gemName", "petstore") + .addAdditionalProperty("moduleName", "Petstore") + .toClientOptInput(); + new DefaultGenerator(false).opts(input).generate(); + + TestUtils.assertFileContains( + target.resolve("lib/petstore/validations.rb"), + "out << \"\\\"#{name}\\\" does not match #{rules[:pattern]}\" if" + + " rules[:pattern] && (!value.is_a?(String) || value !~" + + " rules[:pattern])"); + TestUtils.assertFileContains( + target.resolve("lib/petstore/models/pet.rb"), "pattern: /^[a-z]+$/"); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/ruby-nextgen/pattern-validation.yaml b/modules/openapi-generator/src/test/resources/3_0/ruby-nextgen/pattern-validation.yaml new file mode 100644 index 000000000000..a6aa804856ab --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/ruby-nextgen/pattern-validation.yaml @@ -0,0 +1,28 @@ +openapi: 3.0.3 +info: + title: Pattern validation + version: 1.0.0 +paths: + /pets: + get: + operationId: listPets + responses: + '200': + description: OK + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' +components: + schemas: + Pet: + type: object + properties: + birthday: + type: string + format: date + code: + type: string + pattern: '^[a-z]+$' diff --git a/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/validations.rb b/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/validations.rb index 9c611f27a19c..b0353b986c4d 100644 --- a/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/validations.rb +++ b/samples/client/others/ruby-nextgen-qdrant/lib/qdrant/validations.rb @@ -80,7 +80,7 @@ def validate_attribute(name, attr, value) out << "\"#{name}\" must be >= #{rules[:minimum]}" if rules[:minimum] && value.is_a?(Numeric) && value < rules[:minimum] out << "\"#{name}\" too many items (max #{rules[:max_items]})" if rules[:max_items] && value.respond_to?(:length) && value.length > rules[:max_items] out << "\"#{name}\" too few items (min #{rules[:min_items]})" if rules[:min_items] && value.respond_to?(:length) && value.length < rules[:min_items] - out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && value !~ rules[:pattern] + out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && (!value.is_a?(String) || value !~ rules[:pattern]) out end end diff --git a/samples/client/petstore/ruby-nextgen/lib/petstore/validations.rb b/samples/client/petstore/ruby-nextgen/lib/petstore/validations.rb index 653a62291c3a..be0ac7c3ad86 100644 --- a/samples/client/petstore/ruby-nextgen/lib/petstore/validations.rb +++ b/samples/client/petstore/ruby-nextgen/lib/petstore/validations.rb @@ -80,7 +80,7 @@ def validate_attribute(name, attr, value) out << "\"#{name}\" must be >= #{rules[:minimum]}" if rules[:minimum] && value.is_a?(Numeric) && value < rules[:minimum] out << "\"#{name}\" too many items (max #{rules[:max_items]})" if rules[:max_items] && value.respond_to?(:length) && value.length > rules[:max_items] out << "\"#{name}\" too few items (min #{rules[:min_items]})" if rules[:min_items] && value.respond_to?(:length) && value.length < rules[:min_items] - out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && value !~ rules[:pattern] + out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && (!value.is_a?(String) || value !~ rules[:pattern]) out end end