chronic 0.1.0 → 0.2.2

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -4,24 +4,29 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   def next(pointer)
     super
     
-    if !@current_day
-      @current_day = Date.parse(@now.to_s)
-      @current_day += pointer == :future ? 1 : -1
+    direction = pointer == :future ? 1 : -1
+    
+    if !@current_day_start
+      @current_day_start = Time.construct(@now.year, @now.month, @now.day)
+      @current_day_start += direction * DAY_SECONDS
+
       day_num = symbol_to_number(@type)
-      while @current_day.wday != day_num
-        @current_day += pointer == :future ? 1 : -1
+      
+      while @current_day_start.wday != day_num
+        @current_day_start += direction * DAY_SECONDS
       end
     else
-      @current_day += pointer == :future ? 7 : -7
+      @current_day_start += direction * 7 * DAY_SECONDS
     end
-    span_begin = Time.parse(@current_day.to_s)
-    Chronic::Span.new(span_begin, span_begin + width)
+    
+    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
   
   def this(pointer = :future)
     super
     
-    self.next(:future)
+    pointer = :future if pointer == :none
+    self.next(pointer)
   end
   
   def width
@@ -29,7 +34,7 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   end
   
   def to_s
-    super << '-dayofweek-' << @type.to_s
+    super << '-dayname-' << @type.to_s
   end
   
   private

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -28,27 +28,27 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
     full_day = 60 * 60 * 24
     
     if !@current_span
-      now_seconds = @now - Time.local(@now.year, @now.month, @now.day)
+      now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
       if now_seconds < @range.begin
         case pointer
         when :future
-          range_start = Time.local(@now.year, @now.month, @now.day) + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
         when :past
-          range_start = Time.local(@now.year, @now.month, @now.day) - full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
         end
       elsif now_seconds > @range.end
         case pointer
         when :future
-          range_start = Time.local(@now.year, @now.month, @now.day) + full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
         when :past
-          range_start = Time.local(@now.year, @now.month, @now.day) + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
         end
       else
         case pointer
         when :future
-          range_start = Time.local(@now.year, @now.month, @now.day) + full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
         when :past
-          range_start = Time.local(@now.year, @now.month, @now.day) - full_day + @range.begin
+          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
         end
       end
       
@@ -66,7 +66,7 @@ class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
   def this(context = :future)
     super
     
-    range_start = Time.local(@now.year, @now.month, @now.day) + @range.begin
+    range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
     @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
   end
   

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -29,9 +29,11 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
   def this(pointer = :future)
     super
     
+    pointer = :future if pointer == :none
+    
     case pointer
     when :future
-      this_fortnight_start = Time.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
+      this_fortnight_start = Time.construct(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
       sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
       sunday_repeater.start = @now
       sunday_repeater.this(:future)
@@ -39,10 +41,9 @@ class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
       this_fortnight_end = this_sunday_span.begin
       Chronic::Span.new(this_fortnight_start, this_fortnight_end)
     when :past
-      this_fortnight_end = Time.local(@now.year, @now.month, @now.day, @now.hour)
+      this_fortnight_end = Time.construct(@now.year, @now.month, @now.day, @now.hour)
       sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
       sunday_repeater.start = @now
-      #sunday_repeater.next(:past)
       last_sunday_span = sunday_repeater.next(:past)
       this_fortnight_start = last_sunday_span.begin
       Chronic::Span.new(this_fortnight_start, this_fortnight_end)

data/lib/chronic/repeaters/repeater_hour.rb

@@ -7,9 +7,9 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
     if !@current_hour_start
       case pointer
       when :future
-        @current_hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour + 1)
+        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
       when :past
-        @current_hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour - 1)
+        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour - 1)
       end
     else
       direction = pointer == :future ? 1 : -1
@@ -24,13 +24,13 @@ class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
-      hour_end = Time.local(@now.year, @now.month, @now.day, @now.hour + 1)
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
     when :past
-      hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour)
-      hour_end = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
     when :none
-      hour_start = Time.local(@now.year, @now.month, @now.day, @now.hour)
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
       hour_end = hour_begin + HOUR_SECONDS
     end
     

