date-performance 0.4.6 → 0.4.7

data/Rakefile

@@ -11,9 +11,9 @@ Project.new "Date::Performance" do |p|
   p.author = 'Ryan Tomayko <r@tomayko.com>'
   p.rubyforge_project = 'wink'
 
-  p.remote_dist_location   = "tomayko.com:/dist/#{p.package_name}"
-  p.remote_branch_location = "tomayko.com:/src/#{p.package_name}.git"
-  p.remote_doc_location    = "tomayko.com:/src/#{p.package_name}"
+  p.remote_dist_location   = "gus@tomayko.com:/dist/#{p.package_name}"
+  p.remote_branch_location = "gus@tomayko.com:/src/#{p.package_name}.git"
+  p.remote_doc_location    = "gus@tomayko.com:/src/#{p.package_name}"
 end
 
 task :default => [ :compile, :test ]

data/ext/date_performance.c

@@ -22,6 +22,7 @@ static ID id_new;           /* :new */
 static ID id_new_bang;      /* :new! */
 static ID id_ivar_civil;    /* :@__civil__ */
 static ID id_jd;            /* :jd */
+static ID id_ivar_ajd;      /* :@ajd */
 static ID id_jd_to_civil;   /* :jd_to_civil */
 static ID id_ivar_sg;       /* :@sg */
 static ID id_numerator;     /* :numerator */
@@ -338,6 +339,42 @@ rb_date_strptime(int argc, VALUE * argv, VALUE self)
   return rb_funcall2(self, id_strptime_without_performance, argc, argv);
 }
 
+/*
+ * Date::<=>(other)
+*/
+static VALUE
+rb_date_compare(int argc, VALUE * argv, VALUE self)
+{
+  if (NIL_P(argv[0]))
+    return Qnil;
+  long other_den = -1;
+  long other_num = -1;
+  if (FIXNUM_P(argv[0])) {
+    //compare with argument as with astronomical julian day number
+    other_den = 1;
+    other_num = FIX2LONG(argv[0]);
+  } else if (rb_obj_is_kind_of(argv[0], rb_cDate)) {
+    VALUE other_date = argv[0];
+    VALUE other_ajd = rb_ivar_get(other_date, id_ivar_ajd);
+    other_den = FIX2LONG(rb_funcall(other_ajd, id_denominator, 0));
+    other_num = FIX2LONG(rb_funcall(other_ajd, id_numerator, 0));
+  } else {
+    return Qnil;
+  }
+  
+  VALUE ajd = rb_ivar_get(self, id_ivar_ajd);
+  long den = FIX2LONG(rb_funcall(ajd, id_denominator, 0));
+  long num = FIX2LONG(rb_funcall(ajd, id_numerator, 0));
+
+  long v = (num * other_den) - (other_num * den);
+  if (v > 0)
+    return INT2FIX(1);
+  else if (v < 0)
+    return INT2FIX(-1);
+  else
+    return INT2FIX(0);
+}
+
 
 VALUE
 Init_date_performance() {
@@ -358,6 +395,7 @@ Init_date_performance() {
   rb_define_method(rb_cDate, "civil",        rb_date_civil, 0);
   rb_define_method(rb_cDate, "sys_strftime", rb_date_strftime, -1);
   rb_define_method(rb_cDate, "strftime",     rb_date_strftime, -1);
+  rb_define_method(rb_cDate, "<=>",          rb_date_compare, -1);
 
   /* Date Singleton Methods */
   rb_define_singleton_method(rb_cDate, "civil_to_jd",   rb_date_civil_to_jd, -1);
@@ -383,6 +421,7 @@ Init_date_performance() {
   id_divmod = rb_intern("divmod");
   id_new = rb_intern("new");
   id_jd = rb_intern("jd");
+  id_ivar_ajd = rb_intern("@ajd");
   id_jd_to_civil = rb_intern("jd_to_civil");
   id_ivar_civil = rb_intern("@__civil__");
   id_ivar_sg = rb_intern("@sg");

data/lib/date/performance.rb

@@ -9,7 +9,7 @@ class Date
   # The Date::Performance module is present when the performance enhacing extension 
   # has been loaded. It serves no other purpose.
   module Performance
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 
   # The extension replaces Date#strftime but falls back on the stock version when

data/test/extension_test.rb

@@ -117,4 +117,29 @@ class ExtensionTest < Test::Unit::TestCase
     end
   end
 
+  def test_date_comparisons
+    #regular Date class comparison
+    d = Date.new(2008, 1, 1)
+    366.times do |i|
+        assert_equal( 0, d+i <=> d+i )
+        assert_equal(-1, d+i <=> d+i+1 )
+        assert_equal( 1, d+i+1 <=> d+i )
+    end
+
+    #DateTime comparison
+    dt1 = DateTime.new(2006,1,1,12,15,30)
+    dt2 = DateTime.new(2006,1,1,12,15,31)
+    dt3 = DateTime.new(2006,1,1,12,15,29)
+ 
+    assert_equal( 0, DateTime.new(2006,1,1,12,15,30) <=> dt1 )
+    assert_equal( 1, dt1 <=> dt3 )
+    assert_equal( -1, dt1 <=> dt2 )
+
+    #comparison with some random type
+    assert_equal nil, dt1 <=> "foo"
+
+    #comparison with Fixnum that represents ajd
+    assert_equal(-1, d <=> d.ajd.numerator )
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: date-performance
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,7 +9,7 @@ autorequire:
 bindir: 
 cert_chain: []
 
-date: 2008-07-12 00:00:00 -07:00
+date: 2008-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - test/date_memoize_test.rb
 - test/extension_test.rb
 - doc/asciidoc.conf
-- doc/changes.html
 - doc/changes.txt
 - doc/images
 - doc/images/icons
@@ -60,7 +59,6 @@ files:
 - doc/images/icons/tip.png
 - doc/images/icons/up.png
 - doc/images/icons/warning.png
-- doc/license.html
 - doc/license.txt
 - doc/stylesheets
 - doc/stylesheets/handbookish-manpage.css

data/doc/changes.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
-<link rel="stylesheet" href="stylesheets/handbookish.css" type="text/css" />
-<title>Date::Performance ChangeLog</title>
-</head>
-<body>
-<div id="header">
-<h1>Date::Performance ChangeLog</h1>
-<span id="author">Ryan Tomayko</span><br />
-<span id="email"><tt>&lt;<a href="mailto:r@tomayko.com">r@tomayko.com</a>&gt;</tt></span><br />
-</div>
-<div id="preamble">
-<div class="sectionbody">
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt></tt></pre></div></div>
-</div>
-</div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2008-07-12 08:15:20 PDT
-</div>
-</div>
-</body>
-</html>

data/doc/license.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
-<link rel="stylesheet" href="stylesheets/handbookish.css" type="text/css" />
-<title>The MIT License</title>
-</head>
-<body>
-<div id="header">
-<h1>The MIT License</h1>
-<span id="author">Ryan Tomayko</span><br />
-<span id="email"><tt>&lt;<a href="mailto:r@tomayko.com">r@tomayko.com</a>&gt;</tt></span><br />
-</div>
-<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>Date::Performance is Copyright (c) 2007-08, Ryan Tomayko</p></div>
-<div class="para"><p>Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:</p></div>
-<div class="para"><p>The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.</p></div>
-<div class="para"><p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.</p></div>
-</div>
-</div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2008-07-12 08:15:21 PDT
-</div>
-</div>
-</body>
-</html>