home_run 1.0.3-x86-mswin32-60 → 1.0.4-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.0.4 (2011-09-02)
+
+* Handle time zone offsets given as strings in the constructors (jeremyevans) (#37)
+
 === 1.0.3 (2011-07-05)
 
 * Work around segfault in rb_ary_push during extension initialization (jeremyevans)

data/README.rdoc

@@ -222,6 +222,8 @@ bugs, so please report any other differences you find.
 Some other libraries are known to be incompatible with this
 extension due to the above differences:
 
+* ActiveSupport 3.1 - DateTime#<=> broken because it relies on
+  Date#<=> working for DateTimes.
 * Date::Performance - Date#<=> assumes @ajd instance variable
   (unnecessary anyway, as home_run is faster)
 * Runt - assumes @ajd instance variable

data/ext/date_ext/datetime.c

@@ -512,6 +512,15 @@ VALUE rhrdt__new_offset(VALUE self, double offset) {
   return rhrdt__from_jd_nanos(rb_obj_class(self), dt->jd, dt->nanos - (dt->offset - offset_min)*RHR_NANOS_PER_MINUTE, (short)offset_min);
 }
 
+/* Handle both string timezones and numeric offsets in
+ * constructors and new_offset */
+double rhrdt__constructor_offset(VALUE self, VALUE offset) {
+  if (TYPE(offset) == T_STRING) {
+    return NUM2LONG(rhrd_s_zone_to_diff(self, offset))/RHR_SECONDS_PER_DAYD;
+  }
+  return NUM2DBL(offset);
+}
+
 /* Class methods */
 
 /* call-seq:
@@ -618,7 +627,7 @@ static VALUE rhrdt_s_civil(int argc, VALUE *argv, VALUE klass) {
       return rdt;
     case 8:
     case 7:
-      offset = NUM2DBL(argv[6]);
+      offset = rhrdt__constructor_offset(klass, argv[6]);
     case 6:
       second = NUM2LONG(argv[5]);
     case 5:
@@ -672,7 +681,7 @@ static VALUE rhrdt_s_commercial(int argc, VALUE *argv, VALUE klass) {
   switch(argc) {
     case 8:
     case 7:
-      offset = NUM2DBL(argv[6]);
+      offset = rhrdt__constructor_offset(klass, argv[6]);
     case 6:
       second = NUM2LONG(argv[5]);
     case 5:
@@ -727,7 +736,7 @@ static VALUE rhrdt_s_jd(int argc, VALUE *argv, VALUE klass) {
       return rdt;
     case 6:
     case 5:
-      offset = NUM2DBL(argv[4]);
+      offset = rhrdt__constructor_offset(klass, argv[4]);
     case 4:
       second = NUM2LONG(argv[3]);
     case 3:
@@ -842,7 +851,7 @@ static VALUE rhrdt_s_ordinal(int argc, VALUE *argv, VALUE klass) {
   switch(argc) {
     case 7:
     case 6:
-      offset = NUM2DBL(argv[5]);
+      offset = rhrdt__constructor_offset(klass, argv[5]);
     case 5:
       second = NUM2LONG(argv[4]);
     case 4:
@@ -1378,11 +1387,7 @@ static VALUE rhrdt_new_offset(int argc, VALUE *argv, VALUE self) {
       offset = 0;
       break;
     case 1:
-      if (RTEST(rb_obj_is_kind_of(argv[0], rb_cString))) {
-        offset = NUM2LONG(rhrd_s_zone_to_diff(self, argv[0]))/RHR_SECONDS_PER_DAYD;
-      } else {
-        offset = NUM2DBL(argv[0]);
-      }
+      offset= rhrdt__constructor_offset(rb_obj_class(self), argv[0]);
       break;
     default:
       rb_raise(rb_eArgError, "wrong number of arguments: %i for 1", argc);

data/spec/datetime/constructor_spec.rb

@@ -149,4 +149,18 @@ describe "DateTime constructors" do
     c.new!.should be_kind_of(c)
     c.new.should be_kind_of(c)
   end
+
+  it "should handle strings for the offset" do
+    DateTime.jd(2008, 0, 0, 0, 'Z').should == DateTime.jd(2008, 0, 0, 0, 0)
+    DateTime.civil(2008, 1, 1, 0, 0, 0, 'Z').should == DateTime.civil(2008, 1, 1, 0, 0, 0, 0)
+    DateTime.commercial(2008, 1, 1, 0, 0, 0, 'Z').should == DateTime.commercial(2008, 1, 1, 0, 0, 0, 0)
+    DateTime.ordinal(2008, 1, 0, 0, 0, 'Z').should == DateTime.ordinal(2008, 1, 0, 0, 0, 0)
+    DateTime.new(2008, 1, 1, 0, 0, 0, 'Z').should == DateTime.new(2008, 1, 1, 0, 0, 0, 0)
+
+    DateTime.jd(2008, 0, 0, 0, '+1200').should == DateTime.jd(2008, 0, 0, 0, 0.5)
+    DateTime.civil(2008, 1, 1, 0, 0, 0, '+1200').should == DateTime.civil(2008, 1, 1, 0, 0, 0, 0.5)
+    DateTime.commercial(2008, 1, 1, 0, 0, 0, '+1200').should == DateTime.commercial(2008, 1, 1, 0, 0, 0, 0.5)
+    DateTime.ordinal(2008, 1, 0, 0, 0, '+1200').should == DateTime.ordinal(2008, 1, 0, 0, 0, 0.5)
+    DateTime.new(2008, 1, 1, 0, 0, 0, '+1200').should == DateTime.new(2008, 1, 1, 0, 0, 0, 0.5)
+  end
 end

data/spec/datetime/conversions_spec.rb

@@ -5,6 +5,10 @@ describe "DateTime conversions" do
     DateTime.new(2008, 1, 1).new_offset(0.5).to_s.should == DateTime.new(2008, 1, 1, 12, 0, 0, 0.5).to_s
   end
 
+  it "#new_offset should work with strings" do
+    DateTime.new(2008, 1, 1).new_offset('+12:00').to_s.should == DateTime.new(2008, 1, 1, 12, 0, 0, 0.5).to_s
+  end
+
   it "#new_offset result should be equal to the receiver" do
     DateTime.new(2008, 1, 1).new_offset(0.5).should == DateTime.new(2008, 1, 1)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: home_run
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: x86-mswin32-60
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -07:00
+date: 2011-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: []