medjool 0.3 → 0.4

data/lib/medjool/date_range.rb

@@ -0,0 +1,11 @@
+require 'active_support/core_ext'
+
+class Medjool::DateRange
+
+  attr_accessor :start_date, :end_date
+
+  def initialize(start_date, end_date)
+    @start_date = start_date
+    @end_date = end_date
+  end
+end

data/lib/medjool/parser.rb

@@ -8,7 +8,30 @@ class Medjool::Parser
     @context = context
   end
 
-  def parse(text)
+  def is_date_range?(text)
+    Medjool::DATE_RANGE_MATCHER.match(text.strip).present?
+  end
+
+  def parse_date_range(text)
+    if bits = Medjool::DATE_RANGE_MATCHER.match(text.strip)
+      if bits[15]
+        # October
+        if month_start = self.parse(text.strip, update_now = false)
+          month_end = month_start.end_of_month
+          return Medjool::DateRange.new(month_start, month_end)
+        end
+      elsif bits[2]
+        # 12-15 Oct
+        # Start is 12 Oct
+        range_start = self.parse("#{bits[3]} #{bits[5]}", update_now = false)
+        # End is 15 Oct
+        range_end = self.parse("#{bits[4]} #{bits[5]}", update_now = false)
+        return Medjool::DateRange.new(range_start, range_end)
+      end
+    end
+  end
+
+  def parse(text, update_now = true)
     if Medjool::DATE_MATCHER.match(text)
       base_date = Date.parse(text)
 
@@ -63,7 +86,7 @@ class Medjool::Parser
         end
       end
 
-      @context[:now] = guess_date
+      @context[:now] = guess_date if update_now
       return guess_date
     else
       return nil

data/lib/medjool/regexs.rb

@@ -1,10 +1,13 @@
 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_MATCHER = /\s*(Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sept(ember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?),?\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)?)/
+  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*)/
   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})/
+
+  DATE_RANGE_MATCHER = /^((([0-9]+) ?- ?([0-9]+) #{MONTH_NAME_MATCHER})|#{MONTH_NAME_MATCHER})$/
 end

data/lib/medjool.rb

@@ -1,7 +1,8 @@
 module Medjool
-  VERSION = 0.3
+  VERSION = 0.4
 
   require 'medjool/parser'
+  require 'medjool/date_range'
   require 'medjool/regexs'
 
   class << self
@@ -11,4 +12,4 @@ module Medjool
   def self.parse(t, context = {})
     Medjool::Parser.new(context).parse(t)
   end
-end
+end

data/test/test_medjool.rb

@@ -50,4 +50,25 @@ class TestMedjool < TestCase
     assert_equal "2013-07-06".to_date, parser.parse("06/07/2013")
     assert_equal "2013-07-06".to_date, parser.parse("06/07/2013")
   end
+
+  def test_is_date_range
+    parser = Medjool::Parser.new
+    assert parser.is_date_range?("October")
+    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")
+  end
+
+  def test_parse_date_range
+    parser = Medjool::Parser.new
+    date_range = parser.parse_date_range("October")
+    assert_equal "2013-10-01".to_date, date_range.start_date
+    assert_equal "2013-10-31".to_date, date_range.end_date
+    date_range = parser.parse_date_range("12-15 Jan")
+    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
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: medjool
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Andy Geers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-17 00:00:00 Z
+date: 2013-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -77,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - lib/medjool.rb
+- lib/medjool/date_range.rb
 - lib/medjool/parser.rb
 - lib/medjool/regexs.rb
 - medjool.gemspec