et-orbi 1.2.5 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee673cb530f7c10cff490be7104ce58f7ed2aaba9824169e9598c29f136dc22c
-  data.tar.gz: 25f5e2700473dfd30ae472388b298a9caa1ceae2bd4ed4985f800953f453c3b4
+  metadata.gz: 23ff138170f965f0a2dc35d38aaa08123ddfd97176d76f5e1b2136306eec812e
+  data.tar.gz: 193d8bca6b8cfb34f023aadb504e127fd3f187eb64c10f546327510c8f487e04
 SHA512:
-  metadata.gz: 68014f7b6df2c3cb55b0ef4b7b7405db4f65ee1e583b95c13dfeb4138cd370a64eeacdd26bf519618613caf4851eea1609c148d1851207cbec1e514ec34f9e48
-  data.tar.gz: 2f00a51829515e0b9d49b536b2a5914aa916a9eff1ffb623b32416182220b4b635bc12216a247172aee798b4e524f3fc7bac0f5f23c903bf77f22dd39ae8d18d
+  metadata.gz: 9a5747b65189567c49a9dda0936bac7d947deaa8a5067ba4d311d1c80032722baae682acfc111488d8c6b3139fa41238dfec645279983449312c6f5aa8881eb9
+  data.tar.gz: 2173668af72a6c2aff4e992201d5c74ffe5f87023f6e52c4c42389c28bb8cab4a231c55142bbc9c12513173260c80bf3b372c0ccad555900f6a7efad01e35482

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 # CHANGELOG.md
 
 
+## 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
+
+
 ## et-orbi 1.2.5  released 2021-09-18
 
 - Re-use the DateTime.parse result

data/CREDITS.md

@@ -1,6 +1,9 @@
 
 # et-orbi credits
 
+* 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-2022, 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/lib/et-orbi/make.rb

@@ -86,8 +86,8 @@ module EtOrbi
       z =
         zone ||
         get_as_tzone(t) ||
-        get_tzone(t.zone) ||
-        get_local_tzone(t)
+        get_local_tzone(t) ||
+        get_tzone(t.zone)
 
       z ||= t.zone
         # pass the abbreviation anyway,

data/lib/et-orbi/time.rb

@@ -326,7 +326,8 @@ 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
 
     def rweek
@@ -385,10 +386,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.5'
+  VERSION = '1.2.7'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et-orbi
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo