Support (mm/yy), :endian_precedence == :month_year

mojombo · Sep 27, 2017 · 8e243c6 · 8e243c6
1 parent 345e9f4
commit 8e243c6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/lib/chronic/definition.rb b/lib/chronic/definition.rb
@@ -73,7 +73,7 @@ def definitions
         [[MonthName, [SeparatorSpace, SeparatorDash], ScalarDay, [SeparatorSpace, Unit, :none]], :handle_mn_sd],
         [[MonthName,  SeparatorSpace, SeparatorApostrophe, ScalarYear], :handle_mn_sy],
         [[MonthName,  SeparatorSpace, ScalarYear], :handle_mn_sy],
-        [[ScalarYear, [SeparatorDash, SeparatorSlash],   ScalarMonth], :handle_sy_sm],
+        [[ScalarFullYear, [SeparatorDash, SeparatorSlash],   ScalarMonth], :handle_sy_sm],
         [[ScalarFullYear, SeparatorSpace, MonthName], :handle_sy_mn],
         [[OrdinalDay, SeparatorSpace, MonthName], :handle_od_mn],
         [[ScalarDay, [SeparatorSpace, SeparatorDash, :optional], MonthName], :handle_sd_mn],
@@ -177,7 +177,13 @@ def self.little
         [[ScalarDay,   SeparatorSlash, ScalarMonth,   SeparatorSlash, ScalarYear, [SeparatorDot, Scalar, :none]],  :handle_sd_sm_sy],
         [[ScalarDay,  [SeparatorSlash, SeparatorDash, SeparatorDot],  ScalarMonth, [SeparatorSlash, :none]], :handle_sd_sm]
       ]
-     end
+    end
+
+    def self.month_year
+      [
+        [[ScalarMonth, SeparatorSlash, ScalarYear], :handle_sm_sy]
+      ]
+    end
 
     def prefered_endian
       options[:endian_precedence] ||= [:middle, :little]
@@ -189,6 +195,8 @@ def prefered_endian
           definition_list += self.class.little
         when :middle
           definition_list += self.class.middle
+        when :month_year
+          definition_list += self.class.month_year
         else
           raise ArgumentError, "Unknown endian option '#{endian}'"
         end

diff --git a/lib/chronic/handlers/date.rb b/lib/chronic/handlers/date.rb
@@ -194,7 +194,14 @@ def handle_mn_sy
       @precision = :month
     end
 
-
+    # Handle scalar-month/scalar-year
+    # formats: mm/yy
+    def handle_sm_sy
+      handle_sm
+      next_tag
+      handle_sy
+      @precision = :month
+    end
 
     # Handle scalar-month/scalar-day
     # formats: mm/dd

diff --git a/test/test_parsing.rb b/test/test_parsing.rb
@@ -442,16 +442,16 @@ def test_handle_sm_sd
     assert_equal Time.local(2006, 1, 1, 12), time
   end
 
-  # def test_handle_sm_sy
-  #   time = parse_now("05/06")
-  #   assert_equal Time.local(2006, 5, 16, 12), time
-  #
-  #   time = parse_now("12/06")
-  #   assert_equal Time.local(2006, 12, 16, 12), time
-  #
-  #   time = parse_now("13/06")
-  #   assert_nil time
-  # end
+  def test_handle_sm_sy
+    time = parse_now("05/06", :endian_precedence => :month_year)
+    assert_equal Time.local(2006, 5, 16, 12), time
+
+    time = parse_now("12/06", :endian_precedence => :month_year)
+    assert_equal Time.local(2006, 12, 16, 12), time
+
+    time = parse_now("13/06", :endian_precedence => :month_year)
+    assert_nil time
+  end
 
   def test_handle_sy_sm
     time = parse_now("2012-06")