refactor[2020-day-02]: prep for different password validation rules

Rules provided were for old employers
amclin · Dec 7, 2020 · 03a33e7 · 03a33e7
1 parent be91e9e
commit 03a33e7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/2020/day-02/cleanupPasswords.js b/2020/day-02/cleanupPasswords.js
@@ -14,7 +14,7 @@ const splitRecord = (row) => {
 /**
  * Splits a password validation rule into its component parts
  */
-const splitRule = (rule) => {
+const oldSplitRule = (rule) => {
   const splitRow = rule.split(/-| /)
 
   return {
@@ -27,7 +27,7 @@ const splitRule = (rule) => {
 /**
  * Validates a password against the specified rule
  */
-const isValidPassword = (rule, password) => {
+const oldIsValidPassword = (rule, password) => {
   // count how many times `rule.char` exists in `password`
   const count = (
     password.match(
@@ -40,15 +40,17 @@ const isValidPassword = (rule, password) => {
   return true
 }
 
-const isValidRecord = (record) => {
+const oldIsValidRecord = (record) => {
   const { rule, password } = splitRecord(record)
-  const { min, max, char } = splitRule(rule)
-  return isValidPassword({ min, max, char }, password)
+  const parsedRule = oldSplitRule(rule)
+  return oldIsValidPassword(parsedRule, password)
 }
 
 module.exports = {
-  splitRecord,
-  splitRule,
-  isValidRecord,
-  isValidPassword
+  old: {
+    splitRule: oldSplitRule,
+    isValidPassword: oldIsValidPassword,
+    isValidRecord: oldIsValidRecord
+  },
+  splitRecord
 }
diff --git a/2020/day-02/cleanupPasswords.test.js b/2020/day-02/cleanupPasswords.test.js
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 const { expect } = require('chai')
-const { splitRecord, splitRule, isValidPassword, isValidRecord } = require('./cleanupPasswords')
+const { splitRecord, old } = require('./cleanupPasswords')
 
 const testData = [
   '1-3 a: abcde',
@@ -22,7 +22,7 @@ describe('--- Day 2: Password Philosophy ---', () => {
       it('splits a password formatting rule into component parts', () => {
         testData.forEach((row, idx) => {
           const { rule, password } = splitRecord(row)
-          const { min, max, char } = splitRule(rule)
+          const { min, max, char } = old.splitRule(rule)
           expect(`${min}-${max} ${char}: ${password}`).to.equal(testData[idx])
         })
       })
@@ -32,22 +32,22 @@ describe('--- Day 2: Password Philosophy ---', () => {
         const expectedResults = [true, false, true]
         testData.forEach((row, idx) => {
           const { rule, password } = splitRecord(row)
-          const { min, max, char } = splitRule(rule)
-          expect(isValidPassword({ min, max, char }, password))
+          const { min, max, char } = old.splitRule(rule)
+          expect(old.isValidPassword({ min, max, char }, password))
             .to.equal(expectedResults[idx])
         })
       })
       it('won\'t allow more than the specified character count', () => {
         const badPass = 'abcabcabcabc'
-        expect(isValidPassword({ min: 2, max: 3, char: 'a' }, badPass))
+        expect(old.isValidPassword({ min: 2, max: 3, char: 'a' }, badPass))
           .to.equal(false)
       })
     })
     describe('isValidRecord()', () => {
       it('checks if a specified record contains valid rule and password', () => {
         const expectedResults = [true, false, true]
         testData.forEach((row, idx) => {
-          expect(isValidRecord(row))
+          expect(old.isValidRecord(row))
             .to.equal(expectedResults[idx])
         })
       })