home_run 0.9.3-x86-mswin32-60 → 0.9.4-x86-mswin32-60

data/ext/date_ext/datetime.c

@@ -307,11 +307,11 @@ void rhrdt__now(rhrdt_t * dt) {
  * the number per day by subtracting from or adding to the jd.
  * It should ensure that the stored nanos value is in the range
  * [0, RHR_NANOS_PER_DAY). */
-VALUE rhrdt__from_jd_nanos(long jd, long long nanos, short offset) {
+VALUE rhrdt__from_jd_nanos(VALUE klass, long jd, long long nanos, short offset) {
   long t;
   rhrdt_t *dt;
   VALUE new;
-  new = Data_Make_Struct(rhrdt_class, rhrdt_t, NULL, -1, dt);
+  new = Data_Make_Struct(klass, rhrdt_t, NULL, -1, dt);
   
   if (nanos < 0) {
     t = (long)(nanos/RHR_NANOS_PER_DAY - 1);
@@ -363,7 +363,7 @@ VALUE rhrdt__add_days(VALUE self, double n) {
   RHRDT_FILL_NANOS(dt)
   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);
+  return rhrdt__from_jd_nanos(rb_obj_class(self), rhrd__safe_add_long(dt->jd, l), dt->nanos + nanos, dt->offset);
 }
 
 /* Similar to rhrd__add_months, but for ruby DateTime
@@ -375,7 +375,7 @@ VALUE rhrdt__add_months(VALUE self, long n) {
   long x;
   Data_Get_Struct(self, rhrdt_t, d);
 
-  new = Data_Make_Struct(rhrdt_class, rhrdt_t, NULL, -1, newd);
+  new = Data_Make_Struct(rb_obj_class(self), rhrdt_t, NULL, -1, newd);
   RHRDT_FILL_CIVIL(d)
   memcpy(newd, d, sizeof(rhrdt_t));
 
@@ -509,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, (short)offset_min);
+  return rhrdt__from_jd_nanos(rb_obj_class(self), dt->jd, dt->nanos - (dt->offset - offset_min)*RHR_NANOS_PER_MINUTE, (short)offset_min);
 }
 
 /* Class methods */
@@ -1453,7 +1453,7 @@ 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, new_off;
+  VALUE rlimit, new, rstep, new_off, klass;
   new_off = rhrdt__new_offset(self, 0.0);
   Data_Get_Struct(self, rhrdt_t, d);
   Data_Get_Struct(new_off, rhrdt_t, d0);
@@ -1475,6 +1475,7 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
       break;
   }
   rlimit = argv[0];
+  klass = rb_obj_class(self);
 
 #ifdef RUBY19
   if (!rb_block_given_p()) {
@@ -1510,12 +1511,12 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
 
   current_jd = d0->jd;
   current_nanos = d0->nanos;
-  new = rhrdt__from_jd_nanos(current_jd, current_nanos, d->offset);
+  new = rhrdt__from_jd_nanos(klass, current_jd, current_nanos, d->offset);
   if (limit_jd > current_jd || (limit_jd == current_jd && limit_nanos > current_nanos)) {
     if (step_jd > 0 || (step_jd == 0 && step_nanos > 0)) {
       while (limit_jd > current_jd || (limit_jd == current_jd && limit_nanos >= current_nanos)) {
         rb_yield(new);
-        new = rhrdt__from_jd_nanos(current_jd + step_jd, current_nanos + step_nanos, d->offset);
+        new = rhrdt__from_jd_nanos(klass, current_jd + step_jd, current_nanos + step_nanos, d->offset);
         Data_Get_Struct(new, rhrdt_t, ndt);
         current_jd = ndt->jd;
         current_nanos = ndt->nanos;
@@ -1525,7 +1526,7 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
     if (step_jd < 0 || (step_jd == 0 && step_nanos < 0)) {
       while (limit_jd < current_jd || (limit_jd == current_jd && limit_nanos <= current_nanos)) {
         rb_yield(new);
-        new = rhrdt__from_jd_nanos(current_jd + step_jd, current_nanos + step_nanos, d->offset);
+        new = rhrdt__from_jd_nanos(klass, current_jd + step_jd, current_nanos + step_nanos, d->offset);
         Data_Get_Struct(new, rhrdt_t, ndt);
         current_jd = ndt->jd;
         current_nanos = ndt->nanos;
@@ -1924,7 +1925,7 @@ VALUE rhrdt__add_years(VALUE self, long n) {
   VALUE new;
   Data_Get_Struct(self, rhrdt_t, d);
 
-  new = Data_Make_Struct(rhrdt_class, rhrdt_t, NULL, -1, newd);
+  new = Data_Make_Struct(rb_obj_class(self), rhrdt_t, NULL, -1, newd);
   RHRDT_FILL_CIVIL(d)
   memcpy(newd, d, sizeof(rhrdt_t));
 
@@ -2605,7 +2606,7 @@ static VALUE rhrdt_to_time(VALUE self) {
   Data_Get_Struct(self, rhrdt_t, dt);
   RHRDT_FILL_JD(dt)
   RHRDT_FILL_NANOS(dt)
-  self = rhrdt__from_jd_nanos(dt->jd, dt->nanos - dt->offset * RHR_NANOS_PER_MINUTE, 0);
+  self = rhrdt__from_jd_nanos(rb_obj_class(self), dt->jd, dt->nanos - dt->offset * RHR_NANOS_PER_MINUTE, 0);
   Data_Get_Struct(self, rhrdt_t, dt);
   RHRDT_FILL_CIVIL(dt)
   RHRDT_FILL_HMS(dt)

data/spec/date/add_month_spec.rb

@@ -17,6 +17,11 @@ describe "Date#>>" do
     d.should == Date.civil(2008, 4, 30)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.>>(-10).should be_kind_of(c)
+  end
+
   it "should raise an error on non numeric parameters" do
     lambda { Date.civil(2007,2,27) >> "hello" }.should raise_error(TypeError)
     lambda { Date.civil(2007,2,27) >> Date.new }.should raise_error(TypeError)

data/spec/date/add_spec.rb

@@ -14,6 +14,11 @@ describe "Date#+" do
     d.should == Date.civil(2007, 2, 17)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.+(10).should be_kind_of(c)
+  end
+
   it "should raise an error on non numeric parameters" do
     lambda { Date.civil(2007,2,27) + "hello" }.should raise_error(TypeError)
     lambda { Date.civil(2007,2,27) + Date.new }.should raise_error(TypeError)

data/spec/date/civil_spec.rb

@@ -67,6 +67,11 @@ describe "Date.civil" do
     proc{Date.civil(2008, 2, 30)}.should raise_error(ArgumentError)
     proc{Date.civil(2009, 2, 29)}.should raise_error(ArgumentError)
   end
+
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.civil.should be_kind_of(c)
+  end
 end
 
 describe "Date.new" do
@@ -143,5 +148,4 @@ describe "Date.valid_civil?" do
       Date.valid_civil?(2008, -11, -10).should == true
     end
   end
-
 end

data/spec/date/commercial_spec.rb

@@ -91,6 +91,11 @@ describe "Date.commercial" do
     proc{Date.commercial(2008, 54, 6)}.should raise_error(ArgumentError)
     proc{Date.commercial(2009, 1, 8)}.should raise_error(ArgumentError)
   end
+
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.commercial.should be_kind_of(c)
+  end
 end
 
 ruby_version_is "" ... "1.9" do

data/spec/date/conversions_spec.rb

@@ -9,6 +9,11 @@ describe "Date#new_start" do
     Date.civil(1752,  9, 13).new_start(Date::ENGLAND).should == Date.civil(1752,  9, 13, Date::ENGLAND)
   end
   
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.new_start.should be_kind_of(c)
+  end
+
   ruby_version_is "" ... "1.9" do
     it "#newsg should be the same as new_start" do
       Date.civil(1582, 10, 14, Date::ENGLAND).newsg.should == Date.civil(1582, 10, 14, Date::ENGLAND).new_start
@@ -45,6 +50,11 @@ describe "Date#gregorian" do
     Date.civil(1582, 10, 14).gregorian.should == Date.civil(1582, 10, 14, Date::GREGORIAN)
     Date.civil(1752,  9, 14).gregorian.should == Date.civil(1752,  9, 14, Date::GREGORIAN)
   end
+
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.gregorian.should be_kind_of(c)
+  end
 end
 
 ruby_version_is "" ... "1.9" do

data/spec/date/downto_spec.rb

@@ -14,4 +14,10 @@ describe "Date#downto" do
     count.should == 17
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.downto(c.jd - 2) do |d|
+      d.should be_kind_of(c)
+    end.should be_kind_of(c)
+  end
 end

data/spec/date/julian_spec.rb

@@ -24,6 +24,11 @@ describe "Date.jd" do
     proc{Date.jd(Date::JULIAN)}.should raise_error
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.should be_kind_of(c)
+  end
+
   ruby_version_is "" ... "1.9" do
     it ".new1 should be the same as jd" do
       Date.new1(2454156).should == Date.jd(2454156)
@@ -43,6 +48,11 @@ describe "Date.new!" do
     Date.new!(2008, 1, 1).should == Date.jd(2008)
   end
   
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.new!.should be_kind_of(c)
+  end
+
   it "should not accept more than 3 arguments" do
     proc{Date.new!(2008, 1, 1, 1)}.should raise_error(ArgumentError)
   end

data/spec/date/minus_month_spec.rb

@@ -16,6 +16,11 @@ describe "Date#<<" do
     d.should == Date.civil(2008, 2, 29)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.<<(-10).should be_kind_of(c)
+  end
+
   it "should raise an error on non numeric parameters" do
     lambda { Date.civil(2007,2,27) << "hello" }.should raise_error(TypeError)
     lambda { Date.civil(2007,2,27) << Date.new }.should raise_error(TypeError)

data/spec/date/minus_spec.rb

@@ -14,6 +14,11 @@ describe "Date#-" do
     d.should == Date.civil(2007, 5 ,2) 
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.-(10).should be_kind_of(c)
+  end
+
   it "should be able to compute the different between two dates" do
     (Date.civil(2007,2,27) - Date.civil(2007,2,27)).should == 0
     (Date.civil(2007,2,27) - Date.civil(2007,2,26)).should == 1

data/spec/date/next_prev_spec.rb

@@ -13,6 +13,11 @@ ruby_version_is "1.9" do
     it "should handle a negative argument by subtracting days" do
       (Date.civil(2007,2,27).next_day(-2)).should == Date.civil(2007, 2, 25)
     end
+
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.jd.next_day.should be_kind_of(c)
+    end
   end 
 
   describe "Date#prev_day" do
@@ -27,6 +32,11 @@ ruby_version_is "1.9" do
     it "should handle a negative argument by adding days" do
       (Date.civil(2007,2,27).prev_day(-2)).should == Date.civil(2007, 3, 1)
     end
+
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.jd.prev_day.should be_kind_of(c)
+    end
   end 
 
   describe "Date#next_month" do
@@ -47,6 +57,11 @@ ruby_version_is "1.9" do
       (Date.civil(2008,1,31).next_month).should == Date.civil(2008, 2, 29)
       (Date.civil(2007,1,31).next_month(3)).should == Date.civil(2007, 4, 30)
     end
+
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.jd.next_month.should be_kind_of(c)
+    end
   end 
 
   describe "Date#prev_month" do
@@ -67,6 +82,11 @@ ruby_version_is "1.9" do
       (Date.civil(2008,3,31).prev_month).should == Date.civil(2008, 2, 29)
       (Date.civil(2007,3,31).prev_month(4)).should == Date.civil(2006, 11, 30)
     end
+
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.jd.prev_month.should be_kind_of(c)
+    end
   end 
 
   describe "Date#next_year" do
@@ -85,6 +105,11 @@ ruby_version_is "1.9" do
     it "should handle adding a year where the new date is not a valid date" do
       (Date.civil(2008,2,29).next_year).should == Date.civil(2009, 2, 28)
     end
+
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.jd.next_year.should be_kind_of(c)
+    end
   end 
 
   describe "Date#prev_year" do
@@ -103,6 +128,10 @@ ruby_version_is "1.9" do
     it "should handle adding a year where the new date is not a valid date" do
       (Date.civil(2008,2,29).prev_year).should == Date.civil(2007, 2, 28)
     end
-  end 
 
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.jd.prev_year.should be_kind_of(c)
+    end
+  end 
 end

data/spec/date/ordinal_spec.rb

@@ -25,6 +25,11 @@ describe "Date.ordinal" do
     lambda { Date.ordinal(2008, 367) }.should raise_error(ArgumentError)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.ordinal.should be_kind_of(c)
+  end
+
   ruby_version_is "" ... "1.9" do
     it ".new2 should be the same as ordinal" do
       Date.new2(2008, 10).should == Date.ordinal(2008, 10)

data/spec/date/parse_spec.rb

@@ -57,6 +57,12 @@ describe "Date.parse" do
     Date.parse('2008-10-11', true, 1).should == Date.civil(2008, 10, 11)
   end
   
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.parse.should be_kind_of(c)
+    c.parse('20081011').should be_kind_of(c)
+  end
+
   it "raises errors for invalid dates" do
     lambda { Date.parse("") }.should raise_error(ArgumentError)
     lambda { Date.parse("2009-02-29") }.should raise_error(ArgumentError)

data/spec/date/parsing_spec.rb

@@ -84,5 +84,16 @@ ruby_version_is "1.9" do
     it ".xmlschema should parse an ISO8601 format" do
       Date.xmlschema("2009-01-02").should == Date.new(2009, 1, 2)
     end
+
+    it "should keep the same class as the receiver" do
+      c = Class.new(Date)
+      c.httpdate("Fri, 02 Jan 2009 00:00:00 GMT").should be_kind_of(c)
+      c.iso8601("2009-01-02").should be_kind_of(c)
+      c.jisx0301("H21.01.02").should be_kind_of(c)
+      c.rfc2822("Fri, 2 Jan 2009 00:00:00 +0000").should be_kind_of(c)
+      c.rfc822("Fri, 2 Jan 2009 00:00:00 +0000").should be_kind_of(c)
+      c.rfc3339("2009-01-02T00:00:00+00:00").should be_kind_of(c)
+      c.xmlschema("2009-01-02").should be_kind_of(c)
+    end
   end
 end

data/spec/date/step_spec.rb

@@ -128,4 +128,10 @@ describe "Date#step" do
     count.should == 0
   end
   
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.step(c.jd + 2) do |d|
+      d.should be_kind_of(c)
+    end.should be_kind_of(c)
+  end
 end

data/spec/date/strptime_spec.rb

@@ -22,6 +22,12 @@ describe "Date#strptime" do
     Date.strptime('2008-10-11', '%Y-%m-%d', 1).should == Date.civil(2008, 10, 11)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.strptime.should be_kind_of(c)
+    c.strptime('20081011', '%Y%m%d').should be_kind_of(c)
+  end
+
   it "raises errors for invalid dates" do
     lambda { Date.strptime("") }.should raise_error(ArgumentError)
     lambda { Date.strptime("", "") }.should raise_error(ArgumentError)

data/spec/date/succ_spec.rb

@@ -14,6 +14,11 @@ describe "Date#succ" do
     ds.succ.should == Date.ordinal(2009, 1)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.succ.should be_kind_of(c)
+  end
+
   it "should be aliased as next" do
     Date.civil(2008, 10, 11).next.should == Date.civil(2008, 10, 12)
   end

data/spec/date/today_spec.rb

@@ -12,4 +12,9 @@ describe "Date.today" do
   it ".today should have an optional sg value" do
     Date.today(1).should == Date.today
   end
+
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.today.should be_kind_of(c)
+  end
 end

data/spec/date/upto_spec.rb

@@ -14,4 +14,11 @@ describe "Date#upto" do
     count.should == 13
   end
 
+
+  it "should keep the same class as the receiver" do
+    c = Class.new(Date)
+    c.jd.upto(c.jd + 2) do |d|
+      d.should be_kind_of(c)
+    end.should be_kind_of(c)
+  end
 end

data/spec/datetime/add_month_spec.rb

@@ -17,6 +17,11 @@ describe "DateTime#>>" do
     d.should == DateTime.civil(2008, 4, 30)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(DateTime)
+    c.jd.>>(10).should be_kind_of(c)
+  end
+
   it "should raise an error on non numeric parameters" do
     lambda { DateTime.civil(2007,2,27) >> "hello" }.should raise_error(TypeError)
     lambda { DateTime.civil(2007,2,27) >> DateTime.new }.should raise_error(TypeError)

data/spec/datetime/add_spec.rb

@@ -26,6 +26,11 @@ describe "DateTime#+" do
     d.should == DateTime.civil(2007, 2, 16, 12)
   end
 
+  it "should keep the same class as the receiver" do
+    c = Class.new(DateTime)
+    c.jd.+(10).should be_kind_of(c)
+  end
+
   it "should raise an error on non numeric parameters" do
     lambda { DateTime.civil(2007,2,27) + :hello }.should raise_error
     lambda { DateTime.civil(2007,2,27) + "hello" }.should raise_error

data/spec/datetime/constructor_spec.rb

@@ -139,4 +139,14 @@ describe "DateTime constructors" do
     DateTime.ordinal(2008, 1, 0, 0, 0, 0).should == DateTime.ordinal(2008, 1, 0, 0, 0, 0)
     DateTime.ordinal(2008, 1, 1, 1, 1, 0.5, 1).should == DateTime.ordinal(2008, 1, 1, 1, 1, 0.5)
   end
+
+  it "should keep the same class as the receiver" do
+    c = Class.new(DateTime)
+    c.jd.should be_kind_of(c)
+    c.civil.should be_kind_of(c)
+    c.commercial.should be_kind_of(c)
+    c.ordinal.should be_kind_of(c)
+    c.new!.should be_kind_of(c)
+    c.new.should be_kind_of(c)
+  end
 end