sourced-message 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f851a99f35af7389e8aeaa9a62e174c9c76fe83c7123ccf245160672250534b
-  data.tar.gz: af633b34af3853e032e2b4735394dec70b03bcce4e19b1dacd54f80cf76382f3
+  metadata.gz: 80569ac57d96516a6efd3bd8c09ef862a7c48d9e661fb82404476608995c6350
+  data.tar.gz: a480b3c5007cab3ad87f242a5828a548e294150ef2ad65b5afdc2dc98d53423c
 SHA512:
-  metadata.gz: 46637a045f56cd99c1ead9dba880d6d846a58106d7d8200c35606fc21d484f92514f310cad4fc1f3ea20298c9e356a875069a4c076c9a40c73a7cc7ebdc1be85
-  data.tar.gz: 83972e23b181caa04596cb6235a5fe0aec375bf6795967a12157c1b104c1b5e380c37a246afff29ce57c3fa909847ade958567b0b90ff1af2831c7c922353846
+  metadata.gz: bae04d8962a7e19f8f21985b674b29e0ddb90987934a51504e8eeba4e357b7925b983c4e9cee10b719b0598ecae963af0dccbd79efb0679a44ace463184e6c37
+  data.tar.gz: df823ccc2eab96eaddba05255f0776b069dfa57004bb58f2337f9de8aeedd29fe3d30ed04ed7e72ac0211c0e6195110cb19bbd735014fefd76013aa975349f24

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+- `Message#at` with a duration string (`'1h30m'`) raised `ArgumentError` ("Cannot
+  determine timezone from \"BST\"") in the hour the clocks go back. The duration's
+  seconds are now added to `Time.now`, exactly. Durations in months or years, which
+  aren't a fixed number of seconds, raise `ArgumentError`.
 - `Message::Registry` raises `DuplicateTypeError` when two classes with different names
   claim one type string, instead of silently replacing the registered class. Registering
   a type again is still allowed when the names are equal (a code reloader redefining a

data/README.md

@@ -372,10 +372,11 @@ Scheduling a message into the past raises `Sourced::Message::PastMessageDateErro
 msg.at(Time.now - 60) # => raises Sourced::Message::PastMessageDateError
 ```
 
-Passing a string that isn't a duration (e.g. an absolute date) raises `ArgumentError`:
+Passing a string that isn't a duration (e.g. an absolute date) raises `ArgumentError`, as does a duration in months or years, which vary in length (give days instead):
 
 ```ruby
 msg.in('2026-12-31T10:00:00') # => raises ArgumentError
+msg.in('1M')                  # => raises ArgumentError; msg.in('30d') instead
 ```
 
 ### Pattern matching with `case`/`when`

data/lib/sourced/message.rb

@@ -22,7 +22,7 @@ module Sourced
   # +Sourced::Message.registry[type]+ resolves a type registered under any
   # subclass. Resolve from this root to see the whole tree.
   class Message < Plumb::Types::Data
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
 
     EMPTY_ARRAY = [].freeze
 
@@ -286,7 +286,9 @@ module Sourced
     #   target.
     # - +Integer+ — interpreted as seconds; added to +Time.now+.
     # - +String+ — parsed via +Fugit.parse_duration+ as a duration (e.g.
-    #   +'5m'+, +'1h30m'+, +'PT5M'+) and added to +Time.now+.
+    #   +'5m'+, +'1h30m'+, +'PT5M'+), up to weeks, and its seconds added to
+    #   +Time.now+. Months and years aren't a fixed number of seconds, so
+    #   they raise +ArgumentError+.
     #
     # Raises {PastMessageDateError} when the resolved target is
     # before +created_at+.
@@ -295,11 +297,7 @@ module Sourced
                when Integer
                  Time.now + value
                when String
-                 parsed = Fugit.parse_duration(value) or
-                   raise ArgumentError,
-                         "Message#at: String argument must be an ISO8601 / Fugit duration " \
-                         "(e.g. '5m', 'PT1H30M'); got #{value.inspect}"
-                 parsed.add_to_time(Time.now).to_local_time
+                 Time.now + duration_seconds(value)
                else
                  value
                end
@@ -375,6 +373,21 @@ module Sourced
       attrs[:causation_id] = attrs[:id] unless attrs[:causation_id]
       attrs
     end
+
+    # A duration string's seconds, up to weeks.
+    def duration_seconds(value)
+      duration = Fugit.parse_duration(value) or
+        raise ArgumentError,
+              "Message#at: String argument must be an ISO8601 / Fugit duration " \
+              "(e.g. '5m', 'PT1H30M'); got #{value.inspect}"
+      if duration.h.key?(:yea) || duration.h.key?(:mon)
+        raise ArgumentError,
+              "Message#at: can't delay by months or years, which vary in length; " \
+              "give days (e.g. '30d'); got #{value.inspect}"
+      end
+
+      duration.to_sec
+    end
   end
 
   class Command < Message; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sourced-message
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ismael Celis