trackler 2.2.1.131 → 2.2.1.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2e1ba3f3af22decf9f03ccb9bc3417246da1f4
-  data.tar.gz: 4b348ef49dcd73c7dd8249a7bd686693358b98d7
+  metadata.gz: e478de20af389be52d781a2d47847e675fcb3445
+  data.tar.gz: 1b158116931fb875e127102199db876edf2cfc56
 SHA512:
-  metadata.gz: 6cc2ecafb9edbed7f8113eda045d4118afe44b8649e353aea6403b4a8f00f534b524a9d77f48ee40992696be98312d1a3e8cd205a603daffd333d7e7c6117faa
-  data.tar.gz: c04c86adf4afdba89a4a3b3fbd5e0fd8b006c4affa358dc5977eea660c7846e88196c155807976ff3f8e626a37d8ca98244e534bae96c1b7232c2b0a49c30921
+  metadata.gz: ba89ba4b7f07e6c582a4950ffdac818fa16e2831613d22b06de2ef46bfc0bf8c9369b591afeb1ffea22438bcd123df033d87f68f9559fe084049c20849ac470b
+  data.tar.gz: d00499a417f38ad4e78668e656faf9e262173f951a3ee7addd50906a4f5c707fb609a6ab43e2b781e05375d64bdbf36d9e710d7d801e99a54b6a27d9e296bdf3

data/lib/trackler/version.rb

@@ -1,3 +1,3 @@
 module Trackler
-  VERSION = "2.2.1.131"
+  VERSION = "2.2.1.132"
 end

data/problem-specifications/exercises/react/canonical-data.json

@@ -1,6 +1,6 @@
 {
   "exercise": "react",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "comments": [
     "Note that, due to the nature of this exercise,",
     "the tests are specified using their cells and a series of operations to perform on the cells.",
@@ -13,11 +13,12 @@
     "The possible types and semantics of their fields are as follows:",
     "",
     "* expect_cell_value (`cell`, `value`): Expect that cell `cell` has value `value`.",
-    "* set_value (`cell`, `value`): Sets input cell `cell` to value `value`.",
+    "* set_value (`cell`, `value`, optionally `expect_callbacks`, `expect_callbacks_not_to_be_called`): Sets input cell `cell` to value `value`.",
+    "  Expect that, as a result, all callbacks in `expect_callbacks` (if present) were called exactly once with the designated value",
+    "  Expect that no callbacks in `expect_callbacks_not_to_be_called` (if present) were called as a result.",
     "* add_callback (`cell`, `name`): Adds a callback to cell `cell`. Store the callback ID in a variable named `name`.",
     "  all callbacks are assumed to simply store the values they're called with in some array.",
     "* remove_callback (`cell`, `name`): Removes the callback `name` from cell `cell`.",
-    "* expect_callback_values (`callback`, `values`): Expects callback `callback` to have been called with values `values` since the last `expect_callback_values` operation.",
     "",
     "Additional notes:",
     "",
@@ -256,12 +257,10 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 3
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": [4]
+            "value": 3,
+            "expect_callbacks": {
+              "callback1": 4
+            }
           }
         ]
       },
@@ -293,22 +292,16 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 2
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": []
+            "value": 2,
+            "expect_callbacks_not_to_be_called": ["callback1"]
           },
           {
             "type": "set_value",
             "cell": "input",
-            "value": 4
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": [222]
+            "value": 4,
+            "expect_callbacks": {
+              "callback1": 222
+            }
           }
         ]
       },