data/lib/chronic/repeaters/repeater_minute.rb

@@ -1,9 +1,40 @@
 class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
   MINUTE_SECONDS = 60
   
+  def next(pointer = :future)
+    super
+    
+    if !@current_minute_start
+      case pointer
+      when :future
+        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+      when :past
+        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min - 1)
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_minute_start += direction * MINUTE_SECONDS
+    end
+    
+    Chronic::Span.new(@current_minute_start, @current_minute_start + MINUTE_SECONDS)
+  end
+  
   def this(pointer = :future)
-    minute_begin = Time.local(@now.year, @now.month, @now.day, @now.hour, @now.min)
-    Chronic::Span.new(minute_begin, minute_begin + MINUTE_SECONDS)
+    super
+    
+    case pointer
+    when :future
+      minute_begin = @now
+      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+    when :past
+      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = @now
+    when :none
+      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
+    end
+    
+    Chronic::Span.new(minute_begin, minute_end)
   end
   
   def offset(span, amount, pointer)

data/lib/chronic/repeaters/repeater_month.rb

@@ -6,12 +6,12 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
     super
     
     if !@current_month_start
-      @current_month_start = offset_by(Time.local(@now.year, @now.month), 1, pointer)
+      @current_month_start = offset_by(Time.construct(@now.year, @now.month), 1, pointer)
     else
-      @current_month_start = offset_by(Time.local(@current_month_start.year, @current_month_start.month), 1, pointer)
+      @current_month_start = offset_by(Time.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
     end
     
-    Chronic::Span.new(@current_month_start, Time.local(@current_month_start.year, @current_month_start.month + 1))
+    Chronic::Span.new(@current_month_start, Time.construct(@current_month_start.year, @current_month_start.month + 1))
   end
   
   def this(pointer = :future)
@@ -19,11 +19,14 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      month_start = Time.local(@now.year, @now.month, @now.day + 1)
-      month_end = self.offset_by(Time.local(@now.year, @now.month), 1, :future)
+      month_start = Time.construct(@now.year, @now.month, @now.day + 1)
+      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
     when :past
-      month_start = Time.local(@now.year, @now.month)
-      month_end = Time.local(@now.year, @now.month, @now.day)
+      month_start = Time.construct(@now.year, @now.month)
+      month_end = Time.construct(@now.year, @now.month, @now.day)
+    when :none
+      month_start = Time.construct(@now.year, @now.month)
+      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
     end
     
     Chronic::Span.new(month_start, month_end)
@@ -45,10 +48,14 @@ class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
       new_year += 1
       new_month -= YEAR_MONTHS
     end
-    Time.local(new_year, new_month, time.day, time.hour, time.min, time.sec)
+    Time.construct(new_year, new_month, time.day, time.hour, time.min, time.sec)
   end
   
   def width
     MONTH_SECONDS
   end
+  
+  def to_s
+    super << '-month'
+  end
 end

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -9,24 +9,30 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
       case pointer
       when :future
         if @now.month < target_month
-          @current_month_begin = Time.local(@now.year, target_month)
+          @current_month_begin = Time.construct(@now.year, target_month)
         else @now.month > target_month
-          @current_month_begin = Time.local(@now.year + 1, target_month)
+          @current_month_begin = Time.construct(@now.year + 1, target_month)
+        end
+      when :none
+        if @now.month <= target_month
+          @current_month_begin = Time.construct(@now.year, target_month)
+        else @now.month > target_month
+          @current_month_begin = Time.construct(@now.year + 1, target_month)
         end
       when :past
         if @now.month > target_month
-          @current_month_begin = Time.local(@now.year, target_month)
+          @current_month_begin = Time.construct(@now.year, target_month)
         else @now.month < target_month
-          @current_month_begin = Time.local(@now.year - 1, target_month)
+          @current_month_begin = Time.construct(@now.year - 1, target_month)
         end
       end
       @current_month_begin || raise("Current month should be set by now")
     else
       case pointer
       when :future
-        @current_month_begin = Time.local(@current_month_begin.year + 1, @current_month_begin.month)
+        @current_month_begin = Time.construct(@current_month_begin.year + 1, @current_month_begin.month)
       when :past
-        @current_month_begin = Time.local(@current_month_begin.year - 1, @current_month_begin.month)
+        @current_month_begin = Time.construct(@current_month_begin.year - 1, @current_month_begin.month)
       end
     end
     
@@ -41,13 +47,18 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
       next_month_month = cur_month_month + 1
     end
       
-    Chronic::Span.new(@current_month_begin, Time.local(next_month_year, next_month_month))
+    Chronic::Span.new(@current_month_begin, Time.construct(next_month_year, next_month_month))
   end
   
   def this(pointer = :future)
     super
     
-    self.next(pointer)
+    case pointer
+    when :past
+      self.next(pointer)
+    when :future, :none
+      self.next(:none)
+    end
   end
   
   def width
@@ -59,7 +70,7 @@ class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
   end
   
   def to_s
-    super << '-month-' << @type.to_s
+    super << '-monthname-' << @type.to_s
   end
   
   private

data/lib/chronic/repeaters/repeater_second.rb

@@ -16,6 +16,8 @@ class Chronic::RepeaterSecond < Chronic::Repeater #:nodoc:
   end
   
   def this(pointer = :future)
+    super
+    
     Chronic::Span.new(@now, @now + 1)
   end
   

data/lib/chronic/repeaters/repeater_time.rb

@@ -25,7 +25,7 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
   end
   
   def initialize(time, options = {})
-    t = time.sub(/\:/, '')
+    t = time.gsub(/\:/, '')
     @type = 
     if (1..2) === t.size
       Tick.new(t.to_i * 60 * 60, true)
@@ -34,8 +34,13 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
     elsif t.size == 4
       ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
       Tick.new(t[0..1].to_i * 60 * 60 + t[2..3].to_i * 60, ambiguous)
+    elsif t.size == 5
+      Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
+    elsif t.size == 6
+      ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
+      Tick.new(t[0..1].to_i * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
     else
-      raise("Time cannot exceed four digits")
+      raise("Time cannot exceed six digits")
     end
   end
   
@@ -92,7 +97,10 @@ class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
   end
   
   def this(context = :future)
-    [:future, :past].include?(context) || raise("First argument 'context' must be one of :past or :future")
+    super
+    
+    context = :future if context == :none
+    
     self.next(context)
   end
   

data/lib/chronic/repeaters/repeater_week.rb

@@ -44,6 +44,12 @@ class Chronic::RepeaterWeek < Chronic::Repeater #:nodoc:
       last_sunday_span = sunday_repeater.next(:past)
       this_week_start = last_sunday_span.begin
       Chronic::Span.new(this_week_start, this_week_end)
+    when :none
+      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+      sunday_repeater.start = @now
+      last_sunday_span = sunday_repeater.next(:past)
+      this_week_start = last_sunday_span.begin
+      Chronic::Span.new(this_week_start, this_week_start + WEEK_SECONDS)
     end
   end
   

data/lib/chronic/repeaters/repeater_weekend.rb

@@ -1,6 +1,55 @@
 class Chronic::RepeaterWeekend < Chronic::Repeater #:nodoc:
   WEEKEND_SECONDS = 172_800 # (2 * 24 * 60 * 60)
   
+  def next(pointer)
+    super
+    
+    if !@current_week_start
+      case pointer
+      when :future
+        saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+        saturday_repeater.start = @now
+        next_saturday_span = saturday_repeater.next(:future)
+        @current_week_start = next_saturday_span.begin
+      when :past
+        saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+        saturday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
+        last_saturday_span = saturday_repeater.next(:past)
+        @current_week_start = last_saturday_span.begin
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_week_start += direction * Chronic::RepeaterWeek::WEEK_SECONDS
+    end
+    
+    Chronic::Span.new(@current_week_start, @current_week_start + WEEKEND_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :future, :none
+      saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+      saturday_repeater.start = @now
+      this_saturday_span = saturday_repeater.this(:future)
+      Chronic::Span.new(this_saturday_span.begin, this_saturday_span.begin + WEEKEND_SECONDS)
+    when :past
+      saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+      saturday_repeater.start = @now
+      last_saturday_span = saturday_repeater.this(:past)
+      Chronic::Span.new(last_saturday_span.begin, last_saturday_span.begin + WEEKEND_SECONDS)
+    end
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = span.begin
+    start = weekend.next(pointer).begin + (amount - 1) * direction * Chronic::RepeaterWeek::WEEK_SECONDS
+    Chronic::Span.new(start, start + (span.end - span.begin))
+  end
+  
   def width
     WEEKEND_SECONDS
   end

data/lib/chronic/repeaters/repeater_year.rb

@@ -6,16 +6,16 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     if !@current_year_start
       case pointer
       when :future
-        @current_year_start = Time.local(@now.year + 1)
+        @current_year_start = Time.construct(@now.year + 1)
       when :past
-        @current_year_start = Time.local(@now.year - 1)
+        @current_year_start = Time.construct(@now.year - 1)
       end
     else
       diff = pointer == :future ? 1 : -1
-      @current_year_start = Time.local(@current_year_start.year + diff)
+      @current_year_start = Time.construct(@current_year_start.year + diff)
     end
     
-    Chronic::Span.new(@current_year_start, Time.local(@current_year_start.year + 1))
+    Chronic::Span.new(@current_year_start, Time.construct(@current_year_start.year + 1))
   end
   
   def this(pointer = :future)
@@ -23,11 +23,14 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     
     case pointer
     when :future
-      this_year_start = Time.local(@now.year, @now.month, @now.day) + Chronic::RepeaterDay::DAY_SECONDS
-      this_year_end = Time.local(@now.year + 1, 1, 1)
+      this_year_start = Time.construct(@now.year, @now.month, @now.day) + Chronic::RepeaterDay::DAY_SECONDS
+      this_year_end = Time.construct(@now.year + 1, 1, 1)
     when :past
-      this_year_start = Time.local(@now.year, 1, 1)
-      this_year_end = Time.local(@now.year, @now.month, @now.day)
+      this_year_start = Time.construct(@now.year, 1, 1)
+      this_year_end = Time.construct(@now.year, @now.month, @now.day)
+    when :none
+      this_year_start = Time.construct(@now.year, 1, 1)
+      this_year_end = Time.construct(@now.year + 1, 1, 1)
     end
     
     Chronic::Span.new(this_year_start, this_year_end)
@@ -37,10 +40,10 @@ class Chronic::RepeaterYear < Chronic::Repeater #:nodoc:
     direction = pointer == :future ? 1 : -1
     
     sb = span.begin
-    new_begin = Time.local(sb.year + (amount * direction), sb.month, sb.day, sb.hour, sb.min, sb.sec)
+    new_begin = Time.construct(sb.year + (amount * direction), sb.month, sb.day, sb.hour, sb.min, sb.sec)
     
     se = span.end
-    new_end = Time.local(se.year + (amount * direction), se.month, se.day, se.hour, se.min, se.sec)
+    new_end = Time.construct(se.year + (amount * direction), se.month, se.day, se.hour, se.min, se.sec)
     
     Chronic::Span.new(new_begin, new_end)
   end

data/lib/chronic/scalar.rb

@@ -40,7 +40,7 @@ module Chronic
     end
     
     def self.scan_for_years(token, post_token)
-      if token.word =~ /^\d\d(\d\d)?$/
+      if token.word =~ /^([1-9]\d)?\d\d?$/
         unless post_token && %w{am pm morning afternoon evening night}.include?(post_token)
           return ScalarYear.new(token.word.to_i)
         end

data/lib/chronic/time_zone.rb

@@ -0,0 +1,22 @@
+module Chronic
+  class TimeZone < Tag #:nodoc:    
+    def self.scan(tokens)
+      tokens.each_index do |i|
+        if t = self.scan_for_all(tokens[i]) then tokens[i].tag(t); next end
+      end
+      tokens
+    end
+
+    def self.scan_for_all(token)
+      scanner = {/[PMCE][DS]T/i => :tz}
+      scanner.keys.each do |scanner_item|
+        return self.new(scanner[scanner_item]) if scanner_item =~ token.word
+      end
+      return nil
+    end
+
+    def to_s
+      'timezone'
+    end
+  end
+end

data/lib/chronic.rb

@@ -7,24 +7,119 @@
 #
 #=============================================================================
 
-require 'date'
+$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
 
 require 'chronic/chronic'
 require 'chronic/handlers'
+
+require 'chronic/repeater'
+require 'chronic/repeaters/repeater_year'
+require 'chronic/repeaters/repeater_season'
+require 'chronic/repeaters/repeater_season_name'
+require 'chronic/repeaters/repeater_month'
+require 'chronic/repeaters/repeater_month_name'
+require 'chronic/repeaters/repeater_fortnight'
+require 'chronic/repeaters/repeater_week'
+require 'chronic/repeaters/repeater_weekend'
+require 'chronic/repeaters/repeater_day'
+require 'chronic/repeaters/repeater_day_name'
+require 'chronic/repeaters/repeater_day_portion'
+require 'chronic/repeaters/repeater_hour'
+require 'chronic/repeaters/repeater_minute'
+require 'chronic/repeaters/repeater_second'
+require 'chronic/repeaters/repeater_time'
+
 require 'chronic/grabber'
-require 'chronic/ordinal'
 require 'chronic/pointer'
 require 'chronic/scalar'
+require 'chronic/ordinal'
 require 'chronic/separator'
+require 'chronic/time_zone'
 
-require 'chronic/repeater'
-Dir["#{File.dirname(__FILE__)}/chronic/repeaters/*.rb"].each do |file|
-  require file
-end
+require 'numerizer/numerizer'
 
 module Chronic
-  def self.debug=(val); @debug = val; end
+  VERSION = "0.2.2"
+  
+  def self.debug; false; end
+end
+
+alias p_orig p
+
+def p(val)
+  p_orig val
+  puts
 end
 
-Chronic.debug = false
+# class Time
+#   def self.construct(year, month = 1, day = 1, hour = 0, minute = 0, second = 0)
+#     # extra_seconds = second > 60 ? second - 60 : 0
+#     # extra_minutes = minute > 59 ? minute - 59 : 0
+#     # extra_hours = hour > 23 ? hour - 23 : 0
+#     # extra_days = day > 
+#     
+#     if month > 12
+#       if month % 12 == 0
+#         year += (month - 12) / 12
+#         month = 12
+#       else
+#         year += month / 12
+#         month = month % 12
+#       end
+#     end
+#     
+#     base = Time.local(year, month)
+#     puts base
+#     offset = ((day - 1) * 24 * 60 * 60) + (hour * 60 * 60) + (minute * 60) + second
+#     puts offset.to_s
+#     date = base + offset
+#     puts date
+#     date
+#   end
+# end
 
+class Time
+  def self.construct(year, month = 1, day = 1, hour = 0, minute = 0, second = 0)
+    if second >= 60
+      minute += second / 60
+      second = second % 60
+    end
+    
+    if minute >= 60
+      hour += minute / 60
+      minute = minute % 60
+    end
+    
+    if hour >= 24
+      day += hour / 24
+      hour = hour % 24
+    end
+    
+    # determine if there is a day overflow. this is complicated by our crappy calendar
+    # system (non-constant number of days per month)
+    day <= 56 || raise("day must be no more than 56 (makes month resolution easier)")
+    if day > 28
+      # no month ever has fewer than 28 days, so only do this if necessary
+      leap_year = (year % 4 == 0) && !(year % 100 == 0)
+      leap_year_month_days = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+      common_year_month_days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+      days_this_month = leap_year ? leap_year_month_days[month - 1] : common_year_month_days[month - 1]
+      if day > days_this_month
+        month += day / days_this_month
+        day = day % days_this_month
+      end
+    end
+    
+    if month > 12
+      if month % 12 == 0
+        year += (month - 12) / 12
+        month = 12
+      else
+        year += month / 12
+        month = month % 12
+      end
+    end
+    
+    Time.local(year, month, day, hour, minute, second)
+  end
+end