medjool 0.5.1 → 0.5.2

data/lib/medjool/parser.rb

@@ -38,7 +38,18 @@ class Medjool::Parser
         text = "#{text.strip}st"
       end
 
-      base_date = Date.parse(text)
+      begin
+        base_date = Date.parse(text)
+      rescue ArgumentError => e
+        # If Date.parse is used on the string "31st" during
+        # a month with only 30 days, it will explode
+        if Medjool::END_OF_MONTH_MATCHER.match(text)
+          # This is a little bit hacky, but switch to a date that will definitely work
+          base_date = Date.parse("#{text} January")
+        else
+          return nil
+        end
+      end
 
       unless @context[:now]
         # In the absence of context, always fall back on the default guess

data/lib/medjool/regexs.rb

@@ -4,7 +4,9 @@ module Medjool
   MONTH_MATCHER = /\s*#{MONTH_NAME_MATCHER},?\s*/
   YYYY_MM_DD_MATCHER = /(\s*[0-9]{4}-[0-9]{2}-[0-9]{2}\s*)/
   DM_DM_YYYY_MATCHER = /(\s*[0-9]{2}[-\/][0-9]{2}[-\/][0-9]{2,4}\s*)/
-  ORDINAL_MATCHER = /(\s*([0-9]{1,2}(st|rd|nd|th)?),?\s*)/
+  ORDINAL_POSTFIX = /(st|rd|nd|th)/
+  ORDINAL_MATCHER = /(\s*([0-9]{1,2}#{ORDINAL_POSTFIX}?),?\s*)/
+  END_OF_MONTH_MATCHER = /^\s*(29|30|31)#{ORDINAL_POSTFIX}?\s*$/
   YEAR_MATCHER = /(\s*([0-9]{4}\s*|\s*'?[0-9]{2}),?\s*)/
   TEXT_DATE_MATCHER = /(#{DAYNAME_MATCHER}|#{ORDINAL_MATCHER}|#{YEAR_MATCHER}|#{MONTH_MATCHER})/
   DATE_MATCHER = /^[^a-zA-Z0-9]*(#{TEXT_DATE_MATCHER}+|#{DM_DM_YYYY_MATCHER}|#{YYYY_MM_DD_MATCHER})/

data/lib/medjool.rb

@@ -1,5 +1,5 @@
 module Medjool
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 
   require 'medjool/parser'
   require 'medjool/date_range'

data/test/test_medjool.rb

@@ -37,6 +37,9 @@ class TestMedjool < TestCase
   def test_ordinal_only
     assert_equal "2013-09-01".to_date, Medjool.parse("1st", {:now => "2013-08-23".to_date})
     assert_equal "2013-08-01".to_date, Medjool.parse("1st", {:now => "2013-08-01".to_date})
+
+    assert_equal "2013-10-31".to_date, Medjool.parse("31st", {:now => "2013-09-01".to_date})
+    assert_equal "2013-09-30".to_date, Medjool.parse("30th", {:now => "2013-09-01".to_date})
   end
 
   def test_day_only
@@ -69,7 +72,6 @@ class TestMedjool < TestCase
     assert_equal "2013-01-12".to_date, date_range.start_date
     assert_equal "2013-01-15".to_date, date_range.end_date
     assert parser.parse_date_range("October 15").nil?
-
   end
 
   def test_lone_numbers
@@ -77,4 +79,9 @@ class TestMedjool < TestCase
     assert_equal Date.parse("1st"), parser.parse("1")
     assert_equal Date.parse("2st"), parser.parse("2 ")
   end
+
+  def test_invalid_dates
+    assert_equal nil, Medjool.parse("Blah")
+    assert_equal nil, Medjool.parse("31st February")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: medjool
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Andy Geers