diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-19 14:31:22 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-21 11:16:40 -0800 |
| commit | 2570c85cb7de03a2c9cc183c73707a267f2efb91 (patch) | |
| tree | 7f07fcd561c682049d10e2a7fe6b350f049bea1a | |
| parent | 8491f16e128d2d2cfe53676f36c5d4c281712bde (diff) | |
| download | rails-2570c85cb7de03a2c9cc183c73707a267f2efb91.tar.gz rails-2570c85cb7de03a2c9cc183c73707a267f2efb91.tar.bz2 rails-2570c85cb7de03a2c9cc183c73707a267f2efb91.zip | |
fixing psych support in big decimal, fixing tests to support YAML 1.1
| -rw-r--r-- | activesupport/lib/active_support/core_ext/big_decimal/conversions.rb | 7 | ||||
| -rw-r--r-- | activesupport/test/core_ext/bigdecimal_test.rb | 8 |
2 files changed, 11 insertions, 4 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 diff --git a/activesupport/test/core_ext/bigdecimal_test.rb b/activesupport/test/core_ext/bigdecimal_test.rb index d592973d7a..b38e08a9f4 100644 --- a/activesupport/test/core_ext/bigdecimal_test.rb +++ b/activesupport/test/core_ext/bigdecimal_test.rb @@ -4,10 +4,10 @@ require 'active_support/core_ext/big_decimal' class BigDecimalTest < Test::Unit::TestCase def test_to_yaml - assert_equal("--- 100000.30020320320000000000000000000000000000001\n", BigDecimal.new('100000.30020320320000000000000000000000000000001').to_yaml) - assert_equal("--- .Inf\n", BigDecimal.new('Infinity').to_yaml) - assert_equal("--- .NaN\n", BigDecimal.new('NaN').to_yaml) - assert_equal("--- -.Inf\n", BigDecimal.new('-Infinity').to_yaml) + assert_match("--- 100000.30020320320000000000000000000000000000001\n", BigDecimal.new('100000.30020320320000000000000000000000000000001').to_yaml) + assert_match("--- .Inf\n", BigDecimal.new('Infinity').to_yaml) + assert_match("--- .NaN\n", BigDecimal.new('NaN').to_yaml) + assert_match("--- -.Inf\n", BigDecimal.new('-Infinity').to_yaml) end def test_to_d |