making sure psych defines to_yaml on object

ruby · Mar 28, 2010 · d99e787 · d99e787
1 parent b051cf8
commit d99e787
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/lib/psych/core_ext.rb b/lib/psych/core_ext.rb
@@ -3,6 +3,12 @@ def self.yaml_tag url
     Psych.add_tag(url, self)
   end
 
+  # FIXME: rename this to "to_yaml" when syck is removed
+
+  ###
+  # call-seq: to_yaml
+  #
+  # Convert an object to YAML
   def psych_to_yaml options = {}
     Psych.dump self, options
   end

diff --git a/test/psych/helper.rb b/test/psych/helper.rb
@@ -54,12 +54,10 @@ def mktime( year, mon, day, hour, min, sec, usec, zone = "Z" )
   end
 end
 
-o = Object.new
-if o.respond_to?(:to_yaml)
-  if o.method(:to_yaml).source_location.first !~ /psych/
-    Object.send :alias_method, :old_to_yaml, :to_yaml
-    Object.send :remove_method, :to_yaml
-  end
-end
-
 require 'psych'
+
+# FIXME: remove this when syck is removed
+o = Object.new
+a = o.method(:psych_to_yaml)
+b = o.method(:to_yaml)
+raise "psych should define to_yaml" unless a == b
diff --git a/test/psych/test_object_to_yaml.rb b/test/psych/test_object_to_yaml.rb