lib/timeboss/calendar/period.rb in timeboss-1.0.5 vs lib/timeboss/calendar/period.rb in timeboss-1.1.0

@@ -111,11 +111,13 @@
         to_range.include?(Date.today)
       end
 
       %w[day week month quarter half year].each do |size|
         define_method(size.pluralize) do
-          entry = calendar.public_send("#{size}_for", self.begin.start_date)
-          build_entries entry
+          entry = calendar.public_send("#{size}_for", self.begin.start_date) || self.begin.public_send(size, 1)
+          entries = build_entries(entry)
+          entries.pop if size == "week" && self.end.next.public_send(size, 1) == entries.last
+          entries
         end
 
         define_method(size) do |index = nil|
           entries = public_send(size.pluralize)
           return entries[index - 1] unless index.nil?