anniversary 1.0.1 → 1.0.2

data/lib/anniversary/date_additions.rb

@@ -49,13 +49,16 @@ class Date
         else
           year - initial_date.year - 1
         end
-        last_monthiversary = monthiversary_this_month = initial_date.in_year_and_month_with_correction(year, month)
-        puts "monthiversary_this_month is #{monthiversary_this_month}" if debug
-        if (monthiversary_this_month > self)
+        last_monthiversary = initial_date.in_year_and_month_with_correction(year, month)
+        puts "last_monthiversary is #{last_monthiversary}" if debug
+        if (last_monthiversary > self)
           last_month = Date.civil(year, month, 1) << 1
-          last_monthiversary = initial_date.in_year_and_month_with_correction(last_month.year, last_month.month)
+          while (last_monthiversary > self)
+            last_monthiversary = initial_date.in_year_and_month_with_correction(last_month.year, last_month.month)
+            last_month = last_month << 1
+          end
         end
-        puts "last_monthiversary is #{last_monthiversary}" if debug
+        puts "last_monthiversary after correction is #{last_monthiversary}" if debug
 
         if last_monthiversary > initial_date
           months = (last_monthiversary.month - anniversary_this_year.month)

data/lib/anniversary/version.rb

@@ -1,3 +1,3 @@
 module Anniversary
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/lib/date_additions_spec.rb

@@ -2,20 +2,20 @@
 require 'spec_helper'
 require 'anniversary.rb'
 describe "::Date" do
-  
+
   context "Date.civil_with_missing_day_correction" do
     it "should handle a leap day jump" do
       Date.civil_with_missing_day_correction(2011, 2, 29).should == Date.civil(2011, 3, 1)
     end
-    
+
     it "should handle a normal short month jump" do
       Date.civil_with_missing_day_correction(2011, 9, 31).should == Date.civil(2011, 10, 1)
     end
-    
+
     it "should handle a multi-day jump in a leap year" do
       Date.civil_with_missing_day_correction(2012, 2, 31).should == Date.civil(2012, 3, 2)
     end
-    
+
     it "should handle a multi-day jump in a non-leap year" do
       Date.civil_with_missing_day_correction(2011, 2, 31).should == Date.civil(2011, 3, 3)
     end
@@ -28,7 +28,7 @@ describe "::Date" do
         subject.years_months_days_since(anniversary).should == [eyd, emd, edd]
       end
     end
-    
+
     def self.test_range(anniversary, last_date_to_test)
       raise "Dates are incompatible" if last_date_to_test < anniversary
       expected_year_diff = 0
@@ -38,7 +38,7 @@ describe "::Date" do
       next_anniversary = ::Date.civil_with_missing_day_correction(test_date.year + 1, test_date.month, test_date.day)
       next_month = ::Date.civil(test_date.year, test_date.month, 1) >> 1
       next_monthiversary = ::Date.civil_with_missing_day_correction(next_month.year, next_month.month, test_date.day)
-      
+
       while (test_date <= last_date_to_test) do
         build_example(anniversary, test_date, [expected_year_diff, expected_month_diff, expected_day_diff])
         expected_day_diff += 1
@@ -57,34 +57,49 @@ describe "::Date" do
         end
       end
     end
-    
+
     it "should give zeroes for the same date" do
       anniversary = ::Date.civil(2001, 6, 1)
       target = ::Date.civil(2001, 6, 1)
-      target.years_months_days_since(anniversary).should == [0, 0, 0]          
+      target.years_months_days_since(anniversary).should == [0, 0, 0]
     end
-    
-    it "should handle a case where the date is in the next calendar month, but before the montiversary" do
+
+    it "should handle a case where the date is in the next calendar month, but before the monthiversary" do
        anniversary = ::Date.civil(2001, 6, 15)
        target = ::Date.civil(2001, 7, 1)
-       target.years_months_days_since(anniversary).should == [0, 0, 16]          
+       target.years_months_days_since(anniversary).should == [0, 0, 16]
      end
-    
+
      it "should handle a case where the date is one month after an anniversary on the first of the month" do
         anniversary = ::Date.civil(2001, 6, 1)
         target = ::Date.civil(2001, 7, 1)
-        target.years_months_days_since(anniversary).should == [0, 1, 0]          
+        target.years_months_days_since(anniversary).should == [0, 1, 0]
       end
-    
+
       it "should handle a case where the date is new years day after the anniversary" do
          anniversary = ::Date.civil(2001, 6, 1)
          target = ::Date.civil(2002, 1, 1)
-         target.years_months_days_since(anniversary).should == [0, 7, 0]          
+         target.years_months_days_since(anniversary).should == [0, 7, 0]
        end
-    
-     
+
+       it "should handle the case of March 1, January 31 in the same non leap year" do
+         Date.civil(2010,3,1).years_months_days_since(Date.civil(2010,1,31)).should == [0, 0, 29]
+       end
+
+       it "should handle the case of March 1, January 31 in the same leap year" do
+         Date.civil(2008,3,1).years_months_days_since(Date.civil(2008,1,31)).should == [0, 0, 30]
+       end
+
+       it "should handle the first case brought up by pit capitan's comment on the blog" do
+         Date.civil(2010,7,4).years_months_days_since(Date.civil(1970,1,31)).should == [40, 6, 3]
+       end
+
+       it "should handle the second case brought up by pit capitan's comment on the blog" do
+         Date.civil(2010,7,4).years_months_days_since(Date.civil(1970,2,1)).should == [40, 5, 3]
+       end
+
      test_range( ::Date.civil(2000,6,1), ::Date.civil(2010,8,31))
      test_range( ::Date.civil(2000, 6, 15), ::Date.civil(2010,8,31))
-  
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: anniversary
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Rick Denatale
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -05:00
+date: 2011-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency