aixm 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d03e0c2f0496021ac6e662b63d10dca97af04c504cee47ffeea6fbd436f4f86
-  data.tar.gz: 0a5b7aa05457930b6e3165c6a90d795135838583fbaca0e0a9912e7f918694c2
+  metadata.gz: 17c37db68c0bd400f252a05376c97844c89287a062c0dc26ceb4e8b4fc53fe62
+  data.tar.gz: 9fd668c694f127adfe07bceb74765785d913bb65413b93330e6870e8ce8761ee
 SHA512:
-  metadata.gz: eff09280b4e5054eee95423f6e4452e54531ea5829427b0a5d982a7698e75503918bbdf7e4fc1214c8a4710c121f53a508f705bbe768744a76ee49ecbdef34e4
-  data.tar.gz: d52511df16c8acaf217278bb7fc222b3dda1fb557dbeffb1b37c8a9c10dce36cbef67b1785177238f359a7f33918a4ac28322198ac3f92f50845f2fee351376d
+  metadata.gz: 4b594ea96f955f07ad380ec021a6b330eb4ec569d92b9dc44897bdc46603431057db81c2091cefddab50d5d6ed1b12ad9cafd13be5fca20627bcaeb7f481cc15
+  data.tar.gz: 5b1910e5db2280d5e74a93ec7709c5ee7972ad1328b5de01c2c542f4c4c02b2e03bdfeeefd5ffd253078f8c65e4acc756d1ae606c116a1ba13d4f4f46ac67752

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-������<�F?5
�eg���LyɊ�^�A�ćeF�T����"�H���?�<#V�ʯ&x�ҷy��Iw��-����{�e}/}�^���9�!�+_�2�U��K(
�A�n��B͗Џf=x��G�����]�&eMFG��CN)[�4;�������G8�H0�����k�<��P��
z��ܞh:�m2�1�D$Á��
-��G����n��j�g�d-w"��R���F��+�6�g�E{o��NI�GD�
+6��h';������Y=��Qb�	W5}X�я�iL|T�1��
lb�Q��W1�
+¼�{��]�jV�6
+!c�%���R�y���7�-?���Qh�ܒ��i�����t�J`�����h�es1߫o7v�B�I��D����m�)���&h��Q���j�CG��iӌ>�DuE����
+�`\

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Nothing so far
 
+## 1.4.2
+
+#### Changes
+* Fix 00:00 vs. 24:00 calculation for times with time zones
+
 ## 1.4.1
 
 #### Changes

data/lib/aixm/schedule/time.rb

@@ -29,7 +29,7 @@ module AIXM
 
       EVENTS = { sunrise: :up, sunset: :down }.freeze
       PRECEDENCES = { first: :min, last: :max }.freeze
-      DATELESS_DATE = ::Date.parse('0000-01-01').freeze
+      DATELESS_DATE = ::Date.parse('0001-01-01').freeze
 
       # @api private
       attr_accessor :time
@@ -250,10 +250,15 @@ module AIXM
       # @param hour [Integer, String]
       # @param min [Integer, String]
       # @param offset [Integer, String] either UTC offset in seconds
-      #   (default: 0) or 'UTC'
+      #   (default: 0), as '+01:00', '-0300' or 'UTC'
       # @return [Time]
       def set_time(hour, min, offset)
-        @time = ::Time.new(DATELESS_DATE.year, DATELESS_DATE.month, DATELESS_DATE.day, hour, min, 0, offset || 0).utc
+# TODO: Colon-workaround can be removed when support of Ruby 3.0 has ended
+        coloned_offset = offset.is_a?(String) ? offset.sub(/([+-]\d{2})(\d{2})/, '\1:\2') : offset
+        utc = ::Time.new(1, 1, 1, hour, min, 0, coloned_offset || 0).utc
+#       utc = ::Time.new(1, 1, 1, hour, min, 0, offset || 0).utc
+        day_shift = utc.hour.zero? && utc.min.zero? && hour.to_i >= 12 ? 1 : 0
+        @time = ::Time.utc(DATELESS_DATE.year, DATELESS_DATE.month, DATELESS_DATE.day + day_shift, utc.hour, utc.min, 0)
       end
 
       def event=(value)
@@ -267,7 +272,7 @@ module AIXM
       end
 
       def end_of_day?
-        @time.day > DATELESS_DATE.day
+        @time.day != DATELESS_DATE.day
       end
 
       # @note Necessary to use this class in Range.

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.4.1".freeze
+  VERSION = "1.4.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri