ruby-changes:39906
From: nagachika <ko1@a...>
Date: Wed, 30 Sep 2015 03:46:03 +0900 (JST)
Subject: [ruby-changes:39906] nagachika:r51987 (ruby_2_2): merge revision(s) 51766, 51767: [Backport #11509]
nagachika 2015-09-30 03:45:50 +0900 (Wed, 30 Sep 2015) New Revision: 51987 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51987 Log: merge revision(s) 51766,51767: [Backport #11509] * lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction digits. [ruby-core:70667] [Bug #11509] Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/lib/rss/rss.rb branches/ruby_2_2/test/rss/test_to_s.rb branches/ruby_2_2/version.h Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 51986) +++ ruby_2_2/ChangeLog (revision 51987) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Wed Sep 30 03:44:36 2015 Nobuyoshi Nakada <nobu@r...> + + * lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction + digits. [ruby-core:70667] [Bug #11509] + Wed Sep 30 03:34:25 2015 Nobuyoshi Nakada <nobu@r...> * re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching Index: ruby_2_2/lib/rss/rss.rb =================================================================== --- ruby_2_2/lib/rss/rss.rb (revision 51986) +++ ruby_2_2/lib/rss/rss.rb (revision 51987) @@ -53,7 +53,7 @@ class Time https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/rss/rss.rb#L53 if usec.zero? fraction_digits = 0 else - fraction_digits = Math.log10(usec.to_s.sub(/0*$/, '').to_i).floor + 1 + fraction_digits = strftime('%6N').index(/0*\z/) end xmlschema(fraction_digits) end Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 51986) +++ ruby_2_2/version.h (revision 51987) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.4" #define RUBY_RELEASE_DATE "2015-09-30" -#define RUBY_PATCHLEVEL 177 +#define RUBY_PATCHLEVEL 178 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 9 Index: ruby_2_2/test/rss/test_to_s.rb =================================================================== --- ruby_2_2/test/rss/test_to_s.rb (revision 51986) +++ ruby_2_2/test/rss/test_to_s.rb (revision 51987) @@ -102,6 +102,12 @@ module RSS https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rss/test_to_s.rb#L102 assert_textinput20(@textinput_info, rss.textinput) end + def test_time_w3cdtf + assert_equal("2015-09-05T01:25:48.0001Z", + Time.utc(2015, 9, 5, 1, 25, 48, 100).w3cdtf, + '[ruby-core:70667] [Bug #11509]') + end + private def setup_xml_declaration_info @version = "1.0" Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r51766-51767 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/