@@ -28,7 +28,7 @@ module CanSearch }, :'bi-weekly' => lambda { |now| today = now.midnight - today.day >= 15 ? (today.change(:day => 15)..today.end_of_month) : (today.beginning_of_month..today.change(:day => 15) - 1.second) + today.day >= 16 ? (today.change(:day => 16)..today.end_of_month) : (today.beginning_of_month..today.change(:day => 16) - 1.second) }, :monthly => lambda { |now| (now.beginning_of_month..now.end_of_month) lib/can_search/date_range_scope.rb @@ -91,15 +91,15 @@ module CanSearch it "creates weekly range" do Record.date_range_for(:weekly, Time.utc(2008, 1, 1)).should == (Time.utc(2007, 12, 31)..Time.utc(2008, 1, 7)-1.second) end - + it "creates bi-weekly range for first half of the month" do - Record.date_range_for(:'bi-weekly', Time.utc(2008, 1, 5)).should == (Time.utc(2008, 1, 1)..Time.utc(2008, 1, 15)-1.second) + Record.date_range_for(:'bi-weekly', Time.utc(2008, 1, 5)).should == (Time.utc(2008, 1, 1)..Time.utc(2008, 1, 16)-1.second) end - + it "creates bi-weekly range for second half of the month" do - Record.date_range_for(:'bi-weekly', Time.utc(2008, 1, 16)).should == (Time.utc(2008, 1, 15)..Time.utc(2008, 2, 1)-1.second) + Record.date_range_for(:'bi-weekly', Time.utc(2008, 1, 17)).should == (Time.utc(2008, 1, 16)..Time.utc(2008, 2, 1)-1.second) end - + it "creates monthly range" do Record.date_range_for(:monthly, Time.utc(2008, 1, 5)).should == (Time.utc(2008, 1, 1)..Time.utc(2008, 2, 1)-1) end spec/date_range_scope_spec.rb 5bcc52d0c3fe11b9f9a4a85fea0074f31d194545 Tekkub tekkub@gmail.com http://github.com/technoweenie/can_search/commit/8f647f7631e4f195017ea112ee00c78627693e77 8f647f7631e4f195017ea112ee00c78627693e77 2008-12-23T15:08:18-08:00 2008-12-21T18:38:29-08:00 Make bi-weekly use 1-15 and 16-end_of_month instead of 1-14 and 15-EOM Signed-off-by: rick <technoweenie@gmail.com> 8a4479213681a43fcf1a5a1634e7dd36f3283788 rick technoweenie@gmail.com