fugit 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3a2d6e072a2ae0ce68473054ef7701ce45a4867
-  data.tar.gz: a1c5e3b9c36b2ee907d617943b5baff6de9005a4
+  metadata.gz: f27107c7603ef6d23deb7ce3a37f377f91efc738
+  data.tar.gz: 01322c2865d102807fe4e263c83d6c6ce56853d7
 SHA512:
-  metadata.gz: 2c1cc2399627c451105219913f9668dfbd55ea77259e8fad5a356da4d828bd136bb72de28446451bf77bbf7455f62c8a73ec25f59d3426b89cd438382ee2a973
-  data.tar.gz: bb30951b92097750810dc700fa0d5d80ade2bc80d5da398776b9f554db3e889e4086c52fd412ba33bacb5f2d66742b3726aa6a694f64653a12780e76970b0e30
+  metadata.gz: acbd5be7fe73de2b68cb518f6626f93d1d7c06f474cb89c2ae487013854deeaebf5029c97ee57d97832f0f2f81a819eeed65a5cf9929dc81bc3c7a7baa0832fc
+  data.tar.gz: 7cfd640731cf49b1ac378d21dc310e852c1bdc995b4ec90228c55db7685041195b3df5caf69e88cf446eb8112fcd4839572dcb542f3b32a424d4469cf74927e1

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # fugit CHANGELOG.md
 
 
+## fugit 1.1.5  released 2018-07-30
+
+* Add Fugit::Cron#rough_frequency (for https://github.com/jmettraux/rufus-scheduler/pull/276)
+
+
 ## fugit 1.1.4  released 2018-07-20
 
 * Add duration support for Fugit::Nat (@cristianbica gh-7)

data/README.md

@@ -63,6 +63,7 @@ p c.previous_time  # => 2017-01-01 00:00:00 +0900
 
 p c.brute_frequency  # => [ 604800, 604800, 53 ]
                      #    [ delta min, delta max, occurrence count ]
+p c.rough_frequency  # => 7 * 24 * 3600 (7d rough frequency)
 
 p c.match?(Time.parse('2017-08-06'))  # => true
 p c.match?(Time.parse('2017-08-07'))  # => false

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -250,6 +250,40 @@ module Fugit
         end
     end
 
+    SLOTS = [
+      [ :seconds, 1, 60 ],
+      [ :minutes, 60, 60 ],
+      [ :hours, 3600, 24 ],
+      [ :days, 24 * 3600, 365 ] ]
+
+    def rough_frequency
+
+      slots = SLOTS
+        .collect { |k, v0, v1|
+          a = (k == :days) ? rough_days : instance_variable_get("@#{k}")
+          [ k, v0, v1, a ] }
+
+      slots.each do |k, v0, _, a|
+        next if a == [ 0 ]
+        break if a != nil
+        return v0 if a == nil
+      end
+
+      slots.each do |k, v0, v1, a|
+        next unless a && a.length > 1
+        return (a + [ a.first + v1 ])
+          .each_cons(2)
+          .collect { |a0, a1| a1 - a0 }
+          .min * v0
+      end
+
+      slots.reverse.each do |k, v0, v1, a|
+        return v0 * v1 if a && a.length == 1
+      end
+
+      1 # second
+    end
+
     class Frequency
 
       attr_reader :span, :delta_min, :delta_max, :occurrences
@@ -283,6 +317,16 @@ module Fugit
       [ @seconds, @minutes, @hours, @monthdays, @months, @weekdays ]
     end
 
+    def to_h
+
+      { seconds: @seconds,
+        minutes: @minutes,
+        hours: @hours,
+        monthdays: @monthdays,
+        months: @months,
+        weekdays: @weekdays }
+    end
+
     def ==(o)
 
       o.is_a?(::Fugit::Cron) && o.to_a == to_a
@@ -296,6 +340,31 @@ module Fugit
 
     protected
 
+    def rough_days
+
+      return nil if @weekdays == nil && @monthdays == nil
+
+      months = (@months || (1..12).to_a)
+
+      monthdays = months
+        .product(@monthdays || [])
+        .collect { |m, d|
+          d = 31 + d if d < 0
+          (m - 1) * 30 + d } # rough
+
+      weekdays = (@weekdays || [])
+        .collect { |d, w|
+          w ?
+          d + (w - 1) * 7 :
+          (0..3).collect { |ww| d + ww * 7 } }
+        .flatten
+      weekdays = months
+        .product(weekdays)
+        .collect { |m, d| (m - 1) * 30 + d } # rough
+
+      (monthdays + weekdays).sort
+    end
+
     FREQUENCY_CACHE = {}
 
     def init(original, h)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro