fugit 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a28ef486584f37659fbcf4e6e4fecfc76aa2a4a6e1fc61d25dd3c44cd3a5c3
-  data.tar.gz: db726ca071f0f98d0f59c3054fca04a537ec2a17fd302013b354d90e1d7dc3c8
+  metadata.gz: 90b61604e15e2cb24d4fb124306affea15a644c2591fc3a49649981616351d66
+  data.tar.gz: 235eec423691346077fd9cfdaed895e28843ecf6681b5aa00a83cfcf9ca711a3
 SHA512:
-  metadata.gz: d1105627f83fd730a7826047679edfd38ad7deb19960715e93769d5c04e80e0079b02b9513f9e5d01614e2e70b75a016a2e16b7a72f568e2a5d3072c42e7e1dc
-  data.tar.gz: eb4b14f1f564bd89ae919c16d6c06ef180b725c81b8d78225661b0a0fb34dee067063de9f2b883e6361e51c0db323224b6ee0a80ab3ca80dd9091a0e872ceae4
+  metadata.gz: 1fd5abf6871b1cb60220bf7d6089be6bff48dfae80a05db6d031def126275940d50cbc5dfcaad493f2b6d327b66162c2a44329966459bfb3d9d5b912e3b7e68c
+  data.tar.gz: '08a846fcce60834f8f0c289e14317249123f1f4028c478953ed04f759e633080c4d843f55c56fb973a104e1b44bbbbc92eecc978a954d7b0b317d7b23b82611b'

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## fugit 1.3.6 released 2020-06-01
+
+* Introduce new nat syntaxed, gh-38
+* Rework nat parser
+
+
 ## fugit 1.3.5 released 2020-05-07
 
 * Implement cron @noon, gh-37

data/CREDITS.md

@@ -1,6 +1,7 @@
 
 # fugit credits
 
+* Danny Ben Shitrit https://github.com/DannyBen nat variants, gh-38
 * Dominik Sander https://github.com/dsander #rough_frequency 0, gh-36
 * Milovan Zogovic https://github.com/assembler Cron#match? vs TZ, gh-31
 * Jessica Stokes https://github.com/ticky 0-24 issue with cron, gh-30

data/README.md

@@ -232,6 +232,29 @@ p d.to_plain_s  # => "2Y2M1D5h3600s"
 p Fugit::Duration.parse('1y2M1d4h').to_sec # => 36820800
 ```
 
+There is a `#deflate` method
+
+```ruby
+Fugit::Duration.parse(1000).to_plain_s # => "1000s"
+Fugit::Duration.parse(3600).to_plain_s # => "3600s"
+Fugit::Duration.parse(1000).deflate.to_plain_s # => "16m40s"
+Fugit::Duration.parse(3600).deflate.to_plain_s # => "1h"
+
+# or event shorter
+Fugit.parse(1000).deflate.to_plain_s # => "16m40s"
+Fugit.parse(3600).deflate.to_plain_s # => "1h"
+```
+
+There is also an `#inflate` method
+
+```ruby
+Fugit::Duration.parse('1h30m12').inflate.to_plain_s # => "5412s"
+Fugit.parse('1h30m12').inflate.to_plain_s # => "5412s"
+
+Fugit.parse('1h30m12').to_sec # => 5412
+Fugit.parse('1h30m12').to_sec.to_s + 's' # => "5412s"
+```
+
 The `to_*_s` methods are also available as class methods:
 ```ruby
 p Fugit::Duration.to_plain_s('1y2M1d4h')

data/fugit.gemspec

@@ -40,7 +40,7 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
   #s.add_runtime_dependency 'tzinfo'
     # this dependency appears in 'et-orbi'
 
-  s.add_runtime_dependency 'raabro', '~> 1.1'
+  s.add_runtime_dependency 'raabro', '~> 1.3'
   s.add_runtime_dependency 'et-orbi', '~> 1.1', '>= 1.1.8'
 
   s.add_development_dependency 'rspec', '~> 3.8'

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -757,7 +757,7 @@ module Fugit
 
       def rewrite_tz(t)
 
-        s = t.string.strip
+        s = t.strim
         z = EtOrbi.get_tzone(s)
 
         [ s, z ]

data/lib/fugit/nat.rb

@@ -16,16 +16,7 @@ module Fugit
 
 #p s; Raabro.pp(Parser.parse(s, debug: 3), colours: true)
 #(p s; Raabro.pp(Parser.parse(s, debug: 1), colours: true)) rescue nil
-        a = Parser.parse(s)
-
-        return nil unless a
-
-        return parse_crons(s, a, opts) \
-          if a.include?([ :flag, 'every' ])
-        return parse_crons(s, a, opts) \
-          if a.include?([ :flag, 'from' ]) && a.find { |e| e[0] == :day_range }
-
-        nil
+        parse_crons(s, Parser.parse(s), opts)
       end
 
       def do_parse(s, opts={})
@@ -38,16 +29,37 @@ module Fugit
 
       def parse_crons(s, a, opts)
 
-        hms, aa = a
-          .partition { |e| e[0] == :point && e[1][0] == :hour }
-        ms = hms
-          .inject({}) { |h, e| (h[e[1][1]] ||= []) << e[1][2]; h }
-          .values
+#p a
+        return nil unless a
+
+        h = a
+          .reverse
+          .inject({}) { |r, e| send("parse_#{e[0]}_elt", e, opts, r); r }
+            #
+            # the reverse ensure that in "every day at five", the
+            # "at five" is placed before the "every day" so that
+            # parse_x_elt calls have the right sequence
+#p h
+
+        if f = h[:_fail]
+          #fail ArgumentError.new(f)
+          return nil
+        end
+
+        hms = h[:hms]
+
+        hours = (hms || [])
           .uniq
-        crons =
-          ms.size > 1 ?
-          hms.collect { |e| parse_cron([ e ] + aa, opts) } :
-          [ parse_cron(a, opts) ]
+          .inject({}) { |r, hm| (r[hm[1]] ||= []) << hm[0]; r }
+          .inject({}) { |r, (m, hs)| (r[hs.sort] ||= []) << m; r }
+          .to_a
+          .sort_by { |hs, ms| -hs.size }
+        if hours.empty?
+          hours << (h[:dom] ? [ [ '0' ], [ '0' ] ] : [ [ '*' ], [ '*' ] ])
+        end
+
+        crons = hours
+          .collect { |hm| assemble_cron(h.merge(hms: hm)) }
 
         fail ArgumentError.new(
           "multiple crons in #{s.inspect} " +
@@ -61,299 +73,451 @@ module Fugit
         end
       end
 
-      def parse_cron(a, opts)
-
-        h = { min: nil, hou: nil, dom: nil, mon: nil, dow: nil }
-        hkeys = h.keys
-
-        i0s, es = a.partition { |e| e[0] == :interval0 }
-        a = es + i0s
-          # interval0s are fallback
-
-        a.each do |key, val|
-          case key
-          when :biz_day
-            (h[:dow] ||= []) << '1-5'
-          when :name_day
-            (h[:dow] ||= []) << val
-          when :day_range
-            (h[:dow] ||= []) << val.collect { |v| v.to_s[0, 3] }.join('-')
-          when :tz
-            h[:tz] = val
-          when :point
-            process_point(h, *val)
-          when :interval1
-            process_interval1(h, *val[0].to_h.first)
-          when :interval0
-            process_interval0(h, val)
-          end
+      def assemble_cron(h)
+
+#puts "ac: " + h.inspect
+        s = []
+        s << h[:sec] if h[:sec]
+        s << h[:hms][1].join(',')
+        s << h[:hms][0].join(',')
+        s << (h[:dom] || '*') << (h[:mon] || '*') << (h[:dow] || '*')
+        s << h[:tz] if h[:tz]
+
+        Fugit::Cron.parse(s.join(' '))
+      end
+
+      def eone(e); e1 = e[1]; e1 == 1 ? '*' : "*/#{e1}"; end
+
+      def parse_interval_elt(e, opts, h)
+
+        e1 = e[1]
+
+        case e[2]
+        when 's', 'sec', 'second', 'seconds'
+          h[:sec] = eone(e)
+        when 'm', 'min', 'mins', 'minute', 'minutes'
+          #(h[:hms] ||= []) << [ '*', eone(e) ]
+          h[:hms] ||= [ [ '*', eone(e) ] ]
+        when 'h', 'hour', 'hours'
+          h[:hms] ||= [ [ eone(e), 0 ] ]
+        when 'd', 'day', 'days'
+          h[:dom] = "*/#{e1}" if e1 > 1
+          h[:hms] ||= [ [ 0, 0 ] ]
+        when 'w', 'week', 'weeks'
+          h[:_fail] = "cannot have crons for \"every #{e1} weeks\"" if e1 > 1
+          h[:hms] ||= [ [ 0, 0 ] ]
+          h[:dow] ||= 0
+        when 'M', 'month', 'months'
+          h[:_fail] = "cannot have crons for \"every #{e1} months\"" if e1 > 12
+          h[:hms] ||= [ [ 0, 0 ] ]
+          h[:dom] = 1
+          h[:mon] = eone(e)
+        when 'Y', 'y', 'year', 'years'
+          h[:_fail] = "cannot have crons for \"every #{e1} years\"" if e1 > 1
+          h[:hms] ||= [ [ 0, 0 ] ]
+          h[:dom] = 1
+          h[:mon] = 1
         end
+      end
 
-        return nil if h[:fail]
-
-        h[:min] = (h[:min] || [ 0 ]).uniq
-        h[:hou] = (h[:hou] || []).uniq.sort
-        h[:dow].sort! if h[:dow]
+      def parse_dow_list_elt(e, opts, h)
 
-        a = hkeys
-          .collect { |k|
-            v = h[k]
-            (v && v.any?) ? v.collect(&:to_s).join(',') : '*' }
-        a.insert(0, h[:sec]) if h[:sec]
-        a << h[:tz].first if h[:tz]
+        h[:hms] ||= [ [ 0, 0 ] ]
+        h[:dow] = e[1..-1].collect(&:to_s).sort.join(',')
+      end
 
-        s = a.join(' ')
+      def parse_dow_range_elt(e, opts, h)
 
-        Fugit::Cron.parse(s)
+        h[:hms] ||= [ [ 0, 0 ] ]
+        h[:dow] = e[1] == e[2] ? e[1] : "#{e[1]}-#{e[2]}"
       end
 
-      def process_point(h, key, *value)
+      def parse_day_of_month_elt(e, opts, h)
 
-        case key
-        when :hour
-          v0, v1 = value
-          v0 = v0.to_i if v0.is_a?(String) && v0.match(/^\d+$/)
-          (h[:hou] ||= []) << v0
-          (h[:min] ||= []) << v1.to_i if v1
-        when :sec, :min
-          (h[key] ||= []) << value[0]
-        end
+        h[:dom] = e[1..-1].join(',')
       end
 
-      def process_interval0(h, value)
-
-        case value
-        when 'sec', 'second'
-          h[:min] = [ '*' ]
-          h[:sec] = [ '*' ]
-        when 'min', 'minute'
-          h[:min] = [ '*' ]
-        when 'hour'
-          unless h[:min] || h[:hou]
-            h[:min] = [ 0 ]
-            h[:hou] = [ '*' ]
-          end
-        when 'day'
-          unless h[:min] || h[:hou]
-            h[:min] = [ 0 ]
-            h[:hou] = [ 0 ]
-          end
-        when 'week'
-          unless h[:min] || h[:hou] || h[:dow]
-            h[:min] = [ 0 ]
-            h[:hou] = [ 0 ]
-            h[:dow] = [ 0 ]
-          end
-        when 'month'
-          unless h[:min] || h[:hou]
-            h[:min] = [ 0 ]
-            h[:hou] = [ 0 ]
-          end
-          (h[:dom] ||= []) << 1
-        when 'year'
-          unless h[:min] || h[:hou]
-            h[:min] = [ 0 ]
-            h[:hou] = [ 0 ]
-          end
-          (h[:dom] ||= []) << 1
-          (h[:mon] ||= []) << 1
-        end
+      def parse_at_elt(e, opts, h)
+
+        (h[:hms] ||= []).concat(e[1])
+
+        l = h[:hms].last
+        h[:sec] = l.pop if l.size > 2
       end
 
-      def process_interval1(h, interval, value)
+      def parse_on_elt(e, opts, h)
 
-        if value != 1 && [ :yea, :wee ].include?(interval)
-          int = interval == :year ? 'years' : 'weeks'
-          h[:fail] = "cannot cron for \"every #{value} #{int}\""
-          return
-        end
+        e1 = e[1]
+        h[:dow] = e1[0]
+        h[:hms] = [ e1[1] ]
 
-        case interval
-        when :yea
-          h[:hou] = [ 0 ]
-          h[:mon] = [ 1 ]
-          h[:dom] = [ 1 ]
-        when :mon
-          h[:hou] = [ 0 ]
-          h[:dom] = [ 1 ]
-          h[:mon] = [ value == 1 ? '*' : "*/#{value}" ]
-        when :wee
-          h[:hou] = [ 0 ]
-          h[:dow] = [ 0 ] # Sunday
-        when :day
-          h[:hou] = [ 0 ]
-          h[:dom] = [ value == 1 ? '*' : "*/#{value}" ]
-        when :hou
-          h[:hou] = [ value == 1 ? '*' : "*/#{value}" ]
-        when :min
-          h[:hou] = [ '*' ]
-          h[:min] = [ value == 1 ? '*' : "*/#{value}" ]
-        when :sec
-          h[:hou] = [ '*' ]
-          h[:min] = [ '*' ]
-          h[:sec] = [ value == 1 ? '*' : "*/#{value}" ]
-        end
+        l = h[:hms].last
+        h[:sec] = l.pop if l.size > 2
+      end
+
+      def parse_tz_elt(e, opts, h)
+
+        h[:tz] = e[1]
       end
     end
 
     module Parser include Raabro
 
       NUMS = %w[
-        zero
-        one two three four five six seven eight nine
-        ten eleven twelve ]
+        zero one two three four five six seven eight nine ten eleven twelve ]
 
       WEEKDAYS =
         Fugit::Cron::Parser::WEEKDS + Fugit::Cron::Parser::WEEKDAYS
 
-      NHOURS =
-        { 'noon' => [ 12, 0 ], 'midnight' => [ 0, 0 ] }
+      NHOURS = {
+        'noon' => [ 12, 0 ],
+        'midnight' => [ 0, 0 ], 'oh' => [ 0, 0 ] }
+      NMINUTES = {
+        "o'clock" => 0, 'five' => 5,
+        'ten' => 10, 'fifteen' => 15,
+        'twenty' => 20, 'twenty-five' => 25,
+        'thirty' => 30, 'thirty-five' => 35,
+        'fourty' => 40, 'fourty-five' => 45,
+        'fifty' => 50, 'fifty-five' => 55 }
+
+      oh = {
+        '1st' => 1, '2nd' => 2, '3rd' => 3, '21st' => 21, '22nd' => 22,
+        '23rd' => 23, '31st' => 31 }
+      %w[ 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 24 25 26 27 28 29 30 ]
+        .each { |i| oh["#{i}th"] = i.to_i }
+      %w[
+        first second third fourth fifth sixth seventh eighth ninth tenth
+        eleventh twelfth thirteenth fourteenth fifteenth sixteenth seventeenth
+        eighteenth nineteenth twentieth twenty-first twenty-second twenty-third
+        twenty-fourth twenty-fifth twenty-fifth twenty-sixth twenty-seventh
+        twenty-eighth twenty-ninth thirtieth thirty-first ]
+          .each_with_index { |e, i| oh[e] = i + 1 }
+      ORDINALS = oh
 
       # piece parsers bottom to top
 
-      def interval0(i)
-        rex(:interval0, i,
-          /(year|month|week|day|hour|min(ute)?|sec(ond)?)(?![a-z])/i)
+      def _from(i); rex(nil, i, /\s*from\s+/i); end
+      def _every(i); rex(nil, i, /\s*(every)\s+/i); end
+      def _at(i); rex(nil, i, /\s*at\s+/i); end
+      def _in(i); rex(nil, i, /\s*(in|on)\s+/i); end
+      def _to(i); rex(nil, i, /\s*to\s+/i); end
+      def _dash(i); rex(nil, i, /-\s*/i); end
+      def _and(i); rex(nil, i, /\s*and\s+/i); end
+      def _on(i); rex(nil, i, /\s*on\s+/i); end
+
+      def _and_or_comma(i)
+        rex(nil, i, /\s*(,?\s*and\s|,?\s*or\s|,)\s*/i)
+      end
+      def _at_comma(i)
+        rex(nil, i, /\s*(at\s|,|)\s*/i)
+      end
+      def _to_through(i)
+        rex(nil, i, /\s*(to|through)\s+/i)
+      end
+
+      def integer(i); rex(:int, i, /\d+\s*/); end
+
+      def tz_name(i)
+        rex(nil, i,
+          /\s*[A-Z][a-zA-Z0-9+\-]+(\/[A-Z][a-zA-Z0-9+\-_]+){0,2}(\s+|$)/)
+      end
+      def tz_delta(i)
+        rex(nil, i,
+          /\s*[-+]([01][0-9]|2[0-4]):?(00|15|30|45)(\s+|$)/)
+      end
+      def tzone(i)
+        alt(:tzone, i, :tz_delta, :tz_name)
+      end
+
+      def and_named_digits(i)
+rex(:xxx, i, 'TODO')
+      end
+
+      def dname(i)
+        rex(:dname, i, /(s(ec(onds?)?)?|m(in(utes?)?)?)\s+/i)
+      end
+      def named_digit(i)
+        seq(:named_digit, i, :dname, :integer)
+      end
+      def named_digits(i)
+        seq(nil, i, :named_digit, '+', :and_named_digits, '*')
       end
 
       def am_pm(i)
-        rex(:am_pm, i, / *(am|pm)/i)
+        rex(:am_pm, i, /\s*(am|pm|dark)\s*/i)
+      end
+
+      def nminute(i)
+        rex(:nminute, i, /(#{NMINUTES.keys.join('|')})\s*/i)
+      end
+      def nhour(i)
+        rex(:nhour, i, /(#{NUMS.join('|')})\s*/i)
+      end
+      def numeral_hour(i)
+        seq(:numeral_hour, i, :nhour, :am_pm, '?', :nminute, '?')
+      end
+
+      def named_hour(i)
+        rex(:named_hour, i, /(#{NHOURS.keys.join('|')})/i)
+      end
+
+      def shour(i)
+        rex(:shour, i, /(2[0-4]|[01]?[0-9])/)
+      end
+      def simple_hour(i)
+        seq(:simple_hour, i, :shour, :am_pm, '?')
       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])/)
+      def at_point(i)
+        alt(nil, i,
+          :digital_hour, :simple_hour, :named_hour, :numeral_hour,
+          :named_digits)
       end
-      def simple_hour(i)
-        seq(:simple_hour, i, :_simple_hour, :am_pm, '?')
+
+      def weekday(i)
+        rex(:weekday, i, /(#{WEEKDAYS.reverse.join('|')})\s*/i)
       end
 
-      def _numeral_hour(i)
-        rex(:nh, i, /(#{NUMS.join('|')})/i)
+      def and_at(i)
+        seq(nil, i, :_and_or_comma, :at_point)
       end
-      def numeral_hour(i)
-        seq(:numeral_hour, i, :_numeral_hour, :am_pm, '?')
+
+      def _intervals(i)
+        rex(:intervals, i,
+          /(
+            y(ears?)?|months?|w(eeks?)?|d(ays?)?|
+            h(ours?)?|m(in(ute)?s?)?|s(ec(ond)?s?)?
+          )(\s+|$)/ix)
+      end
+
+      def sinterval(i)
+        rex(:sinterval, i,
+          /(year|month|week|day|hour|min(ute)?|sec(ond)?)(\s+|$)/i)
+      end
+      def ninterval(i)
+        seq(:ninterval, i, :integer, :_intervals)
       end
 
-      def name_hour(i)
-        rex(:name_hour, i, /(#{NHOURS.keys.join('|')})/i)
+      def ordinal(i)
+        rex(:ordinal, i, /\s*(#{ORDINALS.keys.join('|')})\s*/)
       end
 
-      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 _mod(i); rex(nil, i, /\s*month\s+on\s+days?\s+/i); end
+      def _oftm(i); rex(nil, i, /\s*(day\s)?\s*of\s+the\s+month\s*/i); end
 
-      def range_sep(i); rex(nil, i, / *- *| +(to|through) +/); end
+      def dom(i)
+        rex(:int, i, /([12][0-9]|3[01]|[0-9])/)
+      end
+      def and_or_dom(i)
+        seq(nil, i, :_and_or_comma, :dom)
+      end
+      def dom_list(i)
+        seq(:dom_list, i, :dom, :and_or_dom, '*')
+      end
+
+      def dom_mod(i) # every month on day
+        seq(:dom, i, :_mod, :dom_list)
+      end
+      def dom_noftm(i) # every nth of month
+        seq(:dom, i, :ordinal, :_oftm)
+      end
+      def day_of_month(i)
+        alt(nil, i, :dom_noftm, :dom_mod)
+      end
 
-      def day_range(i)
-        seq(:day_range, i, :name_day, :range_sep, :name_day)
+      def dow_class(i)
+        rex(:dow_class, i, /(weekday)(\s+|$)/i)
       end
 
-      def _tz_name(i)
-        rex(nil, i, /[A-Z][a-zA-Z0-9+\-]+(\/[A-Z][a-zA-Z0-9+\-_]+){0,2}/)
+      def dow(i)
+        seq(:dow, i, :weekday)
       end
-      def _tz_delta(i)
-        rex(nil, i, /[-+]([01][0-9]|2[0-4]):?(00|15|30|45)/)
+      def and_or_dow(i)
+        seq(nil, i, :_and_or_comma, :dow)
+      end
+      def dow_list(i)
+        seq(:dow_list, i, :dow, :and_or_dow, '*')
       end
-      def _tz(i); alt(:tz, i, :_tz_delta, :_tz_name); end
 
-      def interval1(i)
-        rex(:interval1, i,
-          /
-            \d+
-            \s?
-            (y(ears?)?|months?|w(eeks?)?|d(ays?)?|
-              h(ours?)?|m(in(ute)?s?)?|s(ec(ond)?s?)?)
-          /ix)
+      def to_dow_range(i)
+        seq(:dow_range, i, :weekday, :_to_through, :weekday)
+      end
+      def dash_dow_range(i)
+        seq(:dow_range, i, :weekday, :_dash, :weekday)
+      end
+      def dow_range(i)
+        alt(nil, i, :to_dow_range, :dash_dow_range)
       end
 
-      def min_or_sec(i)
-        rex(:min_or_sec, i, /(min(ute)?|sec(ond)?)\s+\d+/i)
+      def day_of_week(i)
+        alt(nil, i, :dow_range, :dow_list, :dow_class)
       end
 
-      def point(i)
-        alt(:point, i,
-          :min_or_sec,
-          :name_hour, :numeral_hour, :digital_hour, :simple_hour)
+      def interval(i)
+        alt(nil, i, :sinterval, :ninterval)
       end
 
-      def flag(i); rex(:flag, i, /(every|from|at|after|on|in)/i); end
+      def every_object(i)
+        alt(nil, i, :day_of_month, :interval, :day_of_week)
+      end
+      def from_object(i)
+        alt(nil, i, :interval, :to_dow_range)
+      end
 
-      def datum(i)
-        alt(nil, i,
-          :flag,
-          :interval1,
-          :point,
-          :interval0,
-          :day_range, :biz_day, :name_day,
-          :_tz)
+      def tz(i)
+        seq(nil, i, :_in, '?', :tzone)
+      end
+      def on(i)
+        seq(:on, i, :_on, :weekday, :at_point, :and_at, '*')
+      end
+      def at(i)
+        seq(:at, i, :_at_comma, :at_point, :and_at, '*')
+      end
+      def from(i)
+        seq(:from, i, :_from, :from_object)
+      end
+      def every(i)
+        seq(:every, i, :_every, :every_object)
       end
 
-      def sugar(i); rex(nil, i, /(and|or|[, \t]+)/i); end
+      def at_from(i)
+        seq(nil, i, :at, :from, :tz, '?')
+      end
+      def at_every(i)
+        seq(nil, i, :at, :every, :tz, '?')
+      end
+
+      def from_at(i)
+        seq(nil, i, :from, :at, '?', :tz, '?')
+      end
+
+      def every_(i)
+        seq(nil, i, :every, :tz, '?')
+      end
+      def every_on(i)
+        seq(nil, i, :every, :on, :tz, '?')
+      end
+      def every_at(i)
+        seq(nil, i, :every, :at, :tz, '?')
+      end
 
-      def elt(i); alt(nil, i, :sugar, :datum); end
-      def nat(i); rep(:nat, i, :elt, 1); end
+      def nat(i)
+        alt(:nat, i,
+          :every_at, :every_on, :every_,
+          :from_at,
+          :at_every, :at_from)
+      end
 
       # rewrite parsed tree
 
-      def _rewrite(t)
-        [ t.name, t.string.downcase ]
+      #def _rewrite_single(t)
+      #  [ t.name, rewrite(t.sublookup(nil)) ]
+      #end
+      def _rewrite_children(t)
+        t.subgather(nil).collect { |tt| rewrite(tt) }
+      end
+      def _rewrite_multiple(t)
+        [ t.name, _rewrite_children(t) ]
+      end
+      def _rewrite_child(t)
+        rewrite(t.sublookup(nil))
+      end
+
+      def rewrite_int(t); t.string.to_i; end
+
+      def rewrite_tzone(t)
+
+        [ :tz, t.strim ]
       end
-      alias rewrite_flag _rewrite
-      alias rewrite_interval0 _rewrite
-      alias rewrite_biz_day _rewrite
 
-      def rewrite_name_day(t)
-        [ :name_day, WEEKDAYS.index(t.string.downcase[0, 3]) ]
+      def rewrite_sinterval(t)
+
+        [ :interval, 1, t.strim ]
       end
 
-      def rewrite_day_range(t)
-        [ :day_range, t.subgather(nil).collect { |st| st.string.downcase } ]
+      def rewrite_ninterval(t)
+
+        [ :interval,
+          t.sublookup(:int).string.to_i,
+          t.sublookup(:intervals).strim ]
       end
 
-      def rewrite_name_hour(t)
-        [ :hour, *NHOURS[t.string.strip.downcase] ]
+      def rewrite_named_digit(t)
+
+        i = t.sublookup(:int).string.to_i
+
+        case n = t.sublookup(:dname).strim
+        when /^s/ then [ '*', '*', i ]
+        when /^m/ then [ '*', i ]
+        end
+      end
+
+      def rewrite_named_hour(t)
+        NHOURS[t.strim.downcase]
       end
       def rewrite_numeral_hour(t)
-        vs = t.subgather(nil).collect { |st| st.string.downcase.strip }
+        vs = t.subgather(nil).collect { |st| st.strim.downcase }
         v = NUMS.index(vs[0])
         v += 12 if vs[1] == 'pm'
-        [ :hour, v, 0 ]
+        m = NMINUTES[vs[2]] || 0
+        [ v, m ]
       end
       def rewrite_simple_hour(t)
-        vs = t.subgather(nil).collect { |st| st.string.downcase.strip }
+        vs = t.subgather(nil).collect { |st| st.strim.downcase }
         v = vs[0].to_i
         v += 12 if vs[1] == 'pm'
-        [ :hour, v, 0 ]
+        [ v, 0 ]
       end
       def rewrite_digital_hour(t)
-        v = t.string.gsub(/:/, '')
-        [ :hour, v[0, 2], v[2, 2] ]
+        m = t.string.match(/(\d\d?):?(\d\d)/)
+        [ m[1].to_i, m[2].to_i ]
       end
 
-      def rewrite_min_or_sec(t)
-        unit, num = t.string.split(/\s+/)
-        [ unit[0, 3].to_sym, num.to_i ]
+      def rewrite_weekday(t)
+
+        WEEKDAYS.index(t.strim.downcase[0, 3])
       end
 
-      def rewrite_point(t)
-        [ :point, rewrite(t.sublookup) ]
+      def rewrite_ordinal(t); ORDINALS[t.strim]; end
+
+      def rewrite_dom(t)
+
+#Raabro.pp(t, colours: true)
+        [ :day_of_month,
+          *_rewrite_children(t).flatten.select { |e| e.is_a?(Integer) } ]
       end
 
-      def rewrite_tz(t)
-        [ :tz,  [ t.string.strip, EtOrbi.get_tzone(t.string.strip) ] ]
+      alias rewrite_dow _rewrite_child
+
+      def rewrite_dom_list(t); [ :dom_list, *_rewrite_children(t) ]; end
+      def rewrite_dow_list(t); [ :dow_list, *_rewrite_children(t) ]; end
+
+      def rewrite_dow_class(t)
+
+        [ :dow_range, 1, 5 ] # only "weekday" for now
       end
 
-      def rewrite_interval1(t)
-        [ t.name, [ Fugit::Duration.parse(t.string.strip) ] ]
+      def rewrite_dow_range(t)
+
+        tts = t.subgather(nil)
+
+        [ :dow_range, rewrite(tts[0]), rewrite(tts[1]) ]
       end
 
+      alias rewrite_on _rewrite_multiple
+      alias rewrite_at _rewrite_multiple
+
+      alias rewrite_from _rewrite_child
+      alias rewrite_every _rewrite_child
+
       def rewrite_nat(t)
 
-#Raabro.pp(t, colours: true)
         t.subgather(nil).collect { |tt| rewrite(tt) }
+#.tap { |x| pp x }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: et-orbi
   requirement: !ruby/object:Gem::Requirement