et-orbi 1.2.6 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187fde2e940f4644e296f434208de71ceeced5bacd257fcc7a799e08e5b3fc2f
-  data.tar.gz: 7c9425490c4cb365453031032faa159fe1111d5bc606a2ad88d7a3cede16d660
+  metadata.gz: 149c5b95f1f67702640cb1b202d768bec7e215bb6335f9ec73f247d65edb6298
+  data.tar.gz: 6e559b757f53c60daef8be08c9c9af0d48378e203cc3d7cbb5582b4bb758b051
 SHA512:
-  metadata.gz: 00f33cb173d79780c87e68d16e4ba64187f37ac9bde5eeafef7169846a597bf1708eeb6cf053d18b74a3030d84c0bfa8ced97898edc9ec5a4886b8470e41d31c
-  data.tar.gz: a5878f8ae60c18404c53d38a58b347916236138af79c90c8a35fb170fc559e85d89336b08b6ea4453a9001b9a4405c8df8aeeed126202f4e6d379d2a443e20ca
+  metadata.gz: 58d548986bc13f557c88cb862f52c10faa9211489a0daa0de7691eea5473905554a3257166d689c128d1a14d97c000713de17ee5064c557eaf601f718ee26b2b
+  data.tar.gz: 4919107bc2091bb8be87af751e86f75bf99f5f29fae457f12321b85bfc38ec38ad47a533e4a706f27bbd409b0bd92e479c9f44b9b01f5dc2adc18a839b2232cc

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 # CHANGELOG.md
 
 
+## et-orbi 1.2.8  released 2024-03-11  (13 years)
+
+- 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
+
+
 ## et-orbi 1.2.6  released 2021-10-30
 
 - Favour IANA timezone name in EtOrbi.make_time

data/CREDITS.md

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

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2021, 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

@@ -101,6 +101,8 @@ module EtOrbi
     def zone=(z)
 
       @time = nil
+      @ref = nil
+
       @zone = self.class.get_tzone(zone || :current)
     end
 
@@ -326,19 +328,26 @@ module EtOrbi
 
     def wday_in_month
 
-      [ count_weeks(-1), - count_weeks(1) ]
+      [ count_weeks(EtOrbi.make_time(strftime('%F 12:00:00 %/Z')), -1),
+        - 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 00: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)
@@ -385,10 +394,11 @@ module EtOrbi
       @time ||= @zone.utc_to_local(utc)
     end
 
-    def count_weeks(dir)
+    def count_weeks(start, dir)
 
       c = 0
-      t = self
+      t = start
+
       until t.month != self.month
         c += 1
         t += dir * (7 * 24 * 3600)

data/lib/et-orbi.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2024-03-11 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.2.33
+signing_key:
 specification_version: 4
 summary: time with zones
 test_files: []