Migrated code for most exercises. A few remain to be ported and adapted.

Author: tdd

Diff for: .gitignore

@@ -1,2 +1,4 @@
 node_modules
 .DS_Store
+npm-debug.log
+TODO.md

Diff for: problems/async_loops/setup.js renamed to exercises/async_loops/exercise.js

@@ -1,18 +1,17 @@
 "use strict"
 
-var input = require('../../input')
+var runner = require('../../runner')
+var util = require('util')
 
 function randomInt(min, max) {
-  return Math.floor((Math.random() * (max - min + 1)) + min)
+  return Math.floor((Math.random() * (max - min)) + min)
 }
 
-module.exports = input(new Array(randomInt(0, 20))
-.join(',')
-.split(',')
-.map(function() {
+var input = Array.apply(null, { length: randomInt(0, 20) }).map(function() {
   return randomInt(0, 10)
-})).wrap(function(input, mod) {
-  var numbers = input[0]
+})
+
+module.exports = runner.custom(function(fx, numbers) {
   var valid = 1
   var objects = [{quack: true}].concat(numbers.map(function(num) {
     switch(num) {
@@ -60,5 +59,5 @@ module.exports = input(new Array(randomInt(0, 20))
     }
   }))
 
-  console.log('Matched %d of %d valid objects from %d total.', mod.apply(mod, objects), valid, objects.length)
-})
+  return util.format('Matched %d of %d valid objects from %d total.', fx.apply(null, objects), valid, objects.length)
+})(input)

Diff for: problems/async_loops/problem.md renamed to exercises/async_loops/problem.md

@@ -0,0 +1,46 @@
+"use strict"
+
+var loremIpsum = require('lorem-ipsum')
+var runner = require('../../runner')
+
+function randomInt(min, max) {
+  return Math.floor((Math.random() * (max - min)) + min)
+}
+
+function makeUser() {
+  return {
+    id: randomInt(0, 1000),
+    name: loremIpsum().split(' ').slice(0, 2).map(function(word) {
+      word[0] = word[0].toUpperCase();
+      return word;
+    }).join(' ')
+  }
+}
+
+function makeListOfUsers() {
+  return Array.apply(null, { length : randomInt(10, 100) }).map(makeUser)
+}
+
+var good = makeListOfUsers()
+var bad = makeListOfUsers()
+var lists = Array.apply(null, {length: 20}).map(function() {
+  return Array.apply(null, {length: 20}).map(function() {
+    if (Math.random() < 0.95) {
+      return good[randomInt(0, 10)]
+    } else {
+      return bad[randomInt(0, 10)]
+    }
+  })
+})
+
+module.exports = runner.custom(function(fx, good, lists) {
+  var test = fx(good)
+
+  var goodLists = 0
+
+  lists.forEach(function(list) {
+    test(list) && ++goodLists
+  })
+
+  return 'found ' + goodLists + ' good lists!'
+}).hideInput(good, lists)

Diff for: problems/async_loops/solution.js renamed to exercises/async_loops/solution/solution.js

@@ -0,0 +1,13 @@
+"use strict"
+
+var loremIpsum = require('lorem-ipsum')
+var runner = require('../../runner')
+
+function randomInt(min, max) {
+  return Math.floor((Math.random() * (max - min)) + min)
+}
+
+var input = new Array(randomInt(10, 30)).join(',').split(',')
+  .map(function() { return { message: loremIpsum() } })
+
+module.exports = runner.hideInput(input)

Diff for: problems/basic_call/setup.js renamed to exercises/basic_call/exercise.js

@@ -0,0 +1,27 @@
+"use strict"
+
+var runner = require('../../runner')
+
+function randomInt(min, max) {
+  return Math.floor((Math.random() * (max - min)) + min)
+}
+
+var input = new Array(randomInt(0, 19)).join(',').split(',')
+  .map(function() { return randomInt(0, 9) })
+
+var regularMap = Array.prototype.map, usedMap
+Array.prototype.map = function() {
+  usedMap = true
+  return regularMap.apply(this, arguments)
+}
+
+module.exports = runner.init(function() {
+  usedMap = false
+}).wrapUp(function(callback) {
+  if (!usedMap) {
+    this.emit('fail', this.__('didnt_use_map'));
+  } else {
+    this.emit('pass', this.__('used_map'));
+  }
+  callback(null, usedMap)
+})(input)

Diff for: problems/basic_call/problem.md renamed to exercises/basic_call/problem.md

@@ -0,0 +1,16 @@
+"use strict"
+
+var loremIpsum = require('lorem-ipsum')
+var runner = require('../../runner')
+
+var input = loremIpsum({count: 1, units:'paragraphs'})
+ .replace(/([^\w ])/g, '')// remove non-words and spaces
+ .toLowerCase() // lowercase I guess
+ .split(' ') // create array of words
+
+module.exports = runner.custom(function(fx, input) {
+  return fx(input, function(prev, curr) {
+    prev[curr] = ++prev[curr] || 1
+    return prev
+  }, {})
+})(input)

Diff for: problems/basic_call/solution.js renamed to exercises/basic_call/solution/solution.js

@@ -0,0 +1,11 @@
+"use strict"
+
+var loremIpsum = require('lorem-ipsum')
+var runner = require('../../runner')
+
+var input = loremIpsum({ count: 1, units: 'paragraphs' })
+ .replace(/([^\w ])/g, '')// remove non-words and spaces
+ .toLowerCase() // lowercase I guess
+ .split(' ') // create array of words
+
+module.exports = runner(input)

Diff for: exercises/basic_every_some/exercise.js

@@ -0,0 +1,5 @@
+"use strict"
+
+var runner = require('../../runner')
+
+module.exports = runner(require('lorem-ipsum')())

Diff for: problems/basic_every_some/problem.md renamed to exercises/basic_every_some/problem.md

@@ -0,0 +1,16 @@
+"use strict"
+
+var runner = require('../../runner')
+
+function randomInt(min, max) {
+  return Math.floor((Math.random() * (max - min)) + min)
+}
+
+var counter
+
+module.exports = runner.init(function() {
+  console.log("------------------------")
+  counter = 0
+}).quiet(function count() {
+  console.log("Called function %d times.", ++counter)
+}, randomInt(3, 10))

Diff for: problems/basic_every_some/solution.js renamed to exercises/basic_every_some/solution/solution.js

@@ -0,0 +1,13 @@
+"use strict"
+
+var runner = require('../../runner')
+
+function randomInt(min, max) {
+  return Math.floor((Math.random() * (max - min)) + min)
+}
+
+var numbers = Array.apply(null, {length: Math.random() * 20 + 1}).map(function() {
+  return randomInt(0, 9)
+})
+
+module.exports = runner(numbers, function(item) { return item * 3 })

Diff for: exercises/basic_filter/exercise.js

@@ -0,0 +1,25 @@
+"use strict"
+
+var loremIpsum = require('lorem-ipsum')
+var runner = require('../../runner')
+
+var input = Array.apply(null, {length: Math.random() * 20 + 1}).map(function() {
+  return loremIpsum()
+})
+
+// FIXME: THIS DOES NOT CAPTURE console.log OUTPUT PROPERLY (as it happens
+// inside the runner, not in child processes).  WE NEED TO CHANGE THIS INTO
+// NON-runner, RAW EXERCISE CODE WITH A WRAPPER MODULE FOR SUBMISSION/SOLUTION CMDS
+
+module.exports = runner.custom(function(fx, input) {
+  console.log.bind = function() {
+    throw new Error('Try implementing this without bind!')
+  }
+
+  var info = fx('INFO:')
+  var warn = fx('WARN:')
+  input.forEach(function(message, i) {
+    if (i % 2 === 0) info.apply(null, message.split(' '))
+    else warn.apply(null, message.split(' '))
+  })
+})(input)

Diff for: problems/basic_filter/problem.md renamed to exercises/basic_filter/problem.md

@@ -7,6 +7,6 @@ var path = require('path')
 
 Workshopper({
     name   : 'functional-javascript'
-  , title  : 'FUNCTIONAL JAVASCRIPT IS GOOD'
-  , appDir : path.join(__dirname)
-}).init()
+  , appDir : __dirname
+  , languages   : ['en', 'fr']
+})

Diff for: problems/basic_filter/solution.js renamed to exercises/basic_filter/solution/solution.js

@@ -0,0 +1,22 @@
+{
+  "title": "FUNCTIONAL JAVASCRIPT IS GOOD",
+  "subtitle": "\u001b[23mSelect an exercise and hit \u001b[3mEnter\u001b[23m to begin",
+  "common": {
+    "exercise": {
+      "fail": {
+        "missing_deps": "You need to install all of the dependencies you are using in your solution (e.g. lodash)",
+        "module_not_found": "Could not find your file. Make sure the path is correct.",
+        "must_export_function": "You should always return a function using the module.exports object."
+      },
+      "input": "input:      %j",
+      "submission": "submission: %j",
+      "solution": "solution:   %j"
+    }
+  },
+  "exercises": {
+    "Basic: Map": {
+      "didnt_use_map": "You did not use Array#map",
+      "used_map": "Yay!  You used Array#map"
+    }
+  }
+}

Diff for: problems/basic_inheritance_with_objectcreate/setup.js renamed to exercises/basic_inheritance_with_objectcreate/exercise.js

@@ -0,0 +1,42 @@
+{
+  "title": "JAVASCRIPT FONCTIONNEL C’EST LE BIEN",
+  "subtitle" : "\u001b[23mSélectionnez un exercice et tapez \u001b[3mEnter\u001b[23m pour démarrer",
+  "common": {
+    "exercise": {
+      "fail": {
+        "missing_deps": "You need to install all of the dependencies you are using in your solution (e.g. lodash)",
+        "module_not_found": "Could not find your file. Make sure the path is correct.",
+        "must_export_function": "You should always return a function using the module.exports object."
+      },
+      "input":      "entrée:            %j",
+      "submission": "votre résultat :   %j",
+      "solution":   "résultat attendu : %j"
+    }
+  },
+  "exercise": {
+    "Hello World": "Bonjour Monde",
+    "Higher Order Functions": "Fonctions d’Ordre Supérieur",
+    "Basic: Map": "Les bases : Map",
+    "Basic: Filter": "Les bases : Filter",
+    "Basic: Every Some": "Les bases : Every, Some",
+    "Basic: Reduce": "Les bases : Reduce",
+    "Basic: Recursion": "Les bases : Récursion",
+    "Basic: Call": "Les bases : Call",
+    "Partial Application without Bind": "Application Partielle sans Bind",
+    "Partial Application with Bind": "Application Partielle avec Bind",
+    "Implement Map with Reduce": "Implémenter Map à l’aide de Reduce",
+    "Function Spies": "Espions sur Fonctions",
+    "Blocking Event Loop": "Boucle d’Événements Bloquée",
+    "Trampoline": "Trampoline",
+    "Async Loops": "Boucles Asynchrones",
+    "Recursion": "Récursion",
+    "Currying": "Currying",
+    "Function Call": "Appel de Fonction"
+  },
+  "exercises": {
+    "Basic: Map": {
+      "didnt_use_map": "Vous n’avez pas utilisé Array#map",
+      "used_map": "Youpi !  Vous avez utilisé Array#map"
+    }
+  }
+}

Diff for: problems/basic_inheritance_with_objectcreate/problem.md renamed to exercises/basic_inheritance_with_objectcreate/problem.md

@@ -17,7 +17,9 @@
   "author": "Tim Oxley",
   "license": "MIT",
   "dependencies": {
-    "workshopper": "~0.7.2",
+    "workshopper": "^2.3.1",
+    "workshopper-exercise": "^2.3.0",
+    "deep-eql": "^0.1.3",
     "lorem-ipsum": "~0.1.1"
   },
   "repository": {