medjool 0.5.7 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmY3MGU3YThiMTg2OTE5NjM0OWYyYTVhNGMyMzgzZDQ0YzEwNWZjYg==
-  data.tar.gz: !binary |-
-    ZTViZGZhNTFiYTk3OGJjNTg2M2Y5MGViMzM2ZGNkNTJjMmUwNGZjZA==
+SHA256:
+  metadata.gz: 3e849a9ee874d8112e2ee66c5428fc52d483a9517132b9ce5c781d762d687687
+  data.tar.gz: a35b502d072b296279bd0b1882a3d8a042e7c0ef7d9229af1d16ce4c540a94d8
 SHA512:
-  metadata.gz: !binary |-
-    MTE4MzU2ZDVjYzkxMDZjZTNkNDJiODE2MjAxM2I0OTM1ZjAyZTUyOThjYjk2
-    ZTVjM2Y0NTc2OGEzOTFjZmM0MGQ2NmU1YWZhYmNkNGZlNTJkM2Y3ZjI2M2E0
-    ZjExMWE1ZDU4Mzg3ZDYzYjI2Y2E0NjIyMGEzZTNjZDQwNjJlMWI=
-  data.tar.gz: !binary |-
-    M2Y0N2QwMzNjNzM4MDljMDEyMTBkOGE2NDk4MGFjOWRiNzNhZDkyZTNhZTM4
-    OTRjOTMyZjIzYTg1OGM5NTQ1NWRmMTA4Yzk5OTMyMWUyM2MwYTM1MDdlMmVk
-    NzA4OWU5ZWUxOWNkYmUxMzg0YTBkOTdlOTViMDIzZGI0NjViYmQ=
+  metadata.gz: 2882248b162c9e0d09332ea1fa10b1e3ac109c8b9e6fd34c72d9edbf7dd5bc876035a57f50d4f2a2f8839b3659d0d3917379baf8b24fa3143ba304f12aaf7450
+  data.tar.gz: a6948793120f4ee891e2dccd2bd759d01b4a265fa896d0bce3718fb90aeca798ffeda5bf7d3a767a575f33c08a5f77aaa7af112427b9a158779d41ef36970438

data/.ruby-version

@@ -0,0 +1 @@
+2.5.8

data/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+#ruby '1.9.3'
+
+gem 'rake', '~> 11.1.2'
+gem 'activesupport', '~> 4.2.4'
+gem 'timecop', '~> 0.6.3'
+

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    i18n (0.7.0)
+    json (1.8.6)
+    minitest (5.9.1)
+    rake (11.1.2)
+    thread_safe (0.3.5)
+    timecop (0.6.3)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.2.4)
+  rake (~> 11.1.2)
+  timecop (~> 0.6.3)
+
+BUNDLED WITH
+   1.17.3

data/lib/medjool/date_range.rb

@@ -3,10 +3,11 @@ require 'active_support/core_ext'
 
 class Medjool::DateRange
 
-  attr_accessor :start_date, :end_date
+  attr_accessor :start_date, :end_date, :prefix
 
-  def initialize(start_date, end_date)
+  def initialize(start_date, end_date, prefix = nil)
     @start_date = start_date
     @end_date = end_date
+    @prefix = prefix
   end
 end

data/lib/medjool/parser.rb

@@ -15,31 +15,37 @@ class Medjool::Parser
 
   def parse_date_range(text)
     if bits = Medjool::DATE_RANGE_MATCHER.match(text.strip)
-      if bits[51]
+      if bits[1].present?
+        prefix = bits[1].strip.sub(/:$/, '')
+      else
+        prefix = nil
+      end
+
+      if bits[52]
         # 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)
+          return Medjool::DateRange.new(month_start, month_end, prefix)
         end
-      elsif bits[2]
+      elsif bits[3]
         # 12-15 Oct
         # Start is 12 Oct
-        end_month = bits[16]
-        start_month = bits[5] || end_month
-        range_start = self.parse("#{bits[3]} #{start_month}", update_now = false)
+        end_month = bits[17]
+        start_month = bits[6] || end_month
+        range_start = self.parse("#{bits[4]} #{start_month}", update_now = false)
         # End is 15 Oct
-        range_end = self.parse("#{bits[15]} #{end_month}", update_now = false)
-        return Medjool::DateRange.new(range_start, range_end)
-      elsif bits[28]
+        range_end = self.parse("#{bits[16]} #{end_month}", update_now = false)
+        return Medjool::DateRange.new(range_start, range_end, prefix)
+      elsif bits[29]
         # Oct 12-15
         # Start is 12 Oct
-        end_month = bits[40]
-        start_month = bits[28] || end_month
+        end_month = bits[41]
+        start_month = bits[29] || end_month
 
-        range_start = self.parse("#{bits[38]} #{start_month}", update_now = false)
+        range_start = self.parse("#{bits[39]} #{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)
+        range_end = self.parse("#{bits[51]} #{end_month}", update_now = false)
+        return Medjool::DateRange.new(range_start, range_end, prefix)
       end
     end
   end
@@ -68,10 +74,22 @@ class Medjool::Parser
         end
       end
 
-      unless @context[:now]
+      should_determine_ambiguity = false
+      if @context[:now]
+        should_determine_ambiguity = true
+      else
         # In the absence of context, always fall back on the default guess
         guess_date = base_date
-      else
+
+        # Only exception for that is the special case where it's currently December,
+        # and "January" *obviouly* should mean January NEXT year not THIS year
+        if Date.today.month == 12 && guess_date < 10.months.ago          
+          should_determine_ambiguity = true
+          @context[:now] = Date.today
+        end
+      end
+
+      if should_determine_ambiguity
         # Determine the ambiguity level for this data
         ambiguity = determine_ambiguity(text)
 

data/lib/medjool/regexs.rb

@@ -10,8 +10,8 @@ module Medjool
   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})/
+  TEXT_DATE_MATCHER = /(#{DAYNAME_MATCHER}|#{ORDINAL_MATCHER}|#{YEAR_MATCHER}|#{MONTH_MATCHER}([^a-zA-Z]|$))/
   DATE_MATCHER = /^[^a-zA-Z0-9]*(#{TEXT_DATE_MATCHER}+|#{DM_DM_YYYY_MATCHER}|#{YYYY_MM_DD_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]|$))$/
+  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.7'
+  VERSION = '0.7.0'
 
   require 'medjool/parser'
   require 'medjool/date_range'

data/test/test_medjool.rb

@@ -2,6 +2,22 @@
 
 require 'helper'
 
+class TestMedjoolInDecember < TestCase
+
+  def setup
+    # 23rd December 2013
+    Timecop.freeze("2022-12-23".to_date)
+  end
+
+  def teardown
+    Timecop.return
+  end
+
+  def test_january_date_in_december
+    assert_equal "2023-01-01".to_date, Medjool.parse("January 1st")
+  end
+end
+
 class TestMedjool < TestCase
 
   def setup
@@ -17,7 +33,8 @@ class TestMedjool < TestCase
     @variations = ["*Monday", "1st July", "2nd July 2010", "1 July 2009", "Monday 2nd July 2009", "Monday 2nd", "Monday 2", "Monday 2 July",
                   "Tue", "Tues", "tuesday", "Tuesday", "Wed", "Wednesday", "Thu", "Thur", "Thurs", "Thursday", "Fri", "Friday-"]
     @variations.each do |t|
-      assert_equal Date.parse(t), Medjool.parse(t), "Error parsing '#{t}'"
+      stripped_date = t.sub(/[*-]/, "")
+      assert_equal Date.parse(stripped_date), Medjool.parse(t), "Error parsing '#{t}'"
     end
   end
 
@@ -68,6 +85,7 @@ class TestMedjool < TestCase
     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?("Hanging out: 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")
@@ -80,18 +98,30 @@ class TestMedjool < TestCase
     assert date_range, "Could not parse input as date range"
     assert_equal "2013-10-01".to_date, date_range.start_date
     assert_equal "2013-10-31".to_date, date_range.end_date
+    assert_nil date_range.prefix
     date_range = parser.parse_date_range("12-15 Jan")
     assert date_range, "Could not parse input as date range"
     assert_equal "2014-01-12".to_date, date_range.start_date
     assert_equal "2014-01-15".to_date, date_range.end_date
+    assert_nil date_range.prefix
     date_range = parser.parse_date_range("28 Jan-3 Feb")
     assert date_range, "Could not parse input as date range"
     assert_equal "2014-01-28".to_date, date_range.start_date
     assert_equal "2014-02-03".to_date, date_range.end_date
+    assert_nil date_range.prefix
 
     assert parser.parse_date_range("October 15").nil?
   end
 
+  def test_parse_date_range_with_prefix
+    parser = Medjool::Parser.new(:now => "2013-08-01".to_datetime)
+    date_range = parser.parse_date_range("Living the dream: 12-15 Jan")
+    assert date_range, "Could not parse input as date range"
+    assert_equal "2014-01-12".to_date, date_range.start_date
+    assert_equal "2014-01-15".to_date, date_range.end_date
+    assert_equal "Living the dream", date_range.prefix
+  end
+
   def test_lone_numbers
     parser = Medjool::Parser.new
     assert_equal Date.parse("1st"), parser.parse("1")

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: medjool
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Andy Geers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: Medjool is a date parser written in pure Ruby, which processes dates
@@ -62,8 +62,11 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .gitignore
+- ".gitignore"
+- ".ruby-version"
 - BUILDING.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -78,25 +81,25 @@ homepage: http://github.com/andygeers/medjool
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Date parsing with context
 test_files: