aixm 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1dc4f9cb88ab4e481f835ca4d309142c6a17910b396f4293a6d9e7d3f946ec6
-  data.tar.gz: 244adc808983bc3e810fb5847051a89dbd0893df3d2c709943d2c7231acfb434
+  metadata.gz: ce948465612571ae319c68d7f0eff0664d41c696440fb190298ac475b0e3105d
+  data.tar.gz: 402358be48d240b24baef522ace4c501b1c685073ef28be35ce70985a5eaa9e8
 SHA512:
-  metadata.gz: ac00f735cca36dc6b1b0ec00c671dcbcbdb1e14c0d051fc8d865737e9ac1363d5648f5df69098b0daf721688c541a79188cac3603a07e01f8719fde3c8070d91
-  data.tar.gz: 59d6ffb78fcb04104838bc4fb0ba50e7f3c5d526e921410e4300d08dafa08a2aa9cd1d637d374d7e5428d05c56e5f66186377a2f32fb6bff6c14ce5539044884
+  metadata.gz: ee675af09c87b12e15bd50e2b2a2c8f00b457cb6ec53c8ee3d16d1b1b5965e410687c2f24f51c49a9673cef00d882f2ef6101e6af780161d33f6f898ff903f9f
+  data.tar.gz: da8135812e7dd27baeb8068b8eefd6004467370763170737c18258b09cdc520bf09aad70fd6eb4c567dd39d5920c46ac1fd87a0ca5e30895c33b684fdf52ab73

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Nothing so far
 
+## 1.2.1
+
+#### Additions
+* Rounding of `AIXM::Schedule::Time`
+
 ## 1.2.0
 
 #### Additions

data/lib/aixm/schedule/time.rb

@@ -23,7 +23,7 @@ module AIXM
       include AIXM::Concerns::HashEquality
       extend Forwardable
 
-      EVENTS = %i(sunrise sunset).freeze
+      EVENTS = { sunrise: :up, sunset: :down }.freeze
       PRECEDENCES = { first: :min, last: :max }.freeze
       DATELESS_DATE = ::Date.parse('0000-01-01').freeze
 
@@ -32,7 +32,7 @@ module AIXM
 
       # Event or alternative to time
       #
-      # @return [Symbol, nil] any from {EVENTS}
+      # @return [Symbol, nil] any key from {EVENTS}
       attr_reader :event
 
       # Minutes added or subtracted from event
@@ -47,6 +47,10 @@ module AIXM
 
       # Parse the given representation of time.
       #
+      # @note Unlike its twin from the stdlib, this class differs between
+      #   +AIXM.time('00:00')+ (beginning of day) and +AIXM.time('24:00')+
+      #   (end of day).
+      #
       # @example
       #   AIXM.time('08:00')
       #   AIXM.time(:sunrise)
@@ -58,8 +62,8 @@ module AIXM
       #
       # @param time_or_event [Time, DateTime, String, Symbol] either time as
       #   stdlib Time or DateTime, "HH:MM" (implicitly UTC), "HH:MM [+-]00:00",
-      #   "HH:MM UTC" or event from {EVENTS} as Symbol
-      # @param or [Symbol] alternative event from {EVENTS}
+      #   "HH:MM UTC" or any key from {EVENTS}
+      # @param or [Symbol] alternative event, any key from {EVENTS}
       # @param plus [Integer] minutes added to event
       # @param minus [Integer] minutes subtracted from event
       # @param whichever_comes [Symbol] any key from {PRECEDENCES}
@@ -127,7 +131,8 @@ module AIXM
         return self unless hour || min
         min ||= time.min
         hour ||= time.hour
-        hour = (hour + 1) % 24 if wrap && min < time.min
+        hour = hour + 1 if wrap && min < time.min
+        hour = hour % 24 unless min.zero?
         self.class.new("%02d:%02d" % [hour, min])
       end
 
@@ -144,17 +149,17 @@ module AIXM
       #
       # @param on [AIXM::Date] defaults to today
       # @param xy [AIXM::XY]
+      # @param round [Integer, nil] round up (sunrise) or down (sunset) to the
+      #   given minutes or +nil+ in order not to round round
       # @return [AIXM::Schedule::Time, self]
-      def resolve(on:, xy:)
+      def resolve(on:, xy:, round: nil)
         if resolved?
           self
         else
           sun_time = self.class.new(Sun.send(event, on.to_date, xy.lat, xy.long).utc + (delta * 60))
-          if time
-            self.class.new([sun_time.time, self.time].send(PRECEDENCES.fetch(precedence)))
-          else
-            sun_time
-          end
+          sun_time = self.class.new([sun_time.time, self.time].send(PRECEDENCES.fetch(precedence))) if time
+          sun_time = sun_time.round(EVENTS.fetch(event) => round) if round
+          sun_time
         end
       end
 
@@ -165,6 +170,22 @@ module AIXM
         !event
       end
 
+      # Round this time up or down.
+      #
+      # @param up [Integer, nil] round up to the next given minutes
+      # @param down [Integer, nil] round down to the next given minutes
+      # @return [AIXM::Schedule::Time, self]
+      def round(up: nil, down: nil)
+        step = up || down || fail(ArgumentError, "either up or down is mandatory")
+        rounded_min = min / step * step
+        if rounded_min == min
+          self
+        else
+          rounded_min = (rounded_min + step) % 60 if up
+          at(min: rounded_min, wrap: !!up)
+        end
+      end
+
       # Stdlib Time equivalent using the value of {DATELESS_DATE} to represent a
       # time only.
       #
@@ -232,7 +253,7 @@ module AIXM
       end
 
       def event=(value)
-        fail ArgumentError if value && !EVENTS.include?(value)
+        fail ArgumentError if value && !EVENTS.has_key?(value)
         @event = value
       end
 

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sven Schwyn
@@ -30,7 +30,7 @@ cert_chain:
   1+2Y1+i+4jd1B7qxIgOLxQTNIJiwE0sqU1itFfuesfgUACS7M0IV9u9Bp4hBGNEw
   5JcY2h7owdMxXIvgk1oakgldFJc=
   -----END CERTIFICATE-----
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder

metadata.gz.sig

@@ -1 +1,3 @@
-?9{�N�a��Ƌ9y�ń$����*�ʈ��{���1;V� �!��*1�b[߷L�D�d�:�A.��VV�?e�GT^5��[���� �2wsξS�3����2�Eh�d��S><�ׇ!����RyMAG�����9�I���
1�D鹵�Y�WG��~<�IíH���L[O޾����G�d^
�v{�r��d����g�!�<8�ӷh�$�m�A�D�;�ϲqWģ�ΦlT�B��w���Ć�
+}�j�%�1dZX{I������:�bq�K�@�b�b��l��he�P�cM��AV.蚲�%�i:OX�+�`<�
��En2��ʎT���!)b��@ЅZ>1�ח�
+S4�z���4D�qvh��܋w��%U7�(���Z�oH@�C�v�ǟ������82ʿk�E(I@��>�[&���|�x4�o�{�ǍqEP���v�$��&��aI�ټ�"�iz�;c���M�X����7(�؝
+F}Ue�h�0