0
@@ -10,7 +10,9 @@ module Chronic
0
                  Handler.new([:repeater_month_name, :scalar_day, :scalar_year], :handle_rmn_sd_sy),
0
                  Handler.new([:repeater_month_name, :scalar_day, :scalar_year, :separator_at?, 'time?'], :handle_rmn_sd_sy),
0
                  Handler.new([:repeater_month_name, :scalar_day, :separator_at?, 'time?'], :handle_rmn_sd),
0
+                 Handler.new([:repeater_time, :repeater_day_portion?, :separator_on?, :repeater_month_name, :scalar_day], :handle_rmn_sd_on),
0
                  Handler.new([:repeater_month_name, :ordinal_day, :separator_at?, 'time?'], :handle_rmn_od),
0
+                 Handler.new([:repeater_time, :repeater_day_portion?, :separator_on?, :repeater_month_name, :ordinal_day], :handle_rmn_od_on),
0
                  Handler.new([:repeater_month_name, :scalar_year], :handle_rmn_sy),
0
                  Handler.new([:scalar_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_sd_rmn_sy),
0
                  Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_day, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
0
@@ -109,9 +111,25 @@ module Chronic
0
       handle_m_d(tokens[0].get_tag(RepeaterMonthName), tokens[1].get_tag(ScalarDay).type, tokens[2..tokens.size], options)
0
     end
0
     
0
+    def handle_rmn_sd_on(tokens, options) #:nodoc:
0
+      if tokens.size > 3
0
+        handle_m_d(tokens[2].get_tag(RepeaterMonthName), tokens[3].get_tag(ScalarDay).type, tokens[0..1], options)
0
+      else
0
+        handle_m_d(tokens[1].get_tag(RepeaterMonthName), tokens[2].get_tag(ScalarDay).type, tokens[0..0], options)
0
+      end
0
+    end
0
+    
0
     def handle_rmn_od(tokens, options) #:nodoc:
0
       handle_m_d(tokens[0].get_tag(RepeaterMonthName), tokens[1].get_tag(OrdinalDay).type, tokens[2..tokens.size], options)
0
     end
0
+
0
+    def handle_rmn_od_on(tokens, options) #:nodoc:
0
+      if tokens.size > 3
0
+        handle_m_d(tokens[2].get_tag(RepeaterMonthName), tokens[3].get_tag(OrdinalDay).type, tokens[0..1], options)
0
+      else
0
+        handle_m_d(tokens[1].get_tag(RepeaterMonthName), tokens[2].get_tag(OrdinalDay).type, tokens[0..0], options)
0
+      end
0
+    end
0
     
0
     def handle_rmn_sy(tokens, options) #:nodoc:
0
       month = tokens[0].get_tag(RepeaterMonthName).index

0
@@ -7,6 +7,7 @@ module Chronic
0
         if t = self.scan_for_slash_or_dash(tokens[i]) then tokens[i].tag(t); next end
0
         if t = self.scan_for_at(tokens[i]) then tokens[i].tag(t); next end
0
         if t = self.scan_for_in(tokens[i]) then tokens[i].tag(t); next end
0
+        if t = self.scan_for_on(tokens[i]) then tokens[i].tag(t); next end
0
       end
0
       tokens
0
     end
0
@@ -44,6 +45,14 @@ module Chronic
0
       return nil
0
     end
0
     
0
+    def self.scan_for_on(token)
0
+      scanner = {/^on$/ => :on}
0
+      scanner.keys.each do |scanner_item|
0
+        return SeparatorOn.new(scanner[scanner_item]) if scanner_item =~ token.word
0
+      end
0
+      return nil
0
+    end
0
+    
0
     def to_s
0
       'separator'
0
     end
0
@@ -72,5 +81,11 @@ module Chronic
0
       super << '-in'
0
     end
0
   end
0
+  
0
+  class SeparatorOn < Separator #:nodoc:
0
+    def to_s
0
+      super << '-on'
0
+    end
0
+  end
0
 
0
 end
0
\ No newline at end of file

0
@@ -27,6 +27,17 @@ class TestParsing < Test::Unit::TestCase
0
     time = parse_now("may 28 at 5:32.19pm", :context => :past)
0
     assert_equal Time.local(2006, 5, 28, 17, 32, 19), time
0
     
0
+    # rm_sd_on
0
+    
0
+    time = parse_now("5pm on may 28")
0
+    assert_equal Time.local(2007, 5, 28, 17), time
0
+
0
+    time = parse_now("5pm may 28")
0
+    assert_equal Time.local(2007, 5, 28, 17), time
0
+
0
+    time = parse_now("5 on may 28", :ambiguous_time_range => :none)
0
+    assert_equal Time.local(2007, 5, 28, 05), time
0
+
0
     # rm_od
0
     
0
     time = parse_now("may 27th")
0
@@ -44,6 +55,17 @@ class TestParsing < Test::Unit::TestCase
0
     time = parse_now("may 27th at 5", :ambiguous_time_range => :none)
0
     assert_equal Time.local(2007, 5, 27, 5), time
0
     
0
+    # rm_od_on
0
+    
0
+    time = parse_now("5:00 pm may 27th", :context => :past)
0
+    assert_equal Time.local(2006, 5, 27, 17), time
0
+    
0
+    time = parse_now("5pm on may 27th", :context => :past)
0
+    assert_equal Time.local(2006, 5, 27, 17), time
0
+    
0
+    time = parse_now("5 on may 27th", :ambiguous_time_range => :none)
0
+    assert_equal Time.local(2007, 5, 27, 5), time
0
+
0
     # rm_sy
0
     
0
     time = parse_now("June 1979")