step 3 progress

Author: ShMcK

coderoad.json

@@ -93,7 +93,7 @@
         {
           "title": "Map",
           "description": "Array -> run a function over each item -> Array",
-          "explanation": "You've filtered and sorted our data, but neither of those actually change the data.\n\nWouldn't it be simpler if you could just change your grades? You can use the array method `map` to run a function that returns changes to your data.\n\nAs an example, let's look at how you would increment each number in an array.\n\n```js\nfunction addOne(num) {\n  return num + 1;\n}\n\nfunction addTwo(num) {\n  return num + 2;\n}\n\n[1, 2, 3].map(addOne);\n//> [2, 3, 4]\n\n[1, 2, 3].map(addOne).map(addTwo);\n//> [4, 5, 6]\n```\n\n`map` can change data, but it can also restrict the data you want to work with. See the example below to see another way scores could be sorted.\n\n```js\nmyBest\n  .map(function(student) {\n    return student.score;\n  })\n  .sort()\n  .reverse()\n//> [93, 91, 88, 88, 82, 81, 73]\n```\n\nIn this example, `map` transformed an object with keys of 'title', 'instructor', 'name', 'score' and 'grade', to an array of scores only. Data wasn't changed, but it was limited to a smaller subset of scores.\n\n`map` is powerful. Let's see what you can do with it.\n\nThose D & F grades would look a lot better if they suddenly became A's.\n\nLet's go back to before we filtered out the bad grades, and instead change the grades to A's.",
+          "explanation": "You've filtered and sorted our data, but neither of those actually change the data.\n\nWouldn't it be simpler if you could just change your grades?\n\nYou can use the array method `map` to run a function that returns changes to your data.\n\nAs an example, let's look at how you would increment each number in an array.\n\n```js\nfunction addOne(num) {\n  return num + 1;\n}\n\n[1, 2, 3].map(addOne);\n//> [2, 3, 4]\n\nfunction addToVal(obj) {\n  obj.val += 1;\n  return obj;\n}\n[{ val: 1}].map(addToVal);\n//> [{ val: 2 }]\n```\n\n`map` can change data, and it can also alter structure of the data you're working with.\n\n```js\nfunction makeObject(num) {\n  return { val: num };\n}\n\n[1, 2].map(makeObject);\n//> [{ val: 1 }, { val: 2 }]\n```\n\nSimilarly, `map` can also restrict the data you want to work with.  See the example below to see another way scores could be sorted.\n\n```js\nmyBest\n  .map(function(student) {\n    return student.score;\n  })\n  .sort()\n  .reverse()\n//> [93, 91, 88, 88, 82, 81, 73]\n```\n\nIn this example, `map` transformed an object with keys of 'title', 'instructor', 'name', 'score' and 'grade', to an array of just scores. Values weren't changed, but rather limited to a smaller subset of scores.\n\n`map` is powerful. Let's see what you can do with it.\n\nThose D & F grades would look a lot better if they suddenly became A's.\n\nLet's go back to before we filtered out the bad grades, and instead change the grades to A's.",
           "tasks": [
             {
               "description": "Make a function `changeGrades` that takes student data and changes all grades to \"A\"s.",
@@ -102,7 +102,7 @@
               ],
               "actions": [
                 "open('03-map.js')",
-                "set('// change any `student.grade`'s into an 'A'\nfunction changeGrades(student) {\n\n}\n')"
+                "set('// change any `student.grade`'s into an 'A'\nfunction changeGrades() {\n\n}\n')"
               ]
             },
             {
@@ -120,7 +120,7 @@
                 "1/03/03-map"
               ],
               "actions": [
-                "insert('// map over `mySlightlyChanged` with a function `increaseGrades` to increment each score by 12\nvar mySlightlyChanged = myData.map();\n')"
+                "insert('\nfunction increaseScores() {\n\n}\n\n// map over `mySlightlyChanged` with a function `increaseScores` to increment each score by 12\nvar mySlightlyChanged = myData;\n')"
               ]
             },
             {
@@ -129,7 +129,7 @@
                 "1/03/04-map"
               ],
               "actions": [
-                "insert('// set `mySlightlyFixed` to change any scores over 100 to a score of 95\nvar mySlightlyFixed = mySlightlyChanged.map();\n')"
+                "insert('\nfunction capScores() {\n\n}\n\n// set `mySlightlyFixed` to change any scores over 100 to a score of 95\nvar mySlightlyFixed = mySlightlyChanged;\n')"
               ]
             },
             {
@@ -138,7 +138,7 @@
                 "1/03/05-map"
               ],
               "actions": [
-                "insert('\nfunction getGrade(score) {\n  switch (true) {\n    case (score >= 90):\n      return \"A\";\n    case (score >= 80):\n      return \"B\";\n    case (score >= 70):\n      return \"C\";\n    case (score >= 60):\n      return \"D\";\n    default:\n      return \"F\";\n  }\n}\n// set `myFixed` to update grades to the new scores\nvar myFixed = mySlightlyChanged.map();\n')"
+                "insert('\nfunction getGrade(score) {\n  switch (true) {\n    case (score >= 90):\n      return \"A\";\n    case (score >= 80):\n      return \"B\";\n    case (score >= 70):\n      return \"C\";\n    case (score >= 60):\n      return \"D\";\n    default:\n      return \"F\";\n  }\n}\n\n// set `myFixed` to update grades to the new scores\nvar myFixed = mySlightlyChanged;\n')"
               ]
             },
             {

tutorial/1/03/01-map.spec.js

@@ -15,11 +15,21 @@ describe('01 function changeGrades', function() {
     expect(changeGrades).to.be.a('function');
   });
 
+  it('should take a parameter', function() {
+    expect(changeGrades).to.have.length(1);
+  });
+
+  it('should try changing `student.grade` first before returning `student`', function () {
+    var regex = /return [a-zA-Z]+\.grade/;
+    var func = changeGrades.toString();
+    expect(func.match(regex)).to.be.null;
+  });
+
   it('should change grades from a D to an A', function() {
     var test = {
       grade: 'D'
     };
-    expect(arrayOfGrades).to.deep.equal({
+    expect(changeGrades(test)).to.deep.equal({
       grade: 'A'
     });
   });
@@ -28,7 +38,7 @@ describe('01 function changeGrades', function() {
     var test = {
       grade: 'F'
     };
-    expect(arrayOfGrades).to.deep.equal({
+    expect(changeGrades(test)).to.deep.equal({
       grade: 'A'
     });
   });
@@ -37,7 +47,7 @@ describe('01 function changeGrades', function() {
     var test = {
       grade: 'B'
     };
-    expect(arrayOfGrades).to.deep.equal({
+    expect(changeGrades(test)).to.deep.equal({
       grade: 'A'
     });
   });

tutorial/1/03/03-map.spec.js

@@ -1,5 +1,36 @@
 var expect = require('chai').expect;
 
+describe('03 function increaseScores', function() {
+
+  it('doesn\'t exist', function() {
+    expect(increaseScores).to.not.be.undefined;
+  });
+
+  it('should be a function', function() {
+    expect(increaseScores).to.be.a('function');
+  });
+
+  it('should take a parameter', function() {
+    expect(increaseScores).to.have.length(1);
+  });
+
+  it('should try changing the `score` first before returning the changed object', function() {
+    var regex = /return [a-zA-Z]+\.score/;
+    var func = increaseScores.toString();
+    expect(func.match(regex)).to.be.null;
+  });
+
+  it('should increment scores by 12 points', function() {
+    var test = {
+      score: 50
+    };
+    expect(increaseScores(test)).to.deep.equal({
+      score: 62
+    });
+  });
+
+});
+
 describe('03 var mySlightlyChanged', function() {
 
   it('doesn\'t exist', function() {
@@ -10,68 +41,11 @@ describe('03 var mySlightlyChanged', function() {
     expect(mySlightlyChanged).to.be.an('array');
   });
 
-  it('doesn\'t increment scores by 12', function() {
-    expect(mySlightlyChanged).to.deep.equal([{
-      "title": "Relational Databases",
-      "instructor": "Sean Quentin Lewis",
-      "name": "Ada Lovelace",
-      "score": 103,
-      "grade": "A"
-    }, {
-      "title": "3D Computer Graphics",
-      "instructor": "G.L. Webb",
-      "name": "Ada Lovelace",
-      "score": 100,
-      "grade": "B"
-    }, {
-      "title": "Front End Web Development",
-      "instructor": "Moe Zaick",
-      "name": "Ada Lovelace",
-      "score": 73,
-      "grade": "D"
-    }, {
-      "title": "Web Security",
-      "instructor": "Sue Denim",
-      "name": "Ada Lovelace",
-      "score": 93,
-      "grade": "B"
-    }, {
-      "title": "Javascript Fundamentals",
-      "instructor": "Jay Kweerie",
-      "name": "Ada Lovelace",
-      "score": 85,
-      "grade": "C"
-    }, {
-      "title": "Data Science",
-      "instructor": "Ford Fulkerson",
-      "name": "Ada Lovelace",
-      "score": 70,
-      "grade": "F"
-    }, {
-      "title": "Algorithm Design",
-      "instructor": "Gale Shapely",
-      "name": "Ada Lovelace",
-      "score": 105,
-      "grade": "A"
-    }, {
-      "title": "Data Abstraction",
-      "instructor": "Aster Ricks",
-      "name": "Ada Lovelace",
-      "score": 94,
-      "grade": "B"
-    }, {
-      "title": "Data Structures",
-      "instructor": "Brodal Q.",
-      "name": "Ada Lovelace",
-      "score": 100,
-      "grade": "B"
-    }, {
-      "title": "Networks",
-      "instructor": "Van Emde Boas",
-      "name": "Ada Lovelace",
-      "score": 77,
-      "grade": "D"
-    }]);
+  it('should increment scores by 12', function() {
+    expect(mySlightlyChanged
+      .map(function(x) {
+        return x.score;
+      })).to.deep.equal([103, 100, 73, 93, 85, 70, 105, 94, 100, 77]);
   });
 
 });

tutorial/1/03/04-map.spec.js

@@ -1,5 +1,39 @@
 var expect = require('chai').expect;
 
+describe('04 function capScores', function() {
+
+  it('doesn\'t exist', function() {
+    expect(capScores).to.not.be.undefined;
+  });
+
+  it('should be a function', function() {
+    expect(capScores).to.be.a('function');
+  });
+
+  it('should take a parameter', function() {
+    expect(capScores).to.have.length(1);
+  });
+
+  it('shouldn\'t change scores under 100', function() {
+    var test = {
+      score: 99
+    };
+    expect(capScores(test)).to.deep.equal({
+      score: 99
+    });
+  });
+
+  it('should change scores over 100 to 95', function() {
+    var test = {
+      score: 101
+    };
+    expect(capScores(test)).to.deep.equal({
+      score: 95
+    });
+  });
+
+});
+
 describe('04 var mySlightlyFixed', function() {
 
   it('doesn\'t exist', function() {

tutorial/1/03/05-map.spec.js

@@ -1,5 +1,20 @@
 var expect = require('chai').expect;
 
+describe('05 function getGrade', function() {
+
+  it('doesn\'t exist', function() {
+    expect(getGrade).to.not.be.undefined;
+  });
+
+  it('should be a function', function() {
+    expect(getGrade).to.be.a('function');
+  });
+
+  it('should take a parameter', function() {
+    expect(getGrade).to.have.length(1);
+  });
+});
+
 describe('05 var myFixed', function() {
 
   it('doesn\'t exist', function() {

tutorial/1/03/map.md

@@ -3,7 +3,9 @@ Array -> run a function over each item -> Array
 
 You've filtered and sorted our data, but neither of those actually change the data.
 
-Wouldn't it be simpler if you could just change your grades? You can use the array method `map` to run a function that returns changes to your data.
+Wouldn't it be simpler if you could just change your grades?
+
+You can use the array method `map` to run a function that returns changes to your data.
 
 As an example, let's look at how you would increment each number in an array.
 
@@ -12,18 +14,29 @@ function addOne(num) {
   return num + 1;
 }
 
-function addTwo(num) {
-  return num + 2;
-}
-
 [1, 2, 3].map(addOne);
 //> [2, 3, 4]
 
-[1, 2, 3].map(addOne).map(addTwo);
-//> [4, 5, 6]
+function addToVal(obj) {
+  obj.val += 1;
+  return obj;
+}
+[{ val: 1}].map(addToVal);
+//> [{ val: 2 }]
+```
+
+`map` can change data, and it can also alter structure of the data you're working with.
+
+```js
+function makeObject(num) {
+  return { val: num };
+}
+
+[1, 2].map(makeObject);
+//> [{ val: 1 }, { val: 2 }]
 ```
 
-`map` can change data, but it can also restrict the data you want to work with. See the example below to see another way scores could be sorted.
+Similarly, `map` can also restrict the data you want to work with.  See the example below to see another way scores could be sorted.
 
 ```js
 myBest
@@ -35,7 +48,7 @@ myBest
 //> [93, 91, 88, 88, 82, 81, 73]
 ```
 
-In this example, `map` transformed an object with keys of 'title', 'instructor', 'name', 'score' and 'grade', to an array of scores only. Data wasn't changed, but it was limited to a smaller subset of scores.
+In this example, `map` transformed an object with keys of 'title', 'instructor', 'name', 'score' and 'grade', to an array of just scores. Values weren't changed, but rather limited to a smaller subset of scores.
 
 `map` is powerful. Let's see what you can do with it.
 
@@ -49,7 +62,7 @@ Let's go back to before we filtered out the bad grades, and instead change the g
 @action(set(
 ```
 // change any `student.grade`'s into an 'A'
-function changeGrades(student) {
+function changeGrades() {
 
 }
 ```
@@ -71,17 +84,27 @@ Let's go back to `myData` and instead increment each score by 12 points.
 @test('1/03/03-map')
 @action(insert(
 ```
-// map over `mySlightlyChanged` with a function `increaseGrades` to increment each score by 12
-var mySlightlyChanged = myData.map();
+
+function increaseScores() {
+
+}
+
+// map over `mySlightlyChanged` with a function `increaseScores` to increment each score by 12
+var mySlightlyChanged = myData;
 ```
 ))
 
 + Wait. Now you're getting 105 in "Algorithm Design" class. Set `mySlightlyFixed` to have a maximum score of 95. That should be less suspicious.
 @test('1/03/04-map')
 @action(insert(
 ```
+
+function capScores() {
+
+}
+
 // set `mySlightlyFixed` to change any scores over 100 to a score of 95
-var mySlightlyFixed = mySlightlyChanged.map();
+var mySlightlyFixed = mySlightlyChanged;
 ```
 ))
 
@@ -104,8 +127,9 @@ function getGrade(score) {
       return "F";
   }
 }
+
 // set `myFixed` to update grades to the new scores
-var myFixed = mySlightlyChanged.map();
+var myFixed = mySlightlyChanged;
 ```
 ))