@@ -340,22 +333,65 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 2
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": [3]
+            "value": 2,
+            "expect_callbacks": {
+              "callback1": 3
+            }
           },
           {
             "type": "set_value",
             "cell": "input",
-            "value": 3
+            "value": 3,
+            "expect_callbacks": {
+              "callback1": 4
+            }
+          }
+        ]
+      },
+      "expected": {}
+    },
+    {
+      "description": "callbacks can fire from multiple cells",
+      "property": "react",
+      "input": {
+        "cells": [
+          {
+            "name": "input",
+            "type": "input",
+            "initial_value": 1
           },
           {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": [4]
+            "name": "plus_one",
+            "type": "compute",
+            "inputs": ["input"],
+            "compute_function": "inputs[0] + 1"
+          },
+          {
+            "name": "minus_one",
+            "type": "compute",
+            "inputs": ["input"],
+            "compute_function": "inputs[0] - 1"
+          }
+        ],
+        "operations": [
+          {
+            "type": "add_callback",
+            "cell": "plus_one",
+            "name": "callback1"
+          },
+          {
+            "type": "add_callback",
+            "cell": "minus_one",
+            "name": "callback2"
+          },
+          {
+            "type": "set_value",
+            "cell": "input",
+            "value": 10,
+            "expect_callbacks": {
+              "callback1": 11,
+              "callback2": 9
+            }
           }
         ]
       },
@@ -392,7 +428,11 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 31
+            "value": 31,
+            "expect_callbacks": {
+              "callback1": 32,
+              "callback2": 32
+            }
           },
           {
             "type": "remove_callback",
@@ -407,22 +447,12 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 41
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": [32]
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback2",
-            "values": [32, 42]
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback3",
-            "values": [42]
+            "value": 41,
+            "expect_callbacks": {
+              "callback2": 42,
+              "callback3": 42
+            },
+            "expect_callbacks_not_to_be_called": ["callback1"]
           }
         ]
       },
@@ -479,17 +509,11 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 2
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": []
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback2",
-            "values": [3]
+            "value": 2,
+            "expect_callbacks": {
+              "callback2": 3
+            },
+            "expect_callbacks_not_to_be_called": ["callback1"]
           }
         ]
       },
@@ -543,12 +567,10 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 4
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": [10]
+            "value": 4,
+            "expect_callbacks": {
+              "callback1": 10
+            }
           }
         ]
       },
@@ -597,27 +619,26 @@
           {
             "type": "set_value",
             "cell": "input",
-            "value": 2
+            "value": 2,
+            "expect_callbacks_not_to_be_called": ["callback1"]
           },
           {
             "type": "set_value",
             "cell": "input",
-            "value": 3
+            "value": 3,
+            "expect_callbacks_not_to_be_called": ["callback1"]
           },
           {
             "type": "set_value",
             "cell": "input",
-            "value": 4
+            "value": 4,
+            "expect_callbacks_not_to_be_called": ["callback1"]
           },
           {
             "type": "set_value",
             "cell": "input",
-            "value": 5
-          },
-          {
-            "type": "expect_callback_values",
-            "callback": "callback1",
-            "values": []
+            "value": 5,
+            "expect_callbacks_not_to_be_called": ["callback1"]
           }
         ]
       },

data/tracks/ceylon/exercises/react/source/react/ReactorTest.ceylon

@@ -2,7 +2,7 @@ import ceylon.test {
     ...
 }
 
-// Tests adapted from problem-specifications version 1.2.0
+// Tests adapted from problem-specifications version 2.0.0
 
 test
 void inputCellsHaveValue() {
@@ -103,6 +103,24 @@ void callbacksCanBeCalledMultipleTimes() {
     assertEquals(vals, [3, 4]);
 }
 
+test
+void callbacksCanFireFromMultipleCells() {
+    value r = Reactor<Integer>();
+    value input = r.InputCell(1);
+    value plusOne = r.ComputeCell.single(input, (Integer x) => x + 1);
+    value minusOne = r.ComputeCell.single(input, (Integer x) => x - 1);
+    
+    variable Integer[] plusVals = [];
+    plusOne.addCallback((x) => plusVals = plusVals.withTrailing(x));
+    
+    variable Integer[] minusVals = [];
+    minusOne.addCallback((x) => minusVals = minusVals.withTrailing(x));
+    
+    input.currentValue = 10;
+    assertEquals(plusVals, [11]);
+    assertEquals(minusVals, [9]);
+}
+
 test
 void callbacksCanBeAddedAndRemoved() {
     value r = Reactor<Integer>();

data/tracks/perl5/.travis.yml

@@ -17,6 +17,7 @@ script:
   - bin/configlet lint .
   - prove exercises/*/.meta/solutions/
     --recurse
+    --directives
     --jobs 2
   - prove t/
     --directives

data/tracks/perl5/exercises/bob/.meta/exercise-data.yaml

@@ -1,9 +1,9 @@
 exercise: Bob
-version: 3
-plan: 27
+version: 4
+plan: 26
 subs: hey
 tests: |-
-  is $subs{hey}->($_->{input}{heyBob}), $_->{expected}, $_->{description} foreach @{$C_DATA->{cases}};
+  is hey($_->{input}{heyBob}), $_->{expected}, $_->{description} foreach @{$C_DATA->{cases}};
 
 exercise_comment: '# The name of this exercise.'
 version_comment: '# The version we will be matching against the exercise.'

data/tracks/perl5/exercises/bob/.meta/solutions/Bob.pm

@@ -1,7 +1,9 @@
 # Declare package 'Bob' with version
-package Bob 3;
+package Bob 4;
 use strict;
 use warnings;
+use Exporter 'import';
+our @EXPORT_OK = qw(hey);
 
 sub hey {
   my ($text) = @_;

data/tracks/perl5/exercises/bob/Bob.pm

@@ -1,7 +1,9 @@
 # Declare package 'Bob' with version
-package Bob 3;
+package Bob 4;
 use strict;
 use warnings;
+use Exporter 'import';
+our @EXPORT_OK = qw(hey);
 
 sub hey {
   my ($msg) = @_;

data/tracks/perl5/exercises/bob/bob.t

@@ -1,15 +1,14 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
+use JSON::PP;
 use FindBin;
 use lib $FindBin::Bin; # Look for the module inside the same directory as this test file.
-use JSON::PP;
+use Bob qw(hey);
 
 my $exercise = 'Bob'; # The name of this exercise.
-my $test_version = 3; # The version we will be matching against the exercise.
-use Test::More tests => 27; # This is how many tests we expect to run.
-
-use_ok $exercise or BAIL_OUT; # Check that the module can be use-d.
+my $test_version = 4; # The version we will be matching against the exercise.
+use Test::More tests => 26; # This is how many tests we expect to run.
 
 # If the exercise is updated, we want to make sure other people testing
 # your code don't think you've made a mistake if things have changed!
@@ -21,14 +20,10 @@ if ($exercise_version != $test_version) {
   BAIL_OUT if $ENV{EXERCISM};
 }
 
-my %subs;
-foreach ( qw(hey) ) {
-  can_ok $exercise, $_;
-  $subs{$_} = $exercise->can($_);
-}
+can_ok $exercise, 'import' or BAIL_OUT 'Cannot import subroutines from module';
 
 my $C_DATA = do { local $/; decode_json(<DATA>); };
-is $subs{hey}->($_->{input}{heyBob}), $_->{expected}, $_->{description} foreach @{$C_DATA->{cases}};
+is hey($_->{input}{heyBob}), $_->{expected}, $_->{description} foreach @{$C_DATA->{cases}};
 
 __DATA__
 {

data/tracks/perl5/exercises/clock/.meta/exercise-data.yaml

@@ -1,16 +1,16 @@
 exercise: Clock
-version: 1
-plan: 57
-subs: new time add_minutes subtract_minutes
+version: 2
+plan: 53
+methods: new time add_minutes subtract_minutes
 tests: |-
   foreach (@{$C_DATA->{cases}}) {
     foreach (@{$_->{cases}}) {
       if ($_->{property} eq 'create') {
-        is Clock->new($_->{input})->time, $_->{expected}, $_->{description};
+        is($exercise->new($_->{input})->time, $_->{expected}, $_->{description});
       }
 
       elsif ($_->{property} eq 'add' || $_->{property} eq 'subtract') {
-        my $clock = Clock->new({
+        my $clock = $exercise->new({
           hour   => $_->{input}{hour},
           minute => $_->{input}{minute},
         });
@@ -21,13 +21,13 @@ tests: |-
 
       elsif ($_->{property} eq 'equal') {
         ok $_->{expected} ==
-          (Clock->new($_->{input}{clock1})->time eq Clock->new($_->{input}{clock2})->time), $_->{description};
+          ($exercise->new($_->{input}{clock1})->time eq $exercise->new($_->{input}{clock2})->time), $_->{description};
       }
     }
   }
 
-  is Clock->new({hour => 0, minute => 0})->add_minutes(65)->time, '01:05', 'add_minutes method can be chained';
-  is Clock->new({hour => 0, minute => 0})->subtract_minutes(65)->time, '22:55', 'subtract_minutes method can be chained';
+  is($exercise->new({hour => 0, minute => 0})->add_minutes(65)->time, '01:05', 'add_minutes method can be chained');
+  is($exercise->new({hour => 0, minute => 0})->subtract_minutes(65)->time, '22:55', 'subtract_minutes method can be chained');
   
 stub: |-
   sub new {

data/tracks/perl5/exercises/clock/.meta/solutions/Clock.pm

@@ -1,4 +1,4 @@
-package Clock 1;
+package Clock 2;
 use strict;
 use warnings;
 

data/tracks/perl5/exercises/clock/Clock.pm

@@ -1,4 +1,4 @@
-package Clock 1;
+package Clock 2;
 use strict;
 use warnings;
 

data/tracks/perl5/exercises/clock/clock.t

@@ -1,15 +1,14 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
+use JSON::PP;
 use FindBin;
 use lib $FindBin::Bin;
-use JSON::PP;
+use Clock ();
 
 my $exercise = 'Clock';
-my $test_version = 1;
-use Test::More tests => 57;
-
-use_ok $exercise or BAIL_OUT;
+my $test_version = 2;
+use Test::More tests => 53;
 
 my $exercise_version = $exercise->VERSION // 0;
 if ($exercise_version != $test_version) {
@@ -19,21 +18,17 @@ if ($exercise_version != $test_version) {
   BAIL_OUT if $ENV{EXERCISM};
 }
 
-my %subs;
-foreach ( qw(new time add_minutes subtract_minutes) ) {
-  can_ok $exercise, $_;
-  $subs{$_} = $exercise->can($_);
-}
+can_ok $exercise, qw(new time add_minutes subtract_minutes);
 
 my $C_DATA = do { local $/; decode_json(<DATA>); };
 foreach (@{$C_DATA->{cases}}) {
   foreach (@{$_->{cases}}) {
     if ($_->{property} eq 'create') {
-      is Clock->new($_->{input})->time, $_->{expected}, $_->{description};
+      is($exercise->new($_->{input})->time, $_->{expected}, $_->{description});
     }
 
     elsif ($_->{property} eq 'add' || $_->{property} eq 'subtract') {
-      my $clock = Clock->new({
+      my $clock = $exercise->new({
         hour   => $_->{input}{hour},
         minute => $_->{input}{minute},
       });
@@ -44,13 +39,13 @@ foreach (@{$C_DATA->{cases}}) {
 
     elsif ($_->{property} eq 'equal') {
       ok $_->{expected} ==
-        (Clock->new($_->{input}{clock1})->time eq Clock->new($_->{input}{clock2})->time), $_->{description};
+        ($exercise->new($_->{input}{clock1})->time eq $exercise->new($_->{input}{clock2})->time), $_->{description};
     }
   }
 }
 
-is Clock->new({hour => 0, minute => 0})->add_minutes(65)->time, '01:05', 'add_minutes method can be chained';
-is Clock->new({hour => 0, minute => 0})->subtract_minutes(65)->time, '22:55', 'subtract_minutes method can be chained';
+is($exercise->new({hour => 0, minute => 0})->add_minutes(65)->time, '01:05', 'add_minutes method can be chained');
+is($exercise->new({hour => 0, minute => 0})->subtract_minutes(65)->time, '22:55', 'subtract_minutes method can be chained');
 
 __DATA__
 {