et-orbi 1.2.9 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435f9eb2e9b27822b9ee161fbe2449375cb710e1e01b8f3313c61983424aba85
-  data.tar.gz: a72603974625eb4e8c49e89c3a317002ea8661adbaa461c2d143450bd8b9c40a
+  metadata.gz: c7f008f08099e4efe55b1cdeef327f9dd043703196609615e52ec20499db141e
+  data.tar.gz: d7d636ce1eaf898dbf76b8d8c94ea3aeaab02a462e9e646ead51502f975dcb93
 SHA512:
-  metadata.gz: b45a1917c605b29254c97d5ab27d1b5e894cb2e9ed01b27594a19b8a52fc16c18fe6f59d56a362cedc0e0d3131278ec2d0d288427a132ce2b5152a7b0404ab22
-  data.tar.gz: dd28bbd9b3fe1ad3feb0088284a01f909453afd1ae56ba3c910215d85d9af793fdf3042adc27fa1789bc646412abb2643f0543c1b7bb2fa8e02aa50a57771f33
+  metadata.gz: c3fbfbef817e8c176a66d38edac9924e8f557fbb12bceddc42249bdd773f74b1fa3792f6a3c7cfff1f3ecd1bf13ff293de7baa0f84da3418cd171574d8984c40
+  data.tar.gz: 2c3176e291230ad074b11d475a823cfa6cbce12cd55295337fcf1c36a9bdf7b35453801d3d940bd72308420594afae61a31a96ff4282fc0e9cc966c02d3ddfaf

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 # CHANGELOG.md
 
 
+## et-orbi 1.2.11  released 2024-03-23
+
+- Cache @rweek and @rday, not @ref, gh-38
+
+
+## et-orbi 1.2.10  released 2024-03-22
+
+- Refine #rweek computation, aim more at noon instead of midnight, gh-38
+
+
 ## et-orbi 1.2.9  released 2024-03-13
 
 - Refine #rweek computation, aim at noon instead of midnight, gh-38

data/CREDITS.md

@@ -1,15 +1,15 @@
 
 # et-orbi credits
 
-* Benjami Darcet @bdarcet https://github.com/floraison/fugit/issues/67 gh-38
-* @franckduche https://github.com/floraison/fugit/issues/67 gh-38
+* Benjami Darcet https://github.com/bdarcet https://github.com/floraison/fugit/issues/67 gh-38
+* https://github.com/franckduche https://github.com/floraison/fugit/issues/67 gh-38
 * Igor Viktor https://github.com/gogainda gh-34
 * phibid, for https://github.com/floraison/fugit/issues/67
 * Peter Goldstein, https://github.com/petergoldstein GHA 3.3 j9.3, gh-32
-* harsha-flipp (https://github.com/harsha-flipp) https://github.com/floraison/fugit/issues/63
-* adank92 (https://github.com/adank92) https://github.com/ondrejbartas/sidekiq-cron/issues/276 gh-28
-* Stan Hu (https://github.com/stanhu) Chronic toubles, gh-24, gh-26, etc
-* d-m-u (https://github.com/d-m-u) EoTime#==(Time), gh-20, gh-7
+* harsha-flipp https://github.com/harsha-flipp https://github.com/floraison/fugit/issues/63
+* adank92 https://github.com/adank92 https://github.com/ondrejbartas/sidekiq-cron/issues/276 gh-28
+* Stan Hu https://github.com/stanhu Chronic toubles, gh-24, gh-26, etc
+* d-m-u https://github.com/d-m-u EoTime#==(Time), gh-20, gh-7
 * Vais Salikhov (https://github.com/vais) missing US timezone aliases, gh-18 gh-19
 * Wenhui Wang https://github.com/w11th .parse vs Chronic+ActiveSupport, fugit 11
 * Marcel https://github.com/MTRNord "Mitteleuropaeische Sommerzeit", gh-15

data/lib/et-orbi/time.rb

@@ -96,7 +96,8 @@ module EtOrbi
     def touch
 
       @time = nil
-      @ref = nil
+      @rday = nil
+      @rweek = nil
     end
 
     def seconds=(f)
@@ -353,18 +354,24 @@ module EtOrbi
     #
     def rweek
 
-      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
-
-      ((self - @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 00:00:00', @zone)
-
-      ((self - @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)

data/lib/et-orbi.rb

@@ -13,6 +13,6 @@ require 'et-orbi/zone'
 
 module EtOrbi
 
-  VERSION = '1.2.9'
+  VERSION = '1.2.11'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.11
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo