Cache @rweek and @rday, not @ref

floraison · Mar 23, 2024 · 78896d7 · 78896d7
1 parent 1104802
commit 78896d7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## et-orbi 1.2.11  not yet released
 
+- Cache @rweek and @rday, not @ref, gh-38
+
 
 ## et-orbi 1.2.10  released 2024-03-22
 

diff --git a/lib/et-orbi/time.rb b/lib/et-orbi/time.rb
@@ -96,7 +96,8 @@ def initialize(s, zone)
     def touch
 
       @time = nil
-      @ref = nil
+      @rday = nil
+      @rweek = nil
     end
 
     def seconds=(f)
@@ -353,20 +354,24 @@ def wday_in_month
     #
     def rweek
 
-      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
-      noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
-
-      ((noon - @ref) / WEEK_S).floor + 1
+      @rweek ||=
+        begin
+          ref = EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+          noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
+          ((noon - ref) / WEEK_S).floor + 1
+        end
     end
 
     # "reference week", used in fugit for cron modulo notation
     #
     def rday
 
-      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
-      noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
-
-      ((noon - @ref) / DAY_S).floor + 1
+      @rday ||=
+        begin
+          ref = EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+          noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
+          ((noon - ref) / DAY_S).floor + 1
+        end
     end
 
     def reach(points)