fugit 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a36077d24c8226afdf974f4054779549fb4ba8
-  data.tar.gz: 38f18eac702bda2136ccd787dee4ca3db41251a3
+  metadata.gz: db0fd5566944d325bda3692e5ca32819d7f0b8d8
+  data.tar.gz: 226e4f9ad3e97a40c17619e9be38f2b2ff408c83
 SHA512:
-  metadata.gz: 0ba8e3e2a0d4e1e07a52f5f6c994c8b1d7b4f28513114c0582a19d8420ea62acdc8a8e934a5473f26ee93e0780ae88faba3faaad9218fbbd8dcea3b7ba08b8dc
-  data.tar.gz: 7ea6c821a417e0e951c00959f9b7800ac7833ff8d0f1ea1bb2505f823dbb50ca5e55b2644d57530c4f2614ab33f694ac3f81647d670eebd623666c007fb24060
+  metadata.gz: 6af1fa57a2484c9c62a3a7f73a65be6d12b579501efdb3c479f8e1868d73afab2b8e544d9d7904834558bab5d6f93e2ce53588ba4a46e2c64868fe4255d77634
+  data.tar.gz: b3be693935fd379a0e9270194600bcfe2210b2bf3b969596b2f476285632729bf3f0e320029c8e398d1f524c240432acc5f15899d6ad1365c0cddd63297fa82f

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # fugit CHANGELOG.md
 
 
+## fugit 0.9.3  released 2017-01-05
+
+* First version of Fugit::Nat
+
+
 ## fugit 0.9.2  released 2017-01-04
 
 * Accept decimal places for duration seconds

data/lib/fugit.rb

@@ -25,7 +25,7 @@
 
 module Fugit
 
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end
 
 require 'time'
@@ -37,4 +37,5 @@ require 'fugit/core'
 require 'fugit/misc'
 require 'fugit/cron'
 require 'fugit/duration'
+require 'fugit/nat'
 

data/lib/fugit/core.rb

@@ -61,7 +61,7 @@ module Fugit
 
   def self.parse(s)
 
-    parse_duration(s) || parse_at(s) || parse_cron(s)
+    parse_cron(s) || parse_duration(s) || parse_at(s)
   end
 
   def self.do_parse(s)

data/lib/fugit/cron.rb

@@ -264,6 +264,8 @@ module Fugit
 
       @original = original
 
+      h ||= {}
+
       determine_minutes(h[:min])
       determine_hours(h[:hou])
       determine_monthdays(h[:dom])
@@ -302,28 +304,34 @@ module Fugit
     end
 
     def determine_minutes(mins)
+      return @minutes = nil unless mins
       @minutes = mins.inject([]) { |a, r| a.concat(expand(0, 59, r)) }
       compact(:@minutes)
     end
 
     def determine_hours(hous)
+      return @hours = nil unless hous
       @hours = hous.inject([]) { |a, r| a.concat(expand(0, 23, r)) }
       @hours = @hours.collect { |h| h == 24 ? 0 : h }
       compact(:@hours)
     end
 
     def determine_monthdays(doms)
+      return @monthdays = nil unless doms
       @monthdays = doms.inject([]) { |a, r| a.concat(expand(1, 31, r)) }
       compact(:@monthdays)
     end
 
     def determine_months(mons)
+      return @months = nil unless mons
       @months = mons.inject([]) { |a, r| a.concat(expand(1, 12, r)) }
       compact(:@months)
     end
 
     def determine_weekdays(dows)
 
+      return @weekdays = nil unless dows
+
       @weekdays = dows.inject([]) { |a, r|
         aa = expand(0, 7, r)
         if hsh = r[3]
@@ -346,7 +354,9 @@ module Fugit
 
     module Parser include Raabro
 
-      WEEKDAYS = %w[ sun mon tue wed thu fri sat ]
+      WEEKDAYS = %w[ sunday monday tuesday wednesday thursday friday saturday ]
+      WEEKDS = WEEKDAYS.collect { |d| d[0, 3] }
+
       MONTHS = %w[ - jan feb mar apr may jun jul aug sep oct nov dec ]
 
       # piece parsers bottom to top
@@ -362,7 +372,7 @@ module Fugit
       def core_hou(i); rex(:hou, i, /(2[0-4]|[01]?[0-9])/); end
       def core_dom(i); rex(:dom, i, /(-?(3[01]|[012]?[0-9])|last|l)/i); end
       def core_mon(i); rex(:mon, i, /(1[0-2]|0?[0-9]|#{MONTHS[1..-1].join('|')})/i); end
-      def core_dow(i); rex(:dow, i, /([0-7]|#{WEEKDAYS.join('|')})/i); end
+      def core_dow(i); rex(:dow, i, /([0-7]|#{WEEKDS.join('|')})/i); end
 
       def dow_hash(i); rex(:hash, i, /#(-?[1-5]|last|l)/i); end
 
@@ -424,7 +434,7 @@ module Fugit
         s = t.string.downcase
 
         (k == :mon && MONTHS.index(s)) ||
-        (k == :dow && WEEKDAYS.index(s)) ||
+        (k == :dow && WEEKDS.index(s)) ||
         (k == :dom && s[0, 1] == 'l' && -1) || # L, l, last
         s.to_i
       end

data/lib/fugit/duration.rb

@@ -251,6 +251,11 @@ module Fugit
       @h.hash
     end
 
+    def next_time(from=Time.now)
+
+      add(from)
+    end
+
     protected
 
     def init(original, h)

data/lib/fugit/nat.rb

@@ -0,0 +1,152 @@
+#--
+# Copyright (c) 2017-2017, John Mettraux, jmettraux+flor@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+
+module Fugit
+
+  # A natural language set of parsers for fugit.
+  # Focuses on cron expressions. The rest is better left to Chronic and friends.
+  #
+  module Nat
+
+    def self.parse(s)
+
+#p s; Raabro.pp(Parser.parse(s, debug: 3))
+      a = Parser.parse(s)
+
+#p a
+      return nil unless a
+
+      if a.include?([ :flag, 'every' ])
+        parse_cron(a)
+      else
+        nil
+      end
+    end
+
+    def self.parse_cron(a)
+
+      h = { min: nil, hou: nil, dom: nil, mon: nil, dow: nil }
+
+      a.each do |key, val|
+        if key == :biz_day
+          h[:dow] = (1..5).to_a.collect { |wd| [ wd ] }
+        elsif key == :simple_hour || key == :numeral_hour
+          (h[:hou] ||= []) << val
+        elsif key == :digital_hour
+          h[:hou] = val[0, 1]
+          h[:min] = val[1, 1]
+        elsif key == :name_day
+          (h[:dow] ||= []) << [ val ]
+        elsif key == :flag && val == 'pm' && h[:hou]
+          h[:hou][-1] = h[:hou][-1] + 12
+        end
+      end
+      h[:min] ||= [ 0 ]
+
+      Fugit::Cron.allocate.send(:init, nil, h)
+    end
+
+    module Parser include Raabro
+
+      NUMS = %w[
+        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 ] }
+
+      # piece parsers bottom to top
+
+      def digital_hour(i)
+        rex(:digital_hour, i, /(2[0-4]|[01][0-9]):?[0-5]\d/)
+      end
+      def simple_hour(i)
+        rex(:simple_hour, i, /(2[0-4]|[01]?[0-9])/)
+      end
+      def numeral_hour(i)
+        rex(:numeral_hour, i, /(#{NUMS.join('|')})/i)
+      end
+      def name_hour(i)
+        rex(:name_hour, i, /(#{NHOURS.keys.join('|')})/i)
+      end
+      def hour(i)
+        alt(nil, i, :numeral_hour, :name_hour, :digital_hour, :simple_hour);
+      end
+
+      def plain_day(i); rex(:plain_day, i, /day/i); 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 flag(i); rex(:flag, i, /(every|day|at|after|am|pm)/i); end
+
+      def datum(i)
+        alt(nil, i,
+          :flag,
+          :plain_day, :biz_day, :name_day,
+          :name_hour, :numeral_hour, :digital_hour, :simple_hour)
+      end
+
+      def sugar(i); rex(nil, i, /(and|or|[, \t]+)/i); end
+
+      def elt(i); alt(nil, i, :sugar, :datum); end
+      def nat(i); rep(:nat, i, :elt, 1); end
+
+      # rewrite parsed tree
+
+      def rewrite_nat(t)
+
+#Raabro.pp(t)
+        t
+          .subgather(nil)
+          .collect { |tt|
+
+            k = tt.name
+            v = tt.string.downcase
+
+            case k
+              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] ] ]
+              when :name_hour
+                [ :digital_hour, NHOURS[v] ]
+              when :name_day
+                [ k, WEEKDAYS.index(v[0, 3]) ]
+              else
+                [ k, v ]
+            end
+          }
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -57,6 +57,7 @@ files:
 - lib/fugit/cron.rb
 - lib/fugit/duration.rb
 - lib/fugit/misc.rb
+- lib/fugit/nat.rb
 homepage: http://github.com/floraison/fugit
 licenses:
 - MIT