medjool 0.5.3 → 0.5.4

data/lib/medjool/parser.rb

@@ -14,7 +14,7 @@ class Medjool::Parser
 
   def parse_date_range(text)
     if bits = Medjool::DATE_RANGE_MATCHER.match(text.strip)
-      if bits[15]
+      if bits[16]
         # October
         if month_start = self.parse(text.strip, update_now = false)
           month_end = month_start.end_of_month

data/lib/medjool/regexs.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 module Medjool
-  DAYNAME_MATCHER = /(\s*Mon(day)?,?\s*|\s*Tue(s(day)?)?,?\s*|\s*Wed(nesday)?,?\s*|\s*Thu(r(s(day)?)?)?,?\s*|\s*Fri(day)?,?\s*|\s*Sat(urday)?,?\s*|\s*Sun(day)?,?\s*)/
-  MONTH_NAME_MATCHER = /(Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sept(ember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?)/
+  DAYNAME_MATCHER = /(\s*Mon(day)?,?\s*|\s*Tue(s(day)?)?,?\s*|\s*Wed(nesday)?,?\s*|\s*Thu(r(s(day)?)?)?,?\s*|\s*Fri(day)?,?\s*|\s*Sat(urday)?,?\s*|\s*Sun(day)?,?\s*)([^a-zA-Z]|$)/
+  MONTH_NAME_MATCHER = /(Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sept(ember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?)([^a-zA-Z]|$)/
   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*)/
@@ -11,5 +13,5 @@ module Medjool
   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})/
 
-  DATE_RANGE_MATCHER = /^((([0-9]+) ?- ?([0-9]+) #{MONTH_NAME_MATCHER})|#{MONTH_NAME_MATCHER})$/
+  DATE_RANGE_MATCHER = /^((([0-9]+) ?[-–] ?([0-9]+) #{MONTH_NAME_MATCHER})|#{MONTH_NAME_MATCHER})$/
 end

data/lib/medjool.rb

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

data/test/test_medjool.rb

@@ -14,12 +14,17 @@ class TestMedjool < TestCase
   end
 
   def test_parse_without_context
-    @variations = ["Thu", "*Monday", "1st July", "2nd July 2010", "1 July 2009", "Monday 2nd July 2009", "Monday 2nd", "Monday 2", "Monday 2 July"]
+    @variations = ["*Monday", "1st July", "2nd July 2010", "1 July 2009", "Monday 2nd July 2009", "Monday 2nd", "Monday 2", "Monday 2 July",
+                  "Tue", "Tues", "Tuesday", "Wed", "Wednesday", "Thu", "Thur", "Thurs", "Thursday", "Fri", "Friday-"]
     @variations.each do |t|
       assert_equal Date.parse(t), Medjool.parse(t), "Error parsing '#{t}'"
     end
   end
 
+  def test_month_prefixes
+    ["Monolith", "Octavia", "Augustus"].map { |name| assert Medjool.parse(name).nil?, "Treated name '#{name}' as date" }
+  end
+
   def test_parse_with_context
     assert_equal "2013-09-02".to_date, Medjool.parse("Monday", { :now => 1.week.from_now })
 
@@ -60,6 +65,7 @@ class TestMedjool < TestCase
     parser = Medjool::Parser.new
     assert parser.is_date_range?("October")
     assert parser.is_date_range?("12-15 Jan")
+    assert parser.is_date_range?("12–15 Jan")
     assert !parser.is_date_range?("October 15")
     assert !parser.is_date_range?("09/12/2012")
     assert !parser.is_date_range?("I am working until next October")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: medjool
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Andy Geers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-18 00:00:00 Z
+date: 2013-11-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport