Save updates to proper-fraction and card-value functions

Author: ahmadehsas

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

@@ -68,3 +68,4 @@ console.log(isProperFraction(-4, 7));
 console.log(isProperFraction(-3, 3));
 console.log(isProperFraction(-2, -3)); // This is a proper fraction because the absolute value of numerator 2 and denominator is 3.
 // the value of  numerator is less than denominator.
+console.log(isProperFraction(-4, -7));

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

@@ -8,26 +8,60 @@
 // write one test at a time, and make it pass, build your solution up methodically
 // just make one change at a time -- don't rush -- programmers are deep and careful thinkers
 function getCardValue(card) {
-  const rank = card.slice(0, -1); // get the rank (before the suit symbol)
+  if (typeof card !== "string") {
+    throw new Error("Card must be a string")
+  }
 
+  if (card.length < 2) {
+    throw new Error("Invalid card rank")
+  }
 
-  const num = Number(rank); // converting to a number.
+  const rank = card.slice(0, -1);
+  const suit = card.slice(-1);
 
-  if (!isNaN(rank)) {
-    return num; // Number card
+  if (!["♠", "♥", "♦", "♣"].includes(suit)) {
+    throw new Error("Invalid card rank");
   }
 
+  if (rank === "A") return 11; // Ace 
+
+
+
+  //const rank = card.slice(0, -1); // get the rank (before the suit symbol)
+
+
+ // const num = Number(rank); // converting to a number.
+
+  // if (!isNaN(rank)) {
+  //   return num; // Number card
+  // }
+
   if (rank === "J" || rank === "Q" || rank === "K") {
     return 10; // Face cards
   }
 
-  if (rank === "A") return 11; // Ace 
+  if (!/^[0-9]+$/.test(rank)) {
+    throw new Error("Invalid card rank");
+  }
+  // Reject weird or malformed ranks (like 3AAAA)
+
+   const num = Number(rank);
+   // Convert numeric string
+
+   if (num >= 2 && num <= 10) {
+    return num;
+  }
+  // Accept valid 2–10 range only
+
+
+
 
   // Anything else is invalid
    throw new Error("Invalid card rank")
 
 } 
 
+
 console.log(Number("0x002"));
 console.log(Number("2.1"));
 console.log(Number("9e1"));
@@ -62,31 +96,31 @@ function assertEquals(actualOutput, targetOutput) {
 // Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A),
 // When the function getCardValue is called with this card string as input,
 // Then it should return the numerical card value
-const aceofSpades = getCardValue("A♠");
-assertEquals(aceofSpades, 11);
+const aceOfSpades = getCardValue("A♠");
+assertEquals(aceOfSpades, 11);
 
 // Handle Number Cards (2-10):
 // Given a card with a rank between "2" and "9",
 // When the function is called with such a card,
 // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5).
-const fiveofHearts = getCardValue("5♥");
-assertEquals(fiveofHearts, 5);
+const fiveOfHearts = getCardValue("5♥");
+assertEquals(fiveOfHearts, 5);
 
-const tenofDiamonds = getCardValue("10♦");
-assertEquals(tenofDiamonds, 10);
+const tenOfDiamonds = getCardValue("10♦");
+assertEquals(tenOfDiamonds, 10);
 
 // Handle Face Cards (J, Q, K):
 // Given a card with a rank of "10," "J," "Q," or "K",
 // When the function is called with such a card,
 // Then it should return the value 10, as these cards are worth 10 points each in blackjack.
-const jackofClubs = getCardValue("J♣");
-assertEquals(jackofClubs, 10);
+const jackOfClubs = getCardValue("J♣");
+assertEquals(jackOfClubs, 10);
 
-const queenofHearts = getCardValue("Q♥");
-assertEquals(queenofHearts, 10);
+const queenOfHearts = getCardValue("Q♥");
+assertEquals(queenOfHearts, 10);
 
-const kingofSpades = getCardValue("K♠");
-assertEquals(kingofSpades, 10);
+const kingOfSpades = getCardValue("K♠");
+assertEquals(kingOfSpades, 10);
 // Handle Ace (A):
 // Given a card with a rank of "A",
 // When the function is called with an Ace,
@@ -96,8 +130,8 @@ assertEquals(kingofSpades, 10);
 // Given a card with an invalid rank (neither a number nor a recognized face card),
 // When the function is called with such a card,
 // Then it should throw an error indicating "Invalid card rank."
-// try {
-//   getCardValue("Z♠");
-// } catch (error) {
-//   console.log("Caught error:", error.message); // Should say "Invalid card rank"
-// }
+try {
+  getCardValue("Z♠");
+} catch (error) {
+  console.log("Caught error:", error.message); // Should say "Invalid card rank"
+}