Fixing Kernel.String, all specs passing.

ryoqun · Aug 7, 2009 · dc8136d · dc8136d
1 parent 2e40b9e
commit dc8136d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/kernel/common/kernel.rb b/kernel/common/kernel.rb
@@ -54,7 +54,15 @@ def Array(obj)
   module_function :Array
 
   def String(obj)
-    Type.coerce_to(obj, String, :to_s)
+    if obj.is_a? String
+      return obj
+    elsif obj.respond_to?(:to_s)
+      coerced_str = obj.to_s
+      return coerced_str if coerced_str.is_a? String
+      raise TypeError, "Coercion error: obj.to_s did NOT return a String (was #{coerced_str.class})"
+    else
+      raise TypeError, "can't convert Object into String: #{obj.inspect}"
+    end
   end
   module_function :String
 

diff --git a/spec/tags/frozen/core/kernel/String_tags.txt b/spec/tags/frozen/core/kernel/String_tags.txt
@@ -1,5 +1 @@
 incomplete:Kernel#String needs to be reviewed for spec completeness
-fails:Kernel.String raises a TypeError if respond_to? returns false for #to_s
-fails:Kernel.String raises a NoMethodError if #to_s is not defined but #respond_to?(:to_s) returns true
-fails:Kernel#String raises a TypeError if respond_to? returns false for #to_s
-fails:Kernel#String raises a NoMethodError if #to_s is not defined but #respond_to?(:to_s) returns true