fugit 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85cb2e1a6f9e87e56f09bd46ebc0f23cf41ebc9
-  data.tar.gz: 2c7c9aeb2e20be568fd41d14bea36aa325077134
+  metadata.gz: 4814a18c1285406d94b93d1ae579c0e26f541653
+  data.tar.gz: 74fa964320d7596ee309edf6f418f714893ae813
 SHA512:
-  metadata.gz: abdc614b1f22423e38cd28d89f3a75b7cb53f5c739f007645fc0957e09fde31b78ffa18ac80c85f3cd178ade3102b917edcc1ef540431be75edfb1db4f81ccb4
-  data.tar.gz: df991f815915b44e0fb094a7dcda59f1b3e304c03d1b6ea708a8f6bfceedd1873ad481d1cde8f70db32465af2fe7e4cae34789a0e0344393361e98d79cdaa383
+  metadata.gz: 1e6039af8e976c6839e34e84f7c2d17eddbde91acd12b91f1f113c2946aac5826a384a55d8fc6d5cdf0042f864ca8ba35882e5a96fc5d04467c0825084641c8a
+  data.tar.gz: c02ee46cf23803f967b086bfa14a19137339733bc73a732358c721e6ce88384d7b432fedb7a2dea22f25913c32316a1a1210ca6d63bbf0f600d79ae192b0ec46

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 # CHANGELOG.md
 
 
+## fugit 1.2.3 released 2019-07-16
+
+* Allow for "from Monday to Friday at 19:22", gh-25
+* Allow for "every Monday to Friday at 18:20", gh-25
+* Allow for "every day at 18:00 and 20:00", gh-24
+
+
 ## fugit 1.2.2 released 2019-06-21
 
 * Fix Fugit.parse vs "every 15 minutes", gh-22

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Shai Coleman https://github.com/shaicoleman parse_nat enhancements, gh-24 and gh-25
 * Jan Stevens https://github.com/JanStevens Fugit.parse('every 15 minutes') gh-22
 * Fabio Pitino https://github.com/hspazio nil on February 30 gh-21
 * Cristian Oneț https://github.com/conet #previous_time vs 1/-1 endless loop gh-15

data/README.md

@@ -54,6 +54,39 @@ Fugit.parse('2017-12-12 UTC').class      # ==> ::EtOrbi::EoTime
 Fugit.parse('every day at noon').class   # ==> ::Fugit::Cron
 ```
 
+If fugit cannot extract a cron, duration or point in time out of the string, it will return nil.
+```ruby
+Fugit.parse('nada')
+  # ==> nil
+```
+
+## `Fugit.do_parse(s)`
+
+`Fugit.do_parse(s)` is equivalent to `Fugit.parse(s)`, but instead of returning nil, it raises an error if the given string contains no time information.
+```
+Fugit.do_parse('nada')
+  # ==> /home/jmettraux/w/fugit/lib/fugit/parse.rb:32
+  #     :in `do_parse': found no time information in "nada" (ArgumentError)
+```
+
+## parse_cron, parse_in, parse_at, parse_duration, and parse_nat
+
+```ruby
+require 'fugit'
+
+Fugit.parse_cron('0 0 1 jan *').class       # ==> ::Fugit::Cron
+Fugit.parse_duration('12y12M').class        # ==> ::Fugit::Duration
+
+Fugit.parse_at('2017-12-12').class          # ==> ::EtOrbi::EoTime
+Fugit.parse_at('2017-12-12 UTC').class      # ==> ::EtOrbi::EoTime
+
+Fugit.parse_nat('every day at noon').class  # ==> ::Fugit::Cron
+```
+
+## do_parse_cron, do_parse_in, do_parse_at, do_parse_duration, and do_parse_nat
+
+As `Fugit.parse(s)` returns nil when it doesn't grok its input, and `Fugit.do_parse(s)` fails when it doesn't grok, each of the `parse_` methods has its partner `do_parse_` method.
+
 ## `Fugit::Cron`
 
 A class `Fugit::Cron` to parse cron strings and then `#next_time` and `#previous_time` to compute the next or the previous occurrence respectively.
@@ -199,6 +232,7 @@ Fugit::Nat.parse('every day at 5 pm')                         # ==> '0 17 * * *'
 Fugit::Nat.parse('every tuesday at 5 pm')                     # ==> '0 17 * * 2'
 Fugit::Nat.parse('every wed at 5 pm')                         # ==> '0 17 * * 3'
 Fugit::Nat.parse('every day at 16:30')                        # ==> '30 16 * * *'
+Fugit::Nat.parse('every day at 16:00 and 18:00')              # ==> '0 16,18 * * *'
 Fugit::Nat.parse('every day at noon')                         # ==> '0 12 * * *'
 Fugit::Nat.parse('every day at midnight')                     # ==> '0 0 * * *'
 Fugit::Nat.parse('every tuesday and monday at 5pm')           # ==> '0 17 * * 1,2'

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end
 
 require 'time'

data/lib/fugit/nat.rb

@@ -8,7 +8,7 @@ module Fugit
 
     class << self
 
-      def parse(s)
+      def parse(s, opts={})
 
         return s if s.is_a?(Fugit::Cron) || s.is_a?(Fugit::Duration)
 
@@ -17,20 +17,23 @@ module Fugit
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colours: true)
         a = Parser.parse(s)
 
-        if a && a.include?([ :flag, 'every' ])
-          parse_cron(a)
-        else
-          nil
-        end
+        return nil unless a
+
+        return parse_cron(a, opts) \
+          if a.include?([ :flag, 'every' ])
+        return parse_cron(a, opts) \
+          if a.include?([ :flag, 'from' ]) && a.find { |e| e[0] == :day_range }
+
+        nil
       end
 
-      def do_parse(s)
+      def do_parse(s, opts={})
 
-        parse(s) ||
+        parse(s, opts) ||
         fail(ArgumentError.new("could not parse a nat #{s.inspect}"))
       end
 
-      def parse_cron(a)
+      def parse_cron(a, opts={})
 
         h = { min: nil, hou: [], dom: nil, mon: nil, dow: nil }
         hkeys = h.keys
@@ -41,10 +44,12 @@ module Fugit
           elsif key == :simple_hour || key == :numeral_hour
             h[:hou] << val
           elsif key == :digital_hour
-            h[:hou] = [ val[0] ]
-            h[:min] = [ val[1] ]
+            (h[:hou] ||= []) << val[0].to_i
+            (h[:min] ||= []) << val[1].to_i
           elsif key == :name_day
             (h[:dow] ||= []) << val
+          elsif key == :day_range
+            (h[:dow] ||= []) << val.collect { |v| v.to_s[0, 3] }.join('-')
           elsif key == :flag && val == 'pm' && h[:hou]
             h[:hou][-1] = h[:hou][-1] + 12
           elsif key == :tz
@@ -54,6 +59,7 @@ module Fugit
           end
         end
         h[:min] ||= [ 0 ]
+        h[:min].uniq!
         h[:hou].sort! if h[:hou]
         h[:dow].sort! if h[:dow]
 
@@ -65,9 +71,12 @@ module Fugit
         a << h[:tz].first if h[:tz]
         s = a.join(' ')
 
+#p s
         Fugit::Cron.parse(s)
       end
 
+      protected
+
       def process_duration(h, interval, value)
 
         send("process_duration_#{interval}", h, value)
@@ -137,6 +146,12 @@ module Fugit
       def biz_day(i); rex(:biz_day, i, /(biz|business|week) *day/i); end
       def name_day(i); rex(:name_day, i, /#{WEEKDAYS.reverse.join('|')}/i); end
 
+      def range_sep(i); rex(nil, i, / *- *| +(to|through) +/); end
+
+      def day_range(i)
+        seq(:day_range, i, :name_day, :range_sep, :name_day)
+      end
+
       def _tz_name(i)
         rex(nil, i, /[A-Z][a-zA-Z0-9+\-]+(\/[A-Z][a-zA-Z0-9+\-_]+){0,2}/)
       end
@@ -155,10 +170,11 @@ module Fugit
           /ix)
       end
 
-      def flag(i); rex(:flag, i, /(every|at|after|am|pm|on|in)/i); end
+      def flag(i); rex(:flag, i, /(every|from|at|after|am|pm|on|in)/i); end
 
       def datum(i)
         alt(nil, i,
+          :day_range,
           :plain_day, :biz_day, :name_day,
           :_tz,
           :flag,
@@ -199,6 +215,8 @@ module Fugit
               [ :digital_hour, NHOURS[v] ]
             when :name_day
               [ k, WEEKDAYS.index(v[0, 3]) ]
+            when :day_range
+              [ k, tt.subgather(nil).collect { |st| st.string.downcase } ]
             else
               [ k, v ]
             end }

data/lib/fugit/parse.rb

@@ -5,13 +5,13 @@ module Fugit
 
     def parse_cron(s); ::Fugit::Cron.parse(s); end
     def parse_duration(s); ::Fugit::Duration.parse(s); end
-    def parse_nat(s); ::Fugit::Nat.parse(s); end
+    def parse_nat(s, opts={}); ::Fugit::Nat.parse(s, opts); end
     def parse_at(s); ::Fugit::At.parse(s); end
     def parse_in(s); parse_duration(s); end
 
     def do_parse_cron(s); ::Fugit::Cron.do_parse(s); end
     def do_parse_duration(s); ::Fugit::Duration.do_parse(s); end
-    def do_parse_nat(s); ::Fugit::Nat.do_parse(s); end
+    def do_parse_nat(s, opts={}); ::Fugit::Nat.do_parse(s, opts); end
     def do_parse_at(s); ::Fugit::At.do_parse(s); end
     def do_parse_in(s); do_parse_duration(s); end
 
@@ -21,7 +21,7 @@ module Fugit
 
       (opts[:cron] != false && parse_cron(s)) ||
       (opts[:duration] != false && parse_duration(s)) ||
-      (opts[:nat] != false && parse_nat(s)) ||
+      (opts[:nat] != false && parse_nat(s, opts)) ||
       (opts[:at] != false && parse_at(s)) ||
       nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro