diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-07 15:08:42 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-07 15:08:42 +0000 |
| commit | 2bf7d240b81e2886e961d2ee755909a4416eebb2 (patch) | |
| tree | 6b0bdf1fba1b52c4a9281a03f265a71998a378f0 /lib/date.rb | |
| parent | 84f677d2f38f596f71d6aea54ba2da68f4f60855 (diff) | |
* lib/date.rb (today,now): should produce own instances.
[ruby-talk:317020]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/date.rb')
| -rw-r--r-- | lib/date.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/date.rb b/lib/date.rb index 5ac8bf03d6..3da3d21f8b 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -1790,12 +1790,23 @@ class Date # Create a new Date object representing today. # # +sg+ specifies the Day of Calendar Reform. - def self.today(sg=ITALY) Time.now.to_date .new_start(sg) end + def self.today(sg=ITALY) + t = Time.now + jd = civil_to_jd(t.year, t.mon, t.mday, sg) + new!(jd_to_ajd(jd, 0, 0), 0, sg) + end # Create a new DateTime object representing the current time. # # +sg+ specifies the Day of Calendar Reform. - def self.now (sg=ITALY) Time.now.to_datetime.new_start(sg) end + def self.now(sg=ITALY) + t = Time.now + jd = civil_to_jd(t.year, t.mon, t.mday, sg) + fr = time_to_day_fraction(t.hour, t.min, [t.sec, 59].min) + + Rational(t.nsec, 86400_000_000_000) + of = Rational(t.utc_offset, 86400) + new!(jd_to_ajd(jd, fr, of), of, sg) + end private_class_method :now |