fixing psych support in big decimal, fixing tests to support YAML 1.1

1 files changed, 7 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
index 3720dbb8b8..a279849829 100644
--- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
@@ -12,12 +12,19 @@ class BigDecimal
   #
   # Note that reconstituting YAML floats to native floats may lose precision.
   def to_yaml(opts = {})
+    return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
+
     YAML.quick_emit(nil, opts) do |out|
       string = to_s
       out.scalar(YAML_TAG, YAML_MAPPING[string] || string, :plain)
     end
   end
 
+  def encode_with(coder)
+    string = to_s
+    coder.represent_scalar(nil, YAML_MAPPING[string] || string)
+  end
+
   def to_d
     self
   end