et-orbi 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ff138170f965f0a2dc35d38aaa08123ddfd97176d76f5e1b2136306eec812e
-  data.tar.gz: 193d8bca6b8cfb34f023aadb504e127fd3f187eb64c10f546327510c8f487e04
+  metadata.gz: 435f9eb2e9b27822b9ee161fbe2449375cb710e1e01b8f3313c61983424aba85
+  data.tar.gz: a72603974625eb4e8c49e89c3a317002ea8661adbaa461c2d143450bd8b9c40a
 SHA512:
-  metadata.gz: 9a5747b65189567c49a9dda0936bac7d947deaa8a5067ba4d311d1c80032722baae682acfc111488d8c6b3139fa41238dfec645279983449312c6f5aa8881eb9
-  data.tar.gz: 2173668af72a6c2aff4e992201d5c74ffe5f87023f6e52c4c42389c28bb8cab4a231c55142bbc9c12513173260c80bf3b372c0ccad555900f6a7efad01e35482
+  metadata.gz: b45a1917c605b29254c97d5ab27d1b5e894cb2e9ed01b27594a19b8a52fc16c18fe6f59d56a362cedc0e0d3131278ec2d0d288427a132ce2b5152a7b0404ab22
+  data.tar.gz: dd28bbd9b3fe1ad3feb0088284a01f909453afd1ae56ba3c910215d85d9af793fdf3042adc27fa1789bc646412abb2643f0543c1b7bb2fa8e02aa50a57771f33

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 # CHANGELOG.md
 
 
+## 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
+
+
 ## et-orbi 1.2.7  released 2022-03-09
 
 - Fix the wday_in_month computation for floraison/fugit#67

data/CREDITS.md

@@ -1,6 +1,9 @@
 
 # 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
+* 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

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2022, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2024, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Makefile

@@ -1,10 +1,10 @@
 
 ## gem tasks ##
 
-NAME = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
-VERSION = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
+NAME != \
+  ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name"
+VERSION != \
+  ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version"
 
 count_lines:
 	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"

data/README.md

@@ -3,7 +3,6 @@
 
 [![tests](https://github.com/floraison/et-orbi/workflows/test/badge.svg)](https://github.com/floraison/et-orbi/actions)
 [![Gem Version](https://badge.fury.io/rb/et-orbi.svg)](http://badge.fury.io/rb/et-orbi)
-[![Join the chat at https://gitter.im/floraison/fugit](https://badges.gitter.im/floraison/fugit.svg)](https://gitter.im/floraison/fugit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Time zones for [fugit](https://github.com/floraison/fugit) and for [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler). Urbi et Orbi.
 

data/lib/et-orbi/time.rb

@@ -88,20 +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
+
       @zone = self.class.get_tzone(zone || :current)
+
+      touch
+
+      @zone
     end
 
     # Returns true if this EoTime instance corresponds to 2 different UTC
@@ -230,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
@@ -301,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)
@@ -330,16 +349,22 @@ module EtOrbi
         - count_weeks(EtOrbi.make_time(strftime('%F 12:00:00 %/Z')) , 1) ]
     end
 
+    # "reference week", used in fugit for cron modulo notation
+    #
     def rweek
 
-      ((self - EtOrbi.make_time('2019-01-01 00:00:00', @zone)) / WEEK_S)
-        .floor + 1
+      @ref ||= EtOrbi.make_time('2019-01-01 12:00:00', @zone)
+
+      ((self - @ref) / WEEK_S).floor + 1
     end
 
+    # "reference week", used in fugit for cron modulo notation
+    #
     def rday
 
-      ((self - EtOrbi.make_time('2019-01-01 00:00:00', @zone)) / DAY_S)
-        .floor + 1
+      @ref ||= EtOrbi.make_time('2019-01-01 00:00:00', @zone)
+
+      ((self - @ref) / DAY_S).floor + 1
     end
 
     def reach(points)
@@ -374,6 +399,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.7'
+  VERSION = '1.2.9'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -82,7 +82,7 @@ metadata:
   bug_tracker_uri: https://github.com/floraison/et-orbi/issues
   homepage_uri: https://github.com/floraison/et-orbi
   source_code_uri: https://github.com/floraison/et-orbi
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: time with zones
 test_files: []