06-concat progress

Author: ShMcK

coderoad.json

@@ -225,25 +225,55 @@
               ]
             },
             {
-              "description": "First, test out `flatten` on the `flattenedArray`\n  @test('1/06/01-concat')\n  @open('06-concat.js')\n  @action(set(\n```\n// Array.prototype can be used to create new Array methods\nArray.prototype.flatten = function() {\n  // more on `reduce` coming up next\n  return this.reduce(function(a, b) {\n    return a.concat(b);\n  }, []);\n});\n```    \n))",
+              "description": "First, test out `flatten` on the `flattenedArray`\n@open('06-concat.js')",
+              "tests": [
+                "1/06/01-concat"
+              ],
+              "hints": [
+                "js\nvar start = [{\n  a: 1,\n  c: [\n    { b: 1 }\n  ]\n}, {\n  a: 2,\n  c: [\n    { b: 2 }, { b: 3 }\n  ]\n}];\n\nvar middle = start.map(function(outer) {\n  return outer.c.map(function(inner) {\n    return {\n      a: outer.a,\n      b: inner.b\n    };\n  });\n});\n//> [ [{ a: 1, b: 1 }], [{a: 2, b: 2}, {a: 2, b: 3}] ]",
+                "Flatten the resulting arrays",
+                "js\nvar end = pre.flatten();\n//> [{a: 1, b: 1}, {a: 2, b: 2}, {a: 2, b: 3}]"
+              ],
               "actions": [
-                "insert('// use `flatten` to set flattenedArray to [1, 2, 3, 4]\nvar flattenedArray = [[1, 2], [3, 4]];\n')"
+                "set('`\n// Array.prototype can be used to create new Array methods\nArray.prototype.flatten = function() {\n  // more on `reduce` coming up next\n  return this.reduce(function(a, b) {\n    return a.concat(b);\n  }, []);\n});')",
+                "insert('\n// use `flatten` on `numberedList` to set flattenedArray to [1, 2, 3, 4]\nvar numberedList = [[1, 2], [3, 4]]\nvar flattenedArray;\n')"
               ]
             },
             {
               "description": "Map over the course data array, and map over the student array inside of the course data. Set `doubleArray` to return an array of array of objects that looks like this:\n\n```js\n  {\n  \"title\": \"Relational Databases\",\n  \"instructor\": \"Sean Quentin Lewis\",\n  \"name\": \"Rebecca Heineman\",\n  \"score\": 71,\n  \"grade\": \"C\"\n  }\n```",
               "tests": [
                 "1/06/02-concat"
+              ],
+              "actions": [
+                "insert('\n// map over doubleArray twice\nvar doubleArray = courses;\n')"
               ]
             },
             {
-              "description": "Use `flatten` to put all data into a single array. Set `flattened` to the result.\n  @test('1/06/03-concat')"
+              "description": "Use `flatten` to put all data into a single array. Set `students` to the result.",
+              "tests": [
+                "1/06/03-concat"
+              ],
+              "actions": [
+                "insert('\n// flatten doubleArray\nvar students = doubleArray;\n')"
+              ]
             },
             {
-              "description": "Use the `suspects` array to `filter` down \"Hack Kerr\"'s data\n  @test('1/06/04-concat')"
+              "description": "Use the `suspects` array to `filter` to only \"Hack Kerr\"'s data",
+              "tests": [
+                "1/06/04-concat"
+              ],
+              "actions": [
+                "insert('\nvar suspects = [\"Hack Kerr\"];\n\n// filter to data matching `suspects`\nvar suspectData = students;\n')"
+              ]
             },
             {
-              "description": "You just thought of two more suspects: `concat` two more suspects to the suspect list, \"Kevin Mitnick\" & \"Albert Gonzalez\"\n  @test('1/06/05-concat')"
+              "description": "You just thought of two more suspects!  `concat` the new suspects array onto the `suspects` list.",
+              "tests": [
+                "1/06/05-concat"
+              ],
+              "actions": [
+                "insert('\nvar newSuspects = [\"Kevin Mitnick\", \"Albert Gonzalez\"];\n')"
+              ]
             }
           ]
         },

tutorial/1/06/02-concat.spec.js

@@ -10,17 +10,28 @@ if (!global.courses) {
   global.courses = JSON.parse(JSON.stringify(require('../../data/courses2.json')));
 }
 
-describe('var flattenedArray', function() {
+describe('var doubleArray', function() {
 
-  var spy = chai.spy.on(Array, 'flatten');
+  var spy = chai.spy.on(Array, 'map');
   loadJS('06-concat.js');
 
-  it('should flatten the array', function() {
-    expect(flattenedArray).to.deep.equal([1, 2, 3, 4]);
+  it('should call map twice', function() {
+    expect(spy).to.have.been.called.twice;
   });
 
-  it('should use the `flatten` Array method', function() {
-    expect(spy).to.have.been.called();
+  it('should create an array of arrays', function() {
+    var result = courses.map(function(course) {
+      return course.students.map(function(student) {
+        return {
+          title: course.title,
+          instructor: course.instructor,
+          name: student.name,
+          score: student.score,
+          grade: student.grade
+        };
+      });
+    });
+    expect(doubleArray).to.deep.equal(result);
   });
 
 });

tutorial/1/06/03-concat.spec.js

@@ -10,7 +10,29 @@ if (!global.courses) {
   global.courses = JSON.parse(JSON.stringify(require('../../data/courses2.json')));
 }
 
-describe('var flattenedArray', function() {
+describe('var students', function() {
+
+  var spy = chai.spy.on(Array, 'map');
+  loadJS('06-concat.js');
+
+  it('should flatten the array with `.flatten()`', function() {
+    expect(spy).to.have.been.called.twice;
+  });
+
+  it('should result in a single array of student data', function () {
+    var result = courses.map(function(course) {
+      return course.students.map(function(student) {
+        return {
+          title: course.title,
+          instructor: course.instructor,
+          name: student.name,
+          score: student.score,
+          grade: student.grade
+        };
+      });
+    }).flatten();
+    expect(students).to.deep.equal(result);
+  })
+
 
-  
 });

tutorial/1/06/04-concat.spec.js

@@ -10,7 +10,10 @@ if (!global.courses) {
   global.courses = JSON.parse(JSON.stringify(require('../../data/courses2.json')));
 }
 
-describe('var flattenedArray', function() {
+describe('var suspectData', function() {
 
+  it('should filter if the `indexOf` the suspects name is greater than -1', function() {
+    
+  });
 
 });

tutorial/1/06/concat.md

@@ -92,9 +92,41 @@ We have a suspect in mind: a classmate named "Hack Kerr". He's a nice guy, and h
 First let's recreate our student array of data from the course data.
 
 + First, test out `flatten` on the `flattenedArray`
-  @test('1/06/01-concat')
-  @open('06-concat.js')
-  @action(set(
+@test('1/06/01-concat')
+@open('06-concat.js')
+@hint(
+```js
+var start = [{
+  a: 1,
+  c: [
+    { b: 1 }
+  ]
+}, {
+  a: 2,
+  c: [
+    { b: 2 }, { b: 3 }
+  ]
+}];
+
+var middle = start.map(function(outer) {
+  return outer.c.map(function(inner) {
+    return {
+      a: outer.a,
+      b: inner.b
+    };
+  });
+});
+//> [ [{ a: 1, b: 1 }], [{a: 2, b: 2}, {a: 2, b: 3}] ]
+```
+)
+@hint(Flatten the resulting arrays)
+@hint(
+```js
+var end = pre.flatten();
+//> [{a: 1, b: 1}, {a: 2, b: 2}, {a: 2, b: 3}]
+```
+)
+@action(set(
 ```
 // Array.prototype can be used to create new Array methods
 Array.prototype.flatten = function() {
@@ -104,11 +136,13 @@ Array.prototype.flatten = function() {
   }, []);
 });
 ```    
-))
+)
 @action(insert(
 ```
-// use `flatten` to set flattenedArray to [1, 2, 3, 4]
-var flattenedArray = [[1, 2], [3, 4]];
+
+// use `flatten` on `numberedList` to set flattenedArray to [1, 2, 3, 4]
+var numberedList = [[1, 2], [3, 4]]
+var flattenedArray;
 ```  
 ))
 
@@ -124,12 +158,41 @@ var flattenedArray = [[1, 2], [3, 4]];
   }
 ```
 @test('1/06/02-concat')
+@action(insert(
+```
 
-+ Use `flatten` to put all data into a single array. Set `flattened` to the result.
-  @test('1/06/03-concat')
+// map over doubleArray twice
+var doubleArray = courses;
+```
+))
+
++ Use `flatten` to put all data into a single array. Set `students` to the result.
+@test('1/06/03-concat')
+@action(insert(
+```
 
-+ Use the `suspects` array to `filter` down "Hack Kerr"'s data
-  @test('1/06/04-concat')
+// flatten doubleArray
+var students = doubleArray;
+```  
+))
 
-+ You just thought of two more suspects: `concat` two more suspects to the suspect list, "Kevin Mitnick" & "Albert Gonzalez"
-  @test('1/06/05-concat')
++ Use the `suspects` array to `filter` to only "Hack Kerr"'s data
+@test('1/06/04-concat')
+@action(insert(
+```
+
+var suspects = ["Hack Kerr"];
+
+// filter to data matching `suspects`
+var suspectData = students;
+```  
+))
+
++ You just thought of two more suspects!  `concat` the new suspects array onto the `suspects` list.
+@test('1/06/05-concat')
+@action(insert(
+```
+
+var newSuspects = ["Kevin Mitnick", "Albert Gonzalez"];
+```  
+))