fugit 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2828bf125d6707c54707f45157f4b84972370fe
-  data.tar.gz: 620ab55025dcebea9b332b4e2610631527659313
+  metadata.gz: 93a36077d24c8226afdf974f4054779549fb4ba8
+  data.tar.gz: 38f18eac702bda2136ccd787dee4ca3db41251a3
 SHA512:
-  metadata.gz: 3012a5dccfb5a63d860a1b83dff62a331f903d470e34084a7f35fca2d47e3facf5a8615f5d0fd818e6fba7650e3015208b6754336fa41b20b0e623f3bf48bb31
-  data.tar.gz: 320140191d5baffc8765ae2776e534a0b5f041f6e8bc315548d03969ebe011e6f79cd152366859e7486659e4eb2679159ac2905b646e7444919ed25ba2d25474
+  metadata.gz: 0ba8e3e2a0d4e1e07a52f5f6c994c8b1d7b4f28513114c0582a19d8420ea62acdc8a8e934a5473f26ee93e0780ae88faba3faaad9218fbbd8dcea3b7ba08b8dc
+  data.tar.gz: 7ea6c821a417e0e951c00959f9b7800ac7833ff8d0f1ea1bb2505f823dbb50ca5e55b2644d57530c4f2614ab33f694ac3f81647d670eebd623666c007fb24060

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # fugit CHANGELOG.md
 
 
+## fugit 0.9.2  released 2017-01-04
+
+* Accept decimal places for duration seconds
+* Alias Fugit .parse_in to .parse_duration
+
+
 ## fugit 0.9.1  released 2017-01-03
 
 * Implement Fugit::Duration #inflate and #deflate

data/README.md

@@ -76,7 +76,7 @@ Example of cron strings understood by fugit:
 
 ## `Fugit::Duration`
 
-A class `Fugit::Duration` to parse duration strings (vanilla [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) ones and [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) ones.
+A class `Fugit::Duration` to parse duration strings (vanilla [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) ones and [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) ones).
 
 Provides duration arithmetic tools.
 

data/lib/fugit.rb

@@ -25,7 +25,7 @@
 
 module Fugit
 
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end
 
 require 'time'

data/lib/fugit/core.rb

@@ -56,6 +56,9 @@ module Fugit
     ::Fugit::Duration.do_parse(s)
   end
 
+  def self.parse_in(s); parse_duration(s); end
+  def self.do_parse_in(s); do_parse_duration(s); end
+
   def self.parse(s)
 
     parse_duration(s) || parse_at(s) || parse_cron(s)

data/lib/fugit/cron.rb

@@ -349,6 +349,8 @@ module Fugit
       WEEKDAYS = %w[ sun mon tue wed thu fri sat ]
       MONTHS = %w[ - jan feb mar apr may jun jul aug sep oct nov dec ]
 
+      # piece parsers bottom to top
+
       def s(i); rex(:s, i, /[ \t]+/); end
       def star(i); str(:star, i, '*'); end
       def hyphen(i); str(nil, i, '-'); end
@@ -415,6 +417,8 @@ module Fugit
 
       def cron(i); seq(:cron, i, :lmin_, :lhou_, :ldom_, :lmon_, :ldow); end
 
+      # rewriting the parsed tree
+
       def to_i(k, t)
 
         s = t.string.downcase

data/lib/fugit/duration.rb

@@ -41,9 +41,9 @@ module Fugit
       original = s
 
       s = s
-      s = s.to_i if s.is_a?(Numeric)
+      #s = s.to_i if s.is_a?(Numeric)
       s = s.to_s.strip
-      s = s + 's' if s.match(/\A-?\d+\z/)
+      s = s + 's' if s.match(/\A-?(\d*\.)?\d+\z/)
 #p [ original, s ]; Raabro.pp(Parser.parse(s, debug: 3))
 
       h =
@@ -263,8 +263,22 @@ module Fugit
       self
     end
 
+    def self.common_rewrite_dur(t)
+
+      t
+        .subgather(nil)
+        .inject({}) { |h, t|
+          v = t.string; v = v.index('.') ? v.to_f : v.to_i
+            # drops ending ("y", "m", ...) by itself
+          h[t.name] = (h[t.name] || 0) + v
+          h
+        }
+    end
+
     module Parser include Raabro
 
+      # piece parsers bottom to top
+
       def sep(i); rex(nil, i, /([ \t,]+|and)*/i); end
 
       def yea(i); rex(:yea, i, /-?\d+ *y(ears?)?/i); end
@@ -274,27 +288,22 @@ module Fugit
       def hou(i); rex(:hou, i, /-?\d+ *(hours?|h)/i); end
       def min(i); rex(:min, i, /-?\d+ *(mins?|minutes?|m)/); end
 
-      def sec(i); rex(:sec, i, /-?\d+ *(secs?|seconds?|s)/i); end
+      def sec(i); rex(:sec, i, /-?((\d*\.)?\d+) *(secs?|seconds?|s)/i); end
         # always last!
 
       def elt(i); alt(nil, i, :yea, :mon, :wee, :day, :hou, :min, :sec); end
 
       def dur(i); jseq(:dur, i, :elt, :sep); end
 
-      def rewrite_dur(t)
+      # rewrite parsed tree
 
-        t
-          .subgather(nil)
-          .inject({}) { |h, t|
-            h[t.name] = (h[t.name] || 0) + t.string.to_i
-              # drops ending ("y", "m", ...) by itself
-            h
-          }
-      end
+      def rewrite_dur(t); Fugit::Duration.common_rewrite_dur(t); end
     end
 
     module IsoParser include Raabro
 
+      # piece parsers bottom to top
+
       def p(i); rex(nil, i, /P/); end
       def t(i); rex(nil, i, /T/); end
 
@@ -304,7 +313,7 @@ module Fugit
       def day(i); rex(:day, i, /-?\d+D/); end
       def hou(i); rex(:hou, i, /-?\d+H/); end
       def min(i); rex(:min, i, /-?\d+M/); end
-      def sec(i); rex(:sec, i, /-?\d+S/); end
+      def sec(i); rex(:sec, i, /-?(\d*\.)?\d+S/); end
 
       def delt(i); alt(nil, i, :yea, :mon, :wee, :day); end
       def telt(i); alt(nil, i, :hou, :min, :sec); end
@@ -315,16 +324,9 @@ module Fugit
 
       def dur(i); seq(:dur, i, :p, :date, '?', :t_time, '?'); end
 
-      def rewrite_dur(t)
+      # rewrite parsed tree
 
-        t
-          .subgather(nil)
-          .inject({}) { |h, t|
-            h[t.name] = (h[t.name] || 0) + t.string.to_i
-              # drops ending ("y", "m", ...) by itself
-            h
-          }
-      end
+      def rewrite_dur(t); Fugit::Duration.common_rewrite_dur(t); end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - John Mettraux