Improve color regex #1021
Closed
Improve color regex #1021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brendanthomas1
force-pushed
the
improve-color-regex
branch
from
e5fca46 to
bfed529
Compare
brendanthomas1
commented
Apr 4, 2017
| @@ -66,7 +66,7 @@ | |||
| pdf.text ' ' | |||
| text = PDF::Inspector::Text.analyze(pdf.render) | |||
| # If anything is rendered to the page, it should be whitespace. | |||
| text.strings.each { |str| expect(str).to match(/\A\s*\z/) } | |||
| expect(text.strings).to all match(/\A\s*\z/) | |||
There was a problem hiding this comment.
Rubocop requested this
brendanthomas1
commented
Apr 4, 2017
| @@ -3,6 +3,7 @@ | |||
| describe Prawn::Stamp do | |||
| describe 'create_stamp before any page is added' do | |||
| let(:pdf) { Prawn::Document.new(skip_page_creation: true) } | |||
|
|
|||
brendanthomas1
commented
Apr 4, 2017
| @@ -26,6 +26,7 @@ | |||
| let(:num_columns) { 5 } | |||
| let(:num_rows) { 8 } | |||
| let(:gutter) { 10.0 } | |||
|
|
|||
brendanthomas1
force-pushed
the
improve-color-regex
branch
from
bfed529 to
0f5b15f
Compare
|
@brendanthomas1 Thank you for your contribution. This PR will be merged a bit later when I have some time to work on Prawn. |
mojavelinux
reviewed
Apr 11, 2017
lib/prawn/graphics/color.rb
Outdated
| @@ -94,7 +94,7 @@ def process_color(*color) | |||
| def color_type(color) | |||
| case color | |||
| when String | |||
| if color =~ /\A[0-F]{6}\z/i | |||
| if color =~ /\A[0-9|A-F]{6}\z/i | |||
There was a problem hiding this comment.
By adding a pipe here, you are allowing the pipe character too. The correct expression is:
/\A[0-9A-F]{6}\z/i
You can test this by running the following in irb:
/[0-9|A-F]/.match('|').inspect
vs
/[0-9A-F]/.match('|').inspect
There was a problem hiding this comment.
The 'i' flag could be avoided by making it:
/\A[0-9a-fA-F]{6}\z/
There was a problem hiding this comment.
Thanks @mojavelinux !
brendanthomas1
force-pushed
the
improve-color-regex
branch
from
0f5b15f to
ed8520e
Compare
|
@brendanthomas1 I cherry-picked your commit into master. Thank you for your contribution. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current color regex uses
[0-F]which allows all characters with a char code between 48-70. This would allow a user to pass in any of: ; < = > ? `into their hex.