From 8a5303df8f0b3b71e7272a6bf5a2856467fe4bd1 Mon Sep 17 00:00:00 2001 From: Elena Machkasova Date: Sun, 14 Jun 2015 11:11:39 -0500 Subject: [PATCH 1/3] replaced "foo" examples with "hello" This is more novice-friendly --- src/koans/01_equalities.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/koans/01_equalities.clj b/src/koans/01_equalities.clj index ed10b7b..8f76176 100644 --- a/src/koans/01_equalities.clj +++ b/src/koans/01_equalities.clj @@ -24,13 +24,13 @@ (= __ (not (= 1 nil))) "Strings, and keywords, and symbols: oh my!" - (= __ (= "foo" :foo 'foo)) + (= __ (= "hello" :hello 'hello)) "Make a keyword with your keyboard" - (= :foo (keyword __)) + (= :hello (keyword __)) "Symbolism is all around us" - (= 'foo (symbol __)) + (= 'hello (symbol __)) "When things cannot be equal, they must be different" (not= :fill-in-the-blank __)) From 29aedc3a6ae244ef554501dc07ee4d9200006383 Mon Sep 17 00:00:00 2001 From: Brian Dawn Date: Sun, 14 Jun 2015 11:09:15 -0500 Subject: [PATCH 2/3] Made conditionals exercises more novice friendly. --- src/koans/07_conditionals.clj | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/koans/07_conditionals.clj b/src/koans/07_conditionals.clj index b33efc6..764cd09 100644 --- a/src/koans/07_conditionals.clj +++ b/src/koans/07_conditionals.clj @@ -1,14 +1,12 @@ (ns koans.07-conditionals (:require [koan-engine.core :refer :all])) -(defn explain-defcon-level [exercise-term] +(defn explain-exercise-velocity [exercise-term] (case exercise-term - :fade-out :you-and-what-army - :double-take :call-me-when-its-important - :round-house :o-rly - :fast-pace :thats-pretty-bad - :cocked-pistol :sirens - :say-what?)) + :bicycling "pretty fast" + :jogging "not super fast" + :walking "not fast at all" + "is that even exercise?")) (meditations "You will face many decisions" @@ -40,10 +38,10 @@ 'doom 'more-doom)) - "In case of emergency, sound the alarms" - (= :sirens - (explain-defcon-level __)) + "In case of emergency, go fast" + (= "pretty fast" + (explain-exercise-velocity __)) "But admit it when you don't know what to do" (= __ - (explain-defcon-level :yo-mama))) + (explain-exercise-velocity :watching-tv))) From 6d5b2263074e5fdc2e0c502a236d011350711577 Mon Sep 17 00:00:00 2001 From: Tom Marble Date: Sun, 14 Jun 2015 21:06:04 -0500 Subject: [PATCH 3/3] attempt to make koans more inclusive --- src/koans/21_group_by.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/koans/21_group_by.clj b/src/koans/21_group_by.clj index 1e845d5..e7a0408 100644 --- a/src/koans/21_group_by.clj +++ b/src/koans/21_group_by.clj @@ -19,20 +19,20 @@ "You can also group by a primary key" (= __ (group-by :id [{:id 1 :name "Bob"} - {:id 2 :name "Mike"} + {:id 2 :name "Jennifer"} {:id 1 :last-name "Smith"} ])) "But be careful when you group by non-required key" (= {"Bob" [{:name "Bob" :id 1}] - "Mike" [{:name "Mike" :id 2}] + "Jennifer" [{:name "Jennifer" :id 2}] __ [{:last-name "Smith" :id 1}]} (group-by :name [{:id 1 :name "Bob"} - {:id 2 :name "Mike"} + {:id 2 :name "Jennifer"} {:id 1 :last-name "Smith"}])) "The true power of group-by comes with custom functions" (= __ (group-by #(if (:bad %) :naughty-list :nice-list) [{:name "Jimmy" :bad true} - {:name "Jack" :bad false} + {:name "Anna" :bad false} {:name "Joe" :bad true}])))