date-formats 0.2.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc67b4f49a89aa6bc05ab8836ed1da60e4378705
-  data.tar.gz: 0f2e024892406fc95e7b365e41782dec1441612f
+  metadata.gz: 29983784dc5d76dd11c233430a3aee08701a711a
+  data.tar.gz: a2fb38dd99f5b98b924516dcf1c9f39c32fb6c20
 SHA512:
-  metadata.gz: 2e75b49ee32ad7d9b0178509a70da635b388cb50496eedfc13cef9ecf87af0e9bccd0cdb8e1c154e7c25a7f62c7543f6dfccc00368bead0df940352f0a4bb135
-  data.tar.gz: a4e71ff6484a61df679baea147d91b5e49ae5da4db169fc2e44b759109a878ac25d936ab3587aa2a79d0af35d4c1554acfa106cfbbe483e90ff8b76cae554da7
+  metadata.gz: 584abc31598b6d1eef8ffa87610122ef2df398b9b537d2fe33e704b6c2554e511526cdc9d337330e5ac70d09d9f1a34278d586f310acd593f8fa81c23ebf81f3
+  data.tar.gz: cb10a5e2c39a0d707f735214aeb5de52473b90619bf62f859b0217a8c0d8e19b6cb4448bed2442a52ef9c77559e5608bb38dbff7f1c233d68681ef0ddc954ba5

data/Manifest.txt

@@ -19,3 +19,4 @@ test/test_parse_fr.rb
 test/test_parse_it.rb
 test/test_parse_pt.rb
 test/test_version.rb
+test/test_week.rb

data/README.md

@@ -44,6 +44,54 @@ DateFormats.parse( 'Lundi 1 Janvier', lang: 'fr')
 #=> <Date: 2019-01-01 ((2458485j,0s,0n),+0s,2299161j)>
 ```
 
+Pre-configured date formats for now include:
+
+**Base - Work for All Languages**
+
+- `YYYY_MM_DD_hh_mm`  e.g. 2020-01-19 22:00  or 2020-1-19 22:00
+- `YYYY_MM_DD` e.g. 2020-01-19   or 2020-1-19
+- `DD_MM_YYYY_hh_mm` e.g. 19.01.2020 22.00  or 19.1.2020 22:00
+- `DD_MM_hh_mm` e.g. 19.01. 22.00  or 19.1. 22:00
+- `DD_MM_YYYY` e.g. 19.01.2020  or 19.1.2020
+- `DD_MM`  e.g. 19.01.  or 19.1.
+
+**English (`en`)**
+
+- `DD_MONTH_YYYY_hh_mm` e.g. 19 Jan 2020 22:00
+- `MONTH_DD_YYYY_hh_mm` e.g. Jan 19 2020 22:00 or Jan 19, 2020 22:00
+- `MONTH_DD_hh_mm` e.g. Jan 19 22:00
+- `MONTH_DD_YYYY` e.g. Jan 19 2020 or Jan 19, 2020 or January 19, 2020
+- `DAY_MONTH_DD` e.g. Sun Jan 19 or Sun, Jan 19 or Sunday, January 19
+- `MONTH_DD` e.g. Jan 19 or Jan/19
+- `DD_MONTH` e.g. 19 Jan or 19/Jan
+
+**Spanish / Español (`es`)**
+
+- `DAY_DD_MONTH_hh_mm` e.g. Dom 19 Ene 22:00 or Dom 19 Ene 22h00
+- `DAY_DD_MONTH` e.g. Dom 19 Ene or Dom 19 Enero
+- `DD_MONTH` e.g. 19 Ene
+- `DAY_DD_MM` e.g. Dom 19.01. or Dom 19.1.
+
+**Portuguese / Português (`pt`)**
+
+- `DD_MM_YYYY_DAY` e.g.  19/1/2020 Domenica
+- `DAY_DD_MONTH` e.g. Dom 19 Jan  or  Dom 19 Janeiro
+- `DAY_DD_MM` e.g. Dom 19/01  or Dom 19/1
+
+**French / Français (`fr`)**
+
+- `DAY_DD_MONTH` e.g. Dim. 19 Janv or Dim. 19 Janvier
+
+**Italian / Italiano (`it`)**
+
+- `DAY_MM_DD` e.g. Dom. 19.1.
+
+**German / Deutsch (`de`)**
+
+- `DAY_MM_DD` e.g. So 19.1. or So 19.01.
+
+
+
 How does it work?
 The  `date-formats` library uses text patterns (that is, regular expressions)
 for defining and parsing new date formats.
@@ -55,7 +103,7 @@ For example, the Spanish date `1 Ene` gets matched by:
 ```ruby
 /\b
  (?<day>\d{1,2})
-   \s
+   [ ]
  (?<month_name>#{MONTH_ES})
  \b/x
 ```
@@ -82,10 +130,10 @@ And the French date `Lundi 1 Janvier` gets matched by:
 ```ruby
 /\b
  (?<day_name>#{DAY_FR})
-   \s+
+   [ ]+
  (?<day>\d{1,2})
    \.?        # note: make dot optional
-   \s+
+   [ ]+
  (?<month_name>#{MONTH_FR})
  \b/x
 ```
@@ -122,6 +170,7 @@ Décembre   Déce   Déc
 And so on.
 
 
+
 ## License
 
 The `date-formats` scripts are dedicated to the public domain.

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.spec 'date-formats' do
   self.summary = "date-formats - read / parse and print dates (and times) from around the world"
   self.description = summary
 
-  self.urls = ['https://github.com/sportdb/sport.db']
+  self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
   self.email = 'opensport@googlegroups.com'
@@ -19,9 +19,7 @@ Hoe.spec 'date-formats' do
 
   self.licenses = ['Public Domain']
 
-  self.extra_deps = [
-    ['logutils', '>= 0.6.1'],
-  ]
+  self.extra_deps = []
 
   self.spec_extras = {
     required_ruby_version: '>= 2.2.2'

data/lib/date-formats.rb

@@ -1,20 +1,29 @@
-# encoding: utf-8
-
 require 'pp'
 require 'time'
 require 'date'
 
-## 3rd party libs/gems
-require 'logutils'
-
 
 ###
 # our own code
 require 'date-formats/version' # let version always go first
+
+## todo/fix: make logging class configurable - lets you use logutils etc.
+module DateFormats
+  module Logging
+    def logger() @logger ||= Logger.new; end
+
+    class Logger   ## for now use quick "dummy" logger to
+      def debug( msg ) puts "[debug] #{msg}"; end
+    end # class Logger
+  end  # module Logging
+end # module DateFormats
+
+
 require 'date-formats/reader'
 require 'date-formats/names'   ## month and day names (e.g. January,.. Monday,...)
 
 
+
 module DateFormats
 
 #############

data/lib/date-formats/formats.rb

@@ -6,6 +6,9 @@ module DateFormats
 # e.g. 2012-09-14 20:30   => YYYY-MM-DD HH:MM
 #  note: allow 2012-9-3 7:30 e.g. no leading zero required
 # regex_db
+
+##  todo/fix: add rule with allowed / separator (e.g. 2019/12/11)
+##    BUT must be used in all following case too (NO mix'n'match allowed e.g. 2019-11/12)
 DB__DATE_TIME_RE = /\b
                (?<year>\d{4})
                  -
@@ -14,7 +17,7 @@ DB__DATE_TIME_RE = /\b
                (?<day>\d{1,2})
                 \s+
                (?<hours>\d{1,2})
-                 :
+                 [:.hH]
                (?<minutes>\d{2})
                 \b/x
 
@@ -42,7 +45,7 @@ DD_MM_YYYY__DATE_TIME_RE = /\b
                         (?<year>\d{4})
                           \s+
                         (?<hours>\d{1,2})
-                          [:.]
+                          [:.hH]
                         (?<minutes>\d{2})
                           \b/x
 
@@ -57,7 +60,7 @@ DD_MM__DATE_TIME_RE = /\b
                          \.
                          \s+
                       (?<hours>\d{1,2})
-                         [:.]
+                         [:.hH]
                       (?<minutes>\d{2})
                         \b/x
 
@@ -86,6 +89,7 @@ DD_MM__DATE_RE = /\b
 
 ##
 # e.g. 12 May 2013 14:00  => D|DD.MMM.YYYY H|HH:MM
+#   or 12 May 2013 14h00
 EN__DD_MONTH_YYYY__DATE_TIME_RE = /\b
               (?<day>\d{1,2})
                  \s
@@ -94,7 +98,7 @@ EN__DD_MONTH_YYYY__DATE_TIME_RE = /\b
               (?<year>\d{4})
                  \s+
               (?<hours>\d{1,2})
-                :
+                [:hH]
               (?<minutes>\d{2})
                 \b/x
 
@@ -105,44 +109,71 @@ EN__DD_MONTH__DATE_RE = /\b
               (?<month_name>#{MONTH_EN})
                  \b/x
 
-# e.g. Fri Aug/9
+# e.g. Fri Aug/9  or Fri Aug 9
+#      Fri, Aug/9 or Fri, Aug 9
 EN__DAY_MONTH_DD__DATE_RE = /\b
      (?<day_name>#{DAY_EN})
+        ,?   # note: allow optional comma
         \s
      (?<month_name>#{MONTH_EN})
-        \/
+        (?: \/|\s )
      (?<day>\d{1,2})
         \b/x
 
-# e.g.  Jun/12 2011 14:00
+
+# e.g. Fri Aug/9 18:00 or Fri Aug 9 18:00
+#      Fri, Aug/9 18:00 or Fri, Aug 9 18:00
+EN__DAY_MONTH_DD__DATE_TIME_RE = /\b
+     (?<day_name>#{DAY_EN})
+        ,?   # note: allow optional comma
+        \s
+     (?<month_name>#{MONTH_EN})
+        (?: \/|\s )
+     (?<day>\d{1,2})
+         \s+
+     (?<hours>\d{1,2})
+        [:hH]
+     (?<minutes>\d{2})
+         \b/x
+
+
+
+# e.g.  Jun/12 2011 14:00  or
+#       Jun 12, 2011 14:00 or
+#       Jun 12, 2011 14h00
 EN__MONTH_DD_YYYY__DATE_TIME_RE = /\b
                  (?<month_name>#{MONTH_EN})
-                   \/
+                   (?: \/|\s )
                  (?<day>\d{1,2})
+                   ,?   # note: allow optional comma
                    \s
                  (?<year>\d{4})
                    \s+
                  (?<hours>\d{1,2})
-                   :
+                   [:hH]
                  (?<minutes>\d{2})
                    \b/x
 
 # e.g.  Jun/12 14:00  w/ implied year H|HH:MM
+#   or  Jun 12 14h00
 EN__MONTH_DD__DATE_TIME_RE = /\b
                  (?<month_name>#{MONTH_EN})
-                   \/
+                   (?: \/|\s )
                  (?<day>\d{1,2})
                    \s+
                  (?<hours>\d{1,2})
-                   :
+                   [:hH]
                  (?<minutes>\d{2})
                    \b/x
 
 # e.g. Jun/12 2013
+#   or Jun 12 2013
+#   or Jun 12, 2013
 EN__MONTH_DD_YYYY__DATE_RE = /\b
               (?<month_name>#{MONTH_EN})
-                 \/
+                 (?: \/|\s )
               (?<day>\d{1,2})
+                 ,?   # note: allow optional comma
                  \s
               (?<year>\d{4})
                 \b/x
@@ -152,14 +183,17 @@ EN__MONTH_DD_YYYY__DATE_RE = /\b
 #   -- fix: might eat french weekday mar 12  is mardi (mar)  !!! see FR__ pattern
 #  fix: remove  space again for now - and use simple en date reader or something!!!
 ##  was [\/ ]   changed back to \/
+
+## check if [\/ ] works!!!! in \x mode ??
 EN__MONTH_DD__DATE_RE = /\b
                  (?<month_name>#{MONTH_EN})
-                    \/
+                    (?: \/|\s )
                  (?<day>\d{1,2})
                    \b/x
 
 
 
+
 # e.g.  12 Ene  w/ implied year
 ES__DD_MONTH__DATE_RE = /\b
                  (?<day>\d{1,2})
@@ -167,9 +201,34 @@ ES__DD_MONTH__DATE_RE = /\b
                  (?<month_name>#{MONTH_ES})
                    \b/x
 
+# e.g.  Vie 12 Ene  w/ implied year
+ES__DAY_DD_MONTH__DATE_RE = /\b
+                 (?<day_name>#{DAY_ES})
+                   \.?        # note: make dot optional
+                   \s
+                 (?<day>\d{1,2})
+                   \s
+                 (?<month_name>#{MONTH_ES})
+                   \b/x
+
+# e.g. Sáb 5 Ene 19:30
+ES__DAY_DD_MONTH__DATE_TIME_RE = /\b
+                 (?<day_name>#{DAY_ES})
+                   \.?        # note: make dot optional
+                   \s
+                 (?<day>\d{1,2})
+                   \s
+                 (?<month_name>#{MONTH_ES})
+                   \s+
+                 (?<hours>\d{1,2})
+                   [:hH]
+                 (?<minutes>\d{2})
+                   \b/x
+
+
 # e.g. Vie. 16.8. or  Sáb. 17.8.
 #  or  Vie 16.8.  or  Sáb 17.8.
-ES__DAY_MM_DD__DATE_RE = /\b
+ES__DAY_DD_MM__DATE_RE = /\b
         (?<day_name>#{DAY_ES})
            \.?        # note: make dot optional
            \s
@@ -218,19 +277,67 @@ PT__DD_MM_YYYY_DAY__DATE_RE = /\b
         (?<day_name>#{DAY_PT})
        \b/x
 
+# e.g. Sáb, 13/Maio or Qui, 08/Junho
+#  or  Sáb 13 Maio or Qui 8 Junho
+PT__DAY_DD_MONTH__DATE_RE = /\b
+        (?<day_name>#{DAY_PT})
+           \.?        # note: make dot optional
+           ,?         # note: allow optional comma too
+           \s
+        (?<day>\d{1,2})
+           (?: \/|\s )
+        (?<month_name>#{MONTH_PT})
+       \b/x
+
+# e.g. Sáb, 29/07 or  Seg, 31/07
+#      Sáb 29/07  or  Seg 31/07
+PT__DAY_DD_MM__DATE_RE = /\b
+        (?<day_name>#{DAY_PT})
+           \.?        # note: make dot optional
+           ,?         # note: allow optional comma too
+           \s
+        (?<day>\d{1,2})
+           \/
+        (?<month>\d{1,2})
+       \b/x
+
+
+
+
+# e.g. Sa., 16.5., 18.00 Uhr  or  Mo., 18.5., 20.30 Uhr
+#      Sa 16.5. 18.00         or  Mo 18.5. 20.30
+DE__DAY_MM_DD__DATE_TIME_RE = /\b
+        (?<day_name>#{DAY_DE})
+           \.?        # note: make dot optional
+           ,?         # note: allow optional comma too
+           [ ]*
+        (?<day>\d{1,2})
+           \.
+        (?<month>\d{1,2})
+           \.
+           ,?         # note: allow optional comma too
+           [ ]*
+         (?<hours>\d{1,2})
+           \.
+         (?<minutes>\d{2})
+            (?:[ ]*
+               uhr
+            )?   ## note: allow optional Uhr
+          (?=[ \]]|$)/ix  ## note: allow end-of-string/line too/x
 
 # e.g. Fr. 26.7. or  Sa. 27.7.
 #  or  Fr 26.7.  or  Sa 27.7.
+#  or  Fr, 26.7. or  Sa, 27.7.
 DE__DAY_MM_DD__DATE_RE = /\b
         (?<day_name>#{DAY_DE})
            \.?        # note: make dot optional
+           ,?         # note: allow optional comma too
            \s
         (?<day>\d{1,2})
            \.
         (?<month>\d{1,2})
            \.
-          (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too/x
-
+          (?=[ \]]|$)/x  ## note: allow end-of-string/line too/x
 
 
 #############################################
@@ -246,11 +353,12 @@ FORMATS_BASE = [    ### all numbers (no month names or weekday) - find a better
 ]
 
 FORMATS_EN = [
+  [ EN__DAY_MONTH_DD__DATE_TIME_RE,  '[EN_DAY_MONTH_DD_hh_mm]'  ],
   [ EN__DD_MONTH_YYYY__DATE_TIME_RE, '[EN_DD_MONTH_YYYY_hh_mm]' ],
   [ EN__MONTH_DD_YYYY__DATE_TIME_RE, '[EN_MONTH_DD_YYYY_hh_mm]' ],
   [ EN__MONTH_DD__DATE_TIME_RE,      '[EN_MONTH_DD_hh_mm]'      ],
   [ EN__MONTH_DD_YYYY__DATE_RE,      '[EN_MONTH_DD_YYYY]'       ],
-  [ EN__DAY_MONTH_DD__DATE_RE,       '[EN_DAY_MONTH_DD]',       ],
+  [ EN__DAY_MONTH_DD__DATE_RE,       '[EN_DAY_MONTH_DD]'        ],
   [ EN__MONTH_DD__DATE_RE,           '[EN_MONTH_DD]'            ],
   [ EN__DD_MONTH__DATE_RE,           '[EN_DD_MONTH]'            ],
 ]
@@ -260,15 +368,21 @@ FORMATS_FR = [
 ]
 
 FORMATS_ES = [
+  [ ES__DAY_DD_MONTH__DATE_TIME_RE,  '[ES_DAY_DD_MONTH_hh_mm]' ],
+  [ ES__DAY_DD_MONTH__DATE_RE,       '[ES_DAY_DD_MONTH]' ],
   [ ES__DD_MONTH__DATE_RE,           '[ES_DD_MONTH]' ],
-  [ ES__DAY_MM_DD__DATE_RE,          '[ES_DAY_MM_DD]' ],
+  [ ES__DAY_DD_MM__DATE_RE,          '[ES_DAY_DD_MM]' ],
 ]
 
+
 FORMATS_PT = [
   [ PT__DD_MM_YYYY_DAY__DATE_RE,     '[PT_DD_MM_YYYY_DAY]' ],
+  [ PT__DAY_DD_MONTH__DATE_RE,       '[PT_DAY_DD_MONTH]' ],
+  [ PT__DAY_DD_MM__DATE_RE,          '[PT_DAY_DD_MM]' ],
 ]
 
 FORMATS_DE = [
+   [ DE__DAY_MM_DD__DATE_TIME_RE,    '[DE_DAY_MM_DD_hh_mm]' ],
    [ DE__DAY_MM_DD__DATE_RE,         '[DE_DAY_MM_DD]' ],
 ]
 

data/lib/date-formats/names.rb

@@ -1,5 +1,10 @@
 module DateFormats
 
+###
+# sources:
+##   see https://web.library.yale.edu/cataloging/months
+##   and others
+
 # todo: make more generic for reuse
 ### fix:
 ##    use  date/en.txt or en.txt etc. --  why? why not?
@@ -27,13 +32,13 @@ TXT
 
 
   DAY_NAMES[:en] = <<TXT
-Monday      Mon
-Tuesday     Tues  Tue  Tu
-Wednesday   Wed
+Monday                   Mon  Mo
+Tuesday            Tues  Tue  Tu
+Wednesday                Wed  We
 Thursday    Thurs  Thur  Thu  Th
-Friday      Fri
-Saturday    Sat
-Sunday      Sun
+Friday                   Fri  Fr
+Saturday                 Sat  Sa
+Sunday                   Sun  Su
 TXT
 
 
@@ -65,31 +70,31 @@ TXT
 
 
   MONTH_NAMES[:es] = <<TXT
-Enero      Ene
-Febrero    Feb
-Marzo      Mar
-Abril      Abr
-Mayo       May
-Junio      Jun
-Julio      Jul
-Agosto     Ago
-Septiembre  Sept  Sep  Set    ## check set in use??
-Octubre    Oct
-Noviembre  Nov
-Diciembre  Dic
+Enero             Ene
+Febrero           Feb
+Marzo             Mar
+Abril             Abr
+Mayo              May
+Junio             Jun
+Julio             Jul
+Agosto            Ago
+Septiembre  Sept  Sep Set    ## check Set in use??
+Octubre           Oct
+Noviembre         Nov
+Diciembre         Dic
 TXT
 
   DAY_NAMES[:es] = <<TXT
-Lunes       Lun  Lu
-Martes      Mar  Ma
-Miércoles   Mié  Mi
-Jueves      Jue  Ju
-Viernes     Vie  Vi
-Sábado      Sáb  Sá
-Domingo     Dom  Do
+Lunes       Lun      Lu
+Martes      Mar      Ma
+Miércoles   Mié Mie  Mi      # note: add unaccented variant (for abbreviation) - why? why not?
+Jueves      Jue      Ju
+Viernes     Vie      Vi
+Sábado      Sáb Sab  Sá Sa   # note: add unaccented variants (for abbreviations) - why? why not?
+Domingo     Dom      Do
 TXT
 
-  
+
   MONTH_NAMES[:de] = <<TXT
 Jänner  Januar    Jan  Jän    # note: in Austria - Jänner; in Deutschland Januar allow both ??
 Feber   Februar   Feb
@@ -114,21 +119,21 @@ Freitag     Fr
 Samstag     Sa
 Sonntag     So
 TXT
-  
-  
+
+
   MONTH_NAMES[:it] = <<TXT
-Gennaio
-Febbraio
-Marzo
-Aprile
-Maggio
+Gennaio     Genn
+Febbraio    Febbr
+Marzo       Mar
+Aprile      Apr
+Maggio      Magg
 Giugno
 Luglio
-Agosto
-Settembre
-Ottobre
-Novembre
-Dicembre
+Agosto      Ag
+Settembre   Sett
+Ottobre     Ott
+Novembre    Nov
+Dicembre    Dic
 TXT
 
   DAY_NAMES[:it] = <<TXT
@@ -140,21 +145,21 @@ Venerdì   Ven
 Sabato    Sab
 Domenica  Dom   Do
 TXT
-  
+
 
   MONTH_NAMES[:pt] = <<TXT
-Janeiro
-Fevereiro
+Janeiro      Jan
+Fevereiro    Fev
 Março
 Abril
 Maio
 Junho
 Julho
 Agosto
-Setembro
-Outubro
-Novembro
-Dezembro
+Setembro     Set
+Outubro      Out
+Novembro     Nov
+Dezembro     Dez
 TXT
 
   DAY_NAMES[:pt] = <<TXT
@@ -163,11 +168,11 @@ Terça-feira    Ter
 Quarta-feira   Qua
 Quinta-feira   Qui
 Sexta-feira    Sex
-Sábado         Sab
+Sábado         Sáb Sab    # note: add unaccented variant (for abbreviation) - why? why not?
 Domingo        Dom
 TXT
-  
-  
+
+
   MONTH_NAMES[:ro] = <<TXT
 Ianuarie
 Februarie
@@ -194,7 +199,7 @@ Duminică  Du
 TXT
 
 
-  
+
   DAY_NAMES[:nl] = <<TXT
 Maandag          Ma
 Dinsdag          Di
@@ -224,10 +229,10 @@ Péntek     P
 Szombat    Szo
 Vasárnap   Vas
 TXT
-  
-  
-  
-  
+
+
+
+
 ############################################
 ## convert (unparsed) text to (parsed) lines with words
 MONTH_NAMES.each {|k,v| MONTH_NAMES[k] = parse_month(v) }

data/lib/date-formats/parser.rb

@@ -18,7 +18,7 @@ module DateFormats
 
     ## note: cache all "built-in" lang versions (e.g. formats == nil)
     @@parser ||= {}
-    parser = @@parser[ lang ] ||= DateParser.new( lang: lang )
+    @@parser[ lang ] ||= DateParser.new( lang: lang )
   end
 
   def self.parse( line,
@@ -37,9 +37,11 @@ module DateFormats
 
 
 
+
   class DateParser
 
-    include LogUtils::Logging
+    include Logging
+
 
     def initialize( lang:,
                     formats: nil, month_names: nil, day_names: nil

data/lib/date-formats/version.rb

@@ -2,8 +2,8 @@
 
 
 module DateFormats
-  MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 2
+  MAJOR = 1    ## todo: namespace inside version or something - why? why not??
+  MINOR = 0
   PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/date/formats.rb

@@ -1 +1,4 @@
-require_relative '../date-formats'     ##  note: allow require 'date/formats' too (in addition to require 'date-formats')
+# note: allow require 'date/formats' too
+#        (in addition to require 'date-formats')
+
+require_relative '../date-formats'

data/test/test_parse.rb

@@ -12,7 +12,12 @@ class TestParse < MiniTest::Test
   def test_date
     data = [
       [ '19.01.2013 22.00', '2013-01-19 22:00', '[DD_MM_YYYY_hh_mm]' ],
+      [ '19.01.2013 22h00', '2013-01-19 22:00', '[DD_MM_YYYY_hh_mm]' ],
+      [ '19.01.2013 22:00', '2013-01-19 22:00', '[DD_MM_YYYY_hh_mm]' ],
       [ '21.01.2013 21.30', '2013-01-21 21:30', '[DD_MM_YYYY_hh_mm]' ],
+      [ '21.01.2013 21:30', '2013-01-21 21:30', '[DD_MM_YYYY_hh_mm]' ],
+      [ '21.01.2013 21H30', '2013-01-21 21:30', '[DD_MM_YYYY_hh_mm]' ],
+
       [ '26.01.2013',       '2013-01-26',       '[DD_MM_YYYY]'       ],
       [ '[26.01.2013]',     '2013-01-26',       '[[DD_MM_YYYY]]'     ],
       [ '[21.1.]',          '2013-01-21',       '[[DD_MM]]'          ]

data/test/test_parse_de.rb

@@ -14,10 +14,20 @@ class TestParseDe < MiniTest::Test
       [ 'Fr. 26.7.',     '2019-07-26', '[DE_DAY_MM_DD]' ],
       [ 'Fr. 26.07.',    '2019-07-26', '[DE_DAY_MM_DD]' ],
       [ 'Fr 26.7.',      '2019-07-26', '[DE_DAY_MM_DD]' ],
+      [ 'Fr., 26.07.',   '2019-07-26', '[DE_DAY_MM_DD]' ],
+      [ 'Fr, 26.7.',     '2019-07-26', '[DE_DAY_MM_DD]' ],
       [ '[Fr. 26.7.]',   '2019-07-26', '[[DE_DAY_MM_DD]]' ],
+
+      [ 'Sa., 16.5., 18.00 Uhr',    '2019-05-16 18:00', '[DE_DAY_MM_DD_hh_mm]' ],
+      [ 'Sa 16.5. 18.00',           '2019-05-16 18:00', '[DE_DAY_MM_DD_hh_mm]' ],
+      [ '[Sa., 16.5., 18.00 Uhr]',  '2019-05-16 18:00', '[[DE_DAY_MM_DD_hh_mm]]' ],
+      [ '[Sa 16.5. 18.00]',         '2019-05-16 18:00', '[[DE_DAY_MM_DD_hh_mm]]' ],
+
+      [ 'Mo., 18.5., 20.30 Uhr',    '2019-05-18 20:30', '[DE_DAY_MM_DD_hh_mm]' ],
+      [ 'Mo 18.5. 20.30',           '2019-05-18 20:30', '[DE_DAY_MM_DD_hh_mm]' ],
     ]
 
-    assert_dates( data, start: Date.new( 2019, 7, 1 ), lang: 'de' )
+    assert_dates( data, start: Date.new( 2019, 1, 1 ), lang: 'de' )
   end
 
 end # class TestParseDe

data/test/test_parse_en.rb

@@ -11,18 +11,29 @@ class TestParseEn < MiniTest::Test
 
   def test_date
     data = [
-      [ 'Jun/12 2011 14:00', '2011-06-12 14:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
-      [ 'Oct/12 2013 16:00', '2013-10-12 16:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
-
-      [ 'Jan/26 2011',       '2011-01-26', '[EN_MONTH_DD_YYYY]' ],
-      [ 'Jan/26',            '2013-01-26', '[EN_MONTH_DD]' ],
-      [ '26 January',        '2013-01-26', '[EN_DD_MONTH]' ],
-
-      [ 'Jun/13',            '2013-06-13', '[EN_MONTH_DD]' ],
-      [ '13 June',           '2013-06-13', '[EN_DD_MONTH]' ],
-
-      [ 'Fri Aug/9',         '2013-08-09',  '[EN_DAY_MONTH_DD]' ],
-      [ '[Fri Aug/9]',       '2013-08-09',  '[[EN_DAY_MONTH_DD]]' ],
+      [ 'Jun/12 2011 14:00',   '2011-06-12 14:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
+      [ 'Jun 12 2011 14:00',   '2011-06-12 14:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
+      [ 'Jun 12, 2011 14h00',  '2011-06-12 14:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
+      [ 'Oct/12 2013 16:00',   '2013-10-12 16:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
+      [ 'Oct 12, 2013 16H00',  '2013-10-12 16:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
+
+      [ 'Jan/26 2011',         '2011-01-26', '[EN_MONTH_DD_YYYY]' ],
+      [ 'Jan/26, 2011',        '2011-01-26', '[EN_MONTH_DD_YYYY]' ],
+      [ 'Jan 26, 2011',        '2011-01-26', '[EN_MONTH_DD_YYYY]' ],
+
+      [ 'Jan/26',              '2013-01-26', '[EN_MONTH_DD]' ],
+      [ 'Jan 26',              '2013-01-26', '[EN_MONTH_DD]' ],
+      [ 'Jun/13',              '2013-06-13', '[EN_MONTH_DD]' ],
+
+      [ '26 January',          '2013-01-26', '[EN_DD_MONTH]' ],
+      [ '13 June',             '2013-06-13', '[EN_DD_MONTH]' ],
+
+      [ 'Fri Aug/9',           '2013-08-09',  '[EN_DAY_MONTH_DD]' ],
+      [ 'Fri Aug 9',           '2013-08-09',  '[EN_DAY_MONTH_DD]' ],
+      [ 'Fri, Aug 9',          '2013-08-09',  '[EN_DAY_MONTH_DD]' ],
+      [ '[Fri Aug/9]',         '2013-08-09',  '[[EN_DAY_MONTH_DD]]' ],
+      [ '[Fri Aug 9]',         '2013-08-09',  '[[EN_DAY_MONTH_DD]]' ],
+      [ '[Fri, Aug 9]',        '2013-08-09',  '[[EN_DAY_MONTH_DD]]' ],
     ]
 
     assert_dates( data, start: Date.new( 2013, 1, 1 ), lang: 'en' )

data/test/test_parse_es.rb

@@ -11,13 +11,21 @@ class TestParseEs < MiniTest::Test
 
   def test_date
     data = [
-      [ '12 Ene',         '2019-01-12', '[ES_DD_MONTH]' ],
-      [ '[12 Ene]',       '2019-01-12', '[[ES_DD_MONTH]]' ],
+      [ '12 Ene',             '2019-01-12', '[ES_DD_MONTH]' ],
+      [ '[12 Ene]',           '2019-01-12', '[[ES_DD_MONTH]]' ],
 
-      [ 'Sáb. 17.8.',     '2019-08-17', '[ES_DAY_MM_DD]' ],
-      [ 'Sáb. 17.08.',    '2019-08-17', '[ES_DAY_MM_DD]' ],
-      [ 'Sáb 17.8.',      '2019-08-17', '[ES_DAY_MM_DD]' ],
-      [ '[Sáb 17.8.]',    '2019-08-17', '[[ES_DAY_MM_DD]]' ],
+      [ 'Sáb. 17.8.',         '2019-08-17', '[ES_DAY_DD_MM]' ],
+      [ 'Sáb. 17.08.',        '2019-08-17', '[ES_DAY_DD_MM]' ],
+      [ 'Sáb 17.8.',          '2019-08-17', '[ES_DAY_DD_MM]' ],
+      [ '[Sáb 17.8.]',        '2019-08-17', '[[ES_DAY_DD_MM]]' ],
+
+      [ 'Sáb 5 Ene',          '2019-01-05', '[ES_DAY_DD_MONTH]'],
+      [ 'Sáb. 05 Ene',        '2019-01-05', '[ES_DAY_DD_MONTH]'],
+      [ '[Sáb 5 Ene]',        '2019-01-05', '[[ES_DAY_DD_MONTH]]'],
+
+      [ 'Sáb 5 Ene 19:30',    '2019-01-05 19:30', '[ES_DAY_DD_MONTH_hh_mm]'],
+      [ 'Sáb. 05 Ene 19:30',  '2019-01-05 19:30', '[ES_DAY_DD_MONTH_hh_mm]'],
+      [ 'Sáb. 5 Ene 19h30',   '2019-01-05 19:30', '[ES_DAY_DD_MONTH_hh_mm]'],
     ]
 
     assert_dates( data, start: Date.new( 2019, 1, 1 ), lang: 'es' )

data/test/test_parse_pt.rb

@@ -18,6 +18,18 @@ class TestParsePt < MiniTest::Test
       [ '09/04/2003 - Quarta-feira', '2003-04-09', '[PT_DD_MM_YYYY_DAY]' ],
       [ '9/4/2003 Quarta-feira',     '2003-04-09', '[PT_DD_MM_YYYY_DAY]' ],
       [ '[9/4/2003 Quarta-feira]',   '2003-04-09', '[[PT_DD_MM_YYYY_DAY]]' ],
+
+      [ 'Sáb, 13/Maio',              '2003-05-13', '[PT_DAY_DD_MONTH]' ],
+      [ 'Sáb 13 Maio',               '2003-05-13', '[PT_DAY_DD_MONTH]' ],
+
+      [ 'Qui, 08/Junho',             '2003-06-08', '[PT_DAY_DD_MONTH]' ],
+      [ 'Qui 8 Junho',               '2003-06-08', '[PT_DAY_DD_MONTH]' ],
+
+      [ 'Sáb, 29/07',                '2003-07-29', '[PT_DAY_DD_MM]' ],
+      [ 'Sáb 29/7',                  '2003-07-29', '[PT_DAY_DD_MM]' ],
+
+      [ 'Seg, 31/07',                '2003-07-31', '[PT_DAY_DD_MM]' ],
+      [ 'Seg 31/7',                  '2003-07-31', '[PT_DAY_DD_MM]' ],
     ]
 
     assert_dates( data, start: Date.new( 2003, 1, 1 ), lang: 'pt' )

data/test/test_week.rb

@@ -0,0 +1,114 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_week.rb
+
+
+require 'helper'
+
+class TestWeek < MiniTest::Test
+
+  def test_2016_17
+    assert_equal 51, Date.parse( '2016-12-25').cweek  # Sun Dec 25
+    assert_equal 52, Date.parse( '2016-12-26').cweek  # Mon Dec 26
+    assert_equal 52, Date.parse( '2016-12-31').cweek  # Sat Dec 31
+
+    assert_equal 52, Date.parse( '2017-01-01').cweek  # Sun Jan 1
+    assert_equal  1, Date.parse( '2017-01-02').cweek  # Mon Jan 2
+    assert_equal  1, Date.parse( '2017-01-03').cweek  # Tue Jan 3
+    assert_equal  1, Date.parse( '2017-01-08').cweek  # Sun Jan 8
+    assert_equal  2, Date.parse( '2017-01-09').cweek  # Mon Jan 9
+  end
+
+  def test_2017_18
+    assert_equal 51, Date.parse( '2017-12-24').cweek  # Sun Dec 24
+    assert_equal 52, Date.parse( '2017-12-25').cweek  # Mon Dec 25
+    assert_equal 52, Date.parse( '2017-12-31').cweek  # Sun Dec 31
+
+    assert_equal  1, Date.parse( '2018-01-01').cweek  # Mon Jan 1
+    assert_equal  1, Date.parse( '2018-01-02').cweek  # Tue Jan 2
+    assert_equal  1, Date.parse( '2018-01-07').cweek  # Sun Jan 7
+    assert_equal  2, Date.parse( '2018-01-09').cweek  # Mon Jan 8
+  end
+
+  def test_2018_19
+    assert_equal 52, Date.parse( '2018-12-29').cweek  # Sat Dec 29
+    assert_equal 52, Date.parse( '2018-12-30').cweek  # Sun Dec 30
+    assert_equal  1, Date.parse( '2018-12-31').cweek  # Mon Dec 31
+
+    assert_equal  1, Date.parse( '2019-01-01').cweek  # Tue Jan 1
+    assert_equal  1, Date.parse( '2019-01-02').cweek  # Wed Jan 2
+    assert_equal  1, Date.parse( '2019-01-06').cweek  # Sun Jan 6
+    assert_equal  2, Date.parse( '2019-01-07').cweek  # Mon Jan 7
+  end
+
+  def test_2019_20
+    assert_equal 52, Date.parse( '2019-12-29').cweek
+    assert_equal  1, Date.parse( '2019-12-30').cweek
+
+    assert_equal  1, Date.parse( '2020-01-01').cweek
+    assert_equal  1, Date.parse( '2020-01-05').cweek
+    assert_equal  2, Date.parse( '2020-01-06').cweek
+  end
+
+  def test_2020_21    ## note: 2020 has 53 (!) weeks
+    assert_equal 52, Date.parse( '2020-12-27').cweek
+    assert_equal 53, Date.parse( '2020-12-28').cweek  # 1/7-Mon
+    assert_equal 53, Date.parse( '2020-12-29').cweek  # 2/7-Tue
+    assert_equal 53, Date.parse( '2020-12-30').cweek  # 3/7-Wed
+    assert_equal 53, Date.parse( '2020-12-31').cweek  # 4/7-Thu
+
+    assert_equal 53, Date.parse( '2021-01-01').cweek  # 5/7-Fri
+    assert_equal 53, Date.parse( '2021-01-02').cweek  # 6/7-Sat
+    assert_equal 53, Date.parse( '2021-01-03').cweek  # 7/7-Sun
+    assert_equal  1, Date.parse( '2021-01-04').cweek
+    assert_equal  1, Date.parse( '2021-01-10').cweek
+    assert_equal  2, Date.parse( '2021-01-11').cweek
+  end
+
+
+  def test_more_weeks
+    assert_equal 53, Date.parse('2004-12-31').cweek ## note: 2004 has 53(!) weeks
+    assert_equal 53, Date.parse('2005-01-01').cweek
+    assert_equal 53, Date.parse('2005-01-02').cweek
+    assert_equal  1, Date.parse('2005-01-03').cweek
+
+    assert_equal 52, Date.parse('2005-12-31').cweek
+    assert_equal 52, Date.parse('2006-01-01').cweek
+    assert_equal  1, Date.parse('2006-01-02').cweek
+
+    assert_equal 52, Date.parse('2006-12-31').cweek
+    assert_equal  1, Date.parse('2007-01-01').cweek
+
+    assert_equal 52, Date.parse('2007-12-30').cweek
+    assert_equal  1, Date.parse('2007-12-31').cweek
+    assert_equal  1, Date.parse('2008-01-01').cweek
+
+    assert_equal 52, Date.parse('2008-12-28').cweek
+    assert_equal  1, Date.parse('2008-12-29').cweek
+    assert_equal  1, Date.parse('2008-12-30').cweek
+    assert_equal  1, Date.parse('2008-12-31').cweek
+    assert_equal  1, Date.parse('2009-01-01').cweek
+
+    assert_equal 53, Date.parse('2009-12-31').cweek  ## note: 2009 has 53(!) weeks
+    assert_equal 53, Date.parse('2010-01-01').cweek
+    assert_equal 53, Date.parse('2010-01-02').cweek
+    assert_equal 53, Date.parse('2010-01-03').cweek
+    assert_equal  1, Date.parse('2010-01-04').cweek
+
+
+
+    assert_equal 52, Date.parse('2012-01-01').cweek
+    assert_equal  1, Date.parse('2012-12-31').cweek
+    assert_equal  1, Date.parse('2014-12-29').cweek
+    assert_equal 53, Date.parse('2015-12-31').cweek ## note: 2015 has 53(!) weeks
+  end
+
+
+  def test_today
+    assert_equal 31, Date.parse('2018-07-30').cweek  # Mon Jul 30
+    assert_equal 31, Date.parse('2018-08-01').cweek
+    assert_equal 31, Date.parse('2018-08-05').cweek  # Sun Aug 5
+  end
+end # class TestWeek

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: date-formats
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +69,7 @@ files:
 - test/test_parse_it.rb
 - test/test_parse_pt.rb
 - test/test_version.rb
+- test/test_week.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain