medjool 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2a5ad6b65b1d605fa09dd79190ee80253676122
-  data.tar.gz: 5c23b5ab9ed4f9742f23d7b1bcfd9cd233d4a4d3
+SHA256:
+  metadata.gz: 3e849a9ee874d8112e2ee66c5428fc52d483a9517132b9ce5c781d762d687687
+  data.tar.gz: a35b502d072b296279bd0b1882a3d8a042e7c0ef7d9229af1d16ce4c540a94d8
 SHA512:
-  metadata.gz: 50a32aec5bb0bc526b916b7210c987a2853bde5698eaba90c18da714d00be65dd05ddef710db31bb1fcced4947447a48dd89b7c8722ec47c29db8816c5945094
-  data.tar.gz: 57afc158ea9759cc9820b5cfa66a3e729ed3deaceb539a91cf11299ce97cfc038a7297c2f510966e7aebdee9b4bb3b83973dd7640c13dba7ecabde9724022765
+  metadata.gz: 2882248b162c9e0d09332ea1fa10b1e3ac109c8b9e6fd34c72d9edbf7dd5bc876035a57f50d4f2a2f8839b3659d0d3917379baf8b24fa3143ba304f12aaf7450
+  data.tar.gz: a6948793120f4ee891e2dccd2bd759d01b4a265fa896d0bce3718fb90aeca798ffeda5bf7d3a767a575f33c08a5f77aaa7af112427b9a158779d41ef36970438

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.5.8

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     i18n (0.7.0)
-    json (1.8.3)
+    json (1.8.6)
     minitest (5.9.1)
     rake (11.1.2)
     thread_safe (0.3.5)
@@ -25,4 +25,4 @@ DEPENDENCIES
   timecop (~> 0.6.3)
 
 BUNDLED WITH
-   1.12.5
+   1.17.3

data/lib/medjool/parser.rb

@@ -74,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.rb

@@ -1,5 +1,5 @@
 module Medjool
-  VERSION = '0.6.0'
+  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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: medjool
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Andy Geers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,7 +81,7 @@ homepage: http://github.com/andygeers/medjool
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -97,9 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Date parsing with context
 test_files: