date_common 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1918d5fe6029dd42ff846b01064a42adea2bea8f74c386e3dbb7b17ae210e5
-  data.tar.gz: 1a05ddd001250a2305975d68bdc67eabfef1ba407b21d337ae19ae4526b5a061
+  metadata.gz: b4124a026dcc1b6c0c8abef95bb600c0cd586bded79e66ffecee7f3718b29ff9
+  data.tar.gz: ac4a31fc20511049109384f3550cb5d23731309ff85c2f342458f7028053ad4d
 SHA512:
-  metadata.gz: db36d974950e3c3efda72e437b246aaa0e2aa743ff4d0c75bf10bb5498cd1affb5165cbe78ab54753f6d9e2453765607d19c55dd626830bafa2c44419d87136d
-  data.tar.gz: bbed39728ba2f07445271073fe47469da62d617f01be478b94e8de6742acd87103326155aa1502210e8f1041141eedc96815ee9a54ece38549a10f593c5bee95
+  metadata.gz: 8f56dbee72ca222c9d7663a24ce6c3f78c2183378132926a740a7d3f2009ebdef9c3f74315d22e86138998c9b5df1673080a14fba72f813f2e6acef966396719
+  data.tar.gz: b7df486c831afefdb21a66d31b5881a9ebd3ca684865c53035234c465d265ce94cb83fdb0340f2f44751b6dd3ad42f91feb4775dfb7e761d60d47fe10ac79c8e

data/lib/date_common.rb

@@ -92,7 +92,7 @@ module DateCommon
   # TESTED
   def self.last_date_of_month(date)
     # fucking god awful approach but it works; refactor
-  
+
     # the 31st
     begin
       date_end = Date.new(date.year, date.month, 31)      
@@ -189,11 +189,13 @@ module DateCommon
   # 
   def self.parse_date(text)
     date_text = extract_date_string(text)
+    puts date_text
     date = recognize_date(date_text)
     return date
   end
   
   def self.extract_date_string(text)
+    #raise "foo"
     patterns = []
     patterns << / (o?n?|l?a?s?t?) ?(monday) ?/i
     patterns << / (o?n?|l?a?s?t?) ?(tuesday) ?/i
@@ -219,8 +221,12 @@ module DateCommon
     
     patterns = []
     patterns << / on ([0-9]+) ([0-9]+) ?/
+    patterns << /[0-9]+\/[0-9]+/
+    patterns << /[0-9]+-[0-9]+/
+    patterns << /[0-9]+ [0-9]+/
     patterns.each do |pattern|
       if text =~ pattern
+        
         current_year = Date.today.year
         return Date.new(current_year, $1.to_i, $2.to_i).to_s.downcase
       end
@@ -257,6 +263,29 @@ module DateCommon
       parts = text.split("-")
       return Date.new(parts[0].to_i, parts[1].to_i, parts[2].to_i)
     end
+
+    if text =~ /[0-9]+\/[0-9]+\/[0-9]+/
+      parts = text.split("/")
+      return Date.new(parts[0].to_i, parts[1].to_i, parts[2].to_i)
+    end
+
+    if text =~ /[0-9]+-[0-9]+-[0-9]+/
+      parts = text.split("-")
+      return Date.new(parts[0].to_i, parts[1].to_i, parts[2].to_i)
+    end
+
+    if text =~ /([0-9]+)\/([0-9]+)/
+      #parts = text.split("-")
+      year = Date.today.year
+      return Date.new(year, $1.to_i, $2.to_i)
+    end
+    
+    if text =~ /([0-9]+)-([0-9]+)/
+      #parts = text.split("-")
+      year = Date.today.year
+      return Date.new(year, $1.to_i, $2.to_i)
+    end
+
     
     # monday / tuesday / wednesday. 
     if text =~ /.+day/

data/lib/date_common/version.rb

@@ -1,3 +1,3 @@
 module DateCommon
-  VERSION = "0.11"
+  VERSION = "0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date_common
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Scott Johnson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies: []
 description: A small library of date handling routines that I use on almost every
   project.