trackler 2.2.1.60 → 2.2.1.61

data/tracks/ecmascript/exercises/house/example.js

@@ -0,0 +1,62 @@
+const OBJECTS = [
+  'house',
+  'malt',
+  'rat',
+  'cat',
+  'dog',
+  'cow with the crumpled horn',
+  'maiden all forlorn',
+  'man all tattered and torn',
+  'priest all shaven and shorn',
+  'rooster that crowed in the morn',
+  'farmer sowing his corn',
+  'horse and the hound and the horn',
+];
+
+const ACTIONS = [
+  'Jack built',
+  'lay in',
+  'ate',
+  'killed',
+  'worried',
+  'tossed',
+  'milked',
+  'kissed',
+  'married',
+  'woke',
+  'kept',
+  'belonged to',
+];
+
+class House {
+  static verse(verseNumber) {
+    const lines = [];
+    const totalLines = verseNumber;
+    let itemIndex = verseNumber - 1;
+    for (let lineNumber = 1; lineNumber <= totalLines; lineNumber += 1) {
+      let lineText = '';
+      if (lineNumber === 1) lineText += 'This is';
+      else {
+        lineText += `that ${ACTIONS[itemIndex]}`;
+        itemIndex -= 1;
+      }
+
+      lineText += ` the ${OBJECTS[itemIndex]}`;
+      if (lineNumber === totalLines) lineText += ` that ${ACTIONS[itemIndex]}.`;
+      lines.push(lineText);
+    }
+    return lines;
+  }
+
+  static verses(start, end) {
+    let lines = [];
+    for (let i = start; i <= end; i += 1) {
+      const verseLines = House.verse(i);
+      lines = lines.concat(verseLines);
+      if (i < end) lines.push('');
+    }
+    return lines;
+  }
+}
+
+export default House;

data/tracks/ecmascript/exercises/house/house.spec.js

@@ -0,0 +1,292 @@
+import House from './house';
+
+describe('House', () => {
+  test('verse one - the house that jack built', () => {
+    const lyrics = [
+      'This is the house that Jack built.',
+    ];
+    expect(House.verse(1)).toEqual(lyrics);
+  });
+
+  xtest('verse two - the malt that lay', () => {
+    const lyrics = [
+      'This is the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(2)).toEqual(lyrics);
+  });
+
+  xtest('verse three - the rat that ate', () => {
+    const lyrics = [
+      'This is the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(3)).toEqual(lyrics);
+  });
+
+  xtest('verse four - the cat that killed', () => {
+    const lyrics = [
+      'This is the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(4)).toEqual(lyrics);
+  });
+
+  xtest('verse five - the dog that worried', () => {
+    const lyrics = [
+      'This is the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(5)).toEqual(lyrics);
+  });
+
+  xtest('verse six - the cow with the crumpled horn', () => {
+    const lyrics = [
+      'This is the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(6)).toEqual(lyrics);
+  });
+
+  xtest('verse seven - the maiden all forlorn', () => {
+    const lyrics = [
+      'This is the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(7)).toEqual(lyrics);
+  });
+
+  xtest('verse eight - the man all tattered and torn', () => {
+    const lyrics = [
+      'This is the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(8)).toEqual(lyrics);
+  });
+
+  xtest('verse nine - the priest all shaven and shorn', () => {
+    const lyrics = [
+      'This is the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(9)).toEqual(lyrics);
+  });
+
+  xtest('verse ten - the rooster that crowed in the morn', () => {
+    const lyrics = [
+      'This is the rooster that crowed in the morn',
+      'that woke the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(10)).toEqual(lyrics);
+  });
+
+  xtest('verse eleven - the farmer sowing his corn', () => {
+    const lyrics = [
+      'This is the farmer sowing his corn',
+      'that kept the rooster that crowed in the morn',
+      'that woke the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(11)).toEqual(lyrics);
+  });
+
+  xtest('verse twelve - the horse and the hound and the horn', () => {
+    const lyrics = [
+      'This is the horse and the hound and the horn',
+      'that belonged to the farmer sowing his corn',
+      'that kept the rooster that crowed in the morn',
+      'that woke the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verse(12)).toEqual(lyrics);
+  });
+
+  xtest('multiple verses', () => {
+    const startVerse = 4;
+    const endVerse = 8;
+    const lyrics = [
+      'This is the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verses(startVerse, endVerse)).toEqual(lyrics);
+  });
+
+  xtest('full rhyme', () => {
+    const startVerse = 1;
+    const endVerse = 12;
+    const lyrics = [
+      'This is the house that Jack built.',
+      '',
+      'This is the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the rooster that crowed in the morn',
+      'that woke the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the farmer sowing his corn',
+      'that kept the rooster that crowed in the morn',
+      'that woke the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+      '',
+      'This is the horse and the hound and the horn',
+      'that belonged to the farmer sowing his corn',
+      'that kept the rooster that crowed in the morn',
+      'that woke the priest all shaven and shorn',
+      'that married the man all tattered and torn',
+      'that kissed the maiden all forlorn',
+      'that milked the cow with the crumpled horn',
+      'that tossed the dog',
+      'that worried the cat',
+      'that killed the rat',
+      'that ate the malt',
+      'that lay in the house that Jack built.',
+    ];
+    expect(House.verses(startVerse, endVerse)).toEqual(lyrics);
+  });
+});

data/tracks/ecmascript/exercises/house/package.json

@@ -0,0 +1,71 @@
+{
+  "name": "xecmascript",
+  "version": "0.0.0",
+  "description": "Exercism exercises in ECMAScript 6.",
+  "author": "Katrina Owen",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/exercism/xecmascript"
+  },
+  "devDependencies": {
+    "babel-jest": "^21.2.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
+    "babel-preset-env": "^1.4.0",
+    "eslint": "^3.19.0",
+    "eslint-config-airbnb": "^15.0.1",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jsx-a11y": "^5.0.1",
+    "eslint-plugin-react": "^7.0.1",
+    "jest": "^21.2.1"
+  },
+  "jest": {
+    "modulePathIgnorePatterns": [
+      "package.json"
+    ]
+  },
+  "babel": {
+    "presets": [
+      "env"
+    ],
+    "plugins": [
+      [
+        "babel-plugin-transform-builtin-extend",
+        {
+          "globals": [
+            "Error"
+          ]
+        }
+      ],
+      [
+        "transform-regenerator"
+      ]
+    ]
+  },
+  "scripts": {
+    "test": "jest --no-cache ./*",
+    "watch": "jest --no-cache --watch ./*",
+    "lint": "eslint .",
+    "lint-test": "eslint . && jest --no-cache ./* "
+  },
+  "eslintConfig": {
+    "parserOptions": {
+      "ecmaVersion": 6,
+      "sourceType": "module"
+    },
+    "env": {
+      "es6": true,
+      "node": true,
+      "jest": true
+    },
+    "extends": "airbnb",
+    "rules": {
+      "import/no-unresolved": "off",
+      "import/extensions": "off"
+    }
+  },
+  "licenses": [
+    "MIT"
+  ],
+  "dependencies": {}
+}

data/tracks/go/exercises/allergies/example.go

@@ -4,10 +4,11 @@ import "math"
 
 var allergens = []string{"eggs", "peanuts", "shellfish", "strawberries", "tomatoes", "chocolate", "pollen", "cats"}
 
-func Allergies(i uint) (result []string) {
+func Allergies(i uint) []string {
+	var result []string
 	for _, v := range allergens {
 		if AllergicTo(i, v) {
-			result = append(result, []string{v}...)
+			result = append(result, v)
 		}
 	}
 	return result

data/tracks/go/exercises/custom-set/cases_test.go

@@ -1,8 +1,8 @@
 package stringset
 
 // Source: exercism/problem-specifications
-// Commit: 4527635 custom-set: Fix description to match property name
-// Problem Specifications Version: 1.0.1
+// Commit: 390a769 custom-set: add test for inequality of subset (#991)
+// Problem Specifications Version: 1.1.0
 
 // Returns true if the set contains no elements
 var emptyCases = []unaryBoolCase{
@@ -129,6 +129,11 @@ var equalCases = []binBoolCase{
 		[]string{"a", "b", "d"},
 		false,
 	},
+	{ // set is not equal to larger set with same elements
+		[]string{"a", "b", "c"},
+		[]string{"a", "b", "c", "d"},
+		false,
+	},
 }
 
 // Unique elements can be added to a set

data/tracks/go/exercises/isogram/.meta/gen.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"log"
+	"text/template"
+
+	"../../../gen"
+)
+
+func main() {
+	t, err := template.New("").Parse(tmpl)
+	if err != nil {
+		log.Fatal(err)
+	}
+	var j js
+	if err := gen.Gen("isogram", &j, t); err != nil {
+		log.Fatal(err)
+	}
+}
+
+// The JSON structure we expect to be able to unmarshal into
+type js struct {
+	Exercise string
+	Version  string
+	Cases    []struct {
+		Description string
+		Cases       []oneCase
+	}
+}
+
+// Test cases
+type oneCase struct {
+	Description string
+	Property    string
+	Input       string
+	Expected    bool
+}
+
+// Template to generate test cases.
+var tmpl = `package isogram
+
+{{.Header}}
+
+var testCases = []struct {
+	description	string
+	input		string
+	expected	bool
+}{ {{range .J.Cases}} {{range .Cases}}
+{
+	description:	{{printf "%q"  .Description}},
+	input:		{{printf "%q"  .Input}},
+	expected:	{{printf "%t"  .Expected}},
+},{{end}}{{end}}
+}
+`

data/tracks/go/exercises/isogram/cases_test.go

@@ -0,0 +1,57 @@
+package isogram
+
+// Source: exercism/problem-specifications
+// Commit: f9e0ebb isogram: Update canonical-data.json as in #919 (#920)
+// Problem Specifications Version: 1.2.0
+
+var testCases = []struct {
+	description string
+	input       string
+	expected    bool
+}{
+	{
+		description: "empty string",
+		input:       "",
+		expected:    true,
+	},
+	{
+		description: "isogram with only lower case characters",
+		input:       "isogram",
+		expected:    true,
+	},
+	{
+		description: "word with one duplicated character",
+		input:       "eleven",
+		expected:    false,
+	},
+	{
+		description: "longest reported english isogram",
+		input:       "subdermatoglyphic",
+		expected:    true,
+	},
+	{
+		description: "word with duplicated character in mixed case",
+		input:       "Alphabet",
+		expected:    false,
+	},
+	{
+		description: "hypothetical isogrammic word with hyphen",
+		input:       "thumbscrew-japingly",
+		expected:    true,
+	},
+	{
+		description: "isogram with duplicated hyphen",
+		input:       "six-year-old",
+		expected:    true,
+	},
+	{
+		description: "made-up name that is an isogram",
+		input:       "Emily Jung Schwartzkopf",
+		expected:    true,
+	},
+	{
+		description: "duplicated character in the middle",
+		input:       "accentor",
+		expected:    false,
+	},
+}

data/tracks/go/exercises/isogram/isogram_test.go

@@ -2,29 +2,13 @@ package isogram
 
 import "testing"
 
-var testCases = []struct {
-	word     string
-	expected bool
-}{
-	{"duplicates", true},
-	{"eleven", false},
-	{"subdermatoglyphic", true},
-	{"Alphabet", false},
-	{"thumbscrew-japingly", true},
-	{"Hjelmqvist-Gryb-Zock-Pfund-Wax", true},
-	{"Heizölrückstoßabdämpfung", true},
-	{"the quick brown fox", false},
-	{"Emily Jung Schwartzkopf", true},
-	{"éléphant", false},
-}
-
 func TestIsIsogram(t *testing.T) {
 	for _, c := range testCases {
-		if IsIsogram(c.word) != c.expected {
-			t.Fatalf("FAIL: Word %q, expected %v, got %v", c.word, c.expected, !c.expected)
+		if IsIsogram(c.input) != c.expected {
+			t.Fatalf("FAIL: %s\nWord %q, expected %t, got %t", c.description, c.input, c.expected, !c.expected)
 		}
 
-		t.Logf("PASS: Word %q", c.word)
+		t.Logf("PASS: Word %q", c.input)
 	}
 }
 
@@ -34,7 +18,7 @@ func BenchmarkIsIsogram(b *testing.B) {
 		b.StartTimer()
 
 		for i := 0; i < b.N; i++ {
-			IsIsogram(c.word)
+			IsIsogram(c.input)
 		}
 
 		b.StopTimer()

data/tracks/java/config.json

@@ -602,7 +602,13 @@
       "core": false,
       "difficulty": 6,
       "slug": "house",
-      "topics": null,
+      "topics": [
+        "arrays",
+        "conditionals",
+        "loops",
+        "strings",
+        "text_formatting"
+      ],
       "unlocked_by": "two-fer",
       "uuid": "6b51aca3-3451-4a64-ad7b-00b151d7548a"
     },

data/tracks/java/exercises/luhn/src/test/java/LuhnValidatorTest.java

@@ -66,10 +66,15 @@ public class LuhnValidatorTest {
         assertFalse(luhnValidator.isValid("055-444-285"));
     }
 
+    /* The following test diverges from the canonical test data. This is because the corresponding canonical test does
+     * not account for Java specific functions (such as Character.getNumericValue()), which can be part of incorrect yet
+     * passing implementations. For more detail, check out issue #972 here:
+     * (https://github.com/exercism/java/issues/972).
+    */
     @Ignore("Remove to run test")
     @Test
     public void testThatStringContainingSymbolsIsInvalid() {
-        assertFalse(luhnValidator.isValid("055£ 444$ 285"));
+        assertFalse(luhnValidator.isValid("34&"));
     }
 
     @Ignore("Remove to run test")

data/tracks/javascript/.eslintignore

@@ -1,6 +1,5 @@
 big-integer.js
 exercises/accumulate
-exercises/acronym
 exercises/alphametics
 exercises/anagram
 exercises/binary-search
@@ -10,7 +9,6 @@ exercises/bracket-push
 exercises/circular-buffer
 exercises/clock
 exercises/custom-set
-exercises/diamond
 exercises/flatten-array
 exercises/food-chain
 exercises/grade-school
@@ -37,7 +35,6 @@ exercises/scrabble-score
 exercises/secret-handshake
 exercises/simple-cipher
 exercises/simple-linked-list
-exercises/sum-of-multiples
 exercises/triangle
 exercises/trinary
 exercises/wordy

data/tracks/javascript/exercises/acronym/example.js

@@ -2,7 +2,8 @@ module.exports = {
   parse: function (phrase) {
     return phrase.match(/[A-Z]+[a-z]*|[a-z]+/g)
       .reduce(function (acronym, word) {
-        return acronym += word[0].toUpperCase();
+        var returnAcronym = acronym + word[0].toUpperCase();
+        return returnAcronym;
       }, '');
   }
 };