chronic-davispuh 0.10.2.v0.1da32066b3f46f2506b3471e39557497e34afa27

data/lib/chronic/objects/anchor_object.rb

@@ -0,0 +1,263 @@
+require 'chronic/handlers/anchor'
+
+module Chronic
+  class AnchorObject < HandlerObject
+    attr_reader :grabber
+    attr_reader :unit
+    attr_reader :season
+    attr_reader :month
+    attr_reader :wday
+    attr_reader :day_special
+    attr_reader :time_special
+    attr_reader :count
+    def initialize(tokens, token_index, definitions, local_date, options)
+      super
+      match(tokens, @index, definitions)
+    end
+
+    def is_valid?
+      true
+    end
+
+    def to_s
+      "grabber #{@grabber.inspect}, unit #{@unit.inspect}, season #{@season.inspect}, quarter #{@quarter.inspect}, month #{@month.inspect}, wday #{@wday.inspect}, day special #{@day_special.inspect}, time special #{@time_special.inspect}, count #{@count.inspect}"
+    end
+
+    def to_span(span = nil, time = nil, timezone = nil)
+      modifier = get_modifier
+      if span
+        year, month, day = Date::split(span.begin)
+      else
+        year, month, day = local_day
+      end
+      time = TimeInfo.new(@local_date) unless time
+      hour, minute, second = time.to_a
+      time_precision = false
+      if time.is_a?(TimeObject)
+      @precision = time.precision
+      time_precision = true
+      end
+      date = Chronic.time_class.new(year, month, day)
+      end_year, end_month, end_day = year, month, day
+      end_hour, end_minute, end_second = time.get_end
+      if @count
+        modifier = @count - 1
+        @context == :future
+      end
+      sign = get_sign
+      if @season
+        season = Date::SEASON_DATES[@season]
+        diff = Date::month_diff(month, season.first, modifier, sign)
+        year, month = Date::add_month(year, month, diff)
+        day = season.last
+        end_year, next_season = Date::add_season(year, @season)
+        end_month, end_day = Date::SEASON_DATES[next_season]
+        hour = minute = second = end_hour = end_minute = end_second = 0
+      elsif @quarter
+        quarter = Date::get_quarter_index(month)
+        diff = Date::quarter_diff(quarter, @quarter, modifier, sign)
+        year, quarter = Date::add_quarter(year, quarter, diff)
+        month = Date::QUARTERS[@quarter]
+        end_year, next_quarter = Date::add_quarter(year, @quarter)
+        end_month = Date::QUARTERS[next_quarter]
+        day = end_day = 1
+        hour = minute = second = end_hour = end_minute = end_second = 0
+      elsif @month
+        diff = Date::month_diff(month, @month, modifier, sign)
+        year, month = Date::add_month(year, month, diff)
+        end_year, end_month = Date::add_month(year, month)
+        day = end_day = 1
+        hour = minute = second = end_hour = end_minute = end_second = 0
+      elsif @wday
+        diff = Date::wday_diff(date, @wday, modifier.zero? ? 1 : modifier, 0)
+        year, month, day = Date::add_day(year, month, day, diff) unless diff.zero?
+        end_year, end_month, end_day = year, month, day
+        unless time_precision
+          end_year, end_month, end_day = Date::add_day(year, month, day)
+          hour = minute = second = 0 if [year, month, day] != local_date
+          end_hour = end_minute = end_second = 0
+        end
+      elsif @day_special
+        case @day_special
+        when :yesterday
+          year, month, day = Date::add_day(year, month, day, -1)
+          if time_precision
+            end_year, end_month, end_day = year, month, day
+          else
+            end_year, end_month, end_day = Date::add_day(year, month, day)
+            hour = minute = second = end_hour = end_minute = end_second = 0
+          end
+        when :today
+          unless time_precision
+            end_year, end_month, end_day = Date::add_day(year, month, day)
+            end_hour = end_minute = end_second = 0
+          end
+        when :tomorrow
+          year, month, day = Date::add_day(year, month, day)
+          if time_precision
+            end_year, end_month, end_day = year, month, day
+          else
+            end_year, end_month, end_day = Date::add_day(year, month, day)
+            hour = minute = second = end_hour = end_minute = end_second = 0
+          end
+        else
+          raise "Uknown day special #{@day_special.inspect}"
+        end
+      elsif @time_special
+        year, month, day = Date::add_day(year, month, day, modifier)
+        end_year, end_month, end_day = year, month, day
+        hour = Time::SPECIAL[@time_special].begin
+        end_hour = Time::SPECIAL[@time_special].end
+        minute = second = end_minute = end_second = 0
+      else
+        case @unit
+        when :year
+          year += modifier
+          unless modifier.zero? and @context == :future
+            month = 1
+            day = 1
+            hour = minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_year = year + 1
+            end_month = 1
+            end_day = 1
+            end_hour = end_minute = end_second = 0
+          end
+        when :quarter
+          year, quarter = Date::add_quarter(year, Date::get_quarter_index(month), modifier)
+          month = Date::QUARTERS[quarter]
+          unless modifier.zero? and @context == :future
+            day = 1
+            hour = minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_year, next_quarter = Date::add_quarter(year, quarter)
+            end_month = Date::QUARTERS[next_quarter]
+            end_day = 1
+            end_hour = end_minute = end_second = 0
+          end
+        when :month
+          year, month = Date::add_month(year, month, modifier)
+          unless modifier.zero? and @context == :future
+            day = 1
+            hour = minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_year, end_month = Date::add_month(year, month)
+            end_day = 1
+            end_hour = end_minute = end_second = 0
+          end
+        when :fortnight
+          unless modifier.zero? and @context == :future
+            diff = Date::wday_diff(date, Date::DAYS[@options[:week_start]], modifier, sign)
+            diff -= Date::WEEK_DAYS
+            year, month, day = Date::add_day(year, month, day, diff)
+            date = Chronic.time_class.new(year, month, day)
+            hour = minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_date = Chronic.time_class.new(year, month, day)
+            diff = Date::wday_diff(end_date, Date::DAYS[@options[:week_start]], modifier, sign)
+            end_year, end_month, end_day = Date::add_day(year, month, day, diff + Date::WEEK_DAYS)
+            end_hour = end_minute = end_second = 0
+          end
+        when :week
+          unless modifier.zero? and @context == :future
+            diff = Date::wday_diff(date, Date::DAYS[@options[:week_start]], 0, 0)
+            diff += Date::WEEK_DAYS * modifier
+            year, month, day = Date::add_day(year, month, day, diff)
+            hour = minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_date = Chronic.time_class.new(year, month, day)
+            diff = Date::wday_diff(end_date, Date::DAYS[@options[:week_start]], 1, 0)
+            end_year, end_month, end_day = Date::add_day(year, month, day, diff)
+            end_hour = end_minute = end_second = 0
+          end
+        when :weekend
+          diff = Date::wday_diff(date, Date::DAYS[:saturday], modifier, sign)
+          year, month, day = Date::add_day(year, month, day, diff)
+          if [year, month, day] != local_date or @context == :past
+            hour = minute = second = 0
+          end
+          if [year, month, day] != local_date or @context == :future
+            end_date = Chronic.time_class.new(year, month, day)
+            diff = Date::wday_diff(end_date, Date::DAYS[:monday], 1, 1)
+            end_year, end_month, end_day = Date::add_day(year, month, day, diff)
+            end_hour = end_minute = end_second = 0
+          end
+        when :weekday
+          diff = Date::wd_diff(date, modifier)
+          year, month, day = Date::add_day(year, month, day, diff)
+          if [year, month, day] != local_date or @context == :past
+            hour = minute = second = 0
+          end
+          if [year, month, day] != local_date or @context == :future
+            end_year, end_month, end_day = Date::add_day(year, month, day)
+            end_hour = end_minute = end_second = 0
+          end
+        when :day
+          unless modifier.zero? and @context == :future
+            year, month, day = Date::add_day(year, month, day, modifier)
+            hour = minute = second = 0
+          end
+          unless modifier.zero? and @context == :past or time_precision
+            end_year, end_month, end_day = Date::add_day(year, month, day)
+            end_hour = end_minute = end_second = 0
+          end
+        when :morning, :noon, :afternoon, :evening, :night, :midnight
+          unless modifier.zero? and @context == :future
+            year, month, day = Date::add_day(year, month, day, modifier)
+            hour = Time::SPECIAL[@unit].begin
+            minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_year, end_month, end_day = Date::add_day(year, month, day)
+            end_hour = Time::SPECIAL[@unit].end
+            end_minute = end_second = 0
+          end
+        when :hour
+          unless modifier.zero? and @context == :future
+            day, hour = Time::add_hour(day, hour, modifier)
+            minute = second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_day, end_hour = Time::add_hour(day, hour)
+            end_minute = end_second = 0
+          end
+        when :minute
+          unless modifier.zero? and @context == :future
+            hour, minute = Time::add_minute(hour, minute, modifier)
+            second = 0
+          end
+          unless modifier.zero? and @context == :past
+            end_hour, end_minute = Time::add_minute(hour, minute)
+            end_second = 0
+          end
+        when :second
+          unless modifier.zero? and @context == :future
+            minute, second = Time::add_second(minute, second, modifier)
+            hour, minute = Time::add_minute(hour, minute, 0)
+          end
+          unless modifier.zero? and @context == :past
+            end_hour = hour
+            end_minute, end_second = Time::add_second(minute, second)
+          end
+        else
+          raise "Uknown unit #{unit.inspect}"
+        end
+      end
+      span_start = Chronic.construct(year, month, day, hour, minute, second, timezone)
+      span_end = Chronic.construct(end_year, end_month, end_day, end_hour, end_minute, end_second, timezone)
+      span = Span.new(span_start, span_end, true)
+      span.precision = @precision
+      span
+    end
+
+    protected
+
+    include AnchorHandlers
+
+  end
+end

data/lib/chronic/objects/arrow_object.rb

@@ -0,0 +1,27 @@
+require 'chronic/handlers/arrow'
+
+module Chronic
+  class ArrowObject < HandlerObject
+    attr_reader :count
+    attr_reader :unit
+    attr_reader :special
+    attr_reader :pointer
+    def initialize(tokens, token_index, definitions, local_date, options)
+      super
+      match(tokens, @index, definitions)
+    end
+
+    def is_valid?
+      true
+    end
+
+    def to_s
+      "count #{@count.inspect}, unit #{@unit.inspect}, pointer #{@pointer.inspect}, special #{@special.inspect}"
+    end
+
+    protected
+
+    include ArrowHandlers
+
+  end
+end

data/lib/chronic/objects/date_object.rb

@@ -0,0 +1,164 @@
+require 'chronic/handlers/date'
+
+module Chronic
+  class DateObject < HandlerObject
+    include DateStructure
+    attr_reader :wday
+    attr_reader :day_special
+    def initialize(tokens, token_index, definitions, local_date, options)
+      super
+      handle_possible(KeywordOn)
+      unless handle_possible(KeywordIn)
+        handle_possible(SeparatorSpace)
+      end
+      @normalized = false
+      match(tokens, @index, definitions)
+    end
+
+    def normalize!
+      return if @normalized
+      adjust!
+      @normalized = true
+    end
+
+    def force_normalize!
+      @year = @local_date.year unless @have_year
+      @month = @local_date.month unless @have_month
+      @day = @local_date.day unless @have_day
+      adjust!
+      @normalized = true
+    end
+
+    def is_valid?
+      normalize!
+      return false if @year.nil? or @month.nil? or @day.nil?
+      ::Date.valid_date?(@year, @month, @day)
+    end
+
+    def get_end
+      year = @year
+      month = @month
+      day = @day
+      case @precision
+      when :year
+        year += 1
+        month = 1
+        day = 1
+      when :month
+        year, month = Date::add_month(year, month)
+        day = 1
+      when :day
+        year, month, day = Date::add_day(year, month, day)
+      else
+        # BUG! Should never happen
+        raise "Uknown precision #{@precision}"
+      end
+      [year, month, day]
+    end
+
+    def to_s
+      "year #{@year.inspect}, month #{@month.inspect}, day #{@day.inspect}, wday #{@wday.inspect}, day special #{@day_special.inspect}, precision #{@precision.inspect}"
+    end
+
+    protected
+
+    def get_date_compare(sign)
+      sign.zero? ? false : ((sign == -1) ? (@day > @local_date.day) : (@day < @local_date.day))
+    end
+
+    def adjust!
+      sign = get_sign
+      if @day_special
+        set_date
+        case @day_special
+        when :yesterday
+          @year, @month, @day = Date::add_day(@year, @month, @day, -1)
+        when :today
+          # do nothing
+        when :tomorrow
+          @year, @month, @day = Date::add_day(@year, @month, @day, 1)
+        else
+          raise "Uknown special day #{@day_special.inspect}"
+        end
+        @precision = :day
+      elsif @wday
+        year, month, day = local_day
+        year = @year if @year
+        month = @month if @month
+        day = @day if @day
+        date = ::Date.new(year, month, day)
+        s = 0
+        s = sign if not @have_year and not @have_month and not @have_day
+        diff = Date::wday_diff(date, @wday, s, 0)
+        actual_year, actual_month, actual_day = Date::add_day(year, month, day, diff)
+        if @have_day and @day != actual_day
+          actual_day = @day
+          n = 0
+          s = sign
+          if not @month
+            begin
+              n += s
+              actual_year, actual_month = Date::add_month(year, month, n)
+              date = ::Date.new(actual_year, actual_month, actual_day)
+              actual_year = nil if date.wday != @wday or (@year and @year != actual_year)
+            end while actual_year.nil? and n*s < 20
+          elsif not @year
+            actual_month = @month
+            begin
+              actual_year = year + n*s
+              date = ::Date.new(actual_year, actual_month, actual_day)
+              actual_year = nil if date.wday != @wday
+              n += 1 if s == sign
+              s *= -1
+            end while actual_year.nil? and n < 200
+          else
+            actual_year = nil
+          end
+        elsif @have_month and @month != actual_month
+          if not @year
+            n = 0
+            begin
+              n += 1
+              year += sign
+              date = ::Date.new(year, month, day)
+              diff = Date::wday_diff(date, @wday, sign)
+              actual_year, actual_month, actual_day = Date::add_day(year, month, day, diff)
+              actual_year = nil if @month != actual_month
+            end while actual_year.nil? and n < 50
+          else
+            actual_year = nil
+          end
+        elsif @have_year and @year != actual_year
+          actual_year = nil
+        end
+        @year, @month, @day = [actual_year, actual_month, actual_day]
+        @precision = :day
+      else
+        @month = 1 if not @month and not @day
+        @day ||= 1
+        date_compare = get_date_compare(sign)
+        if @year.nil?
+          @year = @local_date.year
+          if @month.nil?
+            @month = @local_date.month
+            @year, @month = Date::add_month(@year, @month, sign) if date_compare
+          elsif not sign.zero?
+            month_compare = (sign == -1) ? (@month > @local_date.month) : (@month < @local_date.month)
+            @year += sign if month_compare or (@month == @local_date.month and date_compare)
+          end
+        elsif @month.nil? and date_compare
+          @year, @month = Date::add_month(@year, @local_date.month, sign)
+        elsif @month.nil?
+          @month = @local_date.month
+        end
+      end
+    end
+
+    def set_date
+      @year, @month, @day = local_day
+    end
+
+    include DateHandlers
+
+  end
+end