montrose 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45d4d1eab774adb13047453df886e0dcd9945e79310f2f55a42358d9b1d756b
-  data.tar.gz: e494612344c6e6d156e3372c96e04d57dbcd4a17eee541db252f610c913f8c60
+  metadata.gz: d44082eaa05a068714f05fe6116f8442b0507b3c7612174d93716ce6fd4af4ba
+  data.tar.gz: 691d88452db689b1555772b6749ae12e72bf675fbc55d4082b2d7f4cd41dd795
 SHA512:
-  metadata.gz: 489f9c03d2ef5cb32347bc9b5f97f96a4d11e8dcd3fae2dd948a39bae0228c8a08e34e39005d62e5287d3226f81c427caf7cdcd8ae7ee2f8d864f17f7b8069ee
-  data.tar.gz: e383994b155489b5fcc5e6050165f1103842b974dbfccad4dc6583702ec064dcea43243e106376520b410136db8c60d218173b57b3fa624452a1f605e35bb526
+  metadata.gz: 389adad3b13244fdb642204fa158bde6a204de4c752cab7a11dc1fe2a237a98f7b73c905477fd335d47164b795921a92090b68a528327b115ff2721b8c2945f7
+  data.tar.gz: 9ce4b11ae2d6c0fd06b06ca9fe56aa05767bca879be8c5cd3a24dae1c7fed442ca50d4195cf5225ff42f1bb2f2704a9ab8fb308b0a9167865317a245dd782441

data/.circleci/config.yml

@@ -0,0 +1,65 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@1.1.2
+commands:
+  run-tests:
+    description: Run tests
+    steps:
+      - run: bundle exec rake test
+  restore:
+    description: Restore cache
+    steps:
+      - restore_cache:
+          keys:
+            - v1_bundler_deps-
+  save:
+    description: Save cache
+    steps:
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-bundler-deps-{{ .Environment.CIRCLE_JOB }}
+  bundle:
+    description: Install dependencies
+    steps:
+      - run:
+          echo "export BUNDLE_JOBS=4" >> $BASH_ENV
+          echo "export BUNDLE_RETRY=3" >> $BASH_ENV
+          echo "export BUNDLE_PATH=$(pwd)/vendor/bundle" >> $BASH_ENV
+          echo "export BUNDLE_GEMFILE=$(pwd)/${GEMFILE_NAME}" >> $BASH_ENV
+      - run: bundle install
+
+jobs:
+  test:
+    parameters:
+      ruby_version:
+        type: string
+      gemfile:
+        type: string
+    docker:
+      - image: 'circleci/ruby:<< parameters.ruby_version >>'
+    environment:
+      GEMFILE_NAME: <<parameters.gemfile>>
+    steps:
+      - checkout
+      - restore
+      - bundle
+      - save
+      - run-tests
+
+workflows:
+  all-tests:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby_version: ['2.5', '2.6', '2.7']
+              gemfile:
+                [
+                  'gemfiles/activesupport_5.2.gemfile',
+                  'gemfiles/activesupport_6.0.gemfile',
+                  'gemfiles/activesupport_6.1.gemfile',
+                ]
+            # exclude:
+            #   - ruby_version: '3.0'
+            #   - gemfile: rails_5_2.gemfile

data/Appraisals

@@ -1,21 +1,13 @@
 # frozen_string_literal: true
 
-appraise "activesupport-5.2" do
-  gem "activesupport", "~> 5.2.0"
-end
-
-appraise "activesupport-5.1" do
-  gem "activesupport", "~> 5.1.0"
+appraise "activesupport-6.1" do
+  gem "activesupport", "~> 6.1.0"
 end
 
-appraise "activesupport-5.0" do
-  gem "activesupport", "~> 5.0.0"
+appraise "activesupport-6.0" do
+  gem "activesupport", "~> 6.0.0"
 end
 
-appraise "activesupport-4.2" do
-  gem "activesupport", "~> 4.2.0"
-end
-
-appraise "activesupport-4.1" do
-  gem "activesupport", "~> 4.1.0"
+appraise "activesupport-5.2" do
+  gem "activesupport", "~> 5.2.0"
 end

data/Guardfile

@@ -25,8 +25,8 @@ guard :minitest do
 
   # with Minitest::Spec
   watch(%r{^spec/(.*)_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})         { "spec/rfc_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { "spec/rfc_spec.rb" }
   watch(%r{^spec/spec_helper\.rb$}) { "spec" }
 end
 

data/README.md

@@ -446,6 +446,13 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+To run tests against multiple versions of activesupport, use the Appraisals:
+
+```sh
+bin/appraisal install
+bin/appraisal rake test
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/rossta/montrose. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.

data/Rakefile

@@ -3,7 +3,7 @@
 require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "rubocop/rake_task"
+require "standard/rake"
 require "yard"
 
 Rake::TestTask.new(:spec) do |t|
@@ -15,9 +15,7 @@ end
 
 task test: :spec
 
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]
+task default: %i[spec standard]
 
 namespace :doc do
   desc "Generate docs and publish to gh-pages"

data/bin/setup

@@ -3,5 +3,6 @@ set -euo pipefail
 IFS=$'\n\t'
 
 bundle install
+bundle update
 
 # Do any other automated setup that you need to do here

data/bin/standardrb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'standardrb' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("standard", "standardrb")

data/gemfiles/activesupport_5.2.gemfile

@@ -7,6 +7,10 @@ gem "activesupport", "~> 5.2.0"
 group :development do
   gem "coveralls"
   gem "yard"
+  gem "guard"
+  gem "guard-minitest"
+  gem "guard-rubocop"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/activesupport_6.0.gemfile

@@ -7,6 +7,10 @@ gem "activesupport", "~> 6.0.0"
 group :development do
   gem "coveralls"
   gem "yard"
+  gem "guard"
+  gem "guard-minitest"
+  gem "guard-rubocop"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/{activesupport_4.2.gemfile → activesupport_6.1.gemfile}

@@ -2,11 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.2.0"
+gem "activesupport", "~> 6.1.0"
 
 group :development do
   gem "coveralls"
   gem "yard"
+  gem "guard"
+  gem "guard-minitest"
+  gem "guard-rubocop"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/lib/montrose.rb

@@ -2,10 +2,13 @@
 
 require "active_support"
 require "active_support/core_ext/object"
-require "active_support/core_ext/numeric"
+
 require "active_support/core_ext/date"
-require "active_support/core_ext/time"
 require "active_support/core_ext/date_time"
+require "active_support/core_ext/integer"
+require "active_support/core_ext/numeric"
+require "active_support/core_ext/string"
+require "active_support/core_ext/time"
 
 require "montrose/utils"
 require "montrose/rule"
@@ -35,6 +38,23 @@ module Montrose
     def recurrence(options = {})
       branch(options)
     end
-    alias r recurrence
+    alias_method :r, :recurrence
+
+    # Create a new recurrence from given options
+    # An alias to {Montrose::Recurrence.new}
+    attr_reader :enable_deprecated_between_masking
+
+    def enable_deprecated_between_masking=(value)
+      warn "[DEPRECATION] Montrose.enable_deprecated_between_masking is deprecated and will be removed in a future version."
+      @enable_deprecated_between_masking = value
+    end
+
+    def enable_deprecated_between_masking?
+      result = !!enable_deprecated_between_masking
+      if result
+        warn "[DEPRECATION] Legacy Montrose.between masking behavior is deprecated. Please use Montrose.covering instead to retain this behavior."
+      end
+      result
+    end
   end
 end

data/lib/montrose/chainable.rb

@@ -139,7 +139,7 @@ module Montrose
     def starts(starts_at)
       merge(starts: starts_at)
     end
-    alias starting starts
+    alias_method :starting, :starts
 
     # Create a recurrence ending at given timestamp.
     #
@@ -153,9 +153,12 @@ module Montrose
     def until(ends_at)
       merge(until: ends_at)
     end
-    alias ending until
+    alias_method :ending, :until
 
-    # Create a recurrence occurring during date range.
+    # Create a recurrence occurring between the start and end
+    # of a given date range; :between is shorthand for separate
+    # :starts and :until options. When used with explicit :start
+    # and/or :until options, those will take precedence.
     #
     # @param [Range<Date>] date_range
     #
@@ -168,6 +171,20 @@ module Montrose
       merge(between: date_range)
     end
 
+    # Create a recurrence which will only emit values within the
+    # date range, also called "masking."
+    #
+    # @param [Range<Date>] date_range
+    #
+    # @example
+    #   Montrose.weekly.covering(Date.tomorrow..Date.new(2016, 3, 15))
+    #
+    # @return [Montrose::Recurrence]
+    #
+    def covering(date_range)
+      merge(covering: date_range)
+    end
+
     # Create a recurrence occurring within a time-of-day range or ranges.
     # Given time ranges will parse as times-of-day and ignore given dates.
     #
@@ -241,7 +258,7 @@ module Montrose
     def day_of_month(days, *extras)
       merge(mday: days.array_concat(extras))
     end
-    alias mday day_of_month
+    alias_method :mday, :day_of_month
 
     # Create a recurrence for given days of week
     #
@@ -257,7 +274,7 @@ module Montrose
     def day_of_week(weekdays, *extras)
       merge(day: weekdays.array_concat(extras))
     end
-    alias day day_of_week
+    alias_method :day, :day_of_week
 
     # Create a recurrence for given days of year
     #
@@ -273,7 +290,7 @@ module Montrose
     def day_of_year(days, *extras)
       merge(yday: days.array_concat(extras))
     end
-    alias yday day_of_year
+    alias_method :yday, :day_of_year
 
     # Create a recurrence for given hours of day
     #
@@ -289,7 +306,7 @@ module Montrose
     def hour_of_day(hours, *extras)
       merge(hour: hours.array_concat(extras))
     end
-    alias hour hour_of_day
+    alias_method :hour, :hour_of_day
 
     # Create a recurrence for given months of year
     #
@@ -305,7 +322,7 @@ module Montrose
     def month_of_year(months, *extras)
       merge(month: months.array_concat(extras))
     end
-    alias month month_of_year
+    alias_method :month, :month_of_year
 
     # Create a recurrence for given weeks of year
     #
@@ -335,7 +352,7 @@ module Montrose
     def total(total)
       merge(total: total)
     end
-    alias repeat total
+    alias_method :repeat, :total
 
     # Create a new recurrence combining options of self
     # and other. The value of entries with duplicate

data/lib/montrose/clock.rb

@@ -26,7 +26,7 @@ module Montrose
       if @at
         times = @at.map { |hour, min, sec = 0| @time.change(hour: hour, min: min, sec: sec) }
 
-        min_next = times.select { |t| t > @time }.min and return min_next
+        (min_next = times.select { |t| t > @time }.min) && (return min_next)
 
         advance_step(times.min || @time)
       else
@@ -41,7 +41,7 @@ module Montrose
     end
 
     def step
-      @step ||= smallest_step or fail ConfigurationError, "No step for #{@options.inspect}"
+      (@step ||= smallest_step) || fail(ConfigurationError, "No step for #{@options.inspect}")
     end
 
     def smallest_step
@@ -76,9 +76,9 @@ module Montrose
       is_frequency = @every == unit
       if ([unit] + alternates).any? { |u| @options.key?(u) } && !is_frequency
         # smallest unit, increment by 1
-        { step_key(unit) => 1 }
+        {step_key(unit) => 1}
       elsif is_frequency
-        { step_key(unit) => @interval }
+        {step_key(unit) => @interval}
       end
     end
 

data/lib/montrose/frequency.rb

@@ -30,17 +30,17 @@ module Montrose
     #
     def self.from_options(opts)
       frequency = opts.fetch(:every) { fail ConfigurationError, "Please specify the :every option" }
-      class_name = FREQUENCY_TERMS.fetch(frequency.to_s) do
+      class_name = FREQUENCY_TERMS.fetch(frequency.to_s) {
         fail "Don't know how to enumerate every: #{frequency}"
-      end
+      }
 
       Montrose::Frequency.const_get(class_name).new(opts)
     end
 
     # @private
     def self.assert(frequency)
-      FREQUENCY_TERMS.key?(frequency.to_s) or fail ConfigurationError,
-        "Don't know how to enumerate every: #{frequency}"
+      FREQUENCY_TERMS.key?(frequency.to_s) || fail(ConfigurationError,
+        "Don't know how to enumerate every: #{frequency}")
 
       frequency.to_sym
     end

data/lib/montrose/options.rb

@@ -86,6 +86,7 @@ module Montrose
     def_option :starts
     def_option :until
     def_option :between
+    def_option :covering
     def_option :during
     def_option :hour
     def_option :day
@@ -120,12 +121,12 @@ module Montrose
     end
 
     def to_hash
-      hash_pairs = self.class.defined_options.flat_map do |opt_name|
+      hash_pairs = self.class.defined_options.flat_map { |opt_name|
         [opt_name, send(opt_name)]
-      end
+      }
       Hash[*hash_pairs].reject { |_k, v| v.nil? }
     end
-    alias to_h to_hash
+    alias_method :to_h, :to_hash
 
     def []=(option, val)
       send(:"#{option}=", val)
@@ -142,13 +143,13 @@ module Montrose
       self.class.new(h1.merge(h2))
     end
 
-    def fetch(key, *args, &_block)
-      fail ArgumentError, "wrong number of arguments (#{args.length} for 1..2)" if args.length > 1
+    def fetch(key, *args)
+      raise ArgumentError, "wrong number of arguments (#{args.length} for 1..2)" if args.length > 1
 
       found = send(key)
       return found if found
       return args.first if args.length == 1
-      fail "Key #{key.inspect} not found" unless block_given?
+      raise "Key #{key.inspect} not found" unless block
 
       yield
     end
@@ -165,8 +166,8 @@ module Montrose
       @every = parsed.fetch(:every)
     end
 
-    alias frequency every
-    alias frequency= every=
+    alias_method :frequency, :every
+    alias_method :frequency=, :every=
 
     def starts=(time)
       @starts = normalize_time(as_time(time)) || default_starts
@@ -186,7 +187,7 @@ module Montrose
                   [decompose_during_arg(during)]
                 else
                   map_arg(during) { |d| decompose_during_arg(d) }
-                end
+      end
     end
 
     def day=(days)
@@ -210,7 +211,9 @@ module Montrose
     end
 
     def between=(range)
-      @between = range
+      if Montrose.enable_deprecated_between_masking?
+        @covering = range
+      end
       self[:starts] = range.first unless self[:starts]
       self[:until] = range.last unless self[:until]
     end
@@ -312,7 +315,7 @@ module Montrose
           result[:mday] += map_mdays(v)
         end
       else
-        { day: map_days(arg) }
+        {day: map_days(arg)}
       end
     end
 
@@ -323,12 +326,12 @@ module Montrose
       day = day_number(key)
       return [:day, day] if day
 
-      fail ConfigurationError, "Did not recognize #{key} as a month or day"
+      raise ConfigurationError, "Did not recognize #{key} as a month or day"
     end
 
     def assert_range_includes(range, item, absolute = false)
       test = absolute ? item.abs : item
-      fail ConfigurationError, "Out of range: #{range.inspect} does not include #{test}" unless range.include?(test)
+      raise ConfigurationError, "Out of range: #{range.inspect} does not include #{test}" unless range.include?(test)
 
       item
     end
@@ -343,18 +346,18 @@ module Montrose
     def parse_frequency(input)
       if input.respond_to?(:parts)
         frequency, interval = duration_to_frequency_parts(input)
-        { every: frequency.to_s.singularize.to_sym, interval: interval }
+        {every: frequency.to_s.singularize.to_sym, interval: interval}
       elsif input.is_a?(Numeric)
         frequency, interval = numeric_to_frequency_parts(input)
-        { every: frequency, interval: interval }
+        {every: frequency, interval: interval}
       else
-        { every: Frequency.assert(input) }
+        {every: Frequency.assert(input)}
       end
     end
 
     def numeric_to_frequency_parts(number)
       parts = nil
-      [:year, :month, :week, :day, :hour, :minute].each do |freq|
+      %i[year month week day hour minute].each do |freq|
         div, mod = number.divmod(1.send(freq))
         parts = [freq, div]
         return parts if mod.zero?
@@ -371,7 +374,7 @@ module Montrose
       when Range
         [decompose_during_arg(during.first), decompose_during_arg(during.last)]
       when String
-        during.split(%r{[-—–]}).map { |d| as_time_parts(d) }
+        during.split(/[-—–]/).map { |d| as_time_parts(d) }
       else
         as_time_parts(during)
       end

data/lib/montrose/recurrence.rb

@@ -238,7 +238,7 @@ module Montrose
                else
                  fail SerializationError,
                    "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
-               end
+        end
 
         JSON.dump(hash)
       end
@@ -308,7 +308,7 @@ module Montrose
     def to_hash
       default_options.to_hash
     end
-    alias to_h to_hash
+    alias_method :to_h, :to_hash
 
     # Returns json string of options used to create the recurrence
     #
@@ -346,20 +346,41 @@ module Montrose
     def include?(timestamp)
       return false if earlier?(timestamp) || later?(timestamp)
 
-      recurrence = finite? ? self : starts(timestamp)
+      recurrence = finite? ? self : fast_forward(timestamp)
 
       recurrence.events.lazy.each do |event|
         return true if event == timestamp
         return false if event > timestamp
-      end or false
+      end || false
     end
 
-    # Return true/false if recurrence will iterate infinitely
+    def fast_forward(timestamp)
+      return starts(timestamp) unless starts_at.present?
+
+      interval = default_options[:interval]
+      frequency = default_options[:every]
+      duration = interval.send(frequency)
+
+      # Calculate nearest earlier time ahead matching frequency * interval
+      jump = ((timestamp - starts_at) / duration).floor * duration
+
+      starts(starts_at + jump)
+    end
+
+    # Return true/false if recurrence will terminate
     #
-    # @return [Boolean] whether or not recurrence is infinite
+    # @return [Boolean] returns true if recurrence has an end
     #
     def finite?
-      ends_at || length
+      !infinite?
+    end
+
+    # Return true/false if recurrence will iterate infinitely
+    #
+    # @return [Boolean] returns true if recurrence has no end
+    #
+    def infinite?
+      !ends_at && !length
     end
 
     # Return true/false if given timestamp occurs before
@@ -391,7 +412,7 @@ module Montrose
         loop do
           stack.advance(clock.tick) do |time|
             yielder << time
-          end or break
+          end || break
         end
       end
     end

data/lib/montrose/rule.rb

@@ -36,7 +36,7 @@ module Montrose
 end
 
 require "montrose/rule/after"
-require "montrose/rule/between"
+require "montrose/rule/covering"
 require "montrose/rule/day_of_month"
 require "montrose/rule/day_of_week"
 require "montrose/rule/day_of_year"

data/lib/montrose/rule/between.rb

@@ -22,7 +22,7 @@ module Montrose
       end
 
       def continue?(time)
-        @between.max > time
+        time < @between.max
       end
     end
   end

data/lib/montrose/rule/covering.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Montrose
+  module Rule
+    class Covering
+      include Montrose::Rule
+
+      def self.apply_options(opts)
+        opts[:covering].is_a?(Range) && opts[:covering]
+      end
+
+      # Initializes rule
+      #
+      # @param [Range] covering - timestamp range
+      #
+      def initialize(covering)
+        @covering = case covering.first
+        when Date
+          DateRange.new(covering)
+        else
+          covering
+        end
+      end
+
+      def include?(time)
+        @covering.include?(time)
+      end
+
+      def continue?(time)
+        time < @covering.last
+      end
+
+      class DateRange < SimpleDelegator
+        def include?(time)
+          __getobj__.include?(time.to_date)
+        end
+      end
+    end
+  end
+end

data/lib/montrose/rule/until.rb

@@ -8,7 +8,7 @@ module Montrose
       def self.apply_options(opts)
         return false unless opts[:until]
 
-        { until: opts[:until], exclude_end: opts.fetch(:exclude_end, false) }
+        {until: opts[:until], exclude_end: opts.fetch(:exclude_end, false)}
       end
 
       def initialize(opts)

data/lib/montrose/schedule.rb

@@ -42,7 +42,7 @@ module Montrose
                 else
                   fail SerializationError,
                     "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
-                end
+        end
 
         JSON.dump(array)
       end
@@ -77,7 +77,7 @@ module Montrose
 
       self
     end
-    alias add <<
+    alias_method :add, :<<
 
     # Return true/false if given timestamp is included in any of the rules
     # found in the schedule
@@ -127,7 +127,7 @@ module Montrose
       enums = @rules.map { |r| r.merge(opts).events }
       Enumerator.new do |y|
         loop do
-          enum = active_enums(enums).min_by(&:peek) or break
+          (enum = active_enums(enums).min_by(&:peek)) || break
           y << enum.next
         end
       end
@@ -173,11 +173,9 @@ module Montrose
 
     def active_enums(enums)
       enums.select do |e|
-        begin
-          e.peek
-        rescue StopIteration
-          false
-        end
+        e.peek
+      rescue StopIteration
+        false
       end
     end
   end

data/lib/montrose/stack.rb

@@ -13,7 +13,7 @@ module Montrose
         Frequency,
         Rule::After,
         Rule::Until,
-        Rule::Between,
+        Rule::Covering,
         Rule::During,
         Rule::Except,
         Rule::Total,
@@ -44,7 +44,7 @@ module Montrose
       yes, no = @stack.partition { |rule| rule.include?(time) }
 
       if no.empty?
-        yes.all? { |rule| rule.advance!(time) } or return false
+        yes.all? { |rule| rule.advance!(time) } || (return false)
         puts time if ENV["DEBUG"]
         yield time if block_given?
         true

data/lib/montrose/utils.rb

@@ -29,7 +29,7 @@ module Montrose
 
     # Recurrence at fractions of a second are not recognized
     def normalize_time(time)
-      time && time.change(usec: 0)
+      time&.change(usec: 0)
     end
 
     def as_date(time)
@@ -56,8 +56,8 @@ module Montrose
 
     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 + month_numbers).inspect}"
+      month_number(name) || raise(ConfigurationError,
+        "Did not recognize month #{name}, must be one of #{(MONTHS + month_numbers).inspect}")
     end
 
     def day_number(name)
@@ -74,8 +74,8 @@ module Montrose
 
     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 + day_numbers).inspect}"
+      day_number(name) || raise(ConfigurationError,
+        "Did not recognize day #{name}, must be one of #{(DAYS + day_numbers).inspect}")
     end
 
     def days_in_month(month, year = current_time.year)
@@ -93,7 +93,7 @@ module Montrose
     # 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
+      /^\d+/.match?(string) ? string.to_i : -1
     end
   end
 end

data/lib/montrose/version.rb

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

data/montrose.gemspec

@@ -5,29 +5,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "montrose/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "montrose"
-  spec.version       = Montrose::VERSION
-  spec.authors       = ["Ross Kaffenberger"]
-  spec.email         = ["rosskaff@gmail.com"]
+  spec.name = "montrose"
+  spec.version = Montrose::VERSION
+  spec.authors = ["Ross Kaffenberger"]
+  spec.email = ["rosskaff@gmail.com"]
 
-  spec.summary       = "Recurring events in Ruby"
-  spec.description   = "A library for specifying, quering, and enumerating recurring events for calendars in Ruby."
-  spec.homepage      = "https://github.com/rossta/montrose"
-  spec.license       = "MIT"
+  spec.summary = "Recurring events in Ruby"
+  spec.description = "A library for specifying, quering, and enumerating recurring events for calendars in Ruby."
+  spec.homepage = "https://github.com/rossta/montrose"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_dependency "activesupport", ">= 4.1", "<= 7.0"
+  spec.add_dependency "activesupport", ">= 5.2", "<= 7.0"
 
-  spec.add_development_dependency "appraisal", "~> 2.2.0"
-  spec.add_development_dependency "m", "~> 1.5"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "m"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "rubocop", "~> 0.64.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "standard"
   spec.add_development_dependency "timecop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: montrose
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ross Kaffenberger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<="
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
     - - "<="
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -34,30 +34,30 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -76,30 +76,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -122,10 +122,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -140,14 +139,11 @@ files:
 - bin/guard
 - bin/m
 - bin/rake
-- bin/rubocop
 - bin/setup
-- gemfiles/activesupport_4.1.gemfile
-- gemfiles/activesupport_4.2.gemfile
-- gemfiles/activesupport_5.0.gemfile
-- gemfiles/activesupport_5.1.gemfile
+- bin/standardrb
 - gemfiles/activesupport_5.2.gemfile
 - gemfiles/activesupport_6.0.gemfile
+- gemfiles/activesupport_6.1.gemfile
 - lib/montrose.rb
 - lib/montrose/chainable.rb
 - lib/montrose/clock.rb
@@ -166,6 +162,7 @@ files:
 - lib/montrose/rule.rb
 - lib/montrose/rule/after.rb
 - lib/montrose/rule/between.rb
+- lib/montrose/rule/covering.rb
 - lib/montrose/rule/day_of_month.rb
 - lib/montrose/rule/day_of_week.rb
 - lib/montrose/rule/day_of_year.rb
@@ -189,7 +186,7 @@ homepage: https://github.com/rossta/montrose
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,15 +194,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.8
+signing_key:
 specification_version: 4
 summary: Recurring events in Ruby
 test_files: []

data/.rubocop.yml

@@ -1,136 +0,0 @@
-AllCops:
-  Exclude:
-    - 'bin/**/*'
-    - 'gemfiles/**/*'
-    - 'tmp/**/*'
-  TargetRubyVersion: '2.3.0'
-
-Lint/HandleExceptions:
-  Exclude:
-    - 'test/test_helper.rb'
-
-Metrics/LineLength:
-  Max: 120
-
-Metrics/ClassLength:
-  Max: 300
-
-Metrics/ModuleLength:
-  Max: 300
-
-Metrics/MethodLength:
-  Max: 100
-
-Metrics/ParameterLists:
-  Max: 8
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Documentation:
-  Enabled: false # TODO: Enable again once we have more docs
-
-Lint/HandleExceptions:
-  Enabled: false
-
-Style/GlobalVars:
-  Exclude:
-  - spec/support/trace.rb
-
-Style/SafeNavigation:
-  Enabled: false
-
-Style/SpecialGlobalVars:
-  Enabled: false
-
-Style/TrivialAccessors:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: true
-
-Naming/MethodName:
-  Enabled: false
-
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/AccessModifierIndentation:
-  Enabled: true
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes
-
-Layout/ClosingParenthesisIndentation:
-  Enabled: false
-
-Layout/EndAlignment:
-  Enabled: false
-
-Layout/DefEndAlignment:
-  Enabled: false
-
-Style/OneLineConditional:
-  Enabled: false
-
-Style/AndOr:
-  Enabled: false
-
-Style/Not:
-  Enabled: false
-
-Layout/CaseIndentation:
-  SupportedStyles:
-    - case
-    - end
-  IndentOneStep: false
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%w': "[]"
-    '%W': "[]"
-
-Layout/AccessModifierIndentation:
-  EnforcedStyle: indent
-
-Style/SignalException:
-  Enabled: false
-
-Layout/IndentationWidth:
-  Enabled: false
-
-Style/TrivialAccessors:
-  ExactNameMatch: true
-
-Style/RegexpLiteral:
-  EnforcedStyle: percent_r
-
-Layout/DotPosition:
-  EnforcedStyle: leading
-
-Naming/VariableNumber:
-  Enabled: false
-
-Style/FormatString:
-  Enabled: false
-
-Style/MutableConstant:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/SymbolArray:
-  Enabled: false

data/.travis.yml

@@ -1,33 +0,0 @@
-bundler_args: "--jobs 4 --retry 3"
-cache: bundler
-gemfile:
-- gemfiles/activesupport_6.0.gemfile
-- gemfiles/activesupport_5.2.gemfile
-- gemfiles/activesupport_5.1.gemfile
-- gemfiles/activesupport_5.0.gemfile
-- gemfiles/activesupport_4.2.gemfile
-- gemfiles/activesupport_4.1.gemfile
-language: ruby
-matrix:
-  exclude:
-  - rvm: 2.3
-    gemfile: gemfiles/activesupport_6.0.gemfile # Requires ruby 2.5+
-  - rvm: 2.4
-    gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
-  - rvm: 2.4
-    gemfile: gemfiles/activesupport_6.0.gemfile # Requires ruby 2.5+
-  - rvm: 2.5
-    gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
-  - rvm: 2.6
-    gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
-  fast_finish: true
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-sudo: false
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install bundler

data/bin/rubocop

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rubocop' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rubocop', 'rubocop')

data/gemfiles/activesupport_4.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 4.1.0"
-
-group :development do
-  gem "coveralls"
-  gem "yard"
-end
-
-gemspec path: "../"

data/gemfiles/activesupport_5.0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 5.0.0"
-
-group :development do
-  gem "coveralls"
-  gem "yard"
-end
-
-gemspec path: "../"

data/gemfiles/activesupport_5.1.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 5.1.0"
-
-group :development do
-  gem "coveralls"
-  gem "yard"
-end
-
-gemspec path: "../"