Skip to content

Commit f88113e

Browse files
authored
Merge pull request #237 from lob/feature/MI-226-fix-regex-warning
MI-226 fix: regex warning
2 parents 069bb1c + c6341c7 commit f88113e

File tree

8 files changed

+34
-49
lines changed

8 files changed

+34
-49
lines changed

lib/lob/models/bank_account.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ def list_invalid_properties
257257
invalid_properties.push("invalid value for \"id\", must conform to the pattern #{pattern}.")
258258
end
259259

260-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
260+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
261261
if !@signature_url.nil? && @signature_url !~ pattern
262262
invalid_properties.push("invalid value for \"signature_url\", must conform to the pattern #{pattern}.")
263263
end
@@ -293,7 +293,7 @@ def valid?
293293
return false if @signatory.to_s.length > 30
294294
return false if @id.nil?
295295
return false if @id !~ Regexp.new(/^bank_[a-zA-Z0-9]+$/)
296-
return false if !@signature_url.nil? && @signature_url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
296+
return false if !@signature_url.nil? && @signature_url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
297297
return false if @date_created.nil?
298298
return false if @date_modified.nil?
299299
return false if @object.nil?
@@ -392,7 +392,7 @@ def id=(id)
392392
# Custom attribute writer method with validation
393393
# @param [Object] signature_url Value to be assigned
394394
def signature_url=(signature_url)
395-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
395+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
396396
if !signature_url.nil? && signature_url !~ pattern
397397
fail ArgumentError, "invalid value for \"signature_url\", must conform to the pattern #{pattern}."
398398
end

lib/lob/models/check.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def list_invalid_properties
402402
invalid_properties.push('invalid value for "url", url cannot be nil.')
403403
end
404404

405-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
405+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
406406
if @url !~ pattern
407407
invalid_properties.push("invalid value for \"url\", must conform to the pattern #{pattern}.")
408408
end
@@ -447,7 +447,7 @@ def valid?
447447
return false if !@check_bottom_template_version_id.nil? && @check_bottom_template_version_id !~ Regexp.new(/^vrsn_[a-zA-Z0-9]+$/)
448448
return false if !@attachment_template_version_id.nil? && @attachment_template_version_id !~ Regexp.new(/^vrsn_[a-zA-Z0-9]+$/)
449449
return false if @url.nil?
450-
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
450+
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
451451
return false if @carrier.nil?
452452
carrier_validator = EnumAttributeValidator.new('String', ["USPS"])
453453
return false unless carrier_validator.valid?(@carrier)
@@ -605,7 +605,7 @@ def url=(url)
605605
fail ArgumentError, 'url cannot be nil'
606606
end
607607

608-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
608+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
609609
if url !~ pattern
610610
fail ArgumentError, "invalid value for \"url\", must conform to the pattern #{pattern}."
611611
end

lib/lob/models/letter.rb

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Letter
6767
# The tracking number, if applicable, will appear here when it becomes available. Dummy tracking numbers are not created in test mode.
6868
attr_accessor :tracking_number
6969

70-
# Tracking events are not populated for registered or regular (no extra service) letters.
70+
# An array of tracking_event objects ordered by ascending `time`. Will not be populated for letters created in test mode.
7171
attr_accessor :tracking_events
7272

7373
# Specifies the address the return envelope will be sent back to. This is an optional argument that is available if an account is signed up for the return envelope tracking beta, and has `return_envelope`, and `perforated_page` fields populated in the API request.
@@ -401,7 +401,7 @@ def list_invalid_properties
401401
invalid_properties.push("invalid value for \"template_version_id\", must conform to the pattern #{pattern}.")
402402
end
403403

404-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
404+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
405405
if !@url.nil? && @url !~ pattern
406406
invalid_properties.push("invalid value for \"url\", must conform to the pattern #{pattern}.")
407407
end
@@ -414,10 +414,6 @@ def list_invalid_properties
414414
invalid_properties.push('invalid value for "description", the character length must be smaller than or equal to 255.')
415415
end
416416

417-
if !@tracking_events.nil? && @tracking_events.length > 0
418-
invalid_properties.push('invalid value for "tracking_events", number of items must be less than or equal to 0.')
419-
end
420-
421417
invalid_properties
422418
end
423419

@@ -434,12 +430,11 @@ def valid?
434430
return false if @id !~ Regexp.new(/^ltr_[a-zA-Z0-9]+$/)
435431
return false if !@template_id.nil? && @template_id !~ Regexp.new(/^tmpl_[a-zA-Z0-9]+$/)
436432
return false if !@template_version_id.nil? && @template_version_id !~ Regexp.new(/^vrsn_[a-zA-Z0-9]+$/)
437-
return false if !@url.nil? && @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
433+
return false if !@url.nil? && @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
438434
return false if @object.nil?
439435
object_validator = EnumAttributeValidator.new('String', ["letter"])
440436
return false unless object_validator.valid?(@object)
441437
return false if !@description.nil? && @description.to_s.length > 255
442-
return false if !@tracking_events.nil? && @tracking_events.length > 0
443438
address_placement_validator = EnumAttributeValidator.new('String', ["top_first_page", "insert_blank_page", "bottom_first_page_center", "bottom_first_page"])
444439
return false unless address_placement_validator.valid?(@address_placement)
445440
true
@@ -495,7 +490,7 @@ def template_version_id=(template_version_id)
495490
# Custom attribute writer method with validation
496491
# @param [Object] url Value to be assigned
497492
def url=(url)
498-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
493+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
499494
if !url.nil? && url !~ pattern
500495
fail ArgumentError, "invalid value for \"url\", must conform to the pattern #{pattern}."
501496
end
@@ -535,16 +530,6 @@ def merge_variables=(merge_variables)
535530
@merge_variables = merge_variables
536531
end
537532

538-
# Custom attribute writer method with validation
539-
# @param [Object] tracking_events Value to be assigned
540-
def tracking_events=(tracking_events)
541-
if !tracking_events.nil? && tracking_events.length > 0
542-
fail ArgumentError, 'invalid value for "tracking_events", number of items must be less than or equal to 0.'
543-
end
544-
545-
@tracking_events = tracking_events
546-
end
547-
548533
# Custom attribute writer method checking allowed values (enum).
549534
# @param [Object] address_placement Object to be assigned
550535
def address_placement=(address_placement)

lib/lob/models/postcard.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def list_invalid_properties
334334
invalid_properties.push('invalid value for "url", url cannot be nil.')
335335
end
336336

337-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
337+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
338338
if @url !~ pattern
339339
invalid_properties.push("invalid value for \"url\", must conform to the pattern #{pattern}.")
340340
end
@@ -360,7 +360,7 @@ def valid?
360360
object_validator = EnumAttributeValidator.new('String', ["postcard"])
361361
return false unless object_validator.valid?(@object)
362362
return false if @url.nil?
363-
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
363+
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
364364
return false if !@description.nil? && @description.to_s.length > 255
365365
true
366366
end
@@ -451,7 +451,7 @@ def url=(url)
451451
fail ArgumentError, 'url cannot be nil'
452452
end
453453

454-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
454+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
455455
if url !~ pattern
456456
fail ArgumentError, "invalid value for \"url\", must conform to the pattern #{pattern}."
457457
end

lib/lob/models/self_mailer.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class SelfMailer
5353
# Value is resource type.
5454
attr_accessor :object
5555

56-
# An array of tracking events ordered by ascending `time`. Not populated in test mode.
56+
# An array of certified tracking events ordered by ascending `time`. Not populated in test mode.
5757
attr_accessor :tracking_events
5858

5959
# A [signed link](#section/Asset-URLs) served over HTTPS. The link returned will expire in 30 days to prevent mis-sharing. Each time a GET request is initiated, a new signed URL will be generated.
@@ -128,7 +128,7 @@ def self.openapi_types
128128
:'outside_template_version_id' => :'String',
129129
:'inside_template_version_id' => :'String',
130130
:'object' => :'String',
131-
:'tracking_events' => :'Array<TrackingEventNormal>',
131+
:'tracking_events' => :'Array<TrackingEventCertified>',
132132
:'url' => :'String',
133133
:'use_type' => :'SfmUseType'
134134
}
@@ -284,7 +284,7 @@ def list_invalid_properties
284284
invalid_properties.push('invalid value for "url", url cannot be nil.')
285285
end
286286

287-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
287+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
288288
if @url !~ pattern
289289
invalid_properties.push("invalid value for \"url\", must conform to the pattern #{pattern}.")
290290
end
@@ -305,7 +305,7 @@ def valid?
305305
object_validator = EnumAttributeValidator.new('String', ["self_mailer"])
306306
return false unless object_validator.valid?(@object)
307307
return false if @url.nil?
308-
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
308+
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
309309
true
310310
end
311311

@@ -407,7 +407,7 @@ def url=(url)
407407
fail ArgumentError, 'url cannot be nil'
408408
end
409409

410-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
410+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
411411
if url !~ pattern
412412
fail ArgumentError, "invalid value for \"url\", must conform to the pattern #{pattern}."
413413
end

lib/lob/models/snap_pack.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=begin
22
#Lob
33
4-
#The Lob API is organized around REST. Our API is designed to have predictable, resource-oriented URLs and uses HTTP response codes to indicate any API errors. <p> Looking for our [previous documentation](https://lob.github.io/legacy-docs/)?
4+
#The Lob API is organized around REST. Our API is designed to have predictable, resource-oriented URLs and uses HTTP response codes to indicate any API errors. <p> Looking for our [previous documentation](https://lob.github.io/legacy-docs/)?
55
66
The version of the OpenAPI document: 1.3.0
77
@@ -24,7 +24,7 @@ class SnapPack
2424

2525
attr_accessor :size
2626

27-
# An internal description that identifies this resource. Must be no longer than 255 characters.
27+
# An internal description that identifies this resource. Must be no longer than 255 characters.
2828
attr_accessor :description
2929

3030
# Use metadata to store custom information for tagging and labeling back to your internal systems. Must be an object with up to 20 key-value pairs. Keys must be at most 40 characters and values must be at most 500 characters. Neither can contain the characters `\"` and `\\`. i.e. '{\"customer_id\" : \"NEWYORK2015\"}' Nested objects are not supported. See [Metadata](#section/Metadata) for more information.
@@ -284,7 +284,7 @@ def list_invalid_properties
284284
invalid_properties.push('invalid value for "url", url cannot be nil.')
285285
end
286286

287-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
287+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
288288
if @url !~ pattern
289289
invalid_properties.push("invalid value for \"url\", must conform to the pattern #{pattern}.")
290290
end
@@ -305,7 +305,7 @@ def valid?
305305
object_validator = EnumAttributeValidator.new('String', ["snap_pack"])
306306
return false unless object_validator.valid?(@object)
307307
return false if @url.nil?
308-
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
308+
return false if @url !~ Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
309309
true
310310
end
311311

@@ -407,7 +407,7 @@ def url=(url)
407407
fail ArgumentError, 'url cannot be nil'
408408
end
409409

410-
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9-_]+/)
410+
pattern = Regexp.new(/^https:\/\/lob-assets.com\/(letters|postcards|bank-accounts|checks|self-mailers|cards)\/[a-z]{3,4}_[a-z0-9]{15,16}(_signature)?(\.pdf|_thumb_[a-z]+_[0-9]+\.png|\.png)\?(version=[a-z0-9]*&)expires=[0-9]{10}&signature=[a-zA-Z0-9_-]+/)
411411
if url !~ pattern
412412
fail ArgumentError, "invalid value for \"url\", must conform to the pattern #{pattern}."
413413
end

0 commit comments

Comments
 (0)