home_run 0.9.1-x86-mswin32-60 → 0.9.2-x86-mswin32-60

data/ext/date_ext/datetime.c

@@ -1,5 +1,9 @@
 #include "date_ext.h"
 
+#ifdef RHR_ENCODING
+extern int rhrd_encoding_index;
+#endif
+
 extern const unsigned char rhrd_days_in_month[];
 extern const long rhrd_cumulative_days_in_month[];
 extern const unsigned char rhrd_yday_to_month[];
@@ -115,7 +119,7 @@ void rhrdt__set_offset(rhrdt_t *dt, double offset) {
   long offset_min;
   offset_min = lround(offset * 1440);
   rhrdt__check_offset(offset_min);
-  dt->offset = offset_min;
+  dt->offset = (short)offset_min;
 }
 
 /* Check if the time information consistutes a valid time.  If not, raise an
@@ -138,16 +142,16 @@ void rhrdt__set_time(rhrdt_t *dt, long h, long m, long s, double offset) {
   if (h == 24 && m == 0 && s == 0) {
     RHRDT_FILL_JD(dt)
     dt->jd++;
-    dt->flags &= ~RHR_HAVE_CIVIL;
+    dt->flags &= (unsigned char)~RHR_HAVE_CIVIL;
     h = 0;
   } else if (h < 0 || m < 0 || s < 0 || h > 23 || m > 59 || s > 59) {
     rb_raise(rb_eArgError, "invalid time: %ld hours, %ld minutes, %ld seconds", h, m, s);
   }
   rhrdt__set_offset(dt, offset);
 
-  dt->hour = h;
-  dt->minute = m;
-  dt->second = s;
+  dt->hour = (unsigned char)h;
+  dt->minute = (unsigned char)m;
+  dt->second = (unsigned char)s;
   dt->flags |= RHR_HAVE_HMS;
 }
 
@@ -166,12 +170,12 @@ void rhrdt__jd_to_civil(rhrdt_t *date) {
   c = (long)floor((b - 122.1) / 365.25);
   d = (long)floor(365.25 * c);
   e = (long)floor((b - d) / 30.6001);
-  date->day = b - d - (long)floor(30.6001 * e);
+  date->day = (unsigned char)(b - d - (long)floor(30.6001 * e));
   if (e <= 13) {
-    date->month = e - 1;
+    date->month = (unsigned char)(e - 1);
     date->year = c - 4716;
   } else {
-    date->month = e - 13;
+    date->month = (unsigned char)(e - 13);
     date->year = c - 4715;
   }
   date->flags |= RHR_HAVE_CIVIL;
@@ -182,10 +186,10 @@ void rhrdt__jd_to_civil(rhrdt_t *date) {
  * nanos field has already been filled in. */
 void rhrdt__nanos_to_hms(rhrdt_t *d) {
   unsigned int seconds;
-  seconds = d->nanos/RHR_NANOS_PER_SECOND;
-  d->hour = seconds/RHR_SECONDS_PER_HOUR;
-  d->minute = (seconds % RHR_SECONDS_PER_HOUR)/60;
-  d->second = seconds % 60;
+  seconds = (unsigned int)(d->nanos/RHR_NANOS_PER_SECOND);
+  d->hour = (unsigned char)(seconds/RHR_SECONDS_PER_HOUR);
+  d->minute = (unsigned char)((seconds % RHR_SECONDS_PER_HOUR)/60);
+  d->second = (unsigned char)(seconds % 60);
   d->flags |= RHR_HAVE_HMS;
 }
 
@@ -286,13 +290,13 @@ void rhrdt__now(rhrdt_t * dt) {
   rt = rb_funcall(rb_cTime, rhrd_id_now, 0);
   offset = NUM2LONG(rb_funcall(rt, rhrd_id_utc_offset, 0));
   t = NUM2LONG(rb_funcall(rt, rhrd_id_to_i, 0)) + offset;
-  dt->jd = rhrd__unix_to_jd(t);
+  dt->jd = rhrd__unix_to_jd((long long)t);
 #ifdef RUBY19
   dt->nanos = rhrd__mod(t, RHR_SECONDS_PER_DAY) * RHR_NANOS_PER_SECOND + NUM2LONG(rb_funcall(rt, rhrd_id_nsec, 0));
 #else
   dt->nanos = rhrd__mod(t, RHR_SECONDS_PER_DAY) * RHR_NANOS_PER_SECOND + NUM2LONG(rb_funcall(rt, rhrd_id_usec, 0)) * 1000;
 #endif
-  dt->offset = offset/60;
+  dt->offset = (short)(offset/60);
   dt->flags |= RHR_HAVE_JD | RHR_HAVE_NANOS;
   RHR_CHECK_JD(dt);
 }
@@ -310,11 +314,11 @@ VALUE rhrdt__from_jd_nanos(long jd, long long nanos, short offset) {
   new = Data_Make_Struct(rhrdt_class, rhrdt_t, NULL, -1, dt);
   
   if (nanos < 0) {
-    t = nanos/RHR_NANOS_PER_DAY - 1;
+    t = (long)(nanos/RHR_NANOS_PER_DAY - 1);
     nanos -= t * RHR_NANOS_PER_DAY;
     jd += t;
   } else if (nanos >= RHR_NANOS_PER_DAY) {
-    t = nanos/RHR_NANOS_PER_DAY;
+    t = (long)(nanos/RHR_NANOS_PER_DAY);
     nanos -= t * RHR_NANOS_PER_DAY;
     jd += t;
   }
@@ -357,7 +361,7 @@ VALUE rhrdt__add_days(VALUE self, double n) {
   Data_Get_Struct(self, rhrdt_t, dt);
   RHRDT_FILL_JD(dt)
   RHRDT_FILL_NANOS(dt)
-  l = floor(n);
+  l = (long)floor(n);
   nanos = llround((n - l) * RHR_NANOS_PER_DAY);
   return rhrdt__from_jd_nanos(rhrd__safe_add_long(dt->jd, l), dt->nanos + nanos, dt->offset);
 }
@@ -378,13 +382,13 @@ VALUE rhrdt__add_months(VALUE self, long n) {
   n = rhrd__safe_add_long(n, (long)(d->month));
   if(n > 1 && n <= 12) {
     newd->year = d->year;
-    newd->month = n;
+    newd->month = (unsigned char)n;
   } else {
     x = n / 12;
     n = n % 12;
     if (n <= 0) {
       newd->year = d->year + x - 1;
-      newd->month = n + 12;
+      newd->month = (unsigned char)(n + 12);
     } else {
       newd->year = d->year + x;
       newd->month = (unsigned char)n;
@@ -393,7 +397,7 @@ VALUE rhrdt__add_months(VALUE self, long n) {
   x = rhrd__days_in_month(newd->year, newd->month);
   newd->day = (unsigned char)(d->day > x ? x : d->day);
   RHR_CHECK_CIVIL(newd)
-  newd->flags &= ~RHR_HAVE_JD;
+  newd->flags &= (unsigned char)~RHR_HAVE_JD;
   return new;
 }
 
@@ -430,9 +434,9 @@ void rhrdt__fill_from_hash(rhrdt_t *dt, VALUE hash) {
     dt->jd = rhrd__unix_to_jd(time_set);
     time_set = rhrd__modll(time_set, RHR_SECONDS_PER_DAY);
     dt->nanos = time_set*RHR_NANOS_PER_SECOND + nanos;
-    dt->hour = time_set/RHR_SECONDS_PER_HOUR;
-    dt->minute = (time_set - dt->hour * RHR_SECONDS_PER_HOUR)/60;
-    dt->second = rhrd__mod(time_set, 60);
+    dt->hour = (unsigned char)(time_set/RHR_SECONDS_PER_HOUR);
+    dt->minute = (unsigned char)((time_set - dt->hour * RHR_SECONDS_PER_HOUR)/60);
+    dt->second = (unsigned char)rhrd__mod((long)time_set, 60);
     offset /= 60;
     rhrdt__check_offset(offset);
     RHR_CHECK_JD(dt);
@@ -505,7 +509,7 @@ VALUE rhrdt__new_offset(VALUE self, double offset) {
   Data_Get_Struct(self, rhrdt_t, dt);
   RHRDT_FILL_JD(dt)
   RHRDT_FILL_NANOS(dt)
-  return rhrdt__from_jd_nanos(dt->jd, dt->nanos - (dt->offset - offset_min)*RHR_NANOS_PER_MINUTE, offset_min);
+  return rhrdt__from_jd_nanos(dt->jd, dt->nanos - (dt->offset - offset_min)*RHR_NANOS_PER_MINUTE, (short)offset_min);
 }
 
 /* Class methods */
@@ -541,7 +545,7 @@ static VALUE rhrdt_s__load(VALUE klass, VALUE string) {
 
   x = NUM2LONG(rb_ary_entry(ary, 2));
   rhrdt__check_offset(x);
-  d->offset = x;
+  d->offset = (short)x;
   
   d->flags = RHR_HAVE_JD | RHR_HAVE_NANOS;
   return rd;
@@ -765,9 +769,9 @@ static VALUE rhrdt_s_new_b(int argc, VALUE *argv, VALUE klass) {
       rhrdt__set_offset(dt, offset);
     case 1:
       offset += NUM2DBL(argv[0]) + 0.5;
-      dt->jd = offset;
+      dt->jd = (long)offset;
       RHR_CHECK_JD(dt)
-      dt->nanos = (offset - dt->jd)*RHR_NANOS_PER_DAY;
+      dt->nanos = (long long)((offset - dt->jd)*RHR_NANOS_PER_DAY);
       dt->flags = RHR_HAVE_JD | RHR_HAVE_NANOS;
       break;
     default:
@@ -949,7 +953,7 @@ static VALUE rhrdt_ajd(VALUE self) {
   Data_Get_Struct(self, rhrdt_t, d);
   RHRDT_FILL_JD(d)
   RHRDT_FILL_NANOS(d)
-  return rb_float_new(d->jd + d->nanos/RHR_NANOS_PER_DAYD - d->offset/1440.0 - 0.5);
+  return rb_float_new(d->jd + (double)d->nanos/RHR_NANOS_PER_DAYD - d->offset/1440.0 - 0.5);
 }
 
 /* call-seq:
@@ -963,7 +967,7 @@ static VALUE rhrdt_amjd(VALUE self) {
   Data_Get_Struct(self, rhrdt_t, d);
   RHRDT_FILL_JD(d)
   RHRDT_FILL_NANOS(d)
-  return rb_float_new(d->jd + d->nanos/RHR_NANOS_PER_DAYD - d->offset/1440.0 - RHR_JD_MJD);
+  return rb_float_new(d->jd + (double)d->nanos/RHR_NANOS_PER_DAYD - d->offset/1440.0 - RHR_JD_MJD);
 }
 
 /* call-seq:
@@ -984,10 +988,10 @@ static VALUE rhrdt_asctime(VALUE self) {
   RHRDT_FILL_HMS(d)
 
   s = rb_str_buf_new(128);
-  len = snprintf(RSTRING_PTR(s), 128, "%s %s %2hhi %02hhi:%02hhi:%02hhi %04li", 
+  len = snprintf(RSTRING_PTR(s), 128, "%s %s %2i %02i:%02i:%02i %04li", 
         rhrd__abbr_day_names[rhrd__jd_to_wday(d->jd)],
         rhrd__abbr_month_names[d->month],
-        d->day, d->hour, d->minute, d->second,
+        (int)d->day, (int)d->hour, (int)d->minute, (int)d->second,
         d->year);
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#asctime (in snprintf)");
@@ -1096,7 +1100,7 @@ static VALUE rhrdt_day_fraction(VALUE self) {
   rhrdt_t *dt;
   Data_Get_Struct(self, rhrdt_t, dt);
   RHRDT_FILL_NANOS(dt)
-  return rb_float_new(dt->nanos/RHR_NANOS_PER_DAYD);
+  return rb_float_new((double)dt->nanos/RHR_NANOS_PER_DAYD);
 }
 
 /* call-seq:
@@ -1142,8 +1146,8 @@ static VALUE rhrdt_eql_q(VALUE self, VALUE other) {
   long diff;
 
   if (RTEST(rb_obj_is_kind_of(other, rhrdt_class))) {
-    self = rhrdt__new_offset(self, 0);
-    other = rhrdt__new_offset(other, 0);
+    self = rhrdt__new_offset(self, 0.0);
+    other = rhrdt__new_offset(other, 0.0);
     Data_Get_Struct(self, rhrdt_t, dt);
     Data_Get_Struct(other, rhrdt_t, odt);
     return rhrdt__spaceship(dt, odt) == 0 ? Qtrue : Qfalse;
@@ -1170,8 +1174,9 @@ static VALUE rhrdt_eql_q(VALUE self, VALUE other) {
  */
 static VALUE rhrdt_hash(VALUE self) {
   rhrdt_t *d;
+  VALUE new = rhrdt__new_offset(self, 0.0); 
   RHR_CACHED_IV(self, rhrd_id_hash)
-  Data_Get_Struct(rhrdt__new_offset(self, 0), rhrdt_t, d);
+  Data_Get_Struct(new, rhrdt_t, d);
   return rb_ivar_set(self, rhrd_id_hash, rb_funcall(rb_ary_new3(2, LONG2NUM(d->jd), LL2NUM(d->nanos)), rhrd_id_hash, 0));
 }
 
@@ -1208,8 +1213,8 @@ static VALUE rhrdt_inspect(VALUE self) {
   RHRDT_FILL_HMS(dt)
 
   s = rb_str_buf_new(128);
-  len = snprintf(RSTRING_PTR(s), 128, "#<DateTime %04li-%02hhi-%02hhiT%02hhi:%02hhi:%02hhi%+03i:%02i>",
-        dt->year, dt->month, dt->day, dt->hour, dt->minute, dt->second, dt->offset/60, abs(dt->offset % 60));
+  len = snprintf(RSTRING_PTR(s), 128, "#<DateTime %04li-%02i-%02iT%02i:%02i:%02i%+03i:%02i>",
+        dt->year, (int)dt->month, (int)dt->day, (int)dt->hour, (int)dt->minute, (int)dt->second, dt->offset/60, abs(dt->offset % 60));
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#inspect (in snprintf)");
   }
@@ -1357,7 +1362,7 @@ static VALUE rhrdt_new_offset(int argc, VALUE *argv, VALUE self) {
  *   # => #<DateTime 2009-01-03T12:00:00+00:00>
  */
 static VALUE rhrdt_next(VALUE self) {
-   return rhrdt__add_days(self, 1);
+   return rhrdt__add_days(self, 1.0);
 }
 
 /* call-seq:
@@ -1395,17 +1400,27 @@ static VALUE rhrdt_sec(VALUE self) {
 /* call-seq:
  *   sec_fraction() -> Float
  *
- * Returns a +Float+ representing the fraction of the second as a
+ * On ruby 1.8, returns a +Float+ representing the fraction of the second as a
  * fraction of the day, which will always be in the range [0.0, 1/86400.0).
  * 
  *   (DateTime.civil(2009, 1, 2, 12, 13, 14) + (1.5/86400)).sec_fraction
  *   # => 0.000005787037
+ *
+ * On ruby 1.9, returns a +Float+ representing the fraction of the second, which
+ * will always be in the range [0,1).
+ * 
+ *   (DateTime.civil(2009, 1, 2, 12, 13, 14) + (1.5/86400)).sec_fraction
+ *   # => 0.5
  */
 static VALUE rhrdt_sec_fraction(VALUE self) {
   rhrdt_t *dt;
   Data_Get_Struct(self, rhrdt_t, dt);
   RHRDT_FILL_NANOS(dt)
-  return rb_float_new((dt->nanos % RHR_NANOS_PER_SECOND)/RHR_NANOS_PER_DAYD);
+#ifdef RUBY19
+  return rb_float_new((double)(dt->nanos % RHR_NANOS_PER_SECOND)/RHR_NANOS_PER_SECONDD);
+#else
+  return rb_float_new((double)(dt->nanos % RHR_NANOS_PER_SECOND)/RHR_NANOS_PER_DAYD);
+#endif
 } 
 
 /* call-seq:
@@ -1438,9 +1453,10 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
   double step, limit;
   long long step_nanos, limit_nanos, current_nanos;
   long step_jd, limit_jd, current_jd;
-  VALUE rlimit, new, rstep;
+  VALUE rlimit, new, rstep, new_off;
+  new_off = rhrdt__new_offset(self, 0.0);
   Data_Get_Struct(self, rhrdt_t, d);
-  Data_Get_Struct(rhrdt__new_offset(self, 0), rhrdt_t, d0);
+  Data_Get_Struct(new_off, rhrdt_t, d0);
 
   switch(argc) {
     case 1:
@@ -1451,7 +1467,7 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
     case 2:
       rstep = argv[1];
       step = NUM2DBL(rstep);
-      step_jd = floor(step);
+      step_jd = (long)floor(step);
       step_nanos = llround((step - step_jd)*RHR_NANOS_PER_DAY);
       break;
     default:
@@ -1470,10 +1486,10 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
 
   if (RTEST(rb_obj_is_kind_of(rlimit, rb_cNumeric))) {
     limit = NUM2DBL(rlimit);
-    limit_jd = floor(limit);
+    limit_jd = (long)floor(limit);
     limit_nanos = llround((limit - limit_jd)*RHR_NANOS_PER_DAY);
   } else if (RTEST((rb_obj_is_kind_of(rlimit, rhrdt_class)))) {
-    rlimit = rhrdt__new_offset(rlimit, 0);
+    rlimit = rhrdt__new_offset(rlimit, 0.0);
     Data_Get_Struct(rlimit, rhrdt_t, ndt);
     RHRDT_FILL_JD(ndt)
     RHRDT_FILL_NANOS(ndt)
@@ -1571,8 +1587,8 @@ static VALUE rhrdt_to_s(VALUE self) {
   RHRDT_FILL_HMS(dt)
 
   s = rb_str_buf_new(128);
-  len = snprintf(RSTRING_PTR(s), 128, "%04li-%02hhi-%02hhiT%02hhi:%02hhi:%02hhi%+03i:%02i",
-        dt->year, dt->month, dt->day, dt->hour, dt->minute, dt->second, dt->offset/60, abs(dt->offset % 60));
+  len = snprintf(RSTRING_PTR(s), 128, "%04li-%02i-%02iT%02i:%02i:%02i%+03i:%02i",
+        dt->year, (int)dt->month, (int)dt->day, (int)dt->hour, (int)dt->minute, (int)dt->second, dt->offset/60, abs(dt->offset % 60));
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#to_s (in snprintf)");
   }
@@ -1772,8 +1788,8 @@ static VALUE rhrdt_op_minus(VALUE self, VALUE other) {
     return rhrdt__add_days(self, -NUM2DBL(other));
   }
   if (RTEST((rb_obj_is_kind_of(other, rhrdt_class)))) {
-    self = rhrdt__new_offset(self, 0);
-    other = rhrdt__new_offset(other, 0);
+    self = rhrdt__new_offset(self, 0.0);
+    other = rhrdt__new_offset(other, 0.0);
     Data_Get_Struct(self, rhrdt_t, dt);
     Data_Get_Struct(other, rhrdt_t, newdt);
     RHRDT_FILL_JD(dt)
@@ -1781,11 +1797,11 @@ static VALUE rhrdt_op_minus(VALUE self, VALUE other) {
     RHRDT_FILL_JD(newdt)
     RHRDT_FILL_NANOS(newdt)
     if (dt->nanos == newdt->nanos) {
-      return rb_float_new(dt->jd - newdt->jd);
+      return rb_float_new((double)(dt->jd - newdt->jd));
     } else if (dt->jd == newdt->jd) 
-      return rb_float_new((dt->nanos - newdt->nanos)/RHR_NANOS_PER_DAYD);
+      return rb_float_new((double)(dt->nanos - newdt->nanos)/RHR_NANOS_PER_DAYD);
     else {
-      return rb_float_new((dt->jd - newdt->jd) + (dt->nanos - newdt->nanos)/RHR_NANOS_PER_DAYD);
+      return rb_float_new((dt->jd - newdt->jd) + (double)(dt->nanos - newdt->nanos)/RHR_NANOS_PER_DAYD);
     }
   }
   if (RTEST((rb_obj_is_kind_of(other, rhrd_class)))) {
@@ -1794,7 +1810,7 @@ static VALUE rhrdt_op_minus(VALUE self, VALUE other) {
     RHRDT_FILL_JD(dt)
     RHRDT_FILL_NANOS(dt)
     RHR_FILL_JD(newd)
-    return rb_float_new((dt->jd - newd->jd) + dt->nanos/RHR_NANOS_PER_DAYD); 
+    return rb_float_new((dt->jd - newd->jd) + (double)dt->nanos/RHR_NANOS_PER_DAYD); 
   }
   rb_raise(rb_eTypeError, "expected numeric or date");
 }
@@ -1865,8 +1881,8 @@ static VALUE rhrdt_op_spaceship(VALUE self, VALUE other) {
   int res;
 
   if (RTEST(rb_obj_is_kind_of(other, rhrdt_class))) {
-    self = rhrdt__new_offset(self, 0);
-    other = rhrdt__new_offset(other, 0);
+    self = rhrdt__new_offset(self, 0.0);
+    other = rhrdt__new_offset(other, 0.0);
     Data_Get_Struct(self, rhrdt_t, dt);
     Data_Get_Struct(other, rhrdt_t, odt);
     return LONG2NUM(rhrdt__spaceship(dt, odt));
@@ -1918,7 +1934,7 @@ VALUE rhrdt__add_years(VALUE self, long n) {
   } 
 
   RHR_CHECK_CIVIL(newd)
-  newd->flags &= ~RHR_HAVE_JD;
+  newd->flags &= (unsigned char)~RHR_HAVE_JD;
   return new;
 }
 
@@ -1943,7 +1959,7 @@ long rhrdt__add_iso_time_format(rhrdt_t *dt, char *str, long len, long i) {
     i = 9;
   }
 
-  l = snprintf(str + len, 128 - len, "T%02hhi:%02hhi:%02hhi", dt->hour, dt->minute, dt->second);
+  l = snprintf(str + len, (size_t)(128 - len), "T%02i:%02i:%02i", (int)dt->hour, (int)dt->minute, (int)dt->second);
   if (l == -1 || l > 127) {
     rb_raise(rb_eNoMemError, "in DateTime formatting method (in snprintf)");
   }
@@ -1951,14 +1967,14 @@ long rhrdt__add_iso_time_format(rhrdt_t *dt, char *str, long len, long i) {
 
   if (i) {
     RHRDT_FILL_NANOS(dt)
-    l = snprintf(str + len, 128 - len, ".%09lli", dt->nanos % RHR_NANOS_PER_SECOND);
+    l = snprintf(str + len, (size_t)(128 - len), ".%09lli", dt->nanos % RHR_NANOS_PER_SECOND);
     if (l == -1 || l > 127) {
       rb_raise(rb_eNoMemError, "in DateTime formatting method (in snprintf)");
     }
     len += i + 1;
   }
 
-  l = snprintf(str + len, 128 - len, "%+03i:%02i", dt->offset/60, abs(dt->offset % 60));
+  l = snprintf(str + len, (size_t)(128 - len), "%+03i:%02i", dt->offset/60, abs(dt->offset % 60));
   if (l == -1 || l > 127) {
     rb_raise(rb_eNoMemError, "in DateTime formatting method (in snprintf)");
   }
@@ -2193,18 +2209,18 @@ static VALUE rhrdt_httpdate(VALUE self) {
   VALUE s;
   rhrdt_t *d;
   int len;
-  s = rhrdt__new_offset(self, 0);
+  s = rhrdt__new_offset(self, 0.0);
   Data_Get_Struct(s, rhrdt_t, d);
   RHRDT_FILL_JD(d)
   RHRDT_FILL_CIVIL(d)
   RHRDT_FILL_HMS(d)
 
   s = rb_str_buf_new(128);
-  len = snprintf(RSTRING_PTR(s), 128, "%s, %02hhi %s %04li %02hhi:%02hhi:%02hhi GMT", 
+  len = snprintf(RSTRING_PTR(s), 128, "%s, %02i %s %04li %02i:%02i:%02i GMT", 
         rhrd__abbr_day_names[rhrd__jd_to_wday(d->jd)],
-        d->day,
+        (int)d->day,
         rhrd__abbr_month_names[d->month],
-        d->year, d->hour, d->minute, d->second);
+        d->year, (int)d->hour, (int)d->minute, (int)d->second);
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#httpdate (in snprintf)");
   }
@@ -2250,7 +2266,7 @@ static VALUE rhrdt_iso8601(int argc, VALUE *argv, VALUE self) {
   s = rb_str_buf_new(128);
   str = RSTRING_PTR(s);
 
-  len = snprintf(str, 128, "%04li-%02hhi-%02hhi", dt->year, dt->month, dt->day);
+  len = snprintf(str, 128, "%04li-%02i-%02i", dt->year, (int)dt->month, (int)dt->day);
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#to_s (in snprintf)");
   }
@@ -2301,7 +2317,7 @@ static VALUE rhrdt_jisx0301(int argc, VALUE *argv, VALUE self) {
   str = RSTRING_PTR(s); 
 
   if (d->jd < 2405160) {
-    len = snprintf(str, 128, "%04li-%02hhi-%02hhi", d->year, d->month, d->day);
+    len = snprintf(str, 128, "%04li-%02i-%02i", d->year, (int)d->month, (int)d->day);
   } else {
     if (d->jd >= 2447535) {
       c = 'H';
@@ -2316,7 +2332,7 @@ static VALUE rhrdt_jisx0301(int argc, VALUE *argv, VALUE self) {
       c = 'M';
       year = d->year - 1867;
     }
-    len = snprintf(RSTRING_PTR(s), 128, "%c%02li.%02hhi.%02hhi", c, year, d->month, d->day);
+    len = snprintf(RSTRING_PTR(s), 128, "%c%02li.%02i.%02i", c, year, (int)d->month, (int)d->day);
   }
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#jisx0301 (in snprintf)");
@@ -2354,7 +2370,7 @@ static VALUE rhrdt_next_day(int argc, VALUE *argv, VALUE self) {
       break;
   }
 
-   return rhrdt__add_days(self, i);
+   return rhrdt__add_days(self, (double)i);
 }
 
 /* call-seq:
@@ -2447,7 +2463,7 @@ static VALUE rhrdt_prev_day(int argc, VALUE *argv, VALUE self) {
       break;
   }
 
-   return rhrdt__add_days(self, i);
+   return rhrdt__add_days(self, (double)i);
 }
 
 /* call-seq:
@@ -2531,11 +2547,11 @@ static VALUE rhrdt_rfc2822(VALUE self) {
   RHRDT_FILL_HMS(d)
 
   s = rb_str_buf_new(128);
-  len = snprintf(RSTRING_PTR(s), 128, "%s, %hhi %s %04li %02hhi:%02hhi:%02hhi %+03i%02i", 
+  len = snprintf(RSTRING_PTR(s), 128, "%s, %i %s %04li %02i:%02i:%02i %+03i%02i", 
         rhrd__abbr_day_names[rhrd__jd_to_wday(d->jd)],
-        d->day,
+        (int)d->day,
         rhrd__abbr_month_names[d->month],
-        d->year, d->hour, d->minute, d->second, d->offset/60, abs(d->offset % 60));
+        d->year, (int)d->hour, (int)d->minute, (int)d->second, d->offset/60, abs(d->offset % 60));
   if (len == -1 || len > 127) {
     rb_raise(rb_eNoMemError, "in DateTime#rfc2822 (in snprintf)");
   }
@@ -2594,10 +2610,10 @@ static VALUE rhrdt_to_time(VALUE self) {
   RHRDT_FILL_CIVIL(dt)
   RHRDT_FILL_HMS(dt)
 
-  s = dt->nanos/RHR_NANOS_PER_SECOND;
+  s = (long)(dt->nanos/RHR_NANOS_PER_SECOND);
   h = s/RHR_SECONDS_PER_HOUR;
   m = (s % RHR_SECONDS_PER_HOUR) / 60;
-  return rb_funcall(rb_funcall(rb_cTime, rhrd_id_utc, 6, LONG2NUM(dt->year), LONG2NUM(dt->month), LONG2NUM(dt->day), LONG2NUM(h), LONG2NUM(m), rb_float_new(s % 60 + (dt->nanos % RHR_NANOS_PER_SECOND)/RHR_NANOS_PER_SECONDD)), rhrd_id_localtime, 0);
+  return rb_funcall(rb_funcall(rb_cTime, rhrd_id_utc, 6, LONG2NUM(dt->year), LONG2NUM(dt->month), LONG2NUM(dt->day), LONG2NUM(h), LONG2NUM(m), rb_float_new(s % 60 + (double)(dt->nanos % RHR_NANOS_PER_SECOND)/RHR_NANOS_PER_SECONDD)), rhrd_id_localtime, 0);
 }
 
 /* call-seq:
@@ -2624,7 +2640,7 @@ static VALUE rhrdt_time_to_datetime(VALUE self) {
 #else
   dt->nanos = rhrd__mod(t, RHR_SECONDS_PER_DAY) * RHR_NANOS_PER_SECOND + NUM2LONG(rb_funcall(self, rhrd_id_usec, 0)) * 1000;
 #endif
-  dt->offset = offset/60;
+  dt->offset = (short)(offset/60);
   dt->flags |= RHR_HAVE_JD | RHR_HAVE_NANOS;
   RHR_CHECK_JD(dt);
   return rd;

data/ext/date_ext/extconf.rb

@@ -3,4 +3,6 @@ $CFLAGS << " -DRUBY19" if  RUBY_VERSION >= '1.9.0'
 $CFLAGS << " -DRUBY186" if  RUBY_VERSION < '1.8.7'
 $CFLAGS << " -Wall " unless RUBY_PLATFORM =~ /solaris/
 $CFLAGS << ' -g -ggdb -rdynamic -O0 -DDEBUG' if ENV['DEBUG']
+$CFLAGS << " -Wconversion -Wsign-compare -Wno-unused-parameter -Wwrite-strings -Wpointer-arith -fno-common -pedantic -Wno-long-long" if ENV['STRICT']
+$CFLAGS << (ENV['CFLAGS'] || '')
 create_makefile("date_ext")

data/spec/datetime/accessor_spec.rb

@@ -40,10 +40,19 @@ describe "DateTime#sec" do
 end
 
 describe "DateTime#sec_fraction" do
-  it "should be the fraction of a second as a fraction of the day" do
-    DateTime.new(2008, 1, 1).sec_fraction.should == 0.0
-    DateTime.parse('12:13:15.678900').sec_fraction.should be_close(7.85763888888889e-06, 0.0000000000001)
-  end 
+  ruby_version_is "" ... "1.9" do
+    it "should be the fraction of a second as a fraction of the day" do
+      DateTime.new(2008, 1, 1).sec_fraction.should == 0.0
+      DateTime.parse('12:13:15.678900').sec_fraction.should be_close(7.85763888888889e-06, 0.0000000000001)
+    end 
+  end
+
+  ruby_version_is "1.9" do
+    it "should be the fraction of a second" do
+      DateTime.new(2008, 1, 1).sec_fraction.should == 0.0
+      DateTime.parse('12:13:15.678900').sec_fraction.should be_close(0.6789, 0.0000000000001)
+    end 
+  end
 end
 
 describe "DateTime#zone" do

data/spec/datetime/parse_spec.rb

@@ -1,7 +1,16 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-describe "DateTime#parse" do
+describe "DateTime._parse" do
+  it "should return a hash of values" do
+    DateTime._parse("01:02:03").should == {:hour=>1, :min=>2, :sec=>3}
+  end
+
+  it "should have :sec_fraction entry be the fraction of second" do
+    DateTime._parse('12:13:15.678900')[:sec_fraction].should be_close(0.6789, 0.0000000000001)
+  end 
+end
 
+describe "DateTime.parse" do
   it "should have defaults and an optional sg value" do
     DateTime.parse('2008-10-11').should == DateTime.civil(2008, 10, 11)
     DateTime.parse('2008-10-11', true).should == DateTime.civil(2008, 10, 11)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: home_run
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: x86-mswin32-60
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: []