tzinfo 0.3.27 → 0.3.28

data/CHANGES

@@ -1,3 +1,10 @@
+== Version 0.3.28 (tzdata v2011g) - 13-Jun-2011
+
+* Add support for Ruby 1.9.3 (trunk revision 31668 and later). Thanks to 
+  Aaron Patterson for reporting the problems running on the new version.
+  Closes #29233.
+
+
 == Version 0.3.27 (tzdata v2011g) - 26-Apr-2011
 
 * Updated to tzdata version 2011g

data/Rakefile

@@ -40,7 +40,7 @@ def sh(*cmd, &block)
 end
 
 
-PKG_VERSION = "0.3.27"
+PKG_VERSION = "0.3.28"
 PKG_FILES = FileList[
   'CHANGES',
   'LICENSE',

data/lib/tzinfo/ruby_core_support.rb

@@ -42,15 +42,39 @@ module TZInfo
     
     # Ruby 1.8.6 introduced new! and deprecated new0.
     # Ruby 1.9.0 removed new0.
-    # We still need to support new0 for older versions of Ruby.
+    # Ruby trunk revision 31668 removed the new! method.
+    # Still support new0 for better performance on older versions of Ruby (new0 indicates
+    # that the rational has already been reduced to its lowest terms).
+    # Fallback to jd with conversion from ajd if new! and new0 are unavailable.
     if DateTime.respond_to? :new!
       def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
         DateTime.new!(ajd, of, sg)
       end
-    else
+    elsif DateTime.respond_to? :new0
       def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
         DateTime.new0(ajd, of, sg)
       end
+    else
+      HALF_DAYS_IN_DAY = rational_new!(1, 2)
+
+      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
+        # Convert from an Astronomical Julian Day number to a civil Julian Day number.
+        jd = ajd + of + HALF_DAYS_IN_DAY
+        
+        # Ruby trunk revision 31862 changed the behaviour of DateTime.jd so that it will no
+        # longer accept a fractional civil Julian Day number if further arguments are specified.
+        # Calculate the hours, minutes and seconds to pass to jd.
+        
+        jd_i = jd.to_i
+        jd_i -= 1 if jd < 0
+        hours = (jd - jd_i) * 24
+        hours_i = hours.to_i
+        minutes = (hours - hours_i) * 60
+        minutes_i = minutes.to_i
+        seconds = (minutes - minutes_i) * 60
+        
+        DateTime.jd(jd_i, hours_i, minutes_i, seconds, of, sg)
+      end
     end
   end
 end

data/test/tc_ruby_core_support.rb

@@ -10,6 +10,22 @@ class TCRubyCoreSupport < Test::Unit::TestCase
   end
   
   def test_datetime_new!
-    assert_equal(DateTime.new(2008,10,6,20,30,0, 1, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(117827777, 48),1,2299161))
+    assert_equal(DateTime.new(2008,10,5,12,0,0, 0, Date::ITALY), RubyCoreSupport.datetime_new!(2454745,0,2299161))
+    assert_equal(DateTime.new(2008,10,6,12,0,0, 1, Date::ITALY), RubyCoreSupport.datetime_new!(2454745,1,2299161))
+    
+    assert_equal(DateTime.new(2008,10,5,20,30,0, 0, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(117827777, 48), 0, 2299161))
+    assert_equal(DateTime.new(2008,10,6,20,30,0, 1, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(117827777, 48), 1, 2299161))
+    
+    assert_equal(DateTime.new(2008,10,6,6,26,21, 0, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(70696678127,28800), 0, 2299161))
+    assert_equal(DateTime.new(2008,10,7,6,26,21, 1, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(70696678127, 28800), 1, 2299161))
+    
+    assert_equal(DateTime.new(-4712,1,1,12,0,0, 0, Date::ITALY), RubyCoreSupport.datetime_new!(0, 0, 2299161))
+    assert_equal(DateTime.new(-4712,1,2,12,0,0, 1, Date::ITALY), RubyCoreSupport.datetime_new!(0, 1, 2299161))
+    
+    assert_equal(DateTime.new(-4713,12,31,10,58,59, 0, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(-90061, 86400), 0, 2299161))
+    assert_equal(DateTime.new(-4712,1,1,10,58,59, 1, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(-90061, 86400), 1, 2299161))
+    
+    assert_equal(DateTime.new(-4713,12,30,10,58,59, 0, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(-176461, 86400), 0, 2299161))
+    assert_equal(DateTime.new(-4713,12,31,10,58,59, 1, Date::ITALY), RubyCoreSupport.datetime_new!(Rational(-176461, 86400), 1, 2299161))
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 3
-  - 27
-  version: 0.3.27
+  - 28
+  version: 0.3.28
 platform: ruby
 authors: 
 - Philip Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 16:00:00 -07:00
+date: 2011-06-12 16:00:00 -07:00
 default_executable: 
 dependencies: []