et-orbi 1.2.8 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149c5b95f1f67702640cb1b202d768bec7e215bb6335f9ec73f247d65edb6298
-  data.tar.gz: 6e559b757f53c60daef8be08c9c9af0d48378e203cc3d7cbb5582b4bb758b051
+  metadata.gz: 12da146d4d75a3fb39edea976685cd6117958484f265f6a7eff404a4f9726224
+  data.tar.gz: b772af0f0e49c040ef15e3b2d23a61b28b540cc7d69f3e338f6fca719057c94b
 SHA512:
-  metadata.gz: 58d548986bc13f557c88cb862f52c10faa9211489a0daa0de7691eea5473905554a3257166d689c128d1a14d97c000713de17ee5064c557eaf601f718ee26b2b
-  data.tar.gz: 4919107bc2091bb8be87af751e86f75bf99f5f29fae457f12321b85bfc38ec38ad47a533e4a706f27bbd409b0bd92e479c9f44b9b01f5dc2adc18a839b2232cc
+  metadata.gz: 56992ab662dc9ddcfbf6975332f7e44ee4a0c8eb5a90d519dbc8cd79da0847626f90451c21d5080eee440ba65c93cb16a939d20bb94b442eb5b05ce86cd6eea3
+  data.tar.gz: 6c04743276d444c5d7e38a852c385d643af9e8969f03de382c38661bf61ee6f692a1bebadb7c1700318aa99392c4292b592dbcbc27557cbc15d71e203a47e31a

data/CHANGELOG.md

@@ -2,7 +2,17 @@
 # CHANGELOG.md
 
 
-## et-orbi 1.2.8  released 2024-03-11  (13 years)
+## 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
+
+
+## et-orbi 1.2.8  released 2024-03-11  (13 ans)
 
 - Cache the @ref time used in the #rweek and #rday computation
 

data/CREDITS.md

@@ -1,13 +1,15 @@
 
 # et-orbi credits
 
+* 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

@@ -88,22 +88,34 @@ module EtOrbi
         (defined?(TZInfo::Data) ? '' : "\nand adding gem 'tzinfo-data'")
       ) unless @zone
 
+      touch
+    end
+
+    # Nullify the "caches" used by #to_time, #rweek, and others
+    #
+    def touch
+
       @time = nil
-        # cache for #to_time result
+      @ref = nil
     end
 
     def seconds=(f)
 
-      @time = nil
       @seconds = f
+
+      touch
+
+      f
     end
 
     def zone=(z)
 
-      @time = nil
-      @ref = nil
 
       @zone = self.class.get_tzone(zone || :current)
+
+      touch
+
+      @zone
     end
 
     # Returns true if this EoTime instance corresponds to 2 different UTC
@@ -232,8 +244,8 @@ module EtOrbi
     def <=(o); @seconds <= _to_f(o); end
     def <=>(o); @seconds <=> _to_f(o); end
 
-    def add(t); @time = nil; @seconds += t.to_f; self; end
-    def subtract(t); @time = nil; @seconds -= t.to_f; self; end
+    def add(t); @seconds += t.to_f; touch; self; end
+    def subtract(t); @seconds -= t.to_f; touch; self; end
 
     def +(t); inc(t, 1); end
     def -(t); inc(t, -1); end
@@ -303,19 +315,24 @@ module EtOrbi
 
     def inc(t, dir=1)
 
-      case t
-      when Numeric
-        nt = self.dup
-        nt.seconds += dir * t.to_f
-        nt
-      when ::Time, ::EtOrbi::EoTime
-        fail ArgumentError.new(
-          "Cannot add #{t.class} to EoTime") if dir > 0
-        @seconds + dir * t.to_f
-      else
-        fail ArgumentError.new(
-          "Cannot call add or subtract #{t.class} to EoTime instance")
-      end
+      r =
+        case t
+        when Numeric
+          nt = self.dup
+          nt.seconds += dir * t.to_f
+          nt
+        when ::Time, ::EtOrbi::EoTime
+          fail ArgumentError.new(
+            "Cannot add #{t.class} to EoTime") if dir > 0
+          @seconds + dir * t.to_f
+        else
+          fail ArgumentError.new(
+            "Cannot call add or subtract #{t.class} to EoTime instance")
+        end
+
+      touch
+
+      r
     end
 
     def localtime(zone=nil)
@@ -336,18 +353,20 @@ module EtOrbi
     #
     def rweek
 
-      @ref ||= EtOrbi.make_time('2019-01-01 00:00:00', @zone)
+      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+      noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
 
-      ((self - @ref) / WEEK_S).floor + 1
+      ((noon - @ref) / WEEK_S).floor + 1
     end
 
     # "reference week", used in fugit for cron modulo notation
     #
     def rday
 
-      @ref ||= EtOrbi.make_time('2019-01-01 00:00:00', @zone)
+      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+      noon = EtOrbi.make_time(strftime('%F 12:00:00'), @zone)
 
-      ((self - @ref) / DAY_S).floor + 1
+      ((noon - @ref) / DAY_S).floor + 1
     end
 
     def reach(points)
@@ -382,6 +401,11 @@ module EtOrbi
       t
     end
 
+    def clone
+
+      EtOrbi::EoTime.new(@seconds, @zone)
+    end
+
     protected
 
     # Returns a Ruby Time instance.

data/lib/et-orbi.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.10
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: time with zones