date-formats 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba725c69bb4b79a72034f43db16c2a2d43025c9
-  data.tar.gz: 99dbba88099d5d20104e83c214612e6b3d76f741
+  metadata.gz: 2c4e4577d590d899b2f5215e548913bb4d090e49
+  data.tar.gz: a6ad7a9d7d735f74e27f9759cb4c66463e68152c
 SHA512:
-  metadata.gz: a7de7c61ea555693d16e49a47ab4a28b786aba93acf2c4fce6d0f04a5d5c7556a8d345310a2ee4c95f73967e837822302d97bed3fe2d12bfb9784e951ac81dd8
-  data.tar.gz: 75c22de9d73ef57597ee3cc1fe31096e39a32ad00f45b5df1a5694804c639f89b2720b8ea8efd41bc9221c3023ce794c94ce565875565d9dfe1e5e0905132538
+  metadata.gz: 47922e36f4ff6414d6b776c83c446465961d127a2ae34494d78da520515b5877fd840e0862418bbdf91b70a35c8fac766f6ad806fc406783b3f5324a9c65c97f
+  data.tar.gz: f7c8932114c7f75b2fd8725f970a4f084bd66f914a1cdcff371bdadab8492ba236ccf70cc2a8c353b0779fa44e29bbb56efb890a6353d29b810c4902b6402b07

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

@@ -103,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
 ```
@@ -130,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
 ```

data/Rakefile

@@ -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

@@ -4,17 +4,28 @@ 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

@@ -304,6 +304,26 @@ PT__DAY_DD_MM__DATE_RE = /\b
 
 
 
+# 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.
@@ -317,8 +337,7 @@ DE__DAY_MM_DD__DATE_RE = /\b
            \.
         (?<month>\d{1,2})
            \.
-          (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too/x
-
+          (?=[ \]]|$)/x  ## note: allow end-of-string/line too/x
 
 
 #############################################
@@ -363,6 +382,7 @@ FORMATS_PT = [
 ]
 
 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/parser.rb

@@ -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

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

data/test/test_parse_de.rb

@@ -17,9 +17,17 @@ class TestParseDe < MiniTest::Test
       [ '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_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: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2020-05-16 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