From b95d4f1202174924448fa41a15522717f81aa5ba Mon Sep 17 00:00:00 2001 From: Felipe Sere Date: Mon, 21 Mar 2016 19:11:21 +0000 Subject: [PATCH] Fix punctuation --- lib/koans/09_functions.ex | 4 ++-- lib/koans/10_enums.ex | 40 ++++++++++++++++++------------------- lib/koans/11_processes.ex | 6 +++--- test/koans_harness_test.exs | 4 ++-- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/lib/koans/09_functions.ex b/lib/koans/09_functions.ex index 81275c0..fb6dd78 100644 --- a/lib/koans/09_functions.ex +++ b/lib/koans/09_functions.ex @@ -63,7 +63,7 @@ defmodule Functions do def bigger(a,b) when a > b, do: "#{a} is bigger than #{b}" def bigger(a,b) when a <= b, do: "#{a} is not bigger than #{b}" - koan "You can also create intricate guards based on the values." do + koan "You can also create intricate guards based on the values" do assert bigger(10, 5) == :__ assert bigger(4, 27) == :__ end @@ -97,7 +97,7 @@ defmodule Functions do def multiply_then_call(number, fun), do: fun.(number*5) def square(number), do: number * number - koan "You can 'capture' functions if you want to pass them around as values. Mind the ampersand '&' and the slash followed by the number of args." do + koan "You can 'capture' functions if you want to pass them around as values. Mind the ampersand '&' and the slash followed by the number of args" do assert multiply_then_call(2, &square/1) == :__ end diff --git a/lib/koans/10_enums.ex b/lib/koans/10_enums.ex index 67c295d..3f53938 100644 --- a/lib/koans/10_enums.ex +++ b/lib/koans/10_enums.ex @@ -5,34 +5,34 @@ defmodule Enums do assert Enum.count([1,2,3]) == :__ end - koan "...the same applies for counting elements in a map..." do + koan "The same applies for counting elements in a map" do assert Enum.count(%{ :a => :foo, :b => :bar}) == :__ end - koan "..or a keyword list..." do + koan "Or a keyword list" do assert Enum.count([a: 77, b: 23, c: 12, d: 33, e: 90, f: 113]) == :__ end - def less_than_five(n), do: n < 5 + def less_than_five?(n), do: n < 5 koan "Elements can have a lot in common" do - assert Enum.all?([1,2,3], &less_than_five/1) == :__ + assert Enum.all?([1,2,3], &less_than_five?/1) == :__ end - def less_than_two(n), do: n < 2 + def less_than_two?(n), do: n < 2 koan "If one if different, all elements are not alike" do - assert Enum.all?([1, 2, 3, 2], &less_than_two/1) == :__ + assert Enum.all?([1, 2, 3, 2], &less_than_two?/1) == :__ end - def is_even?(n), do: rem(n, 2) == 0 + def even?(n), do: rem(n, 2) == 0 koan "sometimes you you just want to know if there are any elements fullfilling a condition" do - assert Enum.any?([1,2,3], &is_even?/1) == :__ + assert Enum.any?([1,2,3], &even?/1) == :__ end - def divisible_by_five(n), do: rem(n, 5) == 0 + def divisible_by_five?(n), do: rem(n, 5) == 0 koan "if not a single element fits the bill, any? returns false" do - assert Enum.any?([1,2,3], &divisible_by_five/1) == :__ + assert Enum.any?([1,2,3], &divisible_by_five?/1) == :__ end koan "Sometimes you just want to know if an element is part of the party" do @@ -50,24 +50,23 @@ defmodule Enums do end koan "You can even return a list with entirely different types" do - assert Enum.map([1,2,3], &is_even?/1) == :__ + assert Enum.map([1,2,3], &even?/1) == :__ end - koan "But keep in mind that the original list remains unchanged" do input = [1,2,3,4] - assert Enum.map(input, &is_even?/1) == :__ + assert Enum.map(input, &even?/1) == :__ assert input == :__ end - def is_odd?(n), do: rem(n, 2) == 1 + def odd?(n), do: rem(n, 2) == 1 koan "Filter allows you to only keep what you really care about" do - assert Enum.filter([1,2,3], &is_odd?/1) == :__ + assert Enum.filter([1,2,3], &odd?/1) == :__ end koan "Reject will help you throw out unwanted cruft" do - assert Enum.reject([1,2,3], &is_odd?/1) == :__ + assert Enum.reject([1,2,3], &odd?/1) == :__ end koan "You three there, follow me!" do @@ -78,9 +77,8 @@ defmodule Enums do assert Enum.take([1,2,3,4,5], 10) == :__ end - def less_than_four(n), do: n < 4 koan "Take what you can..." do - assert Enum.take_while([1,2,3,4,5,6,7], &less_than_four/1) == :__ + assert Enum.take_while([1,2,3,4,5,6,7], &less_than_five?/1) == :__ end koan "Just like taking, you can also drop elements" do @@ -115,15 +113,15 @@ defmodule Enums do end koan "When you want to find that one pesky element" do - assert Enum.find([1,2,3], &is_even?/1) == :__ + assert Enum.find([1,2,3], &even?/1) == :__ end koan "...but you don't quite find it..." do - assert Enum.find([1,2,3], &divisible_by_five/1) == :__ + assert Enum.find([1,2,3], &divisible_by_five?/1) == :__ end koan "...you can settle for a consolation prize" do - assert Enum.find([1,2,3], :no_such_element, &divisible_by_five/1) == :__ + assert Enum.find([1,2,3], :no_such_element, &divisible_by_five?/1) == :__ end koan "Collapse an entire list of elements down to a single one by repeating a function." do diff --git a/lib/koans/11_processes.ex b/lib/koans/11_processes.ex index be3f64a..2919a80 100644 --- a/lib/koans/11_processes.ex +++ b/lib/koans/11_processes.ex @@ -2,11 +2,11 @@ defmodule Processes do use Koans koan "Tests run in a process" do - assert Process.alive?(:__) + assert Process.alive?(self()) == :__ end koan "You can ask a process to introduce itself" do - information = Process.info(self) + information = Process.info(self()) assert information[:status] == :__ end @@ -76,7 +76,7 @@ defmodule Processes do assert Process.alive?(pid) == :__ end - koan "Exiting yourself on the other hand DOES termiante you" do + koan "Exiting yourself on the other hand DOES terminate you" do pid = spawn(fn -> receive do :bye -> Process.exit(self(), :normal) end diff --git a/test/koans_harness_test.exs b/test/koans_harness_test.exs index cd548b4..5aa0a2f 100644 --- a/test/koans_harness_test.exs +++ b/test/koans_harness_test.exs @@ -180,7 +180,7 @@ defmodule KoansHarnessTest do [2], [1,2,3], [1,2,3,4,5], - [1,2,3], + [1,2,3,4], [1,2,3], [0,1,2,3], %{ :odd => [3,1], :even => [4,2] }, @@ -198,7 +198,7 @@ defmodule KoansHarnessTest do test "Processes" do answers = [ - self, + true, :running, "hola!", :how_are_you?,