trackler 2.2.1.27 → 2.2.1.28

data/tracks/csharp/generators/Input/CanonicalDataCaseJsonConverter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -7,7 +8,7 @@ namespace Generators.Input
 {
     public class CanonicalDataCaseJsonConverter : JsonConverter
     {
-        private static readonly string[] NonInputProperties = {"description", "property", "expected", "comments"};
+        private static readonly string[] NonInputProperties = { "description", "property", "expected", "comments" };
 
         public override bool CanConvert(Type objectType) => typeof(CanonicalDataCase) == objectType;
 
@@ -17,23 +18,14 @@ namespace Generators.Input
 
             var canonicalDataCase = new CanonicalDataCase();
             serializer.Populate(new JTokenReader(jToken), canonicalDataCase);
-
-            canonicalDataCase.Properties = jToken.ToObject<IDictionary<string, object>>();
-            canonicalDataCase.Input = GetInputProperty(jToken);
-            canonicalDataCase.ConstructorInput = new Dictionary<string, object>();
-
+            
+            canonicalDataCase.Properties = CanonicalDataCaseJson.ToDictionary(jToken);
+            canonicalDataCase.SetInputParameters(GetInputProperties(canonicalDataCase.Properties));
+            
             return canonicalDataCase;
         }
 
-        private static IDictionary<string, object> GetInputProperty(JToken jToken)
-        {
-            var allProperties = jToken.ToObject<IDictionary<string, object>>();
-
-            foreach (var nonInputProperty in NonInputProperties)
-                allProperties.Remove(nonInputProperty);
-
-            return allProperties;
-        }
+        private static string[] GetInputProperties(IDictionary<string, dynamic> properties) => properties.Keys.Except(NonInputProperties).ToArray();
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotImplementedException();
     }

data/tracks/csharp/generators/Input/CanonicalDataCasesJson.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+
+namespace Generators.Input
+{
+    public static class CanonicalDataCasesJson
+    {
+        private const string TokensPath = "$..*[?(@.property)]";
+
+        public static CanonicalDataCase[] ToArray(JToken casesToken)
+        {
+            var caseTokens = new JArray(casesToken.SelectTokens(TokensPath));
+            var canonicalDataCases = new JArray(caseTokens).ToObject<CanonicalDataCase[]>();
+
+            ConvertEmptyJArrayToArray(canonicalDataCases);
+
+            return canonicalDataCases;
+        }
+
+        private static void ConvertEmptyJArrayToArray(CanonicalDataCase[] canonicalDataCases)
+        {
+            foreach (var groupedCanonicalDataCases in canonicalDataCases.ToLookup(c => c.Property))
+            {
+                foreach (var groupedProperties in groupedCanonicalDataCases.SelectMany(x => x.Properties).ToLookup(x => x.Key))
+                {
+                    var arrayType = GetArrayType(groupedProperties);
+                    if (arrayType == null)
+                        continue;
+
+                    foreach (var groupedCanonicalDataCase in GetEmptyJArrays(groupedCanonicalDataCases, groupedProperties))
+                        groupedCanonicalDataCase.Properties[groupedProperties.Key] = Array.CreateInstance(arrayType, 0);
+                }
+            }
+        }
+
+        private static Type GetArrayType(IGrouping<string, KeyValuePair<string, dynamic>> groupedProperties)
+        {
+            if (groupedProperties.Any(x => x.Value is string[]))
+                return typeof(string);
+
+            if (groupedProperties.Any(x => x.Value is int[]))
+                return typeof(int);
+
+            if (groupedProperties.Any(x => x.Value is float[]))
+                return typeof(float);
+
+            return null;
+        }
+
+        private static IEnumerable<CanonicalDataCase> GetEmptyJArrays(IGrouping<string, CanonicalDataCase> groupedCanonicalDataCases, IGrouping<string, KeyValuePair<string, dynamic>> groupedProperties) 
+            => groupedCanonicalDataCases.Where(canonicalDataCase => IsEmptyJArray(canonicalDataCase, groupedProperties));
+
+        private static bool IsEmptyJArray(CanonicalDataCase x, IGrouping<string, KeyValuePair<string, dynamic>> groupedProperties) 
+            => x.Properties[groupedProperties.Key] is JArray jArray && jArray.Count == 0;
+    }
+}

data/tracks/csharp/generators/Input/CanonicalDataCasesJsonConverter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -8,17 +7,10 @@ namespace Generators.Input
 {
     public class CanonicalDataCasesJsonConverter : JsonConverter
     {
-        private const string TokensPath = "$..*[?(@.property)]";
+        public override bool CanConvert(Type objectType) => typeof(CanonicalDataCase[]).GetTypeInfo().IsAssignableFrom(objectType);
 
-        public override bool CanConvert(Type objectType) => typeof(IEnumerable<CanonicalData>).GetTypeInfo().IsAssignableFrom(objectType);
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var casesToken = JToken.ReadFrom(reader);
-            var caseTokens = new JArray(casesToken.SelectTokens(TokensPath));
-            
-            return new JArray(caseTokens).ToObject(objectType);            
-        }
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) 
+            => CanonicalDataCasesJson.ToArray(JToken.ReadFrom(reader));
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotImplementedException();
     }

data/tracks/csharp/generators/Output/TestMethodBodyData.cs

@@ -19,7 +19,7 @@ namespace Generators.Output
         }
 
         public object TestedValue => _testMethodBody.UseVariableForTested ? TestedVariableName : TestedMethodInvocation;
-        public object InputParameters => _testMethodBody.UseVariablesForInput ? string.Join(", ", CanonicalDataCase.Input.Keys.Select(key => NameExtensions.ToVariableName(key))) : Input;
+        public object InputParameters => _testMethodBody.UseVariablesForInput ? string.Join(", ", CanonicalDataCase.Input.Keys.Select(key => key.ToVariableName())) : Input;
         public object ExpectedParameter => _testMethodBody.UseVariableForExpected ? ExpectedVariableName : Expected;
         public object ConstructorParameters => _testMethodBody.UseVariablesForConstructorParameters ? string.Join(", ", CanonicalDataCase.ConstructorInput.Keys.Select(key => key.ToVariableName())) : ConstructorInput;
 

data/tracks/csharp/generators/Output/ValueFormatter.cs

@@ -41,8 +41,8 @@ namespace Generators.Output
             }
         }
 
