trackler 2.2.1.167 → 2.2.1.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a7e4b7f60198ad1fd83f45ace0dd5e1370a4183
-  data.tar.gz: 4cc482c7996ab6feb83fef78709d892c7db4d679
+  metadata.gz: 7ac97baa3d95b5fac5839d39492fdc5ab7bb6475
+  data.tar.gz: 12d70c30408a6223a225465decb0e43fba0a1dc9
 SHA512:
-  metadata.gz: 74643fd7a7aeee2d74dee4476aeaa9b1b30def943ba53d1e810bb858d31d620da9ced430bf50699d2e6efb23b2956e0607648d85b84a068aa3ef3b70935eed3e
-  data.tar.gz: 56d091db74ec5efcb72412214b4174d90624578f1ddaea1355669d52e0ccba13d02318f104c011db303cc8095974d3abb4bcbb564c301e1b52f91f39cd3da412
+  metadata.gz: f4e708c51b3e34a6947c4a0e24ac1e65577ff206edd47c28ecbdbb29015712e966656cbf484599e579fbc3c55994d8469bd42fdb4575b4ec108dccb420f32eff
+  data.tar.gz: 1ab16c23dfb945249683ac5b8ccd1c6bcc7556651fdbd66e3afe81be434fefaf3f88bee458a6fbed8b22a594e203f7a66a36ee4feab5381931868d4b80ffae10

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.2.1.167"
+  VERSION = "2.2.1.169"
 end

data/tracks/csharp/config/maintainers.json

@@ -8,8 +8,8 @@
       "name": "Erik Schierboom",
       "link_text": "My blog",
       "link_url": "http://www.erikschierboom.com/",
-      "avatar_url": null,
-      "bio": null
+      "avatar_url": "https://nl.gravatar.com/userimage/27030165/64dc5009cee6a1177883121d464d7743.jpg",
+      "bio": "I am a developer with a passion for learning new languages. C# is a well-designed and expressive language that I love programming in."
     },
     {
       "github_username": "burtlo",

data/tracks/fsharp/config/maintainers.json

@@ -8,8 +8,8 @@
       "name": "Erik Schierboom",
       "link_text": "My blog",
       "link_url": "http://www.erikschierboom.com/",
-      "avatar_url": null,
-      "bio": null
+      "avatar_url": "https://nl.gravatar.com/userimage/27030165/64dc5009cee6a1177883121d464d7743.jpg",
+      "bio": "I am a developer with a passion for learning new languages. After falling in love with functional languages, F# quickly became my favorite language."
     },
     {
       "github_username": "jwood803",

data/tracks/fsharp/exercises/forth/Example.fs

@@ -99,6 +99,17 @@ let evalWord word state =
     | None -> None
     | Some op -> applyOp op state
 
+let flattenOperation state (operation: Item)  =
+    match operation with
+    | Word word ->
+        match state.sMapping.TryFind word with
+        | Some (User operations) -> operations
+        | _ -> [operation]
+    | Value _ -> [operation]
+    
+let flattenOperations state (operations: Item list) =
+    List.collect (flattenOperation state) operations
+
 let rec evalState state =
     match state with
     | None -> state
@@ -111,7 +122,8 @@ let rec evalState state =
             | ":" -> 
                 match breakBy (fun c -> c = Word ";") xs with
                 | ((Word userWord::operations), remainder) ->
-                    { s with sInput = List.tail remainder; sMapping = Map.add (userWord.ToLower()) (User operations) s.sMapping } 
+                    let flattenedOperations = flattenOperations s operations
+                    { s with sInput = List.tail remainder; sMapping = Map.add (userWord.ToLower()) (User flattenedOperations) s.sMapping } 
                     |> Some
                     |> evalState
                 | _ -> None

data/tracks/fsharp/exercises/forth/ForthTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.5.0 of the canonical data.
+// This file was auto-generated based on version 1.6.0 of the canonical data.
 
 module ForthTest
 
@@ -187,6 +187,16 @@ let ``User-defined words - can override built-in operators`` () =
     let expected = Some [12]
     evaluate [": + * ;"; "3 4 +"] |> should equal expected
 
+[<Fact(Skip = "Remove to run test")>]
+let ``User-defined words - can use different words with the same name`` () =
+    let expected = Some [5; 6]
+    evaluate [": foo 5 ;"; ": bar foo ;"; ": foo 6 ;"; "bar foo"] |> should equal expected
+
+[<Fact(Skip = "Remove to run test")>]
+let ``User-defined words - can define word that uses word with the same name`` () =
+    let expected = Some [11]
+    evaluate [": foo 10 ;"; ": foo foo 1 + ;"; "foo"] |> should equal expected
+
 [<Fact(Skip = "Remove to run test")>]
 let ``User-defined words - cannot redefine numbers`` () =
     let expected = None

data/tracks/fsharp/exercises/isbn-verifier/IsbnVerifierTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 2.4.0 of the canonical data.
+// This file was auto-generated based on version 2.5.0 of the canonical data.
 
 module IsbnVerifierTest
 
@@ -67,3 +67,7 @@ let ``Empty isbn`` () =
 let ``Input is 9 characters`` () =
     isValid "134456729" |> should equal false
 
+[<Fact(Skip = "Remove to run test")>]
+let ``Invalid characters are not ignored`` () =
+    isValid "3132P34035" |> should equal false
+

data/tracks/fsharp/exercises/list-ops/ListOpsTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 2.2.0 of the canonical data.
+// This file was auto-generated based on version 2.3.0 of the canonical data.
 
 module ListOpsTest
 
@@ -27,6 +27,10 @@ let ``concat empty list`` () =
 let ``concat list of lists`` () =
     concat [[1; 2]; [3]; []; [4; 5; 6]] |> should equal [1; 2; 3; 4; 5; 6]
 
+[<Fact(Skip = "Remove to run test")>]
+let ``concat list of nested lists`` () =
+    concat [[[1]; [2]]; [[3]]; [[]]; [[4; 5; 6]]] |> should equal [[1]; [2]; [3]; []; [4; 5; 6]]
+
 [<Fact(Skip = "Remove to run test")>]
 let ``filter empty list`` () =
     filter (fun x -> x % 2 = 1) [] |> should be Empty

data/tracks/fsharp/exercises/luhn/LuhnTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.1.0 of the canonical data.
+// This file was auto-generated based on version 1.2.0 of the canonical data.
 
 module LuhnTest
 
@@ -59,3 +59,7 @@ let ``More than a single zero is valid`` () =
 let ``Input digit 9 is correctly converted to output digit 9`` () =
     valid "091" |> should equal true
 
+[<Fact(Skip = "Remove to run test")>]
+let ``Strings with non-digits is invalid`` () =
+    valid ":9" |> should equal false
+

data/tracks/fsharp/exercises/word-search/WordSearchTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.2.0 of the canonical data.
+// This file was auto-generated based on version 1.2.1 of the canonical data.
 
 module WordSearchTest
 

data/tracks/fsharp/generators/Generators.fs

@@ -206,7 +206,7 @@ type Change() =
 type CircularBuffer() = 
     inherit GeneratorExercise()
 
-    override __.AdditionalNamespaces = [ "System" ]
+    override __.AdditionalNamespaces = [typeof<Exception>.Namespace]
 
     override __.RenderAssert _ = []
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.2.1.167
+  version: 2.2.1.169
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip