jruby · Nov 3, 2017 · Nov 3, 2017 · Nov 3, 2017 · Nov 3, 2017
Showing with 47 additions and 8 deletions.

+8 −7 lib/ruby/stdlib/date.rb

+12 −0 spec/ruby/library/datetime/to_time_spec.rb

+27 −0 spec/ruby/library/time/to_datetime_spec.rb

+0 −1 spec/tags/ruby/library/time/to_date_tags.txt
diff --git a/lib/ruby/stdlib/date.rb b/lib/ruby/stdlib/date.rb
@@ -1879,16 +1879,17 @@ def to_time
   end
 
   def to_date
-    Date.civil(year, mon, mday, Date::GREGORIAN)
+    jd = Date.__send__(:civil_to_jd, year, mon, mday, Date::GREGORIAN)
+    Date.new!(Date.__send__(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
   end
 
-  def to_datetime(sg = Date::ITALY, klass = DateTime)
+  def to_datetime
+    jd = DateTime.__send__(:civil_to_jd, year, mon, mday, DateTime::ITALY)
+    fr = DateTime.__send__(:time_to_day_fraction, hour, min, [sec, 59].min) +
+      Rational(subsec, 86400)
     of = Rational(utc_offset, 86400)
-    s = [sec, 59].min
-    ms, sub_millis = nsec.divmod(1_000_000) # expects ns precision for Time
-    sub_millis = Rational(sub_millis, 1_000_000) if sub_millis != 0
-    dt = Date::JODA::DateTime.new(1000 * to_i + ms, Date.send(:chronology, sg, of))
-    klass.new!(dt, of, sg, sub_millis)
+    DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),
+		  of, DateTime::ITALY)
   end
 
 end

diff --git a/spec/ruby/library/datetime/to_time_spec.rb b/spec/ruby/library/datetime/to_time_spec.rb
@@ -6,6 +6,18 @@
     DateTime.now.to_time.should be_kind_of(Time)
   end
 
+  it "returns a Time representing the same instant" do
+    datetime = DateTime.civil(3, 12, 31, 23, 58, 59)
+    time = datetime.to_time.utc
+
+    time.year.should == 3
+    time.month.should == 12
+    time.day.should == 31
+    time.hour.should == 23
+    time.min.should == 58
+    time.sec.should == 59
+  end
+
   ruby_version_is "2.4" do
     it "preserves the same time regardless of local time or zone" do
       date = DateTime.new(2012, 12, 24, 12, 23, 00, '+03:00')

diff --git a/spec/ruby/library/time/to_datetime_spec.rb b/spec/ruby/library/time/to_datetime_spec.rb
@@ -0,0 +1,27 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'time'
+
+describe "Time#to_datetime" do
+  it "returns a DateTime representing the same instant" do
+    time = Time.utc(3, 12, 31, 23, 58, 59)
+    datetime = time.to_datetime
+    datetime.year.should == 3
+    datetime.month.should == 12
+    datetime.day.should == 31
+    datetime.hour.should == 23
+    datetime.min.should == 58
+    datetime.sec.should == 59
+  end
+
+  it "roundtrips" do
+    time = Time.utc(3, 12, 31, 23, 58, 59)
+    datetime = time.to_datetime
+    datetime.to_time.utc.should == time
+  end
+
+  it "yields a DateTime with the default Calendar reform day" do
+    Time.utc(1582, 10,  4, 1, 2, 3).to_datetime.start.should == Date::ITALY
+    Time.utc(1582, 10, 14, 1, 2, 3).to_datetime.start.should == Date::ITALY
+    Time.utc(1582, 10, 15, 1, 2, 3).to_datetime.start.should == Date::ITALY
+  end
+end
diff --git a/spec/tags/ruby/library/time/to_date_tags.txt b/spec/tags/ruby/library/time/to_date_tags.txt