fugit 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4814a18c1285406d94b93d1ae579c0e26f541653
-  data.tar.gz: 74fa964320d7596ee309edf6f418f714893ae813
+  metadata.gz: 57336fd846b610ad0c361564a8025f3ccb752025
+  data.tar.gz: 4effff19a32313a7eefad03b6ba1eebe1d056e62
 SHA512:
-  metadata.gz: 1e6039af8e976c6839e34e84f7c2d17eddbde91acd12b91f1f113c2946aac5826a384a55d8fc6d5cdf0042f864ca8ba35882e5a96fc5d04467c0825084641c8a
-  data.tar.gz: c02ee46cf23803f967b086bfa14a19137339733bc73a732358c721e6ce88384d7b432fedb7a2dea22f25913c32316a1a1210ca6d63bbf0f600d79ae192b0ec46
+  metadata.gz: 429bc3055890b87c7a1cb78da8d713844f73de3bc162295ce7e0688179800caec9c5bb96b792276b1bf71ee40de1cee50070553ccbeb98e6150abe7b168b3f9c
+  data.tar.gz: 95fa1fc74e5ebdef176edd772d7978f8c845ecd9d9e465450ae3d61d6d7cebca89bca8cb43cc1e1e4986ff22a392fb08c58525d4ed5c5a9cd31ee8539efd4738

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## fugit 1.3.0 released 2019-07-21
+
+* Introduce Fugit.parse_nat('every day at 18:00 and 19:15', multi: true)
+* Rework AM/PM parsing
+
+
 ## fugit 1.2.3 released 2019-07-16
 
 * Allow for "from Monday to Friday at 19:22", gh-25

data/README.md

@@ -250,6 +250,21 @@ Directly with `Fugit.parse(s)` is OK too:
 Fugit.parse('every day at five')  # ==> Fugit::Cron instance '0 5 * * *'
 ```
 
+### Ambiguous nats
+
+Not all strings result in a clean, single, cron expression.
+
+```ruby
+Fugit::Nat.parse('every day at 16:00 and 18:00', multi: true)
+  # ==> [ '0 16,18 * * *' ]
+Fugit::Nat.parse('every day at 16:15 and 18:30')
+  # ==> [ '15 16 * * *' ]
+Fugit::Nat.parse('every day at 16:15 and 18:30', multi: true)
+  # ==> [ '15 16 * * *', '30 18 * * *' ]
+Fugit::Nat.parse('every day at 16:15 and 18:30', multi: :fail)
+  # ==> ArgumentError: multiple crons in "every day at 16:15 and 18:30" (15 16 * * * | 30 18 * * *)
+```
+
 
 ## LICENSE
 

data/lib/fugit.rb

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

data/lib/fugit/nat.rb

@@ -19,9 +19,9 @@ module Fugit
 
         return nil unless a
 
-        return parse_cron(a, opts) \
+        return parse_crons(s, a, opts) \
           if a.include?([ :flag, 'every' ])
-        return parse_cron(a, opts) \
+        return parse_crons(s, a, opts) \
           if a.include?([ :flag, 'from' ]) && a.find { |e| e[0] == :day_range }
 
         nil
@@ -33,7 +33,35 @@ module Fugit
         fail(ArgumentError.new("could not parse a nat #{s.inspect}"))
       end
 
-      def parse_cron(a, opts={})
+      protected
+
+      def parse_crons(s, a, opts)
+
+        dhs, aa =
+          a.partition { |e| e[0] == :digital_hour }
+        dms =
+          dhs.collect { |dh| dh[1][1] }.uniq
+
+        crons =
+          if dhs.empty? || dms.size == 1
+            [ parse_cron(a, opts) ]
+          else
+            dhs.collect { |dh| parse_cron([ dh ] + aa, opts) }
+          end
+
+        fail ArgumentError.new(
+          "multiple crons in #{s.inspect} " +
+          "(#{crons.collect(&:original).join(' | ')})"
+        ) if opts[:multi] == :fail && crons.size > 1
+
+        if opts[:multi]
+          crons
+        else
+          crons.first
+        end
+      end
+
+      def parse_cron(a, opts)
 
         h = { min: nil, hou: [], dom: nil, mon: nil, dow: nil }
         hkeys = h.keys
@@ -50,8 +78,6 @@ module Fugit
             (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
             h[:tz] = val
           elsif key == :duration
@@ -75,8 +101,6 @@ module Fugit
         Fugit::Cron.parse(s)
       end
 
-      protected
-
       def process_duration(h, interval, value)
 
         send("process_duration_#{interval}", h, value)
@@ -129,15 +153,28 @@ module Fugit
 
       # piece parsers bottom to top
 
+      def am_pm(i)
+        rex(:am_pm, i, / *(am|pm)/i)
+      end
+
       def digital_hour(i)
         rex(:digital_hour, i, /(2[0-4]|[01][0-9]):?[0-5]\d/)
       end
+
+      def _simple_hour(i)
+        rex(:sh, i, /(2[0-4]|[01]?[0-9])/)
+      end
       def simple_hour(i)
-        rex(:simple_hour, i, /(2[0-4]|[01]?[0-9])/)
+        seq(:simple_hour, i, :_simple_hour, :am_pm, '?')
+      end
+
+      def _numeral_hour(i)
+        rex(:nh, i, /(#{NUMS.join('|')})/i)
       end
       def numeral_hour(i)
-        rex(:numeral_hour, i, /(#{NUMS.join('|')})/i)
+        seq(:numeral_hour, i, :_numeral_hour, :am_pm, '?')
       end
+
       def name_hour(i)
         rex(:name_hour, i, /(#{NHOURS.keys.join('|')})/i)
       end
@@ -170,7 +207,7 @@ module Fugit
           /ix)
       end
 
-      def flag(i); rex(:flag, i, /(every|from|at|after|am|pm|on|in)/i); end
+      def flag(i); rex(:flag, i, /(every|from|at|after|on|in)/i); end
 
       def datum(i)
         alt(nil, i,
@@ -204,10 +241,6 @@ module Fugit
               [ k, [ tt.string.strip, EtOrbi.get_tzone(tt.string.strip) ] ]
             when :duration
               [ k, [ Fugit::Duration.parse(tt.string.strip) ] ]
-            when :numeral_hour
-              [ k, NUMS.index(v) ]
-            when :simple_hour
-              [ k, v.to_i ]
             when :digital_hour
               v = v.gsub(/:/, '')
               [ k, [ v[0, 2], v[2, 2] ] ]
@@ -217,6 +250,11 @@ module Fugit
               [ k, WEEKDAYS.index(v[0, 3]) ]
             when :day_range
               [ k, tt.subgather(nil).collect { |st| st.string.downcase } ]
+            when :numeral_hour, :simple_hour
+              vs = tt.subgather(nil).collect { |ttt| ttt.string.downcase.strip }
+              v = k == :simple_hour ? vs[0].to_i : NUMS.index(vs[0])
+              v += 12 if vs[1] == 'pm'
+              [ k, v ]
             else
               [ k, v ]
             end }

metadata

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