montrose 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6586fb7cc1e8bfb5bf4a60b01dc27687703b613
-  data.tar.gz: 2de01900143bb357b8250d7213b02f18d63f7f6e
+  metadata.gz: 177a7778b6014cbf29338af5d999c7214662f15d
+  data.tar.gz: 7a375b6e47b4399277246f490714983b1ce7bf69
 SHA512:
-  metadata.gz: 97c05ddc454035a90a397d3aa0b498baedee44288a0e1488c57629e62ff5516542e023deac99ec2ac26b2ac3e612836e8f15d18da08403f77ef848564ea23b37
-  data.tar.gz: e8e8d506f11e6dade4915e3af9c4a518102a1eb5199a499485975020334744ba67a2943db5ccaa094cff05827c2172ec912c42d23dd69bd09107cf16c23e7843
+  metadata.gz: 79edb791f61f1bf5b9a4250eaaeee275c81241aa7ddf2312de365726b48977c12b4d51793a6e0027e5d6debb12415dad710bba5cf029f8a5ccf022b12fdfd97a
+  data.tar.gz: c9f41be8ea24bc7f686c91aaf3f842e3ce6e2b39fbacbcbacb0bba4a059e4e70a55a5194a05427b1ae65abb6d493378be68ed795a0674f78e046f05d9592307f

data/.codeclimate.yml

@@ -0,0 +1,19 @@
+---
+engines:
+  bundler-audit:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - Gemfile.lock
+  - "**.rb"
+exclude_paths:
+- spec/

data/.rubocop.yml

@@ -118,3 +118,9 @@ Style/VariableNumber:
 
 Style/FormatString:
   Enabled: false
+
+Style/MutableConstant:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false

data/.travis.yml

@@ -1,6 +1,7 @@
 bundler_args: "--jobs 4 --retry 3"
 cache: bundler
 gemfile:
+- gemfiles/activesupport_5.1.gemfile
 - gemfiles/activesupport_5.0.gemfile
 - gemfiles/activesupport_4.2.gemfile
 - gemfiles/activesupport_4.1.gemfile
@@ -9,9 +10,17 @@ matrix:
   exclude:
   - rvm: 2.1.10
     gemfile: gemfiles/activesupport_5.0.gemfile # Requires Ruby 2.2+
+  - rvm: 2.1.10
+    gemfile: gemfiles/activesupport_5.1.gemfile # Requires Ruby 2.2+
+  - rvm: 2.4.0
+    gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
   fast_finish: true
 rvm:
   - 2.1.10
   - 2.2.6
   - 2.3.3
+  - 2.4.0
 sudo: false
+before_install:
+  - gem update --system
+  - gem --version

data/Appraisals

@@ -1,3 +1,7 @@
+appraise "activesupport-5.1" do
+  gem "activesupport", "~> 5.1.0"
+end
+
 appraise "activesupport-5.0" do
   gem "activesupport", "~> 5.0.0"
 end

data/CHANGELOG.md

@@ -1,4 +1,24 @@
-### 0.6.0 - (2016-01-05)
+### 0.7.0 - (2017-09-18)
+
+* enhancements
+  * Adds the :exclude_end option can be used to determine whether :until value
+    is included in the recurrence. Mimics the API to Ruby's Range.
+  * Support activesupport-5.1 (by @fauxparse)
+  * Support ruby-2.4
+
+* bug fixes
+  * Recurrence#to_json accepts arguments for JSON.dump
+
+* breaking changes
+  * Previously, the :between option served as a shorthand for :starts to :until.
+    Now, when both :starts and :between are provided, the recurrence will behave
+as if anchored by the given :starts option, but filtered through the given
+:betweeen option.
+  * The :exclude_end option changes the default behavior of :until--when the
+    timestamp of the interval matches the :until timestamp, it will be included
+by default unless the :exclude_end option is set to true.
+
+### 0.6.0 - (2017-01-05)
 
 * enhancements
   * Alias `every` to `frequency`

data/Gemfile

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 gemspec
 
 group :development do
-  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "coveralls"
   gem "guard", platforms: [:ruby_22, :ruby_23] # Guard no longer supports ruby 2.1
   gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
   gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
+  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
   gem "yard"
-  gem "coveralls"
 end

data/Guardfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

data/README.md

