refactor

lib/latex_yearly_planner/calendar/day.rb

@@ -55,6 +55,13 @@ def strftime(format)
       def ==(other)
         other.is_a?(Day) && moment == other.moment && weekday_start == other.weekday_start
       end
+
+      def <=>(other)
+        return 0 if moment == other.moment
+        return -1 if moment < other.moment
+
+        1
+      end
     end
   end
 end

lib/latex_yearly_planner/calendar/month.rb

@@ -33,10 +33,6 @@ def year
         moment.year
       end
 
-      def mon
-        moment.mon
-      end
-
       def quarter
         Quarter.new(weekday_start:, year: moment.year, number: ((moment.month - 1) / 3) + 1)
       end
@@ -55,6 +51,14 @@ def hash
         [moment, weekday_start].hash
       end
 
+      def first_day
+        Day.new(weekday_start:, moment: moment.beginning_of_month)
+      end
+
+      def last_day
+        Day.new(weekday_start:, moment: moment.end_of_month)
+      end
+
       alias eql? ==
 
       private

lib/latex_yearly_planner/planners/mos/pages/weekly.rb

@@ -62,10 +62,10 @@ def format_day(day)
             dayname = day.strftime('%A')
             daynum = day.strftime('%-d')
 
-            first_day = params.months.first.moment.beginning_of_month
-            last_day = params.months.last.moment.end_of_month
+            first_day = params.months.first.first_day
+            last_day = params.months.last.last_day
 
-            if day.moment < first_day || day.moment > last_day
+            if day < first_day || day > last_day
               return "[#{i18n.t("calendar.weekdays.full.#{dayname.downcase}")}, #{daynum}]"
             end
 

spec/latex_yearly_planner/calendar/month_spec.rb

@@ -44,10 +44,6 @@
     it { expect(month.year).to eq(year) }
   end
 
-  describe '#mon' do
-    it { expect(month.mon).to eq(month_number) }
-  end
-
   describe '#quarter' do
     let(:quarter) { Quarter.new(weekday_start:, year:, number: 3) }