-        public static string[] FormatVariables(IDictionary<string, object> dict) 
-            => dict.Keys.SelectMany((key, i) => FormatVariable(dict[key], key.ToVariableName())).ToArray();
+        public static string[] FormatVariables(IReadOnlyDictionary<string, object> dict) 
+            => dict.Keys.SelectMany(key => FormatVariable(dict[key], key.ToVariableName())).ToArray();
 
         public static string[] FormatVariable(object val, string name)
         {
@@ -50,10 +50,6 @@ namespace Generators.Output
             {
                 case string str when str.Contains("\n"):
                     return FormatMultiLineString(name, str);
-                case int[] ints when ints.Any():
-                    return FormatMultiLineEnumerable(ints.Select(x => x.ToString(CultureInfo.InvariantCulture)), name);
-                case string[] strings when strings.Any():
-                    return FormatMultiLineEnumerable(strings, name);
                 case IDictionary<char, int> dict:
                     return FormatMultiLineEnumerable(dict.Keys.Select((key, i) => $"[{Format(key)}] = {Format(dict[key])}" + (i < dict.Keys.Count - 1 ? "," : "")), name, "new Dictionary<char, int>");
                 case IDictionary<string, int> dict:

data/tracks/ecmascript/README.md

@@ -1,4 +1,4 @@
-# xECMAScript
+# ECMAScript
 [![Build Status](https://travis-ci.org/exercism/ecmascript.svg?branch=master)](https://travis-ci.org/exercism/ecmascript)
 [![Join the chat at https://gitter.im/exercism/xecmascript](https://badges.gitter.im/exercism/xecmascript.svg)](https://gitter.im/exercism/xecmascript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

data/tracks/go/README.md

@@ -49,7 +49,7 @@ $ tree -a
 .
 ├── cases_test.go
 ├── example.go
-├── fizzbuzz_slug.go
+├── fizzbuzz.go
 ├── fizzbuzz_test.go
 ├── .meta
 │   └── description.md
@@ -80,11 +80,11 @@ So let's quickly run through each file and briefly describe it:
   by the `exercism fetch` command. See [ignored files](#ignored-files)
   for details on which files are ignored.
 
-* **exercise_slug.go** - This is a *stub file*, and will only be
+* **fizzbuzz.go** - This is a *stub file*, and will only be
   present in some exercises as a way to give users a useful starting
   point.
 
-* **exercise_slug_test.go** - This is the main test file for the
+* **fizzbuzz_test.go** - This is the main test file for the
   exercise.
 
 * **.meta/** - The `.meta/` directory contains files that are not

data/tracks/go/exercises/robot-simulator/robot_simulator_step2_test.go

@@ -4,13 +4,13 @@ package robot
 
 import "testing"
 
-// For step 1 you implement robot movements, but it's not much of a simulation.
+// For step 1 you implemented robot movements, but it's not much of a simulation.
 // For example where in the source code is "the robot"?  Where is "the grid"?
 // Where are the computations that turn robot actions into grid positions,
-// in the robot or in the grid?  The physical world is different.
+// in the robot, or in the grid?  The physical world is different.
 //
 // Step 2 introduces a "room."  It seems a small addition, but we'll make
-// big changes to clarify the rolls of "room", "robot", and "test program"
+// big changes to clarify the roles of "room", "robot", and "test program"
 // and begin to clarify the physics of the simulation.  You will define Room
 // and Robot as functions which the test program "brings into existence" by
 // launching them as goroutines.  Information moves between test program,
@@ -34,7 +34,7 @@ import "testing"
 // The test program then sends commands to Robot.  When it is done sending
 // commands, it closes the command channel.  Robot must accept commands and
 // inform Room of actions it is attempting.  When it senses the command channel
-// closing, it must shut down itself.  The room must interpret the physical
+// closing, it must shut itself down.  The room must interpret the physical
 // consequences of the robot actions.  When it senses the robot shutting down,
 // it sends a final report back to the test program, telling the robot's final
 // position and direction.

data/tracks/go/exercises/roman-numerals/example.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 )
 
-const testVersion = 3
+const testVersion = 4
 
 type arabicToRoman struct {
 	arabic int
@@ -15,7 +15,7 @@ type arabicToRoman struct {
 func ToRomanNumeral(input int) (string, error) {
 	buffer := bytes.NewBufferString("")
 
-	if input <= 0 || input >= 4000 {
+	if input <= 0 || input >= 3001 {
 		return "", fmt.Errorf("the number %d is undefined in the roman numeral system", input)
 	}
 

data/tracks/go/exercises/roman-numerals/roman_numerals_test.go

@@ -2,7 +2,7 @@ package romannumerals
 
 import "testing"
 
-const targetTestVersion = 3
+const targetTestVersion = 4
 
 func TestTestVersion(t *testing.T) {
 	if testVersion != targetTestVersion {
@@ -14,9 +14,9 @@ func TestRomanNumerals(t *testing.T) {
 	tc := append(romanNumeralTests, []romanNumeralTest{
 		{0, "", true},
 		{-1, "", true},
-		{4000, "", true},
-		{3999, "MMMCMXCIX", false},
+		{3001, "", true},
 	}...)
+
 	for _, test := range tc {
 		actual, err := ToRomanNumeral(test.arabic)
 		if err == nil && test.hasError {

data/tracks/ocaml/.travis-ci.sh

@@ -1,5 +1,5 @@
 # Edit this for your own project dependencies
-OPAM_DEPENDS="ocamlfind core ounit react"
+OPAM_DEPENDS="ocamlfind core ounit react ppx_deriving"
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
     4.05.0,1.2.2) ppa=avsm/ocaml42+opam12 ;;