home_run 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.9.4 (2010-10-18)
+
+* Have methods of subclasses of Date and DateTime return instances of the subclass (jeremyevans)
+
 === 0.9.3 (2010-09-20)
 
 * Don't attempt to undefine already undefined method if you require date_ext twice with two different paths (jeremyevans)

data/README.rdoc

@@ -216,7 +216,6 @@ extension due to the above differences:
 
 * Date::Performance - Date#<=> assumes @ajd instance variable
   (unnecessary anyway, as home_run is faster)
-* ruby-ole - Depends on DateTime.allocate/#initialize
 
 == Reporting issues/bugs
 

data/ext/date_ext/date_ext.c

@@ -286,7 +286,7 @@ VALUE rhrd__add_days(VALUE self, long n) {
   VALUE new;
   long x;
   Data_Get_Struct(self, rhrd_t, d);
-  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
+  new = Data_Make_Struct(rb_obj_class(self), rhrd_t, NULL, -1, newd);
 
   if(!(RHR_HAS_JD(d))) {
     x = rhrd__safe_add_long(n, (long)(d->day));
@@ -317,7 +317,7 @@ VALUE rhrd__add_months(VALUE self, long n) {
   long x;
   Data_Get_Struct(self, rhrd_t, d);
 
-  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
+  new = Data_Make_Struct(rb_obj_class(self), rhrd_t, NULL, -1, newd);
   RHR_FILL_CIVIL(d)
   n = rhrd__safe_add_long(n, (long)(d->month));
   if(n > 1 && n <= 12) {
@@ -718,9 +718,9 @@ int rhrd__fill_from_hash(rhrd_t *d, VALUE hash) {
 /* Returns a new ruby object filled with information from
  * the given hash, or raises an error if the given hash
  * did not contain valid date information. */
-VALUE rhrd__from_hash(VALUE hash) {
+VALUE rhrd__from_hash(VALUE klass, VALUE hash) {
   rhrd_t *d;
-  VALUE rd = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
   if(rhrd__fill_from_hash(d, hash)) {
     rb_raise(rb_eArgError, "invalid date");
   } else {
@@ -1255,7 +1255,7 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
         case 'Z':
 #define RHR_PARSE_Z zone = rb_funcall(rhrd_zone_re, rhrd_id_match, 1, rb_funcall(rstr, rhrd_id_slice, 2, LONG2NUM(pos), LONG2NUM(len)));\
           if (RTEST(zone)) {\
-            zone = rb_funcall(zone, rhrd_id_op_array, 1, LONG2NUM(0));\
+            zone = rb_funcall(zone, rhrd_id_op_array, 1, INT2FIX(0));\
             scan_len = NUM2LONG(rb_funcall(zone, rhrd_id_length, 0));\
           } else {\
             return Qnil;\
@@ -1736,10 +1736,10 @@ static VALUE rhrd_s_parse(int argc, VALUE *argv, VALUE klass) {
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__parse, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__parse, 1, argv[0]));
     case 2:
     case 3:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__parse, 2, argv[0], argv[1]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__parse, 2, argv[0], argv[1]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 3)", argc);
       break;
@@ -1779,7 +1779,7 @@ static VALUE rhrd_s_strptime(int argc, VALUE *argv, VALUE klass) {
 
   rd = rhrd_s__strptime(argc, argv, klass);
   if (RTEST(rd)) {
-    return rhrd__from_hash(rd);
+    return rhrd__from_hash(klass, rd);
   }
   rb_raise(rb_eArgError, "invalid date");
 }
@@ -2009,7 +2009,7 @@ VALUE rhrd_s_zone_to_diff(VALUE klass, VALUE str) {
     }
     switch (len) {
       case 0:
-        return LONG2NUM(0);
+        return INT2FIX(0);
       case 1:
       case 2:
         return LONG2NUM(atol(s) * RHR_SECONDS_PER_HOUR * offset);
@@ -2036,7 +2036,7 @@ VALUE rhrd_s_zone_to_diff(VALUE klass, VALUE str) {
     }
   }
 
-  return LONG2NUM(0);
+  return INT2FIX(0);
 }
 
 /* Ruby instance methods */
@@ -2173,7 +2173,7 @@ static VALUE rhrd_day(VALUE self) {
  * +Date+ objects due not hold fractional days, so 0 is always returned.
  */
 static VALUE rhrd_day_fraction(VALUE self) {
-  return LONG2NUM(0);
+  return INT2FIX(0);
 }
 
 /* call-seq:
@@ -2452,7 +2452,7 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
   rhrd_t *d, *n, *newd;
   rhrdt_t *ndt;
   long step, limit, current;
-  VALUE rlimit, new, rstep;
+  VALUE rlimit, new, rstep, klass;
   Data_Get_Struct(self, rhrd_t, d);
   RHR_FILL_JD(d)
 
@@ -2470,6 +2470,7 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
       break;
   }
   rlimit = argv[0];
+  klass = rb_obj_class(self);
 
 #ifdef RUBY19
   if (!rb_block_given_p()) {
@@ -2497,7 +2498,7 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
   if (limit > current) {
     if (step > 0) {
       while(limit >= current) {
-        new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
+        new = Data_Make_Struct(klass, rhrd_t, NULL, -1, newd);
         newd->jd = current;
         RHR_CHECK_JD(newd)
         newd->flags = RHR_HAVE_JD;
@@ -2508,7 +2509,7 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
   } else if (limit < current) {
     if (step < 0) {
       while(limit <= current) {
-        new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
+        new = Data_Make_Struct(klass, rhrd_t, NULL, -1, newd);
         newd->jd = current;
         RHR_CHECK_JD(newd)
         newd->flags = RHR_HAVE_JD;
@@ -2893,7 +2894,7 @@ VALUE rhrd__add_years(VALUE self, long n) {
   VALUE new;
   Data_Get_Struct(self, rhrd_t, d);
 
-  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
+  new = Data_Make_Struct(rb_obj_class(self), rhrd_t, NULL, -1, newd);
   RHR_FILL_CIVIL(d)
   newd->year = rhrd__safe_add_long(n, d->year);
   newd->month = d->month;
@@ -2946,7 +2947,7 @@ static VALUE rhrd_s_httpdate(int argc, VALUE *argv, VALUE klass) {
       return rd;
     case 1:
     case 2:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__httpdate, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__httpdate, 1, argv[0]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 2)", argc);
       break;
@@ -2980,7 +2981,7 @@ static VALUE rhrd_s_iso8601(int argc, VALUE *argv, VALUE klass) {
       return rd;
     case 1:
     case 2:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__iso8601, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__iso8601, 1, argv[0]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 2)", argc);
       break;
@@ -3014,7 +3015,7 @@ static VALUE rhrd_s_jisx0301(int argc, VALUE *argv, VALUE klass) {
       return rd;
     case 1:
     case 2:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__jisx0301, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__jisx0301, 1, argv[0]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 2)", argc);
       break;
@@ -3048,7 +3049,7 @@ static VALUE rhrd_s_rfc2822(int argc, VALUE *argv, VALUE klass) {
       return rd;
     case 1:
     case 2:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__rfc2822, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__rfc2822, 1, argv[0]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 2)", argc);
       break;
@@ -3082,7 +3083,7 @@ static VALUE rhrd_s_rfc3339(int argc, VALUE *argv, VALUE klass) {
       return rd;
     case 1:
     case 2:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__rfc3339, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__rfc3339, 1, argv[0]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 2)", argc);
       break;
@@ -3116,7 +3117,7 @@ static VALUE rhrd_s_xmlschema(int argc, VALUE *argv, VALUE klass) {
       return rd;
     case 1:
     case 2:
-      return rhrd__from_hash(rb_funcall(klass, rhrd_id__xmlschema, 1, argv[0]));
+      return rhrd__from_hash(klass, rb_funcall(klass, rhrd_id__xmlschema, 1, argv[0]));
     default:
       rb_raise(rb_eArgError, "wrong number of arguments (%i for 2)", argc);
       break;
@@ -4125,176 +4126,176 @@ void Init_date_ext(void) {
   }
 
   rhrd_zones_hash = rb_hash_new();
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("a"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("adt"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("afghanistan"), LONG2NUM(16200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ahst"), LONG2NUM(-36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("akdt"), LONG2NUM(-28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("akst"), LONG2NUM(-32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("alaskan"), LONG2NUM(-32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("arab"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("arabian"), LONG2NUM(14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("arabic"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("art"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ast"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("at"), LONG2NUM(-7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("atlantic"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("aus central"), LONG2NUM(34200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("aus eastern"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("azores"), LONG2NUM(-3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("b"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("brst"), LONG2NUM(-7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("brt"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("bst"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("bt"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("c"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("canada central"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cape verde"), LONG2NUM(-3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cat"), LONG2NUM(-36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("caucasus"), LONG2NUM(14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cct"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cdt"), LONG2NUM(-18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cen. australia"), LONG2NUM(34200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central america"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central asia"), LONG2NUM(21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central europe"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central european"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central pacific"), LONG2NUM(39600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cest"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cet"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("china"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("clst"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("clt"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cst"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("d"), LONG2NUM(14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("dateline"), LONG2NUM(-43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e"), LONG2NUM(18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. africa"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. australia"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. europe"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. south america"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eadt"), LONG2NUM(39600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("east"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eastern"), LONG2NUM(-18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eat"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("edt"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eest"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eet"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("egypt"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ekaterinburg"), LONG2NUM(18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("est"), LONG2NUM(-18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("f"), LONG2NUM(21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fiji"), LONG2NUM(43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fle"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fst"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fwt"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("g"), LONG2NUM(25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("gmt"), LONG2NUM(0));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("greenland"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("greenwich"), LONG2NUM(0));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("gst"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("gtb"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("h"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hadt"), LONG2NUM(-32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hast"), LONG2NUM(-36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hawaiian"), LONG2NUM(-36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hdt"), LONG2NUM(-32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hst"), LONG2NUM(-36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("i"), LONG2NUM(32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("idle"), LONG2NUM(43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("idlw"), LONG2NUM(-43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("india"), LONG2NUM(19800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("iran"), LONG2NUM(12600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ist"), LONG2NUM(19800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("jerusalem"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("jst"), LONG2NUM(32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("k"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("korea"), LONG2NUM(32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("kst"), LONG2NUM(32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("l"), LONG2NUM(39600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("m"), LONG2NUM(43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("malay peninsula"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mdt"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mest"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mesz"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("met"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mewt"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mexico"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mez"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mid-atlantic"), LONG2NUM(-7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mountain"), LONG2NUM(-25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("msd"), LONG2NUM(14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("msk"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mst"), LONG2NUM(-25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("myanmar"), LONG2NUM(23400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("n"), LONG2NUM(-3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("n. central asia"), LONG2NUM(21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ndt"), LONG2NUM(-9000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nepal"), LONG2NUM(20700));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("new zealand"), LONG2NUM(43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("newfoundland"), LONG2NUM(-12600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("north asia"), LONG2NUM(25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("north asia east"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nst"), LONG2NUM(-12600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nt"), LONG2NUM(-39600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nzdt"), LONG2NUM(46800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nzst"), LONG2NUM(43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nzt"), LONG2NUM(43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("o"), LONG2NUM(-7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("p"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pacific"), LONG2NUM(-28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pacific sa"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pdt"), LONG2NUM(-25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pst"), LONG2NUM(-28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("q"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("r"), LONG2NUM(-18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("romance"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("russian"), LONG2NUM(10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("s"), LONG2NUM(-21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sa eastern"), LONG2NUM(-10800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sa pacific"), LONG2NUM(-18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sa western"), LONG2NUM(-14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("samoa"), LONG2NUM(-39600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sast"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("se asia"), LONG2NUM(25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sgt"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("south africa"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sri lanka"), LONG2NUM(21600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sst"), LONG2NUM(7200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("swt"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("t"), LONG2NUM(-25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("taipei"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("tasmania"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("tokyo"), LONG2NUM(32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("tonga"), LONG2NUM(46800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("u"), LONG2NUM(-28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("us eastern"), LONG2NUM(-18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("us mountain"), LONG2NUM(-25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ut"), LONG2NUM(0));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("utc"), LONG2NUM(0));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("v"), LONG2NUM(-32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("vladivostok"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w"), LONG2NUM(-36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w. australia"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w. central africa"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w. europe"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wadt"), LONG2NUM(28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wast"), LONG2NUM(25200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wat"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("west"), LONG2NUM(3600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("west asia"), LONG2NUM(18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("west pacific"), LONG2NUM(36000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wet"), LONG2NUM(0));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("x"), LONG2NUM(-39600));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("y"), LONG2NUM(-43200));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("yakutsk"), LONG2NUM(32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ydt"), LONG2NUM(-28800));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("yst"), LONG2NUM(-32400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("z"), LONG2NUM(0));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("zp4"), LONG2NUM(14400));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("zp5"), LONG2NUM(18000));
-  rb_hash_aset(rhrd_zones_hash, rb_str_new2("zp6"), LONG2NUM(21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("a"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("adt"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("afghanistan"), INT2FIX(16200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ahst"), INT2FIX(-36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("akdt"), INT2FIX(-28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("akst"), INT2FIX(-32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("alaskan"), INT2FIX(-32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("arab"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("arabian"), INT2FIX(14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("arabic"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("art"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ast"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("at"), INT2FIX(-7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("atlantic"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("aus central"), INT2FIX(34200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("aus eastern"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("azores"), INT2FIX(-3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("b"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("brst"), INT2FIX(-7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("brt"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("bst"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("bt"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("c"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("canada central"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cape verde"), INT2FIX(-3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cat"), INT2FIX(-36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("caucasus"), INT2FIX(14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cct"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cdt"), INT2FIX(-18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cen. australia"), INT2FIX(34200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central america"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central asia"), INT2FIX(21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central europe"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central european"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("central pacific"), INT2FIX(39600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cest"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cet"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("china"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("clst"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("clt"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("cst"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("d"), INT2FIX(14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("dateline"), INT2FIX(-43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e"), INT2FIX(18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. africa"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. australia"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. europe"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("e. south america"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eadt"), INT2FIX(39600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("east"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eastern"), INT2FIX(-18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eat"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("edt"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eest"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("eet"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("egypt"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ekaterinburg"), INT2FIX(18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("est"), INT2FIX(-18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("f"), INT2FIX(21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fiji"), INT2FIX(43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fle"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fst"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("fwt"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("g"), INT2FIX(25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("gmt"), INT2FIX(0));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("greenland"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("greenwich"), INT2FIX(0));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("gst"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("gtb"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("h"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hadt"), INT2FIX(-32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hast"), INT2FIX(-36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hawaiian"), INT2FIX(-36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hdt"), INT2FIX(-32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("hst"), INT2FIX(-36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("i"), INT2FIX(32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("idle"), INT2FIX(43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("idlw"), INT2FIX(-43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("india"), INT2FIX(19800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("iran"), INT2FIX(12600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ist"), INT2FIX(19800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("jerusalem"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("jst"), INT2FIX(32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("k"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("korea"), INT2FIX(32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("kst"), INT2FIX(32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("l"), INT2FIX(39600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("m"), INT2FIX(43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("malay peninsula"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mdt"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mest"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mesz"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("met"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mewt"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mexico"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mez"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mid-atlantic"), INT2FIX(-7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mountain"), INT2FIX(-25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("msd"), INT2FIX(14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("msk"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("mst"), INT2FIX(-25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("myanmar"), INT2FIX(23400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("n"), INT2FIX(-3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("n. central asia"), INT2FIX(21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ndt"), INT2FIX(-9000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nepal"), INT2FIX(20700));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("new zealand"), INT2FIX(43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("newfoundland"), INT2FIX(-12600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("north asia"), INT2FIX(25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("north asia east"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nst"), INT2FIX(-12600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nt"), INT2FIX(-39600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nzdt"), INT2FIX(46800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nzst"), INT2FIX(43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("nzt"), INT2FIX(43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("o"), INT2FIX(-7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("p"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pacific"), INT2FIX(-28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pacific sa"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pdt"), INT2FIX(-25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("pst"), INT2FIX(-28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("q"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("r"), INT2FIX(-18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("romance"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("russian"), INT2FIX(10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("s"), INT2FIX(-21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sa eastern"), INT2FIX(-10800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sa pacific"), INT2FIX(-18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sa western"), INT2FIX(-14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("samoa"), INT2FIX(-39600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sast"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("se asia"), INT2FIX(25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sgt"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("south africa"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sri lanka"), INT2FIX(21600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("sst"), INT2FIX(7200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("swt"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("t"), INT2FIX(-25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("taipei"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("tasmania"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("tokyo"), INT2FIX(32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("tonga"), INT2FIX(46800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("u"), INT2FIX(-28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("us eastern"), INT2FIX(-18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("us mountain"), INT2FIX(-25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ut"), INT2FIX(0));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("utc"), INT2FIX(0));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("v"), INT2FIX(-32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("vladivostok"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w"), INT2FIX(-36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w. australia"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w. central africa"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("w. europe"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wadt"), INT2FIX(28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wast"), INT2FIX(25200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wat"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("west"), INT2FIX(3600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("west asia"), INT2FIX(18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("west pacific"), INT2FIX(36000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("wet"), INT2FIX(0));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("x"), INT2FIX(-39600));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("y"), INT2FIX(-43200));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("yakutsk"), INT2FIX(32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("ydt"), INT2FIX(-28800));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("yst"), INT2FIX(-32400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("z"), INT2FIX(0));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("zp4"), INT2FIX(14400));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("zp5"), INT2FIX(18000));
+  rb_hash_aset(rhrd_zones_hash, rb_str_new2("zp6"), INT2FIX(21600));
 
   rhrd_start_num = LONG2NUM(RHR_JD_MIN - 1);
   rhrd_empty_string = rb_str_new("", 0);