Refactor

Author: cjdell

challenges/es5-1-number-reader/challenge.json

@@ -1,13 +1,5 @@
 import { Challenge } from '..';
-
-const solution = (n: number) => {
-  const a = [];
-  const ns = n + '';
-  for (let i = 0; i < ns.length; i += 1) {
-    a.push(['zero', 0, 'two', 'three', 0, 'five', 'six', 'seven', 0, 'nine'][parseInt(ns[i], 10)]);
-  }
-  return a.join(' ');
-};
+import solution from './solution';
 
 const input = 77209536;
 

challenges/es5-1-number-reader/solution.js

@@ -0,0 +1,3 @@
+declare function play(n: number): string;
+
+export = play;

challenges/es5-2-sort-the-numbers/challenge.json

@@ -0,0 +1,11 @@
+function play(n) {
+  const a = []
+  n += ''
+  for (let i = 0; i < n.length; i++)
+    a.push(['zero', 0, 'two', 'three', 0, 'five', 'six', 'seven', 0, 'nine'][n[i]])
+  return a.join(' ')
+}
+
+if (typeof module !== 'undefined') {
+  module.exports = play;
+}

challenges/es5-2-sort-the-numbers/solution.js

@@ -1,16 +1,5 @@
 import { Challenge } from '..';
-
-const solution = (n: number[]) => {
-  const a = [];
-  const b = [];
-  for (let i = 0; i < n.length; i += 1) {
-    a[n[i]] ? a[n[i] + 1] = n[i] : a[n[i]] = n[i];
-  }
-  for (let x = 0; x < a.length; x += 1) {
-    if (a[x]) b.push(a[x]);
-  }
-  return b;
-};
+import solution from './solution';
 
 const input = [
   10,

challenges/es6-5-arabic-roman/challenge.json

@@ -0,0 +1,3 @@
+declare function play(n: number[]): number[];
+
+export = play;

challenges/es6-5-arabic-roman/solution.js

@@ -0,0 +1,15 @@
+function play(n) {
+  const a = [];
+  const b = [];
+  for (let i = 0; i < n.length; i += 1) {
+    a[n[i]] ? a[n[i] + 1] = n[i] : a[n[i]] = n[i];
+  }
+  for (let x = 0; x < a.length; x += 1) {
+    if (a[x]) b.push(a[x]);
+  }
+  return b;
+};
+
+if (typeof module !== 'undefined') {
+  module.exports = play;
+}

src/game/data/.gitignore renamed to data/.gitignore

@@ -1,6 +1,8 @@
 import fs = require('fs');
+import path = require('path');
 import crypto = require('crypto');
 import lodash = require('lodash');
+import { challenges } from '../challenges';
 
 interface GameStart {
   key: string;
@@ -29,9 +31,9 @@ interface Entry extends AddEntryRequest {
 const jsmin = require('jsmin').jsmin;
 
 let game: Game | undefined;
-const savePath = __dirname + '/data/game.json';
+const savePath = path.join(__dirname, '..', '..', 'data', 'game.json');
 
-const start = function (data: GameStart) {
+const start = (data: GameStart) => {
   if (game && game.key === data.key) {
     game.running = true;
     return save();
@@ -46,35 +48,39 @@ const start = function (data: GameStart) {
   return save();
 };
 
-const stop = function () {
+const stop = () => {
   if (game) {
     game.running = false;
   }
 
   return save();
 };
 
-const get = function () {
+const get = () => {
   return game;
 };
 
-const getOrError = function () {
+const getCurrentChallenge = () => {
+  return game ? challenges[game.key] : null;
+};
+
+const getOrError = () => {
   if (!game) throw new Error('No game');
 
   return game;
 };
 
-const addEntry = function (data: AddEntryRequest): { entry?: Partial<Entry>, err?: string } {
-  const createKey = function () {
+const addEntry = (data: AddEntryRequest): { entry?: Partial<Entry>, err?: string } => {
+  const createKey = () => {
     return (Math.round(Math.random() * 100000000000)).toString(36);
   };
 
-  const getGravatarUrl = function (email: string) {
+  const getGravatarUrl = (email: string) => {
     const hash = crypto.createHash('md5').update(email).digest('hex');
     return 'http://www.gravatar.com/avatar/' + hash + '?s=130&d=wavatar';
   };
 
-  const countStrokes = function (file: string) {
+  const countStrokes = (file: string) => {
     if (fs.existsSync(file)) {
       const contents = jsmin(fs.readFileSync(file, 'utf8'), 3).replace(/^\n+/, '');
       return contents.length;
@@ -123,7 +129,7 @@ const addEntry = function (data: AddEntryRequest): { entry?: Partial<Entry>, err
   return { err: 'Unknown error' };
 };
 
-const setValid = function (key: string, valid: boolean) {
+const setValid = (key: string, valid: boolean) => {
   if (!game) return;
 
   const entry = lodash.find(game.entries, { key });
@@ -134,11 +140,11 @@ const setValid = function (key: string, valid: boolean) {
   }
 };
 
-const save = function () {
+const save = () => {
   return fs.writeFileSync(savePath, JSON.stringify(game));
 };
 
-const load = function () {
+const load = () => {
   if (fs.existsSync(savePath)) {
     game = JSON.parse(fs.readFileSync(savePath, 'utf8'));
   }
@@ -154,5 +160,6 @@ export {
   start,
   stop,
   get,
+  getCurrentChallenge,
   getOrError,
 };

src/challenges/c1-number-reader/index.ts

@@ -1,8 +1,7 @@
 import express = require('express');
 import expressBasicAuth = require('express-basic-auth');
 import game = require('../game/game');
-
-const challengeLibrary = require('../game/challenge-library');
+import challengeLibrary = require('../game/challenge-library');
 
 const app = express();
 
@@ -13,13 +12,17 @@ const authorizer = (username: string, password: string) => {
 app.use(expressBasicAuth({ authorizer, challenge: true }));
 
 app.get('/admin', (req, res) => {
-  const challenges = challengeLibrary.getChallenges();
+  const challengeList = challengeLibrary.getChallenges();
+
+  const gameState = game.get();
+  const challenge = game.getCurrentChallenge();
 
-  const gameData = JSON.stringify(game.get(), undefined, 2);
+  const gameData = JSON.stringify(gameState, undefined, 2);
 
   return res.render('admin', {
     gameData,
-    challenges,
+    challenge,
+    challengeList,
     game: game.get(),
   });
 });

src/challenges/c1-number-reader/solution.d.ts

@@ -30,26 +30,26 @@ <h4>Game is stopped</h4>
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu" aria-labelledby="challengeMenu">
-            {{#challenges}}
+            {{#challengeList}}
             <li>
               <a href="javascript:void(0)"
                  class="challenge-link"
                  data-key="{{key}}">
                 {{title}}
               </a>
             </li>
-            {{/challenges}}
+            {{/challengeList}}
           </ul>
         </div>
 
         <form method="post" action="/start">
           <input type="hidden" name="key" id="key" value="{{game.key}}" />
 
           <label for="title">Title <span>(new title starts a new game)</span></label>
-          <input type="text" name="title" id="title" value="{{game.title}}" readonly="readonly" />
+          <input type="text" name="title" id="title" value="{{challenge.title}}" readonly="readonly" />
 
           <label for="description">Description</label>
-          <textarea name="description" id="description" rows="5" readonly="readonly">{{game.description}}</textarea>
+          <textarea name="description" id="description" rows="5" readonly="readonly">{{challenge.description}}</textarea>
 
           {{#game.entries.length}}
           <label>Entries</label>