@@ -190,9 +190,9 @@ class Person < ActiveRecord::Base def birthday_soon? today = Date.today - birthday and birthday >= today and birthday < (today + BIRTHDAY_SOON_DAYS) + birthday and ((birthday.yday()+365 - today.yday()).modulo(365) < BIRTHDAY_SOON_DAYS) end - + def mobile_phone=(phone) write_attribute :mobile_phone, phone.to_s.digits_only end app/models/person.rb @@ -110,9 +110,9 @@ class PersonTest < Test::Unit::TestCase end should "know when a birthday is coming up" do - people(:tim).update_attributes!(:birthday => Date.today + 5) + people(:tim).update_attributes!(:birthday => Time.now + 5.days - 27.years) assert people(:tim).reload.birthday_soon? - people(:tim).update_attributes!(:birthday => Date.today + BIRTHDAY_SOON_DAYS + 1) + people(:tim).update_attributes!(:birthday => Time.now - 27.years + (BIRTHDAY_SOON_DAYS + 1).days) assert !people(:tim).reload.birthday_soon? end test/unit/person_test.rb e2bd33309e4688a81f2f97fb5c4184b8d446bdd7 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/c30a91d1b0872668341bd9a8edc4c3a781760bc8 c30a91d1b0872668341bd9a8edc4c3a781760bc8 2008-10-15T14:55:39-07:00 2008-10-15T06:14:00-07:00 Fix birthday_soon? method (Ben Hudson) and fix test. 023197538c998a869d736ea3211b825df3790be3 Tim Morgan tim@timmorgan.org