reservation 0.0.4 → 0.0.5

data/README.md

@@ -36,15 +36,21 @@ This will create a set of events, with the given subjects, within the given cons
                  { "role" => "place", "subject" => here, "status" => "tentative" }
                ]
 
-    pattern = [ { "day" => "wed", "start" => "0930", "finish" => "1030"},
-                { "day" => "wed", "start" => "18",   "finish" => "20"  },
-                { "day" => "tue", "start" => "7",    "finish" => "830" } ]
+    patterns = [ { "day" => "wed", "start" => "0930", "finish" => "1030"},
+                 { "day" => "wed", "start" => "18",   "finish" => "20"  },
+                 { "day" => "tue", "start" => "7",    "finish" => "830" } ]
 
     Reservation::Event.create_weekly "the_title", "2013-09-03", "2013-10-13", subjects, pattern
 
+A 'pattern' may contain an 'nth_of_month' key, in which case the gem will generate events only on days which
+are the given nth day of the month (for example, "2nd wednesday of each month", "last saturday of the month").
+
 You can use Reservation::Event#build_weekly instead in order to instantiate the object graph without
 persisting it.
 
+## History
+
+v0.0.5 Add "nth day of month" feature
 
 ## Contributing
 

data/lib/core_ext/date.rb

@@ -0,0 +1,29 @@
+class Date
+  def nth_day_of_month
+    1 + ( (self.mday - 1) / 7 )
+  end
+
+  def nth_last_day_of_month
+    last_day = self.end_of_month.mday
+    - 1 - (last_day - self.mday) / 7
+  end
+
+  #
+  # return true if this is the nth of this day within the month,
+  # for example, if n is 2, and this is the second wednesday of the month,
+  # return true. If n is -1, and this is the last saturday of the month,
+  # return true. It doesn't matter which *day* it is, it matters whether
+  # it's the first, second, third, etc, or if it's the last, second last,
+  # third last, etc
+  #
+  def nth_day_of_month? n
+    case n <=> 0
+    when -1
+      nth_last_day_of_month == n
+    when 0
+      raise ArgumentError.new("must be non-zero integer")
+    when 1
+      nth_day_of_month == n
+    end
+  end
+end

data/lib/generators/reservation/migration/migration_generator.rb

@@ -17,6 +17,6 @@ class Reservation::MigrationGenerator < Rails::Generators::Base
   end
 
   def create_migration_file
-    migration_template 'migration.rb', 'db/migrate/create_reservations_tables.rb'
+    migration_template 'migration.rb', 'db/migrate/create_reservations.rb'
   end
 end

data/lib/reservation.rb

@@ -5,3 +5,9 @@ require "reservation/event_filter"
 require "reservation/event"
 require "reservation/reservation"
 
+
+module Reservation
+  def self.table_name_prefix
+    'reservation_'
+  end
+end

data/lib/reservation/daily.rb

@@ -0,0 +1,36 @@
+require 'core_ext/date'
+
+module Reservation
+  module Schedule
+    #
+    # a utility class to represent an interval starting on a day
+    #
+    class Daily
+      attr_accessor :wday, :nth_of_month, :interval
+
+      def initialize wday, nth_of_month, interval
+        @wday = wday
+        @nth_of_month = nth_of_month
+        @interval = interval
+      end
+
+      def matches? event
+        good_day?(event.start.to_date) && interval.matches?(event)
+      end
+
+      def generate date, list
+        return list unless good_day?(date)
+        list << interval.generate(date)
+        list
+      end
+
+      def good_day? date
+        (date.wday == self.wday) && ((self.nth_of_month == :all) || date.nth_day_of_month?(self.nth_of_month))
+      end
+
+      def to_s
+        "#{MAP_DAY[wday]} => #{interval}"
+      end
+    end
+  end
+end

data/lib/reservation/event.rb

@@ -4,7 +4,7 @@ class Reservation::Event < ActiveRecord::Base
   extend Reservation::TimeOffset
   extend Reservation::EventFilter
 
-  has_many :reservations, :class_name => "Reservation::Reservation"
+  has_many :reservations, :class_name => "Reservation::Reservation", :inverse_of => :event
   attr_accessible :finish, :start, :title
 
   scope :since, lambda { |time| where("reservation_events.finish > ?", time) }

data/lib/reservation/hour_minute.rb

@@ -0,0 +1,51 @@
+module Reservation
+  module Schedule
+    #
+    # a utility class to match the hour and minute elements of a Time instance, without considering any other values
+    #
+    class HourMinute
+      attr_accessor :hour, :minute
+
+      def initialize hour, minute
+        @hour, @minute = hour, minute
+      end
+
+      def matches_time? time
+        time.hour == self.hour && time.min == self.minute
+      end
+
+      #
+      # hhmm is a string containg an hour-and-minute value
+      #
+      # #parse will remove all nondigit characters, pad the result to 4 digits,
+      # and interpret the first two as an hour value, the last two as a minute value
+      #
+      # padding takes place as follows :
+      #  * one digit becomes 0d00 (assumes "7" means "0700")
+      #  * two digits become dd00 (assumes "11" means "1100")
+      #  * three digits become 0ddd (assumes "830" means "0830")
+      #
+      def self.parse hhmm
+        orig = hhmm
+        hhmm = hhmm.gsub(/[^\d]/, "")
+        hhmm = "0#{hhmm}00" if hhmm.length == 1
+        hhmm = "#{hhmm}00" if hhmm.length == 2
+        hhmm = "0#{hhmm}" if hhmm.length == 3
+        raise "Can't parse #{orig.inspect}" unless hhmm.match(/^\d\d\d\d$/)
+
+        hh = hhmm[0,2].to_i
+        mm = hhmm[2,4].to_i
+
+        new hh, mm
+      end
+
+      def change date
+        date.to_time.change :hour => hour, :min => minute
+      end
+
+      def to_s
+        "#{hour.to_s.rjust 2, "0"}#{minute.to_s.rjust 2, "0"}"
+      end
+    end
+  end
+end

data/lib/reservation/interval.rb

@@ -0,0 +1,32 @@
+module Reservation
+  module Schedule
+    #
+    # a utility class to match the start and end times of an Event instance, without considering the event date
+    #
+    class Interval
+      attr_accessor :start, :finish
+
+      def initialize start, finish
+        @start, @finish = start, finish
+      end
+
+      # true if the start time and finish time of the given event matches start and finish times of this Interval
+      def matches? event
+        start.matches_time?(event.start) && finish.matches_time?(event.finish)
+      end
+
+      # build a new Event with this Interval's start and finish times, on the given date
+      def generate date
+        Event.new :start => start.change(date), :finish => finish.change(date)
+      end
+
+      def self.from start, finish
+        new HourMinute.parse(start), HourMinute.parse(finish)
+      end
+
+      def to_s
+        "#{start}-#{finish}"
+      end
+    end
+  end
+end

data/lib/reservation/reservation.rb

@@ -1,6 +1,6 @@
 module Reservation
   class Reservation < ActiveRecord::Base
-    belongs_to :event, :class_name => "Reservation::Event"
+    belongs_to :event, :class_name => "Reservation::Event", :inverse_of => :reservations
     belongs_to :subject, :polymorphic => true
     attr_accessible :reservation_status, :role, :subject_id, :subject_type, :event_id, :event, :subject
   end

data/lib/reservation/schedule.rb

@@ -1,191 +1,9 @@
+require 'reservation/hour_minute'
+require 'reservation/interval'
+require 'reservation/daily'
+require 'reservation/weekly'
+
 module Reservation
   DAY_MAP = { "sun" => 0, "mon" => 1, "tue" => 2, "wed" => 3, "thu" => 4, "fri" => 5, "sat" => 6 }
   MAP_DAY = %w{ sun mon tue wed thu fri sat }
-
-  module Schedule
-    #
-    # a utility class to match the hour and minute elements of a Time instance, without considering any other values
-    #
-    class HourMinute
-      attr_accessor :hour, :minute
-      def initialize hour, minute
-        @hour, @minute = hour, minute
-      end
-
-      def matches_time? time
-        time.hour == self.hour && time.min == self.minute
-      end
-
-      #
-      # hhmm is a string containg an hour-and-minute value
-      #
-      # #parse will remove all nondigit characters, pad the result to 4 digits,
-      # and interpret the first two as an hour value, the last two as a minute value
-      #
-      # padding takes place as follows :
-      #  * one digit becomes 0d00 (assumes "7" means "0700")
-      #  * two digits become dd00 (assumes "11" means "1100")
-      #  * three digits become 0ddd (assumes "830" means "0830")
-      #
-      def self.parse hhmm
-        orig = hhmm
-        hhmm = hhmm.gsub /[^\d]/, ""
-        hhmm = "0#{hhmm}00" if hhmm.length == 1
-        hhmm = "#{hhmm}00" if hhmm.length == 2
-        hhmm = "0#{hhmm}" if hhmm.length == 3
-        raise "Can't parse #{orig.inspect}" unless hhmm.match(/^\d\d\d\d$/)
-
-        hh = hhmm[0,2].to_i
-        mm = hhmm[2,4].to_i
-
-        new hh, mm
-      end
-
-      def change date
-        date.to_time.change :hour => hour, :min => minute
-      end
-
-      def to_s
-        "#{hour.to_s.rjust 2, "0"}#{minute.to_s.rjust 2, "0"}"
-      end
-    end
-
-    #
-    # a utility class to match the start and end times of an Event instance, without considering the event date
-    #
-    class Interval
-      attr_accessor :start, :finish
-
-      def initialize start, finish
-        @start, @finish = start, finish
-      end
-
-      # true if the start time and finish time of the given event matches start and finish times of this Interval
-      def matches? event
-        start.matches_time?(event.start) && finish.matches_time?(event.finish)
-      end
-
-      # build a new Event with this Interval's start and finish times, on the given date
-      def generate date
-        Event.new :start => start.change(date), :finish => finish.change(date)
-      end
-
-      def self.from start, finish
-        new HourMinute.parse(start), HourMinute.parse(finish)
-      end
-
-      def to_s
-        "#{start}-#{finish}"
-      end
-    end
-
-    #
-    # a utility class to represent a set of intervals on a single day
-    #
-    class Daily
-      attr_accessor :wday, :intervals
-
-      def initialize wday
-        @wday = wday
-        @intervals = []
-      end
-
-      def add interval
-        intervals << interval
-      end
-
-      def matches? event
-        return false if event.start.wday != self.wday
-        intervals.each { |interval|
-          return true if interval.matches? event
-        }
-        false
-      end
-
-      def generate date, list
-        return list if date.wday != wday
-        intervals.inject(list) { |list, interval|
-          list << interval.generate(date)
-          list
-        }
-      end
-
-      def to_s
-        "#{MAP_DAY[wday]} => #{intervals}"
-      end
-    end
-
-    #
-    # Weekly defines a set of intervals that recur weekly
-    #
-    # This class maintains an array of intervals for each weekday
-    #
-    # This class will never match multi-day events, as it assumes each event starts and ends within the same day
-    #
-    class Weekly
-
-      # wdays is a 7-element array of Daily instances
-      #
-      # the zeroth element corresponds to Sunday, because Time#wday behaves that way.
-      #
-      attr_accessor :wdays
-
-      # pattern is an array of the form
-      #
-      #  [ { "day" => "wed", "start" => "0930", "finish" => "10:30"},
-      #    { "day" => "wed", "start" => "18",   "finish" => "20"   },
-      #    { "day" => "tue", "start" => "7",    "finish" => "8h30" }  ]
-      #
-      # see HourMinute#parse for how "start" and "finish" values are read
-      #
-      def initialize pattern
-        self.wdays = (0..6).map { |i| Daily.new(i) }
-
-        pattern.each { |interval_spec|
-          wday   = DAY_MAP[interval_spec["day"]]
-          raise "unrecognised day #{spec["day"].inspect} in #{pattern.inspect}" if wday.nil?
-
-          start  = HourMinute.parse interval_spec["start"]
-          finish = HourMinute.parse interval_spec["finish"]
-          wdays[wday].add Interval.new(start, finish)
-        }
-      end
-
-      # true if there exists a Daily corresponding to this event's weekday, with
-      # an Interval corresponding to this event's start and finish times;
-      # false otherwise
-      #
-      def matches? event
-        return false if event.start.day != event.finish.day
-        wdays[event.start.wday].matches? event
-      end
-
-      #
-      # generate a set of Events according to this Weekly schedule, starting
-      # on #from at the earliest, ending on #upto at the latest.
-      #
-      # Note: #upto is *inclusive*, this will generate events on #upto,
-      # if the schedule allows
-      #
-      def generate from, upto
-        events = []
-        from.upto(upto).map { |date|
-          wdays.each { |day| day.generate date, events }
-        }
-        events
-      end
-
-      #
-      # return a new list including only those events in the given list
-      # that match this weekly schedule
-      #
-      def filter events
-        events.select { |e| matches? e }
-      end
-
-      def to_s
-        wdays.map(&:to_s).join "\n"
-      end
-    end
-  end
 end

data/lib/reservation/version.rb

@@ -1,3 +1,3 @@
 module Reservation
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/reservation/weekly.rb

@@ -0,0 +1,83 @@
+module Reservation
+  module Schedule
+    #
+    # Weekly defines a set of intervals that recur weekly
+    #
+    # This class maintains an array of weekdays with an interval for each
+    #
+    # This class will never match multi-day events, as it assumes each event starts and ends within the same day
+    #
+    class Weekly
+
+      # wdays is an array of Daily instances
+      attr_accessor :wdays
+
+      # pattern is an array of the form
+      #
+      #  [ { "nth_of_month" => "all", "day" => "wed", "start" => "0930", "finish" => "10:30"},
+      #    { "nth_of_month" =>   "1", "day" => "wed", "start" => "18",   "finish" => "20"   },
+      #    { "nth_of_month" =>  "-1", "day" => "tue", "start" => "7",    "finish" => "8h30" }  ]
+      #
+      # see HourMinute#parse for how "start" and "finish" values are read
+      #
+      # "nth_of_month" => "all", "day" => "mon" :: all mondays in the month are considered
+      # "nth_of_month" =>   "1", "day" => "fri" :: only the first friday of the month is considered
+      # "nth_of_month" =>  "-1", "day" => "tue" :: only the last tuesday of the month is considered
+      # "nth_of_month" =>  "-2", "day" => "sat" :: only the second-last saturday of the month is considered
+      #
+      def initialize patterns
+        self.wdays = []
+
+        patterns.each { |pattern|
+          day = pattern["day"]
+          nth_of_month = parse_nth_of_month pattern["nth_of_month"]
+
+          start  = HourMinute.parse pattern["start"]
+          finish = HourMinute.parse pattern["finish"]
+          self.wdays << Daily.new(DAY_MAP[day], nth_of_month, Interval.new(start, finish))
+        }
+      end
+
+      # true if there exists a Daily corresponding to this event's weekday, with
+      # an Interval corresponding to this event's start and finish times;
+      # false otherwise
+      #
+      def matches? event
+        return false if event.start.day != event.finish.day
+        self.wdays.each { |wday| return true if wday.matches?(event) }
+        false
+      end
+
+      #
+      # generate a set of Events according to this Weekly schedule, starting
+      # on #from at the earliest, ending on #upto at the latest.
+      #
+      # Note: #upto is *inclusive*, this will generate events on #upto,
+      # if the schedule allows
+      #
+      def generate from, upto
+        events = []
+        from.upto(upto).map { |date|
+          wdays.each { |day| day.generate date, events }
+        }
+        events
+      end
+
+      #
+      # return a new list including only those events in the given list
+      # that match this weekly schedule
+      #
+      def filter events
+        events.select { |e| matches? e }
+      end
+
+      def to_s
+        wdays.map(&:to_s).join "\n"
+      end
+
+      def parse_nth_of_month txt
+        (txt.to_s == '' || txt.to_s == 'all') ? :all : txt.to_i
+      end
+    end
+  end
+end

data/reservation.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec', '~> 2.9'
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency 'rspec_numbering_formatter'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/models/date_spec.rb

@@ -0,0 +1,239 @@
+require 'core_ext/date'
+
+describe Date do
+  describe :nth_day_of_month do
+    it "should return the index of this week-day in the month" do
+      expect(Date.new(2014, 1,  1).nth_day_of_month).to eq 1 # this is the first wednesday of the month
+      expect(Date.new(2014, 1,  2).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 1,  3).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 1,  4).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 1,  5).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 1,  6).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 1,  7).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 1,  8).nth_day_of_month).to eq 2 # this is the second wednesday of the month
+      expect(Date.new(2014, 1,  9).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 1, 10).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 1, 11).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 1, 12).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 1, 13).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 1, 14).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 1, 15).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 16).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 17).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 18).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 19).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 20).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 21).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 1, 22).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 23).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 24).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 25).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 26).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 27).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 28).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 1, 29).nth_day_of_month).to eq 5 # this is the 5th wednesday of the month
+      expect(Date.new(2014, 1, 30).nth_day_of_month).to eq 5
+      expect(Date.new(2014, 1, 31).nth_day_of_month).to eq 5
+
+      expect(Date.new(2014, 2,  1).nth_day_of_month).to eq 1 # this is the first saturday of the month
+      expect(Date.new(2014, 2,  2).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 2,  3).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 2,  4).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 2,  5).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 2,  6).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 2,  7).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 2,  8).nth_day_of_month).to eq 2 # this is the second saturday of the month
+      expect(Date.new(2014, 2,  9).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 2, 10).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 2, 11).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 2, 12).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 2, 13).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 2, 14).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 2, 15).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 16).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 17).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 18).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 19).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 20).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 21).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 2, 22).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 2, 23).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 2, 24).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 2, 25).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 2, 26).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 2, 27).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 2, 28).nth_day_of_month).to eq 4 # this is the fourth friday of the month
+
+      expect(Date.new(2014, 3,  1).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  2).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  3).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  4).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  5).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  6).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  7).nth_day_of_month).to eq 1
+      expect(Date.new(2014, 3,  8).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3,  9).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3, 10).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3, 11).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3, 12).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3, 13).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3, 14).nth_day_of_month).to eq 2
+      expect(Date.new(2014, 3, 15).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 16).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 17).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 18).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 19).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 20).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 21).nth_day_of_month).to eq 3
+      expect(Date.new(2014, 3, 22).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 23).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 24).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 25).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 26).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 27).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 28).nth_day_of_month).to eq 4
+      expect(Date.new(2014, 3, 29).nth_day_of_month).to eq 5
+      expect(Date.new(2014, 3, 30).nth_day_of_month).to eq 5
+      expect(Date.new(2014, 3, 31).nth_day_of_month).to eq 5
+    end
+  end
+
+  describe :nth_last_day_of_month do
+    it "should return the index of this week-day in the month" do
+      expect(Date.new(2014, 1,  1).nth_last_day_of_month).to eq(-5) # this is the fifth last wednesday of the month
+      expect(Date.new(2014, 1,  2).nth_last_day_of_month).to eq(-5)
+      expect(Date.new(2014, 1,  3).nth_last_day_of_month).to eq(-5)
+      expect(Date.new(2014, 1,  4).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 1,  5).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 1,  6).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 1,  7).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 1,  8).nth_last_day_of_month).to eq(-4) # this is the fourth last wednesday of the month
+      expect(Date.new(2014, 1,  9).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 1, 10).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 1, 11).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 12).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 13).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 14).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 15).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 16).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 17).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 1, 18).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 19).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 20).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 21).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 22).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 23).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 24).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 1, 25).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 1, 26).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 1, 27).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 1, 28).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 1, 29).nth_last_day_of_month).to eq(-1) # this is the last wednesday of the month
+      expect(Date.new(2014, 1, 30).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 1, 31).nth_last_day_of_month).to eq(-1)
+
+      expect(Date.new(2014, 2,  1).nth_last_day_of_month).to eq(-4) # this is the fourth last saturday of the month
+      expect(Date.new(2014, 2,  2).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 2,  3).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 2,  4).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 2,  5).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 2,  6).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 2,  7).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 2,  8).nth_last_day_of_month).to eq(-3) # this is the third last saturday of the month
+      expect(Date.new(2014, 2,  9).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 2, 10).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 2, 11).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 2, 12).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 2, 13).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 2, 14).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 2, 15).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 16).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 17).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 18).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 19).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 20).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 21).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 2, 22).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 2, 23).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 2, 24).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 2, 25).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 2, 26).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 2, 27).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 2, 28).nth_last_day_of_month).to eq(-1) # this is the last friday of the month
+
+      expect(Date.new(2014, 3,  1).nth_last_day_of_month).to eq(-5)
+      expect(Date.new(2014, 3,  2).nth_last_day_of_month).to eq(-5)
+      expect(Date.new(2014, 3,  3).nth_last_day_of_month).to eq(-5)
+      expect(Date.new(2014, 3,  4).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3,  5).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3,  6).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3,  7).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3,  8).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3,  9).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3, 10).nth_last_day_of_month).to eq(-4)
+      expect(Date.new(2014, 3, 11).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 12).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 13).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 14).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 15).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 16).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 17).nth_last_day_of_month).to eq(-3)
+      expect(Date.new(2014, 3, 18).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 19).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 20).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 21).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 22).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 23).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 24).nth_last_day_of_month).to eq(-2)
+      expect(Date.new(2014, 3, 25).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 3, 26).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 3, 27).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 3, 28).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 3, 29).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 3, 30).nth_last_day_of_month).to eq(-1)
+      expect(Date.new(2014, 3, 31).nth_last_day_of_month).to eq(-1)
+    end
+  end
+
+  describe :nth_day_of_month? do
+    it "should return true or false depnding whether the date is the given nth day of the month" do
+      d = Date.new(2014, 3,  1)
+      expect(d.nth_day_of_month?( 1)).to be_true
+      expect(d.nth_day_of_month?( 2)).to be_false
+      expect(d.nth_day_of_month?( 3)).to be_false
+      expect(d.nth_day_of_month?( 4)).to be_false
+      expect(d.nth_day_of_month?( 5)).to be_false
+      expect(d.nth_day_of_month?(-5)).to be_true
+      expect(d.nth_day_of_month?(-4)).to be_false
+      expect(d.nth_day_of_month?(-3)).to be_false
+      expect(d.nth_day_of_month?(-2)).to be_false
+      expect(d.nth_day_of_month?(-1)).to be_false
+
+      d = Date.new(2014, 3,  15)
+      expect(d.nth_day_of_month?( 1)).to be_false
+      expect(d.nth_day_of_month?( 2)).to be_false
+      expect(d.nth_day_of_month?( 3)).to be_true
+      expect(d.nth_day_of_month?( 4)).to be_false
+      expect(d.nth_day_of_month?( 5)).to be_false
+      expect(d.nth_day_of_month?(-5)).to be_false
+      expect(d.nth_day_of_month?(-4)).to be_false
+      expect(d.nth_day_of_month?(-3)).to be_true
+      expect(d.nth_day_of_month?(-2)).to be_false
+      expect(d.nth_day_of_month?(-1)).to be_false
+
+      d = Date.new(2014, 3,  31)
+      expect(d.nth_day_of_month?( 1)).to be_false
+      expect(d.nth_day_of_month?( 2)).to be_false
+      expect(d.nth_day_of_month?( 3)).to be_false
+      expect(d.nth_day_of_month?( 4)).to be_false
+      expect(d.nth_day_of_month?( 5)).to be_true
+      expect(d.nth_day_of_month?(-5)).to be_false
+      expect(d.nth_day_of_month?(-4)).to be_false
+      expect(d.nth_day_of_month?(-3)).to be_false
+      expect(d.nth_day_of_month?(-2)).to be_false
+      expect(d.nth_day_of_month?(-1)).to be_true
+
+      expect { d.nth_day_of_month?(0) }.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/models/schedule/daily_spec.rb

@@ -13,45 +13,85 @@ describe Reservation::Schedule::Daily do
   end
 
   it "should match when there exists a matching interval on the same day as the given event" do
-    daily = Reservation::Schedule::Daily.new(5)
-    daily.add interval("7h", "9:30")
-    daily.add interval("18", "2230")
+    daily = Reservation::Schedule::Daily.new(5, :all, interval("7h", "9:30"))
+    daily.matches?(event).should be_true
+  end
+
+  it "should match when there exists a matching interval on the same nth day as the given event" do
+    daily = Reservation::Schedule::Daily.new(5, 2, interval("7h", "9:30"))
+    daily.matches?(event).should be_true
+  end
 
+  it "should match when there exists a matching interval on the same nth-last day as the given event" do
+    daily = Reservation::Schedule::Daily.new(5, -3, interval("7h", "9:30"))
     daily.matches?(event).should be_true
   end
 
   it "should not match when the day is different" do
-    daily = Reservation::Schedule::Daily.new(3)
-    daily.add interval("7h", "9:30")
-    daily.add interval("18", "2230")
+    daily = Reservation::Schedule::Daily.new(3, :all, interval("7h", "9:30"))
+    daily.matches?(event).should be_false
+  end
 
+  it "should not match when the nth day is different" do
+    daily = Reservation::Schedule::Daily.new(3, 5, interval("7h", "9:30"))
     daily.matches?(event).should be_false
   end
 
-  it "should not match when there is no corresponding interval" do
-    daily = Reservation::Schedule::Daily.new(5)
-    daily.add interval("7h", "9:45")
-    daily.add interval("18", "2230")
+  it "should not match when the nth-last day is different" do
+    daily = Reservation::Schedule::Daily.new(3, -1, interval("7h", "9:30"))
+    daily.matches?(event).should be_false
+  end
 
+  it "should not match when there is no corresponding interval" do
+    daily = Reservation::Schedule::Daily.new(5, :all, interval("7h", "9:45"))
     daily.matches?(event).should be_false
   end
 
   it "should generate events corresponding to its intervals on the given matching date" do
-    daily = Reservation::Schedule::Daily.new(5)
-    daily.add interval("7h", "9:45")
-    daily.add interval("18", "2230")
+    daily = Reservation::Schedule::Daily.new(5, :all, interval("7h", "9:45"))
+
+    events = []
+    daily.generate date("2013-07-12"), events
+    actual = events.map { |e| "#{e.start.prettyd} #{e.finish.pretty}"}.join("\n")
+    actual.should == "Fri,20130712T0700 20130712T0945"
+  end
+
+  it "should generate events corresponding to its intervals on the given matching nth day" do
+    daily = Reservation::Schedule::Daily.new(5, 2, interval("7h", "9:45"))
 
     events = []
     daily.generate date("2013-07-12"), events
-    events.map { |e| "#{e.start.prettyd} #{e.finish.pretty}"}.join("\n").
-      should == "Fri,20130712T0700 20130712T0945
-Fri,20130712T1800 20130712T2230"
+    actual = events.map { |e| "#{e.start.prettyd} #{e.finish.pretty}"}.join("\n")
+    actual.should == "Fri,20130712T0700 20130712T0945"
+  end
+
+  it "should generate events corresponding to its intervals on the given matching nth-last day" do
+    daily = Reservation::Schedule::Daily.new(5, -3, interval("7h", "9:45"))
+
+    events = []
+    daily.generate date("2013-07-12"), events
+    actual = events.map { |e| "#{e.start.prettyd} #{e.finish.pretty}"}.join("\n")
+    actual.should == "Fri,20130712T0700 20130712T0945"
   end
 
   it "should generate no events when the date does not match its weekday" do
-    daily = Reservation::Schedule::Daily.new(2)
-    daily.add interval("7h", "9:45")
-    daily.add interval("18", "2230")
+    daily = Reservation::Schedule::Daily.new(2, :all, interval("7h", "9:45"))
+
+    events = []
+    daily.generate date("2013-07-12"), events
+    events.should == []
+  end
+
+  it "should generate no events when the date does not match its nth weekday" do
+    daily = Reservation::Schedule::Daily.new(2, 5, interval("7h", "9:45"))
+
+    events = []
+    daily.generate date("2013-07-12"), events
+    events.should == []
+  end
+
+  it "should generate no events when the date does not match its nth-last weekday" do
+    daily = Reservation::Schedule::Daily.new(2, -1, interval("7h", "9:45"))
 
     events = []
     daily.generate date("2013-07-12"), events

data/spec/models/schedule/weekly_spec.rb

@@ -56,6 +56,38 @@ Fri,20130719T1000 20130719T1145
 Tue,20130723T0700 20130723T0830"
   end
 
+  it "should generate events for the fourth-last and second-last friday of each month" do
+    weekly = Reservation::Schedule::Weekly.new [ { "day" => "fri", "start" => "10h",   "finish" => "11:45", "nth_of_month" => "-4" },
+                                                 { "day" => "fri", "start" => "10h",   "finish" => "11:45", "nth_of_month" => "-2" } ]
+
+    events = weekly.generate date("2013-01-01"), date("2013-12-31")
+    events.map { |e| "#{e.start.prettyd} #{e.finish.pretty}"}.join("\n").
+      should == "Fri,20130104T1000 20130104T1145
+Fri,20130118T1000 20130118T1145
+Fri,20130201T1000 20130201T1145
+Fri,20130215T1000 20130215T1145
+Fri,20130308T1000 20130308T1145
+Fri,20130322T1000 20130322T1145
+Fri,20130405T1000 20130405T1145
+Fri,20130419T1000 20130419T1145
+Fri,20130510T1000 20130510T1145
+Fri,20130524T1000 20130524T1145
+Fri,20130607T1000 20130607T1145
+Fri,20130621T1000 20130621T1145
+Fri,20130705T1000 20130705T1145
+Fri,20130719T1000 20130719T1145
+Fri,20130809T1000 20130809T1145
+Fri,20130823T1000 20130823T1145
+Fri,20130906T1000 20130906T1145
+Fri,20130920T1000 20130920T1145
+Fri,20131004T1000 20131004T1145
+Fri,20131018T1000 20131018T1145
+Fri,20131108T1000 20131108T1145
+Fri,20131122T1000 20131122T1145
+Fri,20131206T1000 20131206T1145
+Fri,20131220T1000 20131220T1145"
+  end
+
   it "should filter a set of events" do
     weekly = Reservation::Schedule::Weekly.new [ { "day" => "wed", "start" => "0930", "finish" => "10:30"},
                                                  { "day" => "wed", "start" => "18",   "finish" => "20"   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reservation
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_numbering_formatter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A very basic reservation system using ActiveRecord
 email:
 - conan@conandalton.net
@@ -105,17 +121,22 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/core_ext/date.rb
 - lib/generators/reservation/migration/USAGE
 - lib/generators/reservation/migration/migration_generator.rb
 - lib/generators/reservation/migration/templates/migration.rb
 - lib/reservation.rb
+- lib/reservation/daily.rb
 - lib/reservation/event.rb
 - lib/reservation/event_filter.rb
+- lib/reservation/hour_minute.rb
+- lib/reservation/interval.rb
 - lib/reservation/reservation.rb
 - lib/reservation/schedule.rb
 - lib/reservation/scopes.rb
 - lib/reservation/time_offset.rb
 - lib/reservation/version.rb
+- lib/reservation/weekly.rb
 - lib/tasks/reservation_tasks.rake
 - reservation.gemspec
 - spec/dummy/README.rdoc
@@ -172,6 +193,7 @@ files:
 - spec/dummy/test/unit/reservation/reservation_test.rb
 - spec/dummy/test/unit/reservation/time_slot_test.rb
 - spec/dummy/test/unit/thing_test.rb
+- spec/models/date_spec.rb
 - spec/models/event_spec.rb
 - spec/models/schedule/daily_spec.rb
 - spec/models/schedule/hour_minute_spec.rb
@@ -258,6 +280,7 @@ test_files:
 - spec/dummy/test/unit/reservation/reservation_test.rb
 - spec/dummy/test/unit/reservation/time_slot_test.rb
 - spec/dummy/test/unit/thing_test.rb
+- spec/models/date_spec.rb
 - spec/models/event_spec.rb
 - spec/models/schedule/daily_spec.rb
 - spec/models/schedule/hour_minute_spec.rb