gitlab-chronic 0.10.4 → 0.10.5

data/lib/chronic/{tags/sign.rb → sign.rb}

@@ -10,11 +10,25 @@ module Chronic
     # Returns an Array of tokens.
     def self.scan(tokens, options)
       tokens.each do |token|
-        token.tag scan_for(token, SignPlus, { :+ => :plus })
-        token.tag scan_for(token, SignMinus, { :- => :minus })
+        if t = scan_for_plus(token) then token.tag(t); next end
+        if t = scan_for_minus(token) then token.tag(t); next end
       end
     end
 
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SignPlus object.
+    def self.scan_for_plus(token)
+      scan_for token, SignPlus, { /^\+$/ => :plus }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SignMinus object.
+    def self.scan_for_minus(token)
+      scan_for token, SignMinus, { /^-$/ => :minus }
+    end
+
     def to_s
       'sign'
     end

data/lib/chronic/tag.rb

@@ -4,12 +4,10 @@ module Chronic
   class Tag
 
     attr_accessor :type
-    attr_accessor :width
 
     # type - The Symbol type of this tag.
-    def initialize(type, width = nil, options = {})
+    def initialize(type, options = {})
       @type = type
-      @width = width
       @options = options
     end
 
@@ -19,70 +17,20 @@ module Chronic
     end
 
     class << self
-      # Public: Scan an Array of Token objects.
-      #
-      # tokens  - An Array of tokens to scan.
-      # options - The Hash of options specified in Chronic::parse.
-      #
-      # Returns an Array of tokens.
-      def scan(tokens, options)
-        raise NotImplementedError, 'Subclasses must override scan!'
-      end
-
       private
 
-      # Internal: Match item and create respective Tag class.
-      #           When item is a Symbol it will match only when it's identical to Token.
-      #           When it's a String it will case-insesitively match partial token,
-      #           but only if item's last char have different type than token text's next char.
-      #           When item is a Regexp it will match by it.
-      #
-      # item    - Item to match. It can be String, Symbol or Regexp.
-      # klass   - Tag class to create.
-      # symbol  - Tag type as symbol or string to pass to Tag class.
-      # token   - Token to match against.
-      # options - Options as hash to pass to Tag class.
-      #
-      # Returns an instance of specified Tag klass or nil if item didn't match.
-      def match_item(item, klass, symbol, token, options)
-        match = false
-        case item
-        when String
-          item_type = Tokenizer.char_type(item.to_s[-1])
-          text_type = token.text[token.position+item.length]
-          text_type = Tokenizer.char_type(text_type) if text_type
-          compatible = true
-          compatible = item_type != text_type if text_type && (item_type == :letter || item_type == :digit)
-          match = compatible && token.text[token.position, item.length].casecmp(item).zero?
-        when Symbol
-          match = token.word == item.to_s
+      def scan_for(token, klass, items={}, options = {})
+        case items
         when Regexp
-          match = token.word =~ item
-        end
-        return klass.new(symbol, nil, options) if match
-        nil
-      end
-
-      # Internal: Scan for specified items and create respective Tag class.
-      #
-      # token   - Token to match against.
-      # klass   - Tag class to create.
-      # items   - Item(s) to match. It can be Hash, String, Symbol or Regexp.
-      #           Hash keys can be String, Symbol or Regexp, but values much be Symbol.
-      # options - Options as hash to pass to Tag class.
-      #
-      # Returns an instance of specified Tag klass or nil if item(s) didn't match.
-      def scan_for(token, klass, items, options = {})
-        if items.kind_of?(Hash)
+          return klass.new(token.word, options) if items =~ token.word
+        when Hash
           items.each do |item, symbol|
-            scanned = match_item(item, klass, symbol, token, options)
-            return scanned if scanned
+            return klass.new(symbol, options) if item =~ token.word
           end
-        else
-          return match_item(items, klass, token.word, token, options)
         end
         nil
       end
+
     end
 
   end

data/lib/chronic/time.rb

@@ -6,23 +6,23 @@ module Chronic
     SUBSECOND_SECONDS = 0.001
 
     # Checks if given number could be hour
