From d5c9b2d4aee89483b79dc4930b79dec7031ef936 Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@instructure.com>
Date: Tue, 29 Mar 2016 13:47:35 -0600
Subject: fix serialization of a string that looks like a valid YAML float

refs gh-156

(but isn't a valid ruby float)
---
 lib/psych/scalar_scanner.rb       | 2 +-
 test/psych/test_scalar_scanner.rb | 4 ++++
 test/psych/test_string.rb         | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/psych/scalar_scanner.rb b/lib/psych/scalar_scanner.rb
index f519da1..a849359 100644
--- a/lib/psych/scalar_scanner.rb
+++ b/lib/psych/scalar_scanner.rb
@@ -100,7 +100,7 @@ module Psych
           @string_cache[string] = true
           string
         else
-          Float(string.gsub(/[,_]|\.$/, ''))
+          Float(string.gsub(/[,_]|\.([Ee]|$)/, '\1'))
         end
       else
         int = parse_int string.gsub(/[,_]/, '')
diff --git a/test/psych/test_scalar_scanner.rb b/test/psych/test_scalar_scanner.rb
index 7ad18c5..2599989 100644
--- a/test/psych/test_scalar_scanner.rb
+++ b/test/psych/test_scalar_scanner.rb
@@ -74,6 +74,10 @@ module Psych
       assert ss.tokenize('.nan').nan?
     end
 
+    def test_scan_float_with_exponent_but_no_fraction
+      assert_equal(0.0, ss.tokenize('0.E+0'))
+    end
+
     def test_scan_null
       assert_equal nil, ss.tokenize('null')
       assert_equal nil, ss.tokenize('~')
diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb
index 51aef40..25c6353 100644
--- a/test/psych/test_string.rb
+++ b/test/psych/test_string.rb
@@ -99,6 +99,10 @@ module Psych
       assert_cycle '+.'
     end
 
+    def test_float_with_no_fractional_before_exponent
+      assert_cycle '0.E+0'
+    end
+
     def test_string_subclass_with_anchor
       y = Psych.load <<-eoyml
 ---
-- 
cgit v1.2.3