[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Feb 18, 2019
Merged

[Ruby] Fix regualr expression in error message #2139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14592cd
Fix usage of regular expression literals in Ruby client (#2069)
autopp Feb 12, 2019
7bafde9
update samples of Ruby client (#2069)
autopp Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/openapi-generator/src/main/resources/ruby-client/api.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

{{/minimum}}
{{#pattern}}
if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
pattern = Regexp.new({{{pattern}}})
if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
end

{{/pattern}}
Expand Down
10 changes: 6 additions & 4 deletions modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

{{/minimum}}
{{#pattern}}
if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
pattern = Regexp.new({{{pattern}}})
if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
end

{{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

{{/minimum}}
{{#pattern}}
if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
pattern = Regexp.new({{{pattern}}})
if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
end

{{/pattern}}
Expand Down
10 changes: 6 additions & 4 deletions samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
end
if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
pattern = Regexp.new(/^[A-Z].*/)
if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
end

# verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
end

if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
pattern = Regexp.new(/[a-z]/i)
if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
end

if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down
20 changes: 12 additions & 8 deletions samples/client/petstore/ruby/lib/petstore/models/format_test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
end

if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
pattern = Regexp.new(/[a-z]/i)
if !@string.nil? && @string !~ pattern
invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
end

if @byte.nil?
invalid_properties.push('invalid value for "byte", byte cannot be nil.')
end

if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
if @byte !~ pattern
invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
end

if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
# Custom attribute writer method with validation
# @param [Object] string Value to be assigned
def string=(string)
if !string.nil? && string !~ Regexp.new(/[a-z]/i)
fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
pattern = Regexp.new(/[a-z]/i)
if !string.nil? && string !~ pattern
fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
end

@string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
fail ArgumentError, 'byte cannot be nil'
end

if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
if byte !~ pattern
fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
end

@byte = byte
Expand Down
10 changes: 6 additions & 4 deletions samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
end
if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
pattern = Regexp.new(/^[A-Z].*/)
if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
end

# verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
end

if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
pattern = Regexp.new(/[a-z]/i)
if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
end

if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down
30 changes: 18 additions & 12 deletions samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
end

if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
pattern = Regexp.new(/[a-z]/i)
if !@string.nil? && @string !~ pattern
invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
end

if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
end

if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
pattern = Regexp.new(/^\d{10}$/)
if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
end

if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
pattern = Regexp.new(/^image_\d{1,3}$/i)
if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
end

invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
# Custom attribute writer method with validation
# @param [Object] string Value to be assigned
def string=(string)
if !string.nil? && string !~ Regexp.new(/[a-z]/i)
fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
pattern = Regexp.new(/[a-z]/i)
if !string.nil? && string !~ pattern
fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
end

@string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
# Custom attribute writer method with validation
# @param [Object] pattern_with_digits Value to be assigned
def pattern_with_digits=(pattern_with_digits)
if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
pattern = Regexp.new(/^\d{10}$/)
if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
end

@pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
# Custom attribute writer method with validation
# @param [Object] pattern_with_digits_and_delimiter Value to be assigned
def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
pattern = Regexp.new(/^image_\d{1,3}$/i)
if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
end

@pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Ruby] Fix regualr expression in error message#2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Feb 18, 2019
 Merged


[Ruby] Fix regualr expression in error message
#2139
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
14592cd

Fix usage of regular expression literals in Ruby client (#2069)


autopp Feb 12, 2019
7bafde9

update samples of Ruby client (#2069)


autopp Feb 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
modules/openapi-generator/src/main/resources/ruby-client/api.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,8 +102,9 @@ module {{moduleName}}

 {{/minimum}}
 {{#pattern}}
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern {{{pattern}}}."
 pattern = Regexp.new({{{pattern}}})
 if @api_client.config.client_side_validation && {{^required}}!opts[:'{{{paramName}}}'].nil? && {{/required}}{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}} !~ pattern
 fail ArgumentError, "invalid value for '{{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:\"{{{paramName}}}\"]{{/required}}' when calling {{classname}}.{{operationId}}, must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,8 +174,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ Regexp.new({{{pattern}}})
 invalid_properties.push('invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.')
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}} !~ pattern
 invalid_properties.push("invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}.")
 end

 {{/pattern}}
Expand DownExpand Up@@ -327,8 +328,9 @@

 {{/minimum}}
 {{#pattern}}
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ Regexp.new({{{pattern}}})
 fail ArgumentError, 'invalid value for "{{{name}}}", must conform to the pattern {{{pattern}}}.'
 pattern = Regexp.new({{{pattern}}})
 if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}} !~ pattern
 fail ArgumentError, "invalid value for \"{{{name}}}\", must conform to the pattern #{pattern}."
 end

 {{/pattern}}
Expand Down

10 changes: 6 additions & 4 deletions
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,8 +492,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -520,8 +521,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

20 changes: 12 additions & 8 deletions
samples/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,16 +187,18 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
 invalid_properties.push('invalid value for "byte", byte cannot be nil.')
 end

 if @byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 invalid_properties.push('invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.')
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if @byte !~ pattern
 invalid_properties.push("invalid value for \"byte\", must conform to the pattern #{pattern}.")
 end

 if @date.nil?
Expand DownExpand Up@@ -319,8 +321,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -333,8 +336,9 @@ def byte=(byte)
 fail ArgumentError, 'byte cannot be nil'
 end

 if byte !~ Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 fail ArgumentError, 'invalid value for "byte", must conform to the pattern /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.'
 pattern = Regexp.new(/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/)
 if byte !~ pattern
 fail ArgumentError, "invalid value for \"byte\", must conform to the pattern #{pattern}."
 end

 @byte = byte
Expand Down

10 changes: 6 additions & 4 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -448,8 +448,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 if @api_client.config.client_side_validation && pattern_without_delimiter.nil?
 fail ArgumentError, "Missing the required parameter 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters"
 end
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ Regexp.new(/^[A-Z].*/)
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /^[A-Z].*/."
 pattern = Regexp.new(/^[A-Z].*/)
 if @api_client.config.client_side_validation && pattern_without_delimiter !~ pattern
 fail ArgumentError, "invalid value for 'pattern_without_delimiter' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 # verify the required parameter 'byte' is set
Expand All@@ -476,8 +477,9 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
 fail ArgumentError, 'invalid value for "opts[:"float"]" when calling FakeApi.test_endpoint_parameters, must be smaller than or equal to 987.6.'
 end

 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern /[a-z]/i."
 pattern = Regexp.new(/[a-z]/i)
 if @api_client.config.client_side_validation && !opts[:'string'].nil? && opts[:'string'] !~ pattern
 fail ArgumentError, "invalid value for 'opts[:\"string\"]' when calling FakeApi.test_endpoint_parameters, must conform to the pattern #{pattern}."
 end

 if @api_client.config.client_side_validation && !opts[:'password'].nil? && opts[:'password'].to_s.length > 64
Expand Down

30 changes: 18 additions & 12 deletions
samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,8 +205,9 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "double", must be greater than or equal to 67.8.')
 end

 if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
 invalid_properties.push('invalid value for "string", must conform to the pattern /[a-z]/i.')
 pattern = Regexp.new(/[a-z]/i)
 if !@string.nil? && @string !~ pattern
 invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
 end

 if @byte.nil?
Expand All@@ -229,12 +230,14 @@ def list_invalid_properties
 invalid_properties.push('invalid value for "password", the character length must be great than or equal to 10.')
 end

 if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 invalid_properties.push('invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.')
 pattern = Regexp.new(/^\d{10}$/)
 if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
 end

 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 invalid_properties.push('invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.')
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
 invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
 end

 invalid_properties
Expand DownExpand Up@@ -342,8 +345,9 @@ def double=(double)
 # Custom attribute writer method with validation
 # @param [Object] string Value to be assigned
 def string=(string)
 if !string.nil? && string !~ Regexp.new(/[a-z]/i)
 fail ArgumentError, 'invalid value for "string", must conform to the pattern /[a-z]/i.'
 pattern = Regexp.new(/[a-z]/i)
 if !string.nil? && string !~ pattern
 fail ArgumentError, "invalid value for \"string\", must conform to the pattern #{pattern}."
 end

 @string = string
Expand All@@ -370,8 +374,9 @@ def password=(password)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits Value to be assigned
 def pattern_with_digits=(pattern_with_digits)
 if !pattern_with_digits.nil? && pattern_with_digits !~ Regexp.new(/^\d{10}$/)
 fail ArgumentError, 'invalid value for "pattern_with_digits", must conform to the pattern /^\d{10}$/.'
 pattern = Regexp.new(/^\d{10}$/)
 if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits = pattern_with_digits
Expand All@@ -380,8 +385,9 @@ def pattern_with_digits=(pattern_with_digits)
 # Custom attribute writer method with validation
 # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
 def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
 fail ArgumentError, 'invalid value for "pattern_with_digits_and_delimiter", must conform to the pattern /^image_\d{1,3}$/i.'
 pattern = Regexp.new(/^image_\d{1,3}$/i)
 if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
 fail ArgumentError, "invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}."
 end

 @pattern_with_digits_and_delimiter = pattern_with_digits_and_delimiter
Expand Down