-    def self.could_be_hour?(hour, width = nil, hours12 = false)
-      hour >= 0 && hour <= (hours12 ? 12 : 24) && (width.nil? || width > 0)
+    def self.could_be_hour?(hour)
+      hour >= 0 && hour <= 24
     end
 
     # Checks if given number could be minute
-    def self.could_be_minute?(minute, width = nil)
-      minute >= 0 && minute <= 60 && (width.nil? || width <= 2)
+    def self.could_be_minute?(minute)
+      minute >= 0 && minute <= 60
     end
 
     # Checks if given number could be second
-    def self.could_be_second?(second, width = nil)
-      second >= 0 && second <= 60 && (width.nil? || width <= 2)
+    def self.could_be_second?(second)
+      second >= 0 && second <= 60
     end
 
     # Checks if given number could be subsecond
-    def self.could_be_subsecond?(subsecond, width = nil)
-      subsecond >= 0 && subsecond <= 999999 && (width.nil? || width > 0)
+    def self.could_be_subsecond?(subsecond)
+      subsecond >= 0 && subsecond <= 999999
     end
 
     # normalize offset in seconds to offset as string +mm:ss or -mm:ss

data/lib/chronic/{tags/time_zone.rb → time_zone.rb}

@@ -10,7 +10,7 @@ module Chronic
     # Returns an Array of tokens.
     def self.scan(tokens, options)
       tokens.each do |token|
-        token.tag scan_for_all(token)
+        if t = scan_for_all(token) then token.tag(t); next end
       end
     end
 

data/lib/chronic/token.rb

@@ -4,18 +4,9 @@ module Chronic
     attr_accessor :word
     attr_accessor :tags
 
-    attr_reader :text
-    attr_reader :position
-
-    def initialize(word, text = nil, position = 0)
+    def initialize(word)
       @word = word
       @tags = []
-      @text = text
-      @position = position
-    end
-
-    def ==(token)
-      token.word == @word.downcase
     end
 
     # Tag this token with the specified tag.
@@ -24,7 +15,7 @@ module Chronic
     #
     # Returns nothing.
     def tag(new_tag)
-      @tags << new_tag if new_tag
+      @tags << new_tag
     end
 
     # Remove all tags of the given class.
@@ -50,12 +41,11 @@ module Chronic
 
     # Print this Token in a pretty way
     def to_s
-      @word + '(' + @tags.join(', ') + ') '
+      @word << '(' << @tags.join(', ') << ') '
     end
 
     def inspect
       to_s
     end
   end
-
 end

data/lib/chronic/version.rb

@@ -1,3 +1,3 @@
 module Chronic
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

data/lib/gitlab-chronic.rb

@@ -1,6 +1,5 @@
 require 'time'
 require 'date'
-require 'numerizer'
 
 require 'chronic/version'
 
@@ -11,24 +10,21 @@ require 'chronic/time'
 require 'chronic/handler'
 require 'chronic/handlers'
 require 'chronic/mini_date'
+require 'chronic/tag'
 require 'chronic/span'
 require 'chronic/token'
-require 'chronic/tokenizer'
+require 'chronic/grabber'
+require 'chronic/pointer'
+require 'chronic/scalar'
+require 'chronic/ordinal'
+require 'chronic/separator'
+require 'chronic/sign'
+require 'chronic/time_zone'
+require 'chronic/numerizer'
 require 'chronic/season'
 
-require 'chronic/tag'
-require 'chronic/tags/grabber'
-require 'chronic/tags/ordinal'
-require 'chronic/tags/pointer'
-require 'chronic/tags/scalar'
-require 'chronic/tags/separator'
-require 'chronic/tags/sign'
-require 'chronic/tags/time_zone'
-
-require 'chronic/tags/repeater'
+require 'chronic/repeater'
 require 'chronic/repeaters/repeater_year'
-require 'chronic/repeaters/repeater_quarter'
-require 'chronic/repeaters/repeater_quarter_name'
 require 'chronic/repeaters/repeater_season'
 require 'chronic/repeaters/repeater_season_name'
 require 'chronic/repeaters/repeater_month'
@@ -124,7 +120,7 @@ module Chronic
 
     # 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)')
+    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
       days_this_month = ::Date.leap?(year) ? Date::MONTH_DAYS_LEAP[month] : Date::MONTH_DAYS[month]
       if day > days_this_month
@@ -142,12 +138,12 @@ module Chronic
         month = month % 12
       end
     end
-    if Chronic.time_class.name == 'Date'
+    if Chronic.time_class.name == "Date"
       Chronic.time_class.new(year, month, day)
-    elsif not Chronic.time_class.respond_to?(:new) or (RUBY_VERSION.to_f < 1.9 and Chronic.time_class.name == 'Time')
+    elsif not Chronic.time_class.respond_to?(:new) or (RUBY_VERSION.to_f < 1.9 and Chronic.time_class.name == "Time")
       Chronic.time_class.local(year, month, day, hour, minute, second)
     else
-      offset = Time::normalize_offset(offset) if Chronic.time_class.name == 'DateTime'
+      offset = Time::normalize_offset(offset) if Chronic.time_class.name == "DateTime"
       Chronic.time_class.new(year, month, day, hour, minute, second, offset)
     end
   end

data/test/test_chronic.rb

@@ -13,7 +13,7 @@ class TestChronic < TestCase
 
   def test_pre_normalize_numerized_string
     string = 'two and a half years'
-    assert_equal Numerizer.numerize(string), Chronic::Parser.new.pre_normalize(string)
+    assert_equal Chronic::Numerizer.numerize(string), Chronic::Parser.new.pre_normalize(string)
   end
 
   def test_post_normalize_am_pm_aliases
@@ -61,20 +61,19 @@ class TestChronic < TestCase
       Chronic::Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_day, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
       Chronic::Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_day, :separator_at?, 'time?'], :handle_sm_sd),
       Chronic::Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, :separator_at?, 'time?'], :handle_sd_sm),
-      Chronic::Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy),
-      Chronic::Handler.new([:scalar_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_sd_rmn_sy)
+      Chronic::Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy)
     ]
 
-    assert_equal endians, Chronic::SpanDictionary.new.definitions[:endian]
+    assert_equal endians, Chronic::Parser.new.definitions[:endian]
 
-    defs = Chronic::SpanDictionary.new(:endian_precedence => :little).definitions
+    defs = Chronic::Parser.new.definitions(:endian_precedence => :little)
     assert_equal endians.reverse, defs[:endian]
 
-    defs = Chronic::SpanDictionary.new(:endian_precedence => [:little, :middle]).definitions
+    defs = Chronic::Parser.new.definitions(:endian_precedence => [:little, :middle])
     assert_equal endians.reverse, defs[:endian]
 
     assert_raises(ArgumentError) do
-      Chronic::SpanDictionary.new(:endian_precedence => :invalid).definitions
+      Chronic::Parser.new.definitions(:endian_precedence => :invalid)
     end
   end
 
@@ -162,25 +161,6 @@ class TestChronic < TestCase
     end
   end
 
-  def test_valid_options
-    options = {
-      :context => :future,
-      :now => nil,
-      :hours24 => nil,
-      :week_start => :sunday,
-      :guess => true,
-      :ambiguous_time_range => 6,
-      :endian_precedence    => [:middle, :little],
-      :ambiguous_year_future_bias => 50
-    }
-    refute_nil Chronic.parse('now', options)
-  end
-
-  def test_invalid_options
-    assert_raises(ArgumentError) { Chronic.parse('now', foo: 'boo') }
-    assert_raises(ArgumentError) { Chronic.parse('now', time_class: Time) }
-  end
-
   def test_activesupport
 =begin
     # ActiveSupport needs MiniTest '~> 4.2' which conflicts with '~> 5.0'

data/test/test_handler.rb

@@ -8,7 +8,7 @@ class TestHandler < TestCase
   end
 
   def definitions
-    @definitions ||= Chronic::SpanDictionary.new.definitions
+    @definitions ||= Chronic::Parser.new.definitions
   end
 
   def test_handler_class_1

data/test/test_numerizer.rb

@@ -0,0 +1,86 @@
+require 'helper'
+
+class ParseNumbersTest < TestCase
+
+  def test_straight_parsing
+    strings = {
+      'one' => 1,
+      'five' => 5,
+      'ten' => 10,
+      'eleven' => 11,
+      'twelve' => 12,
+      'thirteen' => 13,
+      'fourteen' => 14,
+      'fifteen' => 15,
+      'sixteen' => 16,
+      'seventeen' => 17,
+      'eighteen' => 18,
+      'nineteen' => 19,
+      'twenty' => 20,
+      'twenty seven' => 27,
+      'thirty-one' => 31,
+      'thirty-seven' => 37,
+      'thirty seven' => 37,
+      'fifty nine' => 59,
+      'forty two' => 42,
+      'fourty two' => 42,
+      # 'a hundred' => 100,
+      'one hundred' => 100,
+      'one hundred and fifty' => 150,
+      # 'one fifty' => 150,
+      'two-hundred' => 200,
+      '5 hundred' => 500,
+      'nine hundred and ninety nine' => 999,
+      'one thousand' => 1000,
+      'twelve hundred' => 1200,
+      'one thousand two hundred' => 1_200,
+      'seventeen thousand' => 17_000,
+      'twentyone-thousand-four-hundred-and-seventy-three' => 21_473,
+      'seventy four thousand and two' => 74_002,
+      'ninety nine thousand nine hundred ninety nine' => 99_999,
+      '100 thousand' => 100_000,
+      'two hundred fifty thousand' => 250_000,
+      'one million' => 1_000_000,
+      'one million two hundred fifty thousand and seven' => 1_250_007,
+      'one billion' => 1_000_000_000,
+      'one billion and one' => 1_000_000_001}
+
+    strings.each do |key, val|
+      assert_equal val, Chronic::Numerizer.numerize(key).to_i
+    end
+  end
+
+  def test_ordinal_strings
+    {
+      'first' => '1st',
+      'second' => 'second',
+      'second day' => '2nd day',
+      'second of may' => '2nd of may',
+      'fifth' => '5th',
+      'twelfth' => '12th',
+      'twentieth' => '20th',
+      'thirtieth' => '30th',
+      'fourtieth' => '40th',
+      'fiftieth' => '50th',
+      'sixtieth' => '60th',
+      'seventieth' => '70th',
+      'eightieth' => '80th',
+      'ninetieth' => '90th',
+      'hundredth' => '100th',
+      'thousandth' => '1000th',
+      'millionth' => '1000000th',
+      'billionth' => '1000000000th',
+      'trillionth' => '1000000000000th',
+      'twenty third' => '23rd',
+      'first day month two' => '1st day month 2'
+    }.each do |key, val|
+      # Use pre_normalize here instead of Numerizer directly because
+      # pre_normalize deals with parsing 'second' appropriately
+      assert_equal val, Chronic::Parser.new.pre_normalize(key)
+    end
+  end
+
+  def test_edges
+    assert_equal "27 Oct 2006 7:30am", Chronic::Numerizer.numerize("27 Oct 2006 7:30am")
+  end
+end

data/test/test_parsing.rb

@@ -22,14 +22,6 @@ class TestParsing < TestCase
     time2 = Time.parse("2013-08-01 019:30:00.345-07:00")
     assert_in_delta time, time2, 0.001
 
-    time = Chronic.parse("2013-08-01T19:30:00.34-07:00")
-    time2 = Time.parse("2013-08-01T19:30:00.34-07:00")
-    assert_in_delta time, time2, 0.001
-
-    time = Chronic.parse("2013-08-01T19:30:00.3456789-07:00")
-    time2 = Time.parse("2013-08-01T19:30:00.3456789-07:00")
-    assert_in_delta time, time2, 0.001
-
     time = Chronic.parse("2012-08-02T12:00:00Z")
     assert_equal Time.utc(2012, 8, 2, 12), time
 
@@ -53,13 +45,13 @@ class TestParsing < TestCase
 
   def test_handle_rmn_sd
     time = parse_now("aug 3")
-    assert_equal Time.local(2007, 8, 3, 12), time
+    assert_equal Time.local(2006, 8, 3, 12), time
 
     time = parse_now("aug 3", :context => :past)
     assert_equal Time.local(2006, 8, 3, 12), time
 
     time = parse_now("aug. 3")
-    assert_equal Time.local(2007, 8, 3, 12), time
+    assert_equal Time.local(2006, 8, 3, 12), time
 
     time = parse_now("aug 20")
     assert_equal Time.local(2006, 8, 20, 12), time
@@ -119,7 +111,7 @@ class TestParsing < TestCase
 
   def test_handle_od_rm
     time = parse_now("fifteenth of this month")
-    assert_equal Time.local(2007, 8, 15, 12), time
+    assert_equal Time.local(2006, 8, 15, 12), time
   end
 
   def test_handle_od_rmn
@@ -178,9 +170,6 @@ class TestParsing < TestCase
 
     time = parse_now("may 32")
     assert_equal Time.local(2032, 5, 16, 12, 0, 0), time
-
-    time = parse_now("may '01")
-    assert_equal Time.local(2001, 5, 16, 12, 0, 0), time
   end
 
   def test_handle_rdn_rmn_sd_t_tz_sy
@@ -298,15 +287,6 @@ class TestParsing < TestCase
 
     time = parse_now("27 Oct 2006 7:30pm")
     assert_equal Time.local(2006, 10, 27, 19, 30), time
-
-    time = parse_now("3 jan 10")
-    assert_equal Time.local(2010, 1, 3, 12), time
-
-    time = parse_now("3 jan 10", :endian_precedence => :little)
-    assert_equal Time.local(2010, 1, 3, 12), time
-
-    time = parse_now("3 jan 10", :endian_precedence => :middle)
-    assert_equal Time.local(2010, 1, 3, 12), time
   end
 
   def test_handle_sm_sd_sy
@@ -349,9 +329,6 @@ class TestParsing < TestCase
     time = parse_now("09.08.2013")
     assert_equal Time.local(2013, 8, 9, 12), time
 
-    time = parse_now("9.8.2013")
-    assert_equal Time.local(2013, 8, 9, 12), time
-
     time = parse_now("30-07-2013 21:53:49")
     assert_equal Time.local(2013, 7, 30, 21, 53, 49), time
   end
@@ -420,33 +397,6 @@ class TestParsing < TestCase
 
     time = parse_now("3/13", :context => :none)
     assert_equal Time.local(2006, 3, 13, 12), time
-
-    time = parse_now("12/1", :context => :past)
-    assert_equal Time.local(2005, 12, 1, 12), time
-
-    time = parse_now("12/1", :context => :future)
-    assert_equal Time.local(2006, 12, 1, 12), time
-
-    time = parse_now("12/1", :context => :none)
-    assert_equal Time.local(2006, 12, 1, 12), time
-
-    time = parse_now("8/1", :context => :past)
-    assert_equal Time.local(2006, 8, 1, 12), time
-
-    time = parse_now("8/1", :context => :future)
-    assert_equal Time.local(2007, 8, 1, 12), time
-
-    time = parse_now("8/1", :context => :none)
-    assert_equal Time.local(2006, 8, 1, 12), time
-
-    time = parse_now("1/1", :context => :past)
-    assert_equal Time.local(2006, 1, 1, 12), time
-
-    time = parse_now("1/1", :context => :future)
-    assert_equal Time.local(2007, 1, 1, 12), time
-
-    time = parse_now("1/1", :context => :none)
-    assert_equal Time.local(2006, 1, 1, 12), time
   end
 
   # def test_handle_sm_sy
@@ -457,7 +407,7 @@ class TestParsing < TestCase
   #   assert_equal Time.local(2006, 12, 16, 12), time
   #
   #   time = parse_now("13/06")
-  #   assert_nil time
+  #   assert_equal nil, time
   # end
 
   def test_handle_sy_sm
@@ -520,7 +470,7 @@ class TestParsing < TestCase
     assert_equal Time.local(2007, 01, 30, 12), time
 
     time = parse_now("5th tuesday in february")
-    assert_nil time
+    assert_equal nil, time
 
     %W(jan feb march april may june july aug sep oct nov dec).each_with_index do |month, index|
       time = parse_now("5th tuesday in #{month}")
@@ -536,7 +486,7 @@ class TestParsing < TestCase
     assert_equal Time.local(2006, 11, 15, 12), time
 
     time = parse_now("10th wednesday in november")
-    assert_nil time
+    assert_equal nil, time
 
     # time = parse_now("3rd wednesday in 2007")
     # assert_equal Time.local(2007, 1, 20, 12), time
@@ -701,12 +651,6 @@ class TestParsing < TestCase
     time = parse_now("this week", :context => :past)
     assert_equal Time.local(2006, 8, 14, 19), time
 
-    time = parse_now("this week", :context => :past, :guess => :begin)
-    assert_equal Time.local(2006, 8, 13), time
-
-    time = parse_now("this week", :context => :past, :guess => :begin, :week_start => :monday)
-    assert_equal Time.local(2006, 8, 14), time
-
     # weekend
 
     time = parse_now("this weekend")
@@ -1042,11 +986,6 @@ class TestParsing < TestCase
     # future
   end
 
-  def test_parse_guess_rmn_s_r_p
-    time = parse_now("september 3 years ago", :guess => :start)
-    assert_equal Time.local(2003, 9), time
-  end
-
   def test_parse_guess_o_r_g_r
     time = parse_now("3rd month next year", :guess => false)
     assert_equal Time.local(2007, 3), time.begin
@@ -1067,13 +1006,10 @@ class TestParsing < TestCase
 
   def test_parse_guess_nonsense
     time = parse_now("some stupid nonsense")
-    assert_nil time
+    assert_equal nil, time
 
     time = parse_now("Ham Sandwich")
-    assert_nil time
-
-    time = parse_now("t")
-    assert_nil time
+    assert_equal nil, time
   end
 
   def test_parse_span
@@ -1170,236 +1106,6 @@ class TestParsing < TestCase
     assert_equal Time.local(2007, 6, 20), t.end
   end
 
-  def test_quarters
-    time = parse_now("this quarter", :guess => false)
-    assert_equal Time.local(2006, 7, 1), time.begin
-    assert_equal Time.local(2006, 10, 1), time.end
-
-    time = parse_now("next quarter", :guess => false)
-    assert_equal Time.local(2006, 10, 1), time.begin
-    assert_equal Time.local(2007, 1, 1), time.end
-
-    time = parse_now("last quarter", :guess => false)
-    assert_equal Time.local(2006, 4, 1), time.begin
-    assert_equal Time.local(2006, 7, 1), time.end
-  end
-
-  def test_quarters_srp
-    time = parse_now("1 quarter ago", :guess => false)
-    assert_equal Time.local(2006, 4, 1), time.begin
-    assert_equal Time.local(2006, 7, 1), time.end
-
-    time = parse_now("2 quarters ago", :guess => false)
-    assert_equal Time.local(2006, 1, 1), time.begin
-    assert_equal Time.local(2006, 4, 1), time.end
-
-    time = parse_now("1 quarter from now", :guess => false)
-    assert_equal Time.local(2006, 10, 1), time.begin
-    assert_equal Time.local(2007, 1, 1), time.end
-  end
-
-  def test_quarters_named
-    ["Q1", "first quarter", "1st quarter"].each do |string|
-      time = parse_now(string, :guess => false, :context => :none)
-      assert_equal Time.local(2006, 1, 1), time.begin
-      assert_equal Time.local(2006, 4, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :future)
-      assert_equal Time.local(2007, 1, 1), time.begin
-      assert_equal Time.local(2007, 4, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :past)
-      assert_equal Time.local(2006, 1, 1), time.begin
-      assert_equal Time.local(2006, 4, 1), time.end
-
-      time = parse_now("#{string} 2005", :guess => false)
-      assert_equal Time.local(2005, 1, 1), time.begin
-      assert_equal Time.local(2005, 4, 1), time.end
-
-      time = parse_now("2005 #{string}", :guess => false)
-      assert_equal Time.local(2005, 1, 1), time.begin
-      assert_equal Time.local(2005, 4, 1), time.end
-
-      time = parse_now("#{string} this year", :guess => false)
-      assert_equal Time.local(2006, 1, 1), time.begin
-      assert_equal Time.local(2006, 4, 1), time.end
-
-      time = parse_now("this year #{string}", :guess => false)
-      assert_equal Time.local(2006, 1, 1), time.begin
-      assert_equal Time.local(2006, 4, 1), time.end
-
-      time = parse_now("#{string} next year", :guess => false)
-      assert_equal Time.local(2007, 1, 1), time.begin
-      assert_equal Time.local(2007, 4, 1), time.end
-
-      time = parse_now("next year #{string}", :guess => false)
-      assert_equal Time.local(2007, 1, 1), time.begin
-      assert_equal Time.local(2007, 4, 1), time.end
-
-      time = parse_now("this #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 1, 1), time.begin
-      assert_equal Time.local(2006, 4, 1), time.end
-
-      time = parse_now("last #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 1, 1), time.begin
-      assert_equal Time.local(2006, 4, 1), time.end
-
-      time = parse_now("next #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2007, 1, 1), time.begin
-      assert_equal Time.local(2007, 4, 1), time.end
-    end
-
-    ["Q2", "second quarter", "2nd quarter"].each do |string|
-      time = parse_now(string, :guess => false, :context => :none)
-      assert_equal Time.local(2006, 4, 1), time.begin
-      assert_equal Time.local(2006, 7, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :future)
-      assert_equal Time.local(2007, 4, 1), time.begin
-      assert_equal Time.local(2007, 7, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :past)
-      assert_equal Time.local(2006, 4, 1), time.begin
-      assert_equal Time.local(2006, 7, 1), time.end
-
-      time = parse_now("#{string} 2005", :guess => false)
-      assert_equal Time.local(2005, 4, 1), time.begin
-      assert_equal Time.local(2005, 7, 1), time.end
-
-      time = parse_now("2005 #{string}", :guess => false)
-      assert_equal Time.local(2005, 4, 1), time.begin
-      assert_equal Time.local(2005, 7, 1), time.end
-
-      time = parse_now("#{string} this year", :guess => false)
-      assert_equal Time.local(2006, 4, 1), time.begin
-      assert_equal Time.local(2006, 7, 1), time.end
-
-      time = parse_now("this year #{string}", :guess => false)
-      assert_equal Time.local(2006, 4, 1), time.begin
-      assert_equal Time.local(2006, 7, 1), time.end
-
-      time = parse_now("#{string} next year", :guess => false)
-      assert_equal Time.local(2007, 4, 1), time.begin
-      assert_equal Time.local(2007, 7, 1), time.end
-
-      time = parse_now("next year #{string}", :guess => false)
-      assert_equal Time.local(2007, 4, 1), time.begin
-      assert_equal Time.local(2007, 7, 1), time.end
-
-      time = parse_now("this #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 4, 1), time.begin
-      assert_equal Time.local(2006, 7, 1), time.end
-
-      time = parse_now("last #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 4, 1), time.begin
-      assert_equal Time.local(2006, 7, 1), time.end
-
-      time = parse_now("next #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2007, 4, 1), time.begin
-      assert_equal Time.local(2007, 7, 1), time.end
-    end
-
-    ["Q3", "third quarter", "3rd quarter"].each do |string|
-      time = parse_now(string, :guess => false, :context => :none)
-      assert_equal Time.local(2006, 7, 1), time.begin
-      assert_equal Time.local(2006, 10, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :future)
-      assert_equal Time.local(2007, 7, 1), time.begin
-      assert_equal Time.local(2007, 10, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :past)
-      assert_equal Time.local(2005, 7, 1), time.begin
-      assert_equal Time.local(2005, 10, 1), time.end
-
-      time = parse_now("#{string} 2005", :guess => false)
-      assert_equal Time.local(2005, 7, 1), time.begin
-      assert_equal Time.local(2005, 10, 1), time.end
-
-      time = parse_now("2005 #{string}", :guess => false)
-      assert_equal Time.local(2005, 7, 1), time.begin
-      assert_equal Time.local(2005, 10, 1), time.end
-
-      time = parse_now("#{string} this year", :guess => false)
-      assert_equal Time.local(2006, 7, 1), time.begin
-      assert_equal Time.local(2006, 10, 1), time.end
-
-      time = parse_now("this year #{string}", :guess => false)
-      assert_equal Time.local(2006, 7, 1), time.begin
-      assert_equal Time.local(2006, 10, 1), time.end
-
-      time = parse_now("#{string} next year", :guess => false)
-      assert_equal Time.local(2007, 7, 1), time.begin
-      assert_equal Time.local(2007, 10, 1), time.end
-
-      time = parse_now("next year #{string}", :guess => false)
-      assert_equal Time.local(2007, 7, 1), time.begin
-      assert_equal Time.local(2007, 10, 1), time.end
-
-      time = parse_now("this #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 7, 1), time.begin
-      assert_equal Time.local(2006, 10, 1), time.end
-
-      time = parse_now("last #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2005, 7, 1), time.begin
-      assert_equal Time.local(2005, 10, 1), time.end
-
-      time = parse_now("next #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2007, 7, 1), time.begin
-      assert_equal Time.local(2007, 10, 1), time.end
-    end
-
-    ["Q4", "fourth quarter", "4th quarter"].each do |string|
-      time = parse_now(string, :guess => false, :context => :none)
-      assert_equal Time.local(2006, 10, 1), time.begin
-      assert_equal Time.local(2007, 1, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :future)
-      assert_equal Time.local(2006, 10, 1), time.begin
-      assert_equal Time.local(2007, 1, 1), time.end
-
-      time = parse_now(string, :guess => false, :context => :past)
-      assert_equal Time.local(2005, 10, 1), time.begin
-      assert_equal Time.local(2006, 1, 1), time.end
-
-      time = parse_now("#{string} 2005", :guess => false)
-      assert_equal Time.local(2005, 10, 1), time.begin
-      assert_equal Time.local(2006, 1, 1), time.end
-
-      time = parse_now("2005 #{string}", :guess => false)
-      assert_equal Time.local(2005, 10, 1), time.begin
-      assert_equal Time.local(2006, 1, 1), time.end
-
-      time = parse_now("#{string} this year", :guess => false)
-      assert_equal Time.local(2006, 10, 1), time.begin
-      assert_equal Time.local(2007, 1, 1), time.end
-
-      time = parse_now("this year #{string}", :guess => false)
-      assert_equal Time.local(2006, 10, 1), time.begin
-      assert_equal Time.local(2007, 1, 1), time.end
-
-      time = parse_now("#{string} next year", :guess => false)
-      assert_equal Time.local(2007, 10, 1), time.begin
-      assert_equal Time.local(2008, 1, 1), time.end
-
-      time = parse_now("next year #{string}", :guess => false)
-      assert_equal Time.local(2007, 10, 1), time.begin
-      assert_equal Time.local(2008, 1, 1), time.end
-
-      time = parse_now("this #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 10, 1), time.begin
-      assert_equal Time.local(2007, 1, 1), time.end
-
-      time = parse_now("last #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2005, 10, 1), time.begin
-      assert_equal Time.local(2006, 1, 1), time.end
-
-      time = parse_now("next #{string}", :guess => false, context: :none)
-      assert_equal Time.local(2006, 10, 1), time.begin
-      assert_equal Time.local(2007, 1, 1), time.end
-    end
-  end
-
   # regression
 
   # def test_partial
@@ -1523,10 +1229,6 @@ class TestParsing < TestCase
     assert_equal pre_normalize("8:00 pm February 11"), pre_normalize("8:00 p.m. February 11")
   end
 
-  def test_normalizing_time_of_day_phrases
-    assert_equal pre_normalize("midday February 11"), pre_normalize("12:00 p.m. February 11")
-  end
-
   private
   def parse_now(string, options={})
     Chronic.parse(string, {:now => TIME_2006_08_16_14_00_00 }.merge(options))