refactoring prime, even

bin/brain-calc.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 import app from '../src/index.js';
-import calc from '../src/calc.js';
+import calc from '../src/games/calc.js';
 
 app(calc);

bin/brain-even.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 import app from '../src/index.js';
-import even from '../src/even.js';
+import even from '../src/games/even.js';
 
 app(even);

bin/brain-gcd.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 import app from '../src/index.js';
-import gcd from '../src/gcd.js';
+import gcd from '../src/games/gcd.js';
 
 app(gcd);

bin/brain-prime.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 import app from '../src/index.js';
-import prime from '../src/prime.js';
+import prime from '../src/games/prime.js';
 
 app(prime);

bin/brain-progression.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 import app from '../src/index.js';
-import progression from '../src/progression.js';
+import progression from '../src/games/progression.js';
 
 app(progression);

src/calc.js → src/games/calc.js

@@ -1,6 +1,6 @@
-import randomize from './utils/randomize.js';
+import randomize from '../utils/randomize.js';
 
-export default function calc(questionCount = 3) {
+const calc = (questionCount = 3) => {
   const rules = 'What is the result of the expression?';
   const questionsAnswers = [];
   const operationsMapping = {
@@ -25,4 +25,6 @@ export default function calc(questionCount = 3) {
     });
   }
   return { rules, questionsAnswers };
-}
+};
+
+export default calc;

src/games/even.js

@@ -0,0 +1,6 @@
+import predicateGame from '../utils/predicateGame.js';
+
+const isEven = (num) => num % 2 === 0;
+const even = (questionCount = 3) => predicateGame(isEven, questionCount);
+
+export default even;

src/gcd.js → src/games/gcd.js

@@ -1,12 +1,12 @@
-import randomize from './utils/randomize.js';
+import randomize from '../utils/randomize.js';
 
 const getGCD = (a, b) => {
   if (b === 0) {
     return a;
   }
   return getGCD(b, a % b);
 };
-export default function gcd(questionCount = 3) {
+const gcd = (questionCount = 3) => {
   const rules = 'Find the greatest common divisor of given numbers.';
   const questionsAnswers = [];
   for (let i = 0; i < questionCount; i += 1) {
@@ -20,4 +20,6 @@ export default function gcd(questionCount = 3) {
     });
   }
   return { rules, questionsAnswers };
-}
+};
+
+export default gcd;

src/games/prime.js

@@ -0,0 +1,17 @@
+import predicateGame from '../utils/predicateGame.js';
+
+const isPrime = (num) => {
+  if (num < 2) {
+    return false;
+  }
+  const halfNum = Math.floor(num / 2);
+  for (let i = halfNum; i > 1; i -= 1) {
+    if (num % i === 0) {
+      return false;
+    }
+  }
+  return true;
+};
+const prime = (questionCount = 3) => predicateGame(isPrime, questionCount);
+
+export default prime;

src/progression.js → src/games/progression.js

@@ -1,6 +1,6 @@
-import randomize from './utils/randomize.js';
+import randomize from '../utils/randomize.js';
 
-export default function progression(questionCount = 3) {
+const progression = (questionCount = 3) => {
   const rules = 'What number is missing in the progression?';
   const arrayLength = randomize(5, 15);
   const questionsAnswers = [];
@@ -22,4 +22,6 @@ export default function progression(questionCount = 3) {
     });
   }
   return { rules, questionsAnswers };
-}
+};
+
+export default progression;

src/index.js

@@ -16,8 +16,7 @@ export default function app(game, questionsCount = countOfQuestions) {
     console.log(`Question: ${question}`);
     const answer = readlineSync.question('Your answer: ');
     if (answer !== correctAnswer) {
-      console.log(`${answer} is wrong answer ;(. Correct answer was ${correctAnswer}.
-      Let's try again, Bill!`);
+      console.log(`${answer} is wrong answer ;(. Correct answer was ${correctAnswer}.\nLet's try again, ${userName}!`);
       return;
     }
     console.log('Correct!');

src/utils/predicateGame.js

@@ -0,0 +1,17 @@
+import randomize from './randomize.js';
+
+const predicateGame = (predicateFunc, questionCount) => {
+  const rules = 'Answer "yes" if given number is prime. Otherwise answer "no".';
+  const questionsAnswers = [];
+  for (let i = 0; i < questionCount; i += 1) {
+    const number = randomize(0, 100);
+    const correctAnswer = predicateFunc(number) ? 'yes' : 'no';
+    questionsAnswers.push({
+      question: number,
+      correctAnswer,
+    });
+  }
+  return { rules, questionsAnswers };
+};
+
+export default predicateGame;