home_run 1.0.0-x86-mswin32-60 → 1.0.1-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.0.1 (2011-02-28)
+
+* Make #step with a 0 step value raise an ArgumentError (jeremyevans)
+
+* Fix #dup and #clone to work correctly (jeremyevans) (#21)
+
+=== 1.0.0 (2011-02-01)
+
+* Define the ZONES hash in ruby to work around probably interpreter bug (jeremyevans)
+
 === 0.9.4 (2010-10-18)
 
 * Have methods of subclasses of Date and DateTime return instances of the subclass (jeremyevans)

data/README.rdoc

@@ -182,9 +182,8 @@ you use the standard library.
 * DateTime offsets are stored in minutes, so it will round offsets
   with fractional minutes to the nearest minute.
 * All public class and instance methods for both Date and DateTime
-  are implemented, except that the allocate class method is not
-  available and on 1.9, _dump and _load are used instead of
-  marshal_dump and marshal_load.
+  are implemented, except that on 1.9, _dump and _load are used
+  instead of marshal_dump and marshal_load.
 * Only the public API is compatible, the private methods in the
   standard library are not implemented.
 * The marshalling format differs from the one used by the standard

data/ext/date_ext/date_ext.c

@@ -1516,6 +1516,18 @@ static VALUE rhrd_s__strptime(int argc, VALUE *argv, VALUE klass) {
   return rhrd__strptime(argv[0], fmt_str, fmt_len);
 }
 
+/* call-seq:
+ *   allocate() -> Date <br />
+ *
+ * Returns a +Date+ object for julian day 0.
+ */
+static VALUE rhrd_s_allocate(VALUE klass) {
+  rhrd_t *d;
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
+  d->flags = RHR_HAVE_JD;
+  return rd;
+}
+
 /* call-seq:
  *   civil() -> Date <br />
  *   civil(year, month=1, day=1, sg=nil) -> Date
@@ -2088,6 +2100,22 @@ static VALUE rhrd_asctime(VALUE self) {
   RHR_RETURN_RESIZED_STR(s, len)
 }
 
+/* call-seq:
+ *   clone() -> Date
+ *
+ * Returns a clone of the receiver.
+ */
+static VALUE rhrd_clone(VALUE self) {
+  rhrd_t *d, *nd;
+  VALUE rd = rb_call_super(0, NULL);
+  if (!rb_obj_is_kind_of(self, rhrdt_class)) {
+    Data_Get_Struct(self, rhrd_t, d);
+    Data_Get_Struct(rd, rhrd_t, nd);
+    memcpy(nd, d, sizeof(rhrd_t));
+  }
+  return rd;
+}
+
 /* call-seq:
  *   cwday() -> Integer
  *
@@ -2201,6 +2229,22 @@ static VALUE rhrd_downto(VALUE self, VALUE other) {
   return rhrd_step(2, argv, self);
 }
 
+/* call-seq:
+ *   dup() -> Date
+ *
+ * Returns a dup of the receiver.
+ */
+static VALUE rhrd_dup(VALUE self) {
+  rhrd_t *d, *nd;
+  VALUE rd = rb_call_super(0, NULL);
+  if (!rb_obj_is_kind_of(self, rhrdt_class)) {
+    Data_Get_Struct(self, rhrd_t, d);
+    Data_Get_Struct(rd, rhrd_t, nd);
+    memcpy(nd, d, sizeof(rhrd_t));
+  }
+  return rd;
+}
+
 /* call-seq:
  *   eql?(date) -> true or false
  *
@@ -2469,6 +2513,9 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
     case 2:
       rstep = argv[1];
       step = NUM2LONG(rstep);
+      if (step == 0) {
+        rb_raise(rb_eArgError, "step can't be 0");
+      }
       break;
     default:
       rb_raise(rb_eArgError, "wrong number of arguments: %i for 2", argc);
@@ -4037,7 +4084,7 @@ void Init_date_ext(void) {
   /* Define classes*/
 
   rhrd_class = rb_define_class("Date", rb_cObject);
-  rb_undef_alloc_func(rhrd_class);
+  rb_define_alloc_func(rhrd_class, rhrd_s_allocate);
   rhrd_s_class = rb_singleton_class(rhrd_class);
 
   /* Define methods for all ruby versions */
@@ -4067,12 +4114,14 @@ void Init_date_ext(void) {
 
   rb_define_method(rhrd_class, "_dump", rhrd__dump, 1);
   rb_define_method(rhrd_class, "asctime", rhrd_asctime, 0);
+  rb_define_method(rhrd_class, "clone", rhrd_clone, 0);
   rb_define_method(rhrd_class, "cwday", rhrd_cwday, 0);
   rb_define_method(rhrd_class, "cweek", rhrd_cweek, 0);
   rb_define_method(rhrd_class, "cwyear", rhrd_cwyear, 0);
   rb_define_method(rhrd_class, "day", rhrd_day, 0);
   rb_define_method(rhrd_class, "day_fraction", rhrd_day_fraction, 0);
   rb_define_method(rhrd_class, "downto", rhrd_downto, 1);
+  rb_define_method(rhrd_class, "dup", rhrd_dup, 0);
   rb_define_method(rhrd_class, "eql?", rhrd_eql_q, 1);
   rb_define_method(rhrd_class, "gregorian", rhrd_gregorian, 0);
   rb_define_method(rhrd_class, "gregorian?", rhrd_gregorian_q, 0);

data/ext/date_ext/datetime.c

@@ -579,6 +579,18 @@ static VALUE rhrdt_s__strptime(int argc, VALUE *argv, VALUE klass) {
   return rhrd__strptime(argv[0], fmt_str, fmt_len);
 }
 
+/* call-seq:
+ *   allocate() -> DateTime <br />
+ *
+ * Returns a +DateTime+ object for julian day 0.
+ */
+static VALUE rhrdt_s_allocate(VALUE klass) {
+  rhrdt_t *d;
+  VALUE rd = Data_Make_Struct(klass, rhrdt_t, NULL, -1, d);
+  d->flags = RHR_HAVE_JD | RHR_HAVE_NANOS;
+  return rd;
+}
+
 /* call-seq:
  *   civil() -> DateTime <br />
  *   civil(year, month=1, day=1, hour=0, minute=0, second=0, offset=0, sg=nil) -> DateTime
@@ -1000,6 +1012,20 @@ static VALUE rhrdt_asctime(VALUE self) {
   RHR_RETURN_RESIZED_STR(s, len)
 }
 
+/* call-seq:
+ *   clone() -> DateTime
+ *
+ * Returns a clone of the receiver.
+ */
+static VALUE rhrdt_clone(VALUE self) {
+  rhrdt_t *d, *nd;
+  VALUE rd = rb_call_super(0, NULL);
+  Data_Get_Struct(self, rhrdt_t, d);
+  Data_Get_Struct(rd, rhrdt_t, nd);
+  memcpy(nd, d, sizeof(rhrdt_t));
+  return rd;
+}
+
 /* call-seq:
  *   cwday() -> Integer
  *
@@ -1103,6 +1129,20 @@ static VALUE rhrdt_day_fraction(VALUE self) {
   return rb_float_new((double)dt->nanos/RHR_NANOS_PER_DAYD);
 }
 
+/* call-seq:
+ *   dup() -> DateTime
+ *
+ * Returns a dup of the receiver.
+ */
+static VALUE rhrdt_dup(VALUE self) {
+  rhrdt_t *d, *nd;
+  VALUE rd = rb_call_super(0, NULL);
+  Data_Get_Struct(self, rhrdt_t, d);
+  Data_Get_Struct(rd, rhrdt_t, nd);
+  memcpy(nd, d, sizeof(rhrdt_t));
+  return rd;
+}
+
 /* call-seq:
  *   downto(target){|datetime|} -> DateTime
  *
@@ -1469,6 +1509,9 @@ static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self) {
       step = NUM2DBL(rstep);
       step_jd = (long)floor(step);
       step_nanos = llround((step - step_jd)*RHR_NANOS_PER_DAY);
+      if (step_jd == 0 && step_nanos == 0) {
+        rb_raise(rb_eArgError, "step can't be 0");
+      }
       break;
     default:
       rb_raise(rb_eArgError, "wrong number of arguments: %i for 2", argc);
@@ -2741,6 +2784,7 @@ void Init_datetime(void) {
   /* Define class */
 
   rhrdt_class = rb_define_class("DateTime", rhrd_class);
+  rb_define_alloc_func(rhrdt_class, rhrdt_s_allocate);
   rhrdt_s_class = rb_singleton_class(rhrdt_class);
 
   /* Define methods for all ruby versions*/
@@ -2765,12 +2809,14 @@ void Init_datetime(void) {
   rb_define_method(rhrdt_class, "ajd", rhrdt_ajd, 0);
   rb_define_method(rhrdt_class, "amjd", rhrdt_amjd, 0);
   rb_define_method(rhrdt_class, "asctime", rhrdt_asctime, 0);
+  rb_define_method(rhrdt_class, "clone", rhrdt_clone, 0);
   rb_define_method(rhrdt_class, "cwday", rhrdt_cwday, 0);
   rb_define_method(rhrdt_class, "cweek", rhrdt_cweek, 0);
   rb_define_method(rhrdt_class, "cwyear", rhrdt_cwyear, 0);
   rb_define_method(rhrdt_class, "day", rhrdt_day, 0);
   rb_define_method(rhrdt_class, "day_fraction", rhrdt_day_fraction, 0);
   rb_define_method(rhrdt_class, "downto", rhrdt_downto, 1);
+  rb_define_method(rhrdt_class, "dup", rhrdt_dup, 0);
   rb_define_method(rhrdt_class, "eql?", rhrdt_eql_q, 1);
   rb_define_method(rhrdt_class, "hash", rhrdt_hash, 0);
   rb_define_method(rhrdt_class, "hour", rhrdt_hour, 0);

data/spec/date/allocate_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Date.allocate" do
-  it "should not be defined" do
-    proc{Date.allocate}.should raise_error
+  it "should be the same as jd" do
+    Date.allocate.should == Date.jd
   end
 end

data/spec/date/clone_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "Date#clone" do
+  before do
+    @d = Date.today
+  end
+
+  it "should return a copy of the date" do
+    @d.clone.should == @d 
+  end
+
+  it "should return a different object_id" do
+    @d.clone.object_id.should_not == @d.object_id
+  end
+
+  it "should keep frozen status" do
+    @d.freeze
+    @d.clone.frozen?.should be_true
+  end
+
+  it "should keep singleton_methods" do
+    class << @d; def foo() 1 end end
+    @d.clone.respond_to?(:foo).should be_true
+  end
+end

data/spec/date/dup_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "Date#dup" do
+  before do
+    @d = Date.today
+  end
+
+  it "should return a copy of the date" do
+    @d.dup.should == @d 
+  end
+
+  it "should return a different object_id" do
+    @d.dup.object_id.should_not == @d.object_id
+  end
+
+  it "should not keep frozen status" do
+    @d.freeze
+    @d.dup.frozen?.should be_false
+  end
+
+  it "should not keep singleton_methods" do
+    class << @d; def foo() 1 end end
+    @d.dup.respond_to?(:foo).should be_false
+  end
+end

data/spec/date/step_spec.rb

@@ -83,13 +83,6 @@ describe "Date#step" do
     end.should == ds
     count.should == 1
 
-    count = 0
-    ds.step(ds, 0) do |d|
-      d.should == ds
-      count += 1
-    end.should == ds
-    count.should == 1
-
     count = 0
     ds.step(ds, -1) do |d|
       d.should == ds
@@ -100,12 +93,6 @@ describe "Date#step" do
   
   it "should not yield if the target date is greater than the receiver, and step is not positive" do
     ds = Date.civil(2008, 10, 11)
-    count = 0
-    ds.step(ds.next, 0) do |d|
-      count += 1
-    end.should == ds
-    count.should == 0
-
     count = 0
     ds.step(ds.next, -1) do |d|
       count += 1
@@ -115,12 +102,6 @@ describe "Date#step" do
   
   it "should not yield if the target date is less than the receiver, and step is not negative" do
     ds = Date.civil(2008, 10, 11)
-    count = 0
-    ds.next.step(ds, 0) do |d|
-      count += 1
-    end.should == ds.next
-    count.should == 0
-
     count = 0
     ds.next.step(ds, 1) do |d|
       count += 1
@@ -128,6 +109,13 @@ describe "Date#step" do
     count.should == 0
   end
   
+  it "should raise an ArgumentError for a 0 step" do
+    ds = Date.civil(2008, 10, 11)
+    proc{ds.step(ds, 0){|d|}}.should raise_error(ArgumentError)
+    proc{ds.step(ds+1, 0){|d|}}.should raise_error(ArgumentError)
+    proc{ds.step(ds-1, 0){|d|}}.should raise_error(ArgumentError)
+  end
+
   it "should keep the same class as the receiver" do
     c = Class.new(Date)
     c.jd.step(c.jd + 2) do |d|

data/spec/datetime/allocate_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-describe "Date.allocate" do
-  it "should not be defined" do
-    proc{DateTime.allocate}.should raise_error
+describe "DateTime.allocate" do
+  it "should be the same as jd" do
+    DateTime.allocate.should == DateTime.jd
   end
 end

data/spec/datetime/clone_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "DateTime#clone" do
+  before do
+    @d = DateTime.now
+  end
+
+  it "should return a copy of the date" do
+    @d.clone.should == @d 
+  end
+
+  it "should return a different object_id" do
+    @d.clone.object_id.should_not == @d.object_id
+  end
+
+  it "should keep frozen status" do
+    @d.freeze
+    @d.clone.frozen?.should be_true
+  end
+
+  it "should keep singleton_methods" do
+    class << @d; def foo() 1 end end
+    @d.clone.respond_to?(:foo).should be_true
+  end
+end

data/spec/datetime/dup_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "DateTime#dup" do
+  before do
+    @d = DateTime.now
+  end
+
+  it "should return a copy of the date" do
+    @d.dup.should == @d 
+  end
+
+  it "should return a different object_id" do
+    @d.dup.object_id.should_not == @d.object_id
+  end
+
+  it "should not keep frozen status" do
+    @d.freeze
+    @d.dup.frozen?.should be_false
+  end
+
+  it "should not keep singleton_methods" do
+    class << @d; def foo() 1 end end
+    @d.dup.respond_to?(:foo).should be_false
+  end
+end

data/spec/datetime/step_spec.rb

@@ -99,13 +99,6 @@ describe "DateTime#step" do
     end.should == ds
     count.should == 1
 
-    count = 0
-    ds.step(ds, 0) do |d|
-      d.should == ds
-      count += 1
-    end.should == ds
-    count.should == 1
-
     count = 0
     ds.step(ds, -1) do |d|
       d.should == ds
@@ -116,12 +109,6 @@ describe "DateTime#step" do
   
   it "should not yield if the target date is greater than the receiver, and step is not positive" do
     ds = DateTime.civil(2008, 10, 11)
-    count = 0
-    ds.step(ds.next, 0) do |d|
-      count += 1
-    end.should == ds
-    count.should == 0
-
     count = 0
     ds.step(ds.next, -1) do |d|
       count += 1
@@ -131,12 +118,6 @@ describe "DateTime#step" do
   
   it "should not yield if the target date is less than the receiver, and step is not negative" do
     ds = DateTime.civil(2008, 10, 11)
-    count = 0
-    ds.next.step(ds, 0) do |d|
-      count += 1
-    end.should == ds.next
-    count.should == 0
-
     count = 0
     ds.next.step(ds, 1) do |d|
       count += 1
@@ -174,6 +155,13 @@ describe "DateTime#step" do
 
   end
   
+  it "should raise an ArgumentError for a 0 step" do
+    ds = DateTime.civil(2008, 10, 11)
+    proc{ds.step(ds, 0){|d|}}.should raise_error(ArgumentError)
+    proc{ds.step(ds+1, 0){|d|}}.should raise_error(ArgumentError)
+    proc{ds.step(ds-1, 0){|d|}}.should raise_error(ArgumentError)
+  end
+
   it "should keep the same class as the receiver" do
     c = Class.new(DateTime)
     c.jd.step(c.jd + 2) do |d|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: home_run
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: x86-mswin32-60
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -53,6 +53,7 @@ files:
 - spec/date/strptime_spec.rb
 - spec/date/next_prev_spec.rb
 - spec/date/downto_spec.rb
+- spec/date/dup_spec.rb
 - spec/date/leap_spec.rb
 - spec/date/minus_spec.rb
 - spec/date/minus_month_spec.rb
@@ -62,6 +63,7 @@ files:
 - spec/date/add_spec.rb
 - spec/date/eql_spec.rb
 - spec/date/relationship_spec.rb
+- spec/date/clone_spec.rb
 - spec/date/gregorian_spec.rb
 - spec/date/parse_spec.rb
 - spec/date/day_spec.rb
@@ -85,6 +87,7 @@ files:
 - spec/datetime/strptime_spec.rb
 - spec/datetime/next_prev_spec.rb
 - spec/datetime/downto_spec.rb
+- spec/datetime/dup_spec.rb
 - spec/datetime/leap_spec.rb
 - spec/datetime/minus_spec.rb
 - spec/datetime/minus_month_spec.rb
@@ -95,6 +98,7 @@ files:
 - spec/datetime/eql_spec.rb
 - spec/datetime/relationship_spec.rb
 - spec/datetime/constructor_spec.rb
+- spec/datetime/clone_spec.rb
 - spec/datetime/now_spec.rb
 - spec/datetime/parse_spec.rb
 - spec/datetime/day_spec.rb