Merge pull request #35 from TheSeparateFirst/master

Fixed about_strings for multiple rubies

diff --git a/koans/about_constants.rb b/koans/about_constants.rb
index 0beccdc..41d3f01 100644 (file)
--- a/koans/about_constants.rb
+++ b/koans/about_constants.rb
@@ -67,7 +67,7 @@ class AboutConstants < EdgeCase::Koan
   end
 
   # QUESTION: Which has precedence: The constant in the lexical scope,
-  # or the constant from the inheritance heirarachy?
+  # or the constant from the inheritance hierarchy?
 
   # ------------------------------------------------------------------
 
@@ -81,7 +81,7 @@ class AboutConstants < EdgeCase::Koan
     assert_equal __, MyAnimals::Oyster.new.legs_in_oyster
   end
 
-  # QUESTION: Now Which has precedence: The constant in the lexical
-  # scope, or the constant from the inheritance heirarachy?  Why is it
+  # QUESTION: Now which has precedence: The constant in the lexical
+  # scope, or the constant from the inheritance hierarchy?  Why is it
   # different than the previous answer?
 end

diff --git a/koans/about_inheritance.rb b/koans/about_inheritance.rb
index cafec34..712daca 100644 (file)
--- a/koans/about_inheritance.rb
+++ b/koans/about_inheritance.rb
@@ -31,7 +31,7 @@ class AboutInheritance < EdgeCase::Koan
     assert_equal __, Chihuahua.ancestors.include?(Object)
   end
 
-  def test_subcases_inherit_behavior_from_parent_class
+  def test_subclasses_inherit_behavior_from_parent_class
     chico = Chihuahua.new("Chico")
     assert_equal __, chico.name
   end

diff --git a/koans/about_iteration.rb b/koans/about_iteration.rb
index 591b869..b48c278 100644 (file)
--- a/koans/about_iteration.rb
+++ b/koans/about_iteration.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 class AboutIteration < EdgeCase::Koan
 
   def test_each_is_a_method_on_arrays
-    [].methods.include?("each")
+    assert_equal __, [].methods.include?(:each)
   end
 
   def test_iterating_with_each
@@ -65,7 +65,7 @@ class AboutIteration < EdgeCase::Koan
     result = [2, 3, 4].inject(0) { |sum, item| sum + item }
     assert_equal __, result
 
-    result2 = [2, 3, 4].inject(1) { |sum, item| sum * item }
+    result2 = [2, 3, 4].inject(1) { |product, item| product * item }
     assert_equal __, result2
 
     # Extra Credit:

diff --git a/koans/about_java_interop.rb b/koans/about_java_interop.rb
index 2a58e40..4d35d5d 100644 (file)
--- a/koans/about_java_interop.rb
+++ b/koans/about_java_interop.rb
@@ -5,7 +5,7 @@ include Java
 # Concepts
 # * Pull in a java class
 # * calling a method, Camel vs snake
-# * Resovling module/class name conflicts
+# * Resolving module/class name conflicts
 # * Showing what gets returned
 # * Ruby Strings  VS Java Strings
 # * Calling custom java class

diff --git a/koans/about_message_passing.rb b/koans/about_message_passing.rb
index 45541a0..a978dde 100644 (file)
--- a/koans/about_message_passing.rb
+++ b/koans/about_message_passing.rb
@@ -99,7 +99,7 @@ class AboutMessagePassing < EdgeCase::Koan
     # keep in mind you can't call method_missing like that in Ruby
     # 1.9. normally.
     #
-    # Thanks.  We now return you to your regularly schedule Ruby
+    # Thanks.  We now return you to your regularly scheduled Ruby
     # Koans.
   end
 

diff --git a/koans/about_modules.rb b/koans/about_modules.rb
index cd967a9..8b56b65 100644 (file)
--- a/koans/about_modules.rb
+++ b/koans/about_modules.rb
@@ -42,7 +42,7 @@ class AboutModules < EdgeCase::Koan
     assert_equal __, fido.bark
   end
 
-  def test_module_methods_are_also_availble_in_the_object
+  def test_module_methods_are_also_available_in_the_object
     fido = Dog.new
     assert_nothing_raised(Exception) do
       fido.set_name("Rover")

diff --git a/koans/about_proxy_object_project.rb b/koans/about_proxy_object_project.rb
index a959a80..1c1a8e7 100644 (file)
--- a/koans/about_proxy_object_project.rb
+++ b/koans/about_proxy_object_project.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 # below).  You should be able to initialize the proxy object with any
 # object.  Any messages sent to the proxy object should be forwarded
 # to the target object.  As each message is sent, the proxy should
-# record the name of the method send.
+# record the name of the method sent.
 #
 # The proxy class is started for you.  You will need to add a method
 # missing handler and any other supporting methods.  The specification

diff --git a/koans/about_scoring_project.rb b/koans/about_scoring_project.rb
index 3c8e027..bc61785 100644 (file)
--- a/koans/about_scoring_project.rb
+++ b/koans/about_scoring_project.rb
@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 
 # Greed is a dice game where you roll up to five dice to accumulate
-# points.  The following "score" function will be used calculate the
+# points.  The following "score" function will be used to calculate the
 # score of a single roll of the dice.
 #
 # A greed roll is scored as follows:

diff --git a/koans/about_symbols.rb b/koans/about_symbols.rb
index 6133faa..f4a4319 100644 (file)
--- a/koans/about_symbols.rb
+++ b/koans/about_symbols.rb
@@ -84,7 +84,7 @@ class AboutSymbols < EdgeCase::Koan
   # interesting string operations are available on symbols.
 
   def test_symbols_cannot_be_concatenated
-    # Exceptions will be pondered further father down the path
+    # Exceptions will be pondered further farther down the path
     assert_raise(___) do
       :cats + :dogs
     end

diff --git a/koans/edgecase.rb b/koans/edgecase.rb
index c024438..ba49956 100644 (file)
--- a/koans/edgecase.rb
+++ b/koans/edgecase.rb
@@ -21,7 +21,7 @@ def in_ruby_version(*versions)
 end
 
 # Standard, generic replacement value.
-# If value19 is given, it is used inplace of value for Ruby 1.9.
+# If value19 is given, it is used in place of value for Ruby 1.9.
 def __(value="FILL ME IN", value19=:mu)
   if RUBY_VERSION < "1.9"
     value

diff --git a/rakelib/checks.rake b/rakelib/checks.rake
index 2870202..fa5aaf7 100644 (file)
--- a/rakelib/checks.rake
+++ b/rakelib/checks.rake
@@ -29,5 +29,5 @@ namespace "check" do
   end
 end
 
-desc "Run some simple consistancy checks"
+desc "Run some simple consistency checks"
 task :check => ["check:abouts", "check:asserts"]

diff --git a/src/about_inheritance.rb b/src/about_inheritance.rb
index f516cd6..73030c6 100644 (file)
--- a/src/about_inheritance.rb
+++ b/src/about_inheritance.rb
@@ -31,7 +31,7 @@ class AboutInheritance < EdgeCase::Koan
     assert_equal __(true), Chihuahua.ancestors.include?(Object)
   end
 
-  def test_subcases_inherit_behavior_from_parent_class
+  def test_subclasses_inherit_behavior_from_parent_class
     chico = Chihuahua.new("Chico")
     assert_equal __("Chico"), chico.name
   end

diff --git a/src/about_java_interop.rb b/src/about_java_interop.rb
index 52f03eb..c2d2142 100644 (file)
--- a/src/about_java_interop.rb
+++ b/src/about_java_interop.rb
@@ -5,7 +5,7 @@ include Java
 # Concepts
 # * Pull in a java class
 # * calling a method, Camel vs snake
-# * Resovling module/class name conflicts
+# * Resolving module/class name conflicts
 # * Showing what gets returned
 # * Ruby Strings  VS Java Strings
 # * Calling custom java class

diff --git a/src/about_proxy_object_project.rb b/src/about_proxy_object_project.rb
index 1d64f0f..483a7d7 100644 (file)
--- a/src/about_proxy_object_project.rb
+++ b/src/about_proxy_object_project.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 # below).  You should be able to initialize the proxy object with any
 # object.  Any messages sent to the proxy object should be forwarded
 # to the target object.  As each message is sent, the proxy should
-# record the name of the method send.
+# record the name of the method sent.
 #
 # The proxy class is started for you.  You will need to add a method
 # missing handler and any other supporting methods.  The specification

diff --git a/src/about_scoring_project.rb b/src/about_scoring_project.rb
index 124c387..60b4682 100644 (file)
--- a/src/about_scoring_project.rb
+++ b/src/about_scoring_project.rb
@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/edgecase')
 
 # Greed is a dice game where you roll up to five dice to accumulate
-# points.  The following "score" function will be used calculate the
+# points.  The following "score" function will be used to calculate the
 # score of a single roll of the dice.
 #
 # A greed roll is scored as follows:

diff --git a/src/edgecase.rb b/src/edgecase.rb
index c024438..ba49956 100644 (file)
--- a/src/edgecase.rb
+++ b/src/edgecase.rb
@@ -21,7 +21,7 @@ def in_ruby_version(*versions)
 end
 
 # Standard, generic replacement value.
-# If value19 is given, it is used inplace of value for Ruby 1.9.
+# If value19 is given, it is used in place of value for Ruby 1.9.
 def __(value="FILL ME IN", value19=:mu)
   if RUBY_VERSION < "1.9"
     value