@@ -1,15 +1,15 @@
 # Montrose
 
 [![Build Status](https://travis-ci.org/rossta/montrose.svg?branch=master)](https://travis-ci.org/rossta/montrose)
-[![Coverage Status](https://coveralls.io/repos/rossta/montrose/badge.svg?branch=master&service=github)](https://coveralls.io/github/rossta/montrose?branch=master)
 [![Code Climate](https://codeclimate.com/github/rossta/montrose/badges/gpa.svg)](https://codeclimate.com/github/rossta/montrose)
+[![Coverage Status](https://coveralls.io/repos/rossta/montrose/badge.svg?branch=master&service=github)](https://coveralls.io/github/rossta/montrose?branch=master)
 [![Dependency Status](https://gemnasium.com/rossta/montrose.svg)](https://gemnasium.com/rossta/montrose)
 
 Montrose is an easy-to-use library for defining recurring events in Ruby. It uses a simple chaining system for building recurrences, inspired heavily by the design principles of [HTTP.rb](https://github.com/httprb/http) and rule definitions available in [Recurrence](https://github.com/fnando/recurrence).
 
 * [Introductory blog post](http://bit.ly/1PA68Zb)
 * [NYC.rb
-  presentation](https://speaderdeck.com/rossta/recurring-events-with-montrose)
+  presentation](https://speakerdeck.com/rossta/recurring-events-with-montrose)
 
 ## Installation
 
@@ -370,6 +370,17 @@ r.events.take(10).each { |date| puts date.to_s }
 r.events.lazy.select { |time| time > 1.month.from_now }.take(3).each { |date| puts date.to_s }
 ```
 
+### Ruby on Rails
+
+Instances of `Montrose::Recurrence` support the ActiveRecord serialization API so recurrence objects can be marshalled to and from a single database column:
+
+```ruby
+class RecurringEvent < ApplicationRecord
+  serialize :recurrence, Montrose::Recurrence
+
+end
+```
+
 ## Inspiration
 
 Montrose is named after the beautifully diverse and artistic [neighborhood in Houston, Texas](https://en.wikipedia.org/wiki/Montrose,_Houston).

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"

data/bin/appraisal

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' 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("appraisal", "appraisal")

data/gemfiles/activesupport_4.1.gemfile

@@ -5,12 +5,12 @@ source "https://rubygems.org"
 gem "activesupport", "~> 4.1.0"
 
 group :development do
-  gem "pry-byebug", :platforms => [:ruby_21, :ruby_22, :ruby_23]
-  gem "guard", :platforms => [:ruby_22, :ruby_23]
-  gem "guard-minitest", :platforms => [:ruby_22, :ruby_23]
-  gem "guard-rubocop", :platforms => [:ruby_22, :ruby_23]
-  gem "yard"
   gem "coveralls"
+  gem "guard", platforms: [:ruby_22, :ruby_23]
+  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
+  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
+  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "yard"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activesupport_4.2.gemfile

@@ -5,12 +5,12 @@ source "https://rubygems.org"
 gem "activesupport", "~> 4.2.0"
 
 group :development do
-  gem "pry-byebug", :platforms => [:ruby_21, :ruby_22, :ruby_23]
-  gem "guard", :platforms => [:ruby_22, :ruby_23]
-  gem "guard-minitest", :platforms => [:ruby_22, :ruby_23]
-  gem "guard-rubocop", :platforms => [:ruby_22, :ruby_23]
-  gem "yard"
   gem "coveralls"
+  gem "guard", platforms: [:ruby_22, :ruby_23]
+  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
+  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
+  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "yard"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activesupport_5.0.gemfile

@@ -5,12 +5,12 @@ source "https://rubygems.org"
 gem "activesupport", "~> 5.0.0"
 
 group :development do
-  gem "pry-byebug", :platforms => [:ruby_21, :ruby_22, :ruby_23]
-  gem "guard", :platforms => [:ruby_22, :ruby_23]
-  gem "guard-minitest", :platforms => [:ruby_22, :ruby_23]
-  gem "guard-rubocop", :platforms => [:ruby_22, :ruby_23]
-  gem "yard"
   gem "coveralls"
+  gem "guard", platforms: [:ruby_22, :ruby_23]
+  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
+  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
+  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "yard"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activesupport_5.1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.1.0"
+
+group :development do
+  gem "coveralls"
+  gem "guard", platforms: [:ruby_22, :ruby_23]
+  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
+  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
+  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
+  gem "yard"
+end
+
+gemspec path: "../"

data/lib/montrose.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support"
 require "active_support/core_ext/object"
 require "active_support/core_ext/numeric"

data/lib/montrose/chainable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "montrose/options"
 require "montrose/refinements/array_concat"
 

data/lib/montrose/clock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "montrose/errors"
 
 module Montrose

data/lib/montrose/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   Error = Class.new(StandardError)
   ConfigurationError = Class.new(Error)

data/lib/montrose/frequency.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "montrose/errors"
 require "montrose/options"
 

data/lib/montrose/frequency/daily.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Daily < Frequency

data/lib/montrose/frequency/hourly.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Hourly < Frequency

data/lib/montrose/frequency/minutely.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Minutely < Frequency

data/lib/montrose/frequency/monthly.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Monthly < Frequency

data/lib/montrose/frequency/secondly.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Secondly < Frequency

data/lib/montrose/frequency/weekly.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Weekly < Frequency

data/lib/montrose/frequency/yearly.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Frequency
     class Yearly < Frequency

data/lib/montrose/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   class Options
     include Montrose::Utils
@@ -71,6 +72,7 @@ module Montrose
     def_option :every
     def_option :starts
     def_option :until
+    def_option :between
     def_option :hour
     def_option :day
     def_option :mday
@@ -82,6 +84,7 @@ module Montrose
     def_option :at
     def_option :on
     def_option :except
+    def_option :exclude_end
 
     def initialize(opts = {})
       defaults = {
@@ -94,7 +97,8 @@ module Montrose
         yday: nil,
         week: nil,
         month: nil,
-        total: nil
+        total: nil,
+        exclude_end: nil
       }
 
       options = defaults.merge(opts || {})
@@ -182,14 +186,9 @@ module Montrose
     end
 
     def between=(range)
-      self[:starts] = range.first
-      self[:until] = range.last
-    end
-
-    def between
-      return nil unless self[:starts] && self[:until]
-
-      (self[:starts]..self[:until])
+      @between = range
+      self[:starts] = range.first unless self[:starts]
+      self[:until] = range.last unless self[:until]
     end
 
     def at=(time)

data/lib/montrose/recurrence.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 require "json"
+require "yaml"
 require "montrose/chainable"
 require "montrose/errors"
 require "montrose/stack"
@@ -310,8 +312,16 @@ module Montrose
     #
     # @return [String] json of recurrence options
     #
-    def to_json
-      to_hash.to_json
+    def to_json(*args)
+      JSON.dump(to_hash, *args)
+    end
+
+    # Returns options used to create the recurrence in YAML format
+    #
+    # @return [String] YAML-formatted recurrence options
+    #
+    def to_yaml(*args)
+      YAML.dump(to_hash, *args)
     end
 
     def inspect

data/lib/montrose/refinements/array_concat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Refinements
     module ArrayConcat

data/lib/montrose/rule.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   # Defines the Rule duck type for recurrence rules
   module Rule
@@ -13,7 +14,7 @@ module Montrose
       true
     end
 
-    def continue?
+    def continue?(_time = nil)
       true
     end
 
@@ -34,7 +35,7 @@ module Montrose
 end
 
 require "montrose/rule/after"
-require "montrose/rule/before"
+require "montrose/rule/between"
 require "montrose/rule/day_of_month"
 require "montrose/rule/day_of_week"
 require "montrose/rule/day_of_year"
@@ -45,4 +46,5 @@ require "montrose/rule/nth_day_of_month"
 require "montrose/rule/nth_day_of_year"
 require "montrose/rule/time_of_day"
 require "montrose/rule/total"
+require "montrose/rule/until"
 require "montrose/rule/week_of_year"

data/lib/montrose/rule/after.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class After
@@ -19,7 +20,7 @@ module Montrose
         time >= @start_time
       end
 
-      def continue?
+      def continue?(_time)
         false
       end
     end

data/lib/montrose/rule/between.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module Montrose
+  module Rule
+    class Between
+      include Montrose::Rule
+
+      def self.apply_options(opts)
+        opts[:between].is_a?(Range) && opts[:between]
+      end
+
+      # Initializes rule
+      #
+      # @param [Range] between - timestamp range
+      #
+      def initialize(between)
+        @between = between
+      end
+
+      def include?(time)
+        @between.cover?(time)
+      end
+
+      def continue?(time)
+        @between.max > time
+      end
+    end
+  end
+end

data/lib/montrose/rule/day_of_month.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class DayOfMonth

data/lib/montrose/rule/day_of_week.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class DayOfWeek

data/lib/montrose/rule/day_of_year.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class DayOfYear

data/lib/montrose/rule/except.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class Except

data/lib/montrose/rule/hour_of_day.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class HourOfDay

data/lib/montrose/rule/month_of_year.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class MonthOfYear

data/lib/montrose/rule/nth_day_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 
 module Montrose

data/lib/montrose/rule/nth_day_of_month.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "montrose/rule/nth_day_matcher"
 
 module Montrose

data/lib/montrose/rule/nth_day_of_year.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "montrose/rule/nth_day_matcher"
 
 module Montrose

data/lib/montrose/rule/time_of_day.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class TimeOfDay

data/lib/montrose/rule/total.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class Total
@@ -12,16 +13,16 @@ module Montrose
         @count = 0
       end
 
-      def include?(_time)
-        continue?
+      def include?(time)
+        continue?(time)
       end
 
-      def advance!(_time)
+      def advance!(time)
         @count += 1
-        continue?
+        continue?(time)
       end
 
-      def continue?
+      def continue?(_time)
         @count <= @max
       end
     end

data/lib/montrose/rule/until.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Montrose
+  module Rule
+    class Until
+      include Montrose::Rule
+
+      def self.apply_options(opts)
+        return false unless opts[:until]
+
+        { until: opts[:until], exclude_end: opts.fetch(:exclude_end, false) }
+      end
+
+      def initialize(opts)
+        @end_time = opts.fetch(:until)
+        @exclude_end = opts.fetch(:exclude_end)
+      end
+
+      def include?(time)
+        if @exclude_end
+          time < @end_time
+        else
+          time <= @end_time
+        end
+      end
+
+      def continue?(_time)
+        false
+      end
+    end
+  end
+end

data/lib/montrose/rule/week_of_year.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Rule
     class WeekOfYear

data/lib/montrose/schedule.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   # A schedule represents a group of recurrences
   #

data/lib/montrose/stack.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "montrose/rule"
 
 module Montrose
@@ -10,7 +11,8 @@ module Montrose
       [
         Frequency,
         Rule::After,
-        Rule::Before,
+        Rule::Until,
+        Rule::Between,
         Rule::Except,
         Rule::Total,
         Rule::TimeOfDay,
@@ -45,7 +47,7 @@ module Montrose
         yield time if block_given?
         true
       else
-        no.any?(&:continue?)
+        no.any? { |rule| rule.continue?(time) }
       end
     end
   end

data/lib/montrose/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Montrose
   module Utils
     module_function

data/lib/montrose/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Montrose
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.0"
 end

data/montrose.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "montrose/version"
@@ -21,13 +22,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1.0"
 
-  spec.add_dependency "activesupport", ">= 4.1", "< 5.1"
+  spec.add_dependency "activesupport", ">= 4.1", "< 5.2"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "appraisal", "~> 2.1.0"
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "appraisal", "~> 2.2.0"
   spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "minitest", "~> 5.9"
-  spec.add_development_dependency "m", "~> 1.4"
-  spec.add_development_dependency "rubocop", "0.45.0"
+  spec.add_development_dependency "minitest", "~> 5.10"
+  spec.add_development_dependency "m", "~> 1.5"
+  spec.add_development_dependency "rubocop", "0.46.0"
   spec.add_development_dependency "timecop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: montrose
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,35 +29,35 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,42 +78,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -148,6 +149,7 @@ files:
 - README.md
 - Rakefile
 - bin/_guard-core
+- bin/appraisal
 - bin/console
 - bin/guard
 - bin/m
@@ -157,6 +159,7 @@ files:
 - gemfiles/activesupport_4.1.gemfile
 - gemfiles/activesupport_4.2.gemfile
 - gemfiles/activesupport_5.0.gemfile
+- gemfiles/activesupport_5.1.gemfile
 - lib/montrose.rb
 - lib/montrose/chainable.rb
 - lib/montrose/clock.rb
@@ -174,7 +177,7 @@ files:
 - lib/montrose/refinements/array_concat.rb
 - lib/montrose/rule.rb
 - lib/montrose/rule/after.rb
-- lib/montrose/rule/before.rb
+- lib/montrose/rule/between.rb
 - lib/montrose/rule/day_of_month.rb
 - lib/montrose/rule/day_of_week.rb
 - lib/montrose/rule/day_of_year.rb
@@ -186,6 +189,7 @@ files:
 - lib/montrose/rule/nth_day_of_year.rb
 - lib/montrose/rule/time_of_day.rb
 - lib/montrose/rule/total.rb
+- lib/montrose/rule/until.rb
 - lib/montrose/rule/week_of_year.rb
 - lib/montrose/schedule.rb
 - lib/montrose/stack.rb
@@ -212,9 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Recurring events in Ruby
 test_files: []
-has_rdoc: 

data/lib/montrose/rule/before.rb

@@ -1,23 +0,0 @@
-module Montrose
-  module Rule
-    class Before
-      include Montrose::Rule
-
-      def self.apply_options(opts)
-        opts[:until]
-      end
-
-      def initialize(end_time)
-        @end_time = end_time
-      end
-
-      def include?(time)
-        time < @end_time
-      end
-
-      def continue?
-        false
-      end
-    end
-  end
-end