home_run 1.0.5 → 1.0.6

data/CHANGELOG

@@ -1,4 +1,8 @@
-=== 1.0.5 (2012-12-22)
+=== 1.0.6 (2012-02-27)
+
+* Merge DateTime#<=> into Date#<=> to work around ActiveSupport bug (#45, #41, #38, #36)
+
+=== 1.0.5 (2011-12-22)
 
 * Handle DateTime.jd with a single float argument (jeremyevans)
 

data/ext/date_ext/date_ext.c

@@ -2906,30 +2906,69 @@ static VALUE rhrd_op_relationship(VALUE self, VALUE other) {
  * For an unrecognized type, return +nil+.
  */
 static VALUE rhrd_op_spaceship(VALUE self, VALUE other) {
-  rhrd_t *d, *o;
-  rhrdt_t *odt;
-  long diff;
-  Data_Get_Struct(self, rhrd_t, d);
+  if (RTEST(rb_obj_is_kind_of(self, rhrdt_class))) {
+    rhrdt_t *dt, *odt;
+    rhrd_t *od;
+    double diff;
+    int res;
+
+    if (RTEST(rb_obj_is_kind_of(other, rhrdt_class))) {
+      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));
+    }
+    if (RTEST(rb_obj_is_kind_of(other, rhrd_class))) {
+      Data_Get_Struct(self, rhrdt_t, dt);
+      Data_Get_Struct(other, rhrd_t, od);
+      RHRDT_FILL_JD(dt)
+      RHR_FILL_JD(od)
+      RHR_SPACE_SHIP(res, dt->jd, od->jd)
+      if (res == 0) {
+        RHRDT_FILL_NANOS(dt)
+        RHR_SPACE_SHIP(res, dt->nanos, 0)
+      }
+      return LONG2NUM(res);
+    }
+    if (RTEST((rb_obj_is_kind_of(other, rb_cNumeric)))) {
+      Data_Get_Struct(self, rhrdt_t, dt);
+      diff = NUM2DBL(other);
+      RHRDT_FILL_JD(dt)
+      RHR_SPACE_SHIP(res, dt->jd, (long)diff)
+      if (res == 0) {
+        RHRDT_FILL_NANOS(dt)
+        RHR_SPACE_SHIP(res, dt->nanos, llround((diff - floor(diff)) * RHR_NANOS_PER_DAY))
+      }
+      return LONG2NUM(res);
+    }
+  } else {
+    rhrd_t *d, *o;
+    rhrdt_t *odt;
+    long diff;
+    Data_Get_Struct(self, rhrd_t, d);
 
-  if (RTEST(rb_obj_is_kind_of(other, rhrdt_class))) {
-    Data_Get_Struct(other, rhrdt_t, odt);
-    RHR_FILL_JD(d)
-    RHRDT_FILL_JD(odt)
-    RHR_SPACE_SHIP(diff, d->jd, odt->jd)
-    if (diff == 0) {
-      RHRDT_FILL_NANOS(odt)
-      RHR_SPACE_SHIP(diff, 0, odt->nanos)
+    if (RTEST(rb_obj_is_kind_of(other, rhrdt_class))) {
+      Data_Get_Struct(other, rhrdt_t, odt);
+      RHR_FILL_JD(d)
+      RHRDT_FILL_JD(odt)
+      RHR_SPACE_SHIP(diff, d->jd, odt->jd)
+      if (diff == 0) {
+        RHRDT_FILL_NANOS(odt)
+        RHR_SPACE_SHIP(diff, 0, odt->nanos)
+      }
+      return LONG2NUM(diff);
+    } else if (RTEST(rb_obj_is_kind_of(other, rhrd_class))) {
+      Data_Get_Struct(other, rhrd_t, o);
+      return LONG2NUM(rhrd__spaceship(d, o));
+    } else if (RTEST((rb_obj_is_kind_of(other, rb_cNumeric)))) {
+      diff = NUM2LONG(other);
+      RHR_FILL_JD(d)
+      RHR_SPACE_SHIP(diff, d->jd, diff)
+      return LONG2NUM(diff);
     }
-    return LONG2NUM(diff);
-  } else if (RTEST(rb_obj_is_kind_of(other, rhrd_class))) {
-    Data_Get_Struct(other, rhrd_t, o);
-    return LONG2NUM(rhrd__spaceship(d, o));
-  } else if (RTEST((rb_obj_is_kind_of(other, rb_cNumeric)))) {
-    diff = NUM2LONG(other);
-    RHR_FILL_JD(d)
-    RHR_SPACE_SHIP(diff, d->jd, diff)
-    return LONG2NUM(diff);
   }
+
   return Qnil;
 }
 

data/ext/date_ext/date_ext.h

@@ -181,6 +181,8 @@ VALUE rhrd_s_zone_to_diff(VALUE self, VALUE zone);
 VALUE rhrd__strftime(rhrdt_t *d, const char * fmt, int fmt_len);
 long rhrd__ordinal_day(long year, unsigned char month, unsigned char day);
 VALUE rhrd__ragel_parse(char * p, long len);
+VALUE rhrdt__new_offset(VALUE self, double offset);
+long rhrdt__spaceship(rhrdt_t *dt, rhrdt_t *odt);
 void Init_datetime(void);
 
 #endif /* DATE_EXT_H */

data/ext/date_ext/datetime.c

@@ -14,7 +14,6 @@ extern const char * rhrd__abbr_day_names[];
 
 static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self);
 static VALUE rhrdt_to_s(VALUE self);
-VALUE rhrdt__new_offset(VALUE self, double offset);
 void rhrdt__jd_to_civil(rhrdt_t *date);
 void rhrdt__nanos_to_hms(rhrdt_t *d);
 
@@ -1908,67 +1907,6 @@ static VALUE rhrdt_op_relationship(VALUE self, VALUE other) {
   return dt->jd == jd ? Qtrue : Qfalse;
 }
 
-/* call-seq:
- *   <=>(other) -> -1, 0, 1, or nil
- *
- * If +other+ is a +DateTime+, returns -1 if the absolute date and time of
- * +other+ is before the absolute time of the receiver chronologically,
- * 0 if +other+ is the same absolute date and time as the receiver,
- * or 1 if the absolute date and time of +other+ is before the receiver
- * chronologically.  Absolute date and time in this case means after taking
- * account the time zone offset.
- *
- * If +other+ is a +Date+, return 0 if +other+ has the same
- * julian date as the receiver and the receiver has no fractional part,
- * 1 if +other+ has a julian date greater than the receiver's, or
- * -1 if +other+ has a julian date less than the receiver's or
- * a julian date the same as the receiver's and the receiver has a
- * fractional part. 
- *
- * If +other+ is a +Numeric+, convert it to an +Float+ and compare
- * it to the receiver's julian date plus the fractional part. 
- *
- * For an unrecognized type, return +nil+.
- */
-static VALUE rhrdt_op_spaceship(VALUE self, VALUE other) {
-  rhrdt_t *dt, *odt;
-  rhrd_t *od;
-  double diff;
-  int res;
-
-  if (RTEST(rb_obj_is_kind_of(other, rhrdt_class))) {
-    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));
-  }
-  if (RTEST(rb_obj_is_kind_of(other, rhrd_class))) {
-    Data_Get_Struct(self, rhrdt_t, dt);
-    Data_Get_Struct(other, rhrd_t, od);
-    RHRDT_FILL_JD(dt)
-    RHR_FILL_JD(od)
-    RHR_SPACE_SHIP(res, dt->jd, od->jd)
-    if (res == 0) {
-      RHRDT_FILL_NANOS(dt)
-      RHR_SPACE_SHIP(res, dt->nanos, 0)
-    }
-    return LONG2NUM(res);
-  }
-  if (RTEST((rb_obj_is_kind_of(other, rb_cNumeric)))) {
-    Data_Get_Struct(self, rhrdt_t, dt);
-    diff = NUM2DBL(other);
-    RHRDT_FILL_JD(dt)
-    RHR_SPACE_SHIP(res, dt->jd, (long)diff)
-    if (res == 0) {
-      RHRDT_FILL_NANOS(dt)
-      RHR_SPACE_SHIP(res, dt->nanos, llround((diff - floor(diff)) * RHR_NANOS_PER_DAY))
-    }
-    return LONG2NUM(res);
-  }
-  return Qnil;
-}
-
 #ifdef RUBY19
 
 /* Ruby 1.9 helper methods */
@@ -2858,7 +2796,6 @@ void Init_datetime(void) {
   rb_define_method(rhrdt_class, "+", rhrdt_op_plus, 1);
   rb_define_method(rhrdt_class, "-", rhrdt_op_minus, 1);
   rb_define_method(rhrdt_class, "===", rhrdt_op_relationship, 1);
-  rb_define_method(rhrdt_class, "<=>", rhrdt_op_spaceship, 1);
 
   rb_define_alias(rhrdt_class, "ctime", "asctime");
   rb_define_alias(rhrdt_class, "mday", "day");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: home_run
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies: []
 description: ! 'home_run is an implementation of ruby''s Date/DateTime classes in
   C,