medjool 0.5.5 → 0.5.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmUyNzdhZWZhYzQzYmEzNjllMDgwYjA1NGJiMDU3Y2U2OGFmZGVmYw==
+  data.tar.gz: !binary |-
+    MjM1MTkwYjhlOGNmMjVhNTdjZDVkZDI0ODk3OTIzODcxNjg0ZmViMA==
+SHA512:
+  metadata.gz: !binary |-
+    MTI1MGNhMDMyZGE2NTBmMTU0OWQ3NGE5NDYwY2E3ODg5NTFmNTQyODhkYzJm
+    ZWQ4YzU3ZWVhMjc1Y2ZlZTlhOGYxNTZlNWRiMDRmNTM5ODRlMjVhZWY1M2Y4
+    M2YxYWE5MGM5NWY4MWFlYzg4MGQ1N2I5YjQzNzJiMWE0NzQ3MzY=
+  data.tar.gz: !binary |-
+    NGMwNjA3ZWU2M2UxZjJjNjE3MzRhNjk3YzcwMzUzNDE5ZTk0ODc3Y2RiNjAy
+    MjQ2ODBkMjk2MzAyNDBhZWIzMTI4NGQyYzVkMTJkMDdhMjcwYzMzMWUzMDBh
+    NDA1MDJiOTc2Mzc5YTgyOTViMWUxM2JjZTFkYjAwMjA5OTRmNTk=

data/lib/medjool/date_range.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 
 class Medjool::DateRange
@@ -8,4 +9,4 @@ class Medjool::DateRange
     @start_date = start_date
     @end_date = end_date
   end
-end
+end

data/lib/medjool/parser.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 
 class Medjool::Parser
@@ -14,7 +15,7 @@ class Medjool::Parser
 
   def parse_date_range(text)
     if bits = Medjool::DATE_RANGE_MATCHER.match(text.strip)
-      if bits[16]
+      if bits[51]
         # October
         if month_start = self.parse(text.strip, update_now = false)
           month_end = month_start.end_of_month
@@ -23,9 +24,21 @@ class Medjool::Parser
       elsif bits[2]
         # 12-15 Oct
         # Start is 12 Oct
-        range_start = self.parse("#{bits[3]} #{bits[5]}", update_now = false)
+        end_month = bits[16]
+        start_month = bits[5] || end_month
+        range_start = self.parse("#{bits[3]} #{start_month}", update_now = false)
         # End is 15 Oct
-        range_end = self.parse("#{bits[4]} #{bits[5]}", update_now = false)
+        range_end = self.parse("#{bits[15]} #{end_month}", update_now = false)
+        return Medjool::DateRange.new(range_start, range_end)
+      elsif bits[28]
+        # Oct 12-15
+        # Start is 12 Oct
+        end_month = bits[40]
+        start_month = bits[28] || end_month
+
+        range_start = self.parse("#{bits[38]} #{start_month}", update_now = false)
+        # End is 15 Oct
+        range_end = self.parse("#{bits[50]} #{end_month}", update_now = false)
         return Medjool::DateRange.new(range_start, range_end)
       end
     end
@@ -142,4 +155,4 @@ class Medjool::Parser
       return nil
     end
   end
-end
+end

data/lib/medjool/regexs.rb

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

data/lib/medjool.rb

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

data/medjool.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test`.split("\n")
 
-  s.add_dependency 'activesupport', '~> 3.2.12'
+  s.add_dependency 'activesupport', '>= 3.2.12'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest', '~> 5.0'
 end

data/test/helper.rb

@@ -5,6 +5,7 @@ end
 
 require 'minitest'
 require 'minitest/autorun'
+require 'active_support'
 require 'active_support/core_ext/string'
 require 'timecop'
 
@@ -12,4 +13,4 @@ class TestCase < MiniTest::Test
   def self.test(name, &block)
     define_method("test_#{name.gsub(/\W/, '_')}", &block) if block
   end
-end
+end

data/test/test_medjool.rb

@@ -66,6 +66,9 @@ class TestMedjool < TestCase
     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?("12 – 15 Jan")
+    assert parser.is_date_range?("28 January – 3 February")
+    assert parser.is_date_range?("AUGUST 12-15")
     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")
@@ -79,6 +82,10 @@ class TestMedjool < TestCase
     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
+    date_range = parser.parse_date_range("28 Jan-3 Feb")
+    assert_equal "2013-01-28".to_date, date_range.start_date
+    assert_equal "2013-02-03".to_date, date_range.end_date
+
     assert parser.parse_date_range("October 15").nil?
   end
 

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: medjool
 version: !ruby/object:Gem::Version
-  version: 0.5.5
-  prerelease: 
+  version: 0.5.6
 platform: ruby
 authors:
 - Andy Geers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,28 +77,27 @@ files:
 homepage: http://github.com/andygeers/medjool
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Date parsing with context
 test_files:
 - test/helper.rb