Add IP Address Validation and Separate IP and URI Logic to Files #619
Conversation
|
@Marsup I got them split out where I thought they should be. I left the validation of options within |
| @@ -116,6 +116,9 @@ exports.errors = { | |||
| uppercase: 'must only contain uppercase characters', | |||
| trim: 'must not have leading or trailing whitespace', | |||
| creditCard: 'must be a credit card', | |||
| ref: 'references "{{ref}}" which is not a number' | |||
| ref: 'references "{{ref}}" which is not a number', | |||
| ip: 'must be a valid ip address', | |||
There was a problem hiding this comment.
Regroup those under one option.
| ipOptions.version = [ipOptions.version]; | ||
| } | ||
|
|
||
| var version; |
There was a problem hiding this comment.
You don't need that outside the loop.
|
You're missing many line breaks in the tests as well but I won't comment on all of them. |
|
Gotcha. I'll go through on the pieces you commented on, as well as the rest of the code. I've been getting more familiar with the coding style from the |
|
@Marsup I think it's all set now. I went through and tried to find all the syntax issues I could and addressed your feedback. I also figured out what I did wrong when trying to squash things before (I wasn't force pushing before), so I squashed the changes together. |
|
|
||
| var regex = internals.ipRegex; | ||
| ipOptions = ipOptions || {}; | ||
| Hoek.assert(typeof ipOptions === 'object', 'ipOptions must be an object'); |
| }); | ||
|
|
||
| describe('#ip({ version: "ipvfuture" })', function() { | ||
| it('should validate all ipvfuture addresses with a default CIDR strategy', function(done) { |
|
Do you know how to rebase your commits or should I do it ? |
|
@Marsup It should be all squashed and include the changes for your comments about the error messages. |
|
Your patch contains things that have nothing to do with this, you must have failed the rebase. |
|
Darn! Must have been that merge previously to catch up to the 6.1.0 branch. I'll take a look. |
|
@DavidTPate where are we on this ? |
…ure with or without a CIDR. Separate out IP and URI as well as their shared parts into their own files to keep `string` simpler and easier to understand.
|
@Marsup The changes only include those for the PR now. That was really odd, I had changed permissions and items that I didn't expect included in my commits from when I merged somehow. Never had that happen before. |
|
Rebased on branch, thanks. |
|
This thread has been automatically locked due to inactivity. Please open a new issue for related bugs or questions following the new issue template instructions. |
This PR adds the ability to do IP address validation and updates the handling of the components used to build Regular Expressions for both IP and URI validation into files. Additionally, this replaces the old usage of
Array.reduce()which was occurring before in both IP and URI validation construction in favor of the standardfor(...)loop.This resolves #607 and #617