montrose 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84030dd2ad699d4db2bb62011fa41867964f9e56
-  data.tar.gz: 00a3b299b80f0cdfc0659bee39ff7266d6275d24
+  metadata.gz: b5a8b52963ae6bea219f278406b83d675e619e52
+  data.tar.gz: f1be3f8c5ba5b6154ff9ada19429774bb130df41
 SHA512:
-  metadata.gz: 9d1e5813fba6d74ecdd137e32e911ccfb5642d939c5732e2e302489a66e964ea239175d74c43a3c1d8ffad235c5131a09f773c9bf072d27b4a9569597f5a695d
-  data.tar.gz: 7bd9adae17eff3af8f6cc2d17de785f1ec851856fb5196c54bd9799f99bd70e4c863b23af7f31abe783c920a30c39aedfeb252743e320f925303fc853803476f
+  metadata.gz: 52a9b066ba034e9985e6516485fecbaa1a3bd84f7b5aeb71bfda2ece9ffd421a37a69fdc57e7baf4cbf6e4818333cb6452a6f5f6d203863371416f791ce79c33
+  data.tar.gz: e055001efa95ea285de0bcc40bb7fd868041210bf4faef22103f3af190567f2b41fec3d138bf2da4a27588febc74abd11eb19d53d1240174cb1102094ee404e2

data/.codeclimate.yml

@@ -1,7 +1,7 @@
 ---
 engines:
   bundler-audit:
-    enabled: true
+    enabled: false
   duplication:
     enabled: true
     config:

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'gemfiles/**/*'
+    - 'tmp/**/*'
   TargetRubyVersion: '2.1.0'
 
 Lint/HandleExceptions:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.8.1 - (2018-05-29)
+
+* bug fixes
+  * Fixes interval comparisons for secondly, hourly, minutely by zeroing usec
+    for recurrence start and end times
+
 ### 0.8.0 - (2018-05-29)
 
 * enhancements

data/lib/montrose/frequency.rb

@@ -55,6 +55,16 @@ module Montrose
     def matches_interval?(time_diff)
       (time_diff % @interval).zero?
     end
+
+    def to_cron
+      raise "abstract"
+    end
+
+    protected
+
+    def interval_str
+      @interval != 1 ? "*/#{@interval}" : "*"
+    end
   end
 end
 

data/lib/montrose/frequency/daily.rb

@@ -6,6 +6,10 @@ module Montrose
       def include?(time)
         matches_interval? time.to_date - @starts.to_date
       end
+
+      def to_cron
+        "#{@starts.min} #{@starts.hour} #{interval_str} * *"
+      end
     end
   end
 end

data/lib/montrose/frequency/hourly.rb

@@ -6,6 +6,10 @@ module Montrose
       def include?(time)
         matches_interval?((time - @starts) / 1.hour)
       end
+
+      def to_cron
+        "#{@starts.min} #{interval_str} * * *"
+      end
     end
   end
 end

data/lib/montrose/frequency/monthly.rb

@@ -6,6 +6,10 @@ module Montrose
       def include?(time)
         matches_interval?((time.month - @starts.month) + (time.year - @starts.year) * 12)
       end
+
+      def to_cron
+        "#{@starts.min} #{@starts.hour} #{@starts.day} #{interval_str} *"
+      end
     end
   end
 end

data/lib/montrose/frequency/weekly.rb

@@ -7,6 +7,11 @@ module Montrose
         (weeks_since_start(time) % @interval).zero?
       end
 
+      def to_cron
+        raise "Intervals unsupported" unless @interval == 1
+        "#{@starts.min} #{@starts.hour} * * #{@starts.wday}"
+      end
+
       private
 
       def weeks_since_start(time)

data/lib/montrose/frequency/yearly.rb

@@ -6,6 +6,11 @@ module Montrose
       def include?(time)
         matches_interval? time.year - @starts.year
       end
+
+      def to_cron
+        raise "Intervals unsupported" unless @interval == 1
+        "#{@starts.min} #{@starts.hour} #{@starts.day} #{@starts.month} *"
+      end
     end
   end
 end

data/lib/montrose/options.rb

@@ -32,6 +32,11 @@ module Montrose
       # @example Recurrence.default_until #=> <Date>
       #
       def default_until
+        ::Montrose::Utils.normalize_time determine_default_until
+      end
+
+      # private
+      def determine_default_until
         case @default_until
         when String
           ::Montrose::Utils.parse_time(@default_until)
@@ -47,6 +52,11 @@ module Montrose
       # @example Recurrence.default_starts #=> <Date>
       #
       def default_starts
+        ::Montrose::Utils.normalize_time determine_default_starts
+      end
+
+      # private
+      def determine_default_starts
         case @default_starts
         when String
           ::Montrose::Utils.parse_time(@default_starts)
@@ -156,11 +166,11 @@ module Montrose
     alias frequency= every=
 
     def starts=(time)
-      @starts = as_time(time) || self.class.default_starts
+      @starts = normalize_time(as_time(time)) || default_starts
     end
 
     def until=(time)
-      @until = as_time(time) || self.class.default_until
+      @until = normalize_time(as_time(time)) || default_until
     end
 
     def hour=(hours)
@@ -229,6 +239,10 @@ module Montrose
       self.class.default_starts
     end
 
+    def default_until
+      self.class.default_until
+    end
+
     def nested_map_arg(arg, &block)
       case arg
       when Hash

data/lib/montrose/utils.rb

@@ -5,6 +5,7 @@ module Montrose
     module_function
 
     MONTHS = ::Date::MONTHNAMES
+
     DAYS = ::Date::DAYNAMES
 
     MAX_HOURS_IN_DAY = 24
@@ -26,6 +27,11 @@ module Montrose
       end
     end
 
+    # Recurrence at fractions of a second are not recognized
+    def normalize_time(time)
+      time && time.change(usec: 0)
+    end
+
     def as_date(time)
       as_time(time).to_date
     end
@@ -41,15 +47,17 @@ module Montrose
     def month_number(name)
       case name
       when Symbol, String
-        MONTHS.index(name.to_s.titleize)
+        string = name.to_s
+        MONTHS.index(string.titleize) || month_number(to_index(string))
       when 1..12
         name
       end
     end
 
     def month_number!(name)
+      month_numbers = MONTHS.map.with_index { |_n, i| i.to_s }.slice(1, 12)
       month_number(name) or fail ConfigurationError,
-        "Did not recognize month #{name}, must be one of #{MONTHS.inspect}"
+        "Did not recognize month #{name}, must be one of #{(MONTHS + month_numbers).inspect}"
     end
 
     def day_number(name)
@@ -57,15 +65,17 @@ module Montrose
       when 0..6
         name
       when Symbol, String
-        DAYS.index(name.to_s.titleize)
+        string = name.to_s
+        DAYS.index(string.titleize) || day_number(to_index(string))
       when Array
         day_number name.first
       end
     end
 
     def day_number!(name)
+      day_numbers = DAYS.map.with_index { |_n, i| i.to_s }
       day_number(name) or fail ConfigurationError,
-        "Did not recognize day #{name}, must be one of #{DAYS.inspect}"
+        "Did not recognize day #{name}, must be one of #{(DAYS + day_numbers).inspect}"
     end
 
     def days_in_month(month, year = current_time.year)
@@ -79,5 +89,11 @@ module Montrose
     def days_in_year(year)
       ::Montrose::Utils.days_in_month(2, year) + 337
     end
+
+    # Returns string.to_i only if string fully matches an integer
+    # otherwise ensures that return value won't match a valid index
+    def to_index(string)
+      string =~ %r{^\d+} ? string.to_i : -1
+    end
   end
 end

data/lib/montrose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Montrose
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: montrose
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport