date-formats 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66ff71b3025105325d5411ef4ea1e1787cb6c5c
-  data.tar.gz: e3a61033de8bd61b13cf5dbb3482b6a2fec4217e
+  metadata.gz: c60c4e7804fd0a6a4b11e70c35daccfb6db9acbb
+  data.tar.gz: b78c75c1941eeafd29333b7872fdd62facb93cd1
 SHA512:
-  metadata.gz: 6cfec2ec58486a7dde4af6a55aafd4a6609017ef58f97388f29f4c1c7f83716d835b85d49cc822d041bde5c449b7aca7865e48fa6fddb3007f970ce02ce460d3
-  data.tar.gz: 5cef395ab1d13386395b13c7621bd7bfdb4981c44fcbd7c09cc126c086c230115dbae202f85ed550cb9d0b196f6646f6d484c28141dc3cd37fc44e333050baec
+  metadata.gz: d9f1630097d9f0d1ee5e64963b156093969791ba6626c16421dafe46b33b74966a45875a830f5c61a23d8c76afd471b9715d84fa9de52e68c6ef8aefc0b829c6
+  data.tar.gz: 436c8c910c926d09126f0bd4142d3e1b783f6f3c83d6af18463504470d477f2886be119ff0e03709c892eeafa021ed038b2c84c263b1cd1aafc406357333b1a1

data/Manifest.txt

@@ -5,7 +5,10 @@ Rakefile
 lib/date-formats.rb
 lib/date-formats/date.rb
 lib/date-formats/formats.rb
+lib/date-formats/reader.rb
+lib/date-formats/source.rb
 lib/date-formats/version.rb
+lib/date/formats.rb
 test/helper.rb
 test/test_date.rb
 test/test_formats.rb

data/lib/date-formats.rb

@@ -8,124 +8,48 @@ require 'date'
 require 'logutils'
 
 
+###
+# our own code
+require 'date-formats/version' # let version always go first
+require 'date-formats/source'
+require 'date-formats/reader'
+
 
 module DateFormats
 
-MONTH_EN_TO_MM = {
-      'Jan' => '1', 'January' => '1',
-      'Feb' => '2', 'February' => '2',
-      'Mar' => '3', 'March' => '3',
-      'Apr' => '4', 'April' => '4',
-      'May' => '5',
-      'Jun' => '6', 'June' => '6',
-      'Jul' => '7', 'July' => '7',
-      'Aug' => '8', 'August' => '8',
-      'Sep' => '9', 'Sept' => '9', 'September' => '9',
-      'Oct' => '10', 'October' => '10',
-      'Nov' => '11', 'November' => '11',
-      'Dec' => '12', 'December' =>'12' }
-
-MONTH_EN = 'January|Jan|'+
-           'February|Feb|'+
-           'March|Mar|'+
-           'April|Apr|'+
-           'May|'+
-           'June|Jun|'+
-           'July|Jul|'+
-           'August|Aug|'+
-           'September|Sept|Sep|'+
-           'October|Oct|'+
-           'November|Nov|'+
-           'December|Dec'
 
-###
-## todo: add days
-## 1. Sunday - Sun.	2. Monday - Mon.
-## 3. Tuesday - Tu., Tue., or Tues.	4. Wednesday - Wed.
-## 5. Thursday - Th., Thu., Thur., or Thurs.	6. Friday - Fri.
-## 7. Saturday - Sat.
-
-
-
-MONTH_FR_TO_MM = {
-      'Janvier' => '1', 'Janv' => '1', 'Jan' => '1',   ## check janv in use??
-      'Février' => '2', 'Févr' => '2', 'Fév' => '2',   ## check fevr in use???
-      'Mars'    => '3', 'Mar' => '3',
-      'Avril'   => '4', 'Avri' => '4', 'Avr' => '4',   ## check avri in use??? if not remove
-      'Mai'     => '5',
-      'Juin'    => '6',
-      'Juillet' => '7', 'Juil' => '7',
-      'Août'    => '8',
-      'Septembre' => '9', 'Sept' => '9',
-      'Octobre' => '10',  'Octo' => '10', 'Oct' => '10',  ### check octo in use??
-      'Novembre' => '11', 'Nove' => '11', 'Nov' => '11',  ##  check nove in use??
-      'Décembre' => '12', 'Déce' => '12', 'Déc' => '12' } ## check dece in use??
-
-MONTH_FR = 'Janvier|Janv|Jan|' +
-           'Février|Févr|Fév|' +
-           'Mars|Mar|' +
-           'Avril|Avri|Avr|' +
-           'Mai|'  +
-           'Juin|' +
-           'Juillet|Juil|' +
-           'Août|' +
-           'Septembre|Sept|' +
-           'Octobre|Octo|Oct|' +
-           'Novembre|Nove|Nov|' +
-           'Décembre|Déce|Déc'
-
-WEEKDAY_FR = 'Lundi|Lun|L|' +
-         'Mardi|Mar|Ma|' +
-         'Mercredi|Mer|Me|' +
-         'Jeudi|Jeu|J|' +
-         'Vendredi|Ven|V|' +
-         'Samedi|Sam|S|' +
-         'Dimanche|Dim|D|'
-
-
-MONTH_ES_TO_MM  = {
-      'Ene' => '1', 'Enero' => '1',
-      'Feb' => '2',
-      'Mar' => '3', 'Marzo' => '3',
-      'Abr' => '4', 'Abril' => '4',
-      'May' => '5', 'Mayo' => '5',
-      'Jun' => '6', 'Junio' => '6',
-      'Jul' => '7', 'Julio' => '7',
-      'Ago' => '8', 'Agosto' => '8',
-      'Sep' => '9', 'Set' => '9', 'Sept' => '9',
-      'Oct' => '10',
-      'Nov' => '11',
-      'Dic' => '12' }
-
-MONTH_ES = 'Enero|Ene|'+
-           'Feb|'+
-           'Marzo|Mar|'+
-           'Abril|Abr|'+
-           'Mayo|May|'+
-           'Junio|Jun|'+
-           'Julio|Jul|'+
-           'Agosto|Ago|'+
-           'Sept|Set|Sep|'+
-           'Oct|'+
-           'Nov|'+
-           'Dic'
-
-
-# todo: make more generic for reuse
-### fix:
-##    use  date/fr.yml  en.yml etc. --  why? why not?
-
-# todo/fix - add de and es too!!
-# note: in Austria - Jänner - in Deutschland Januar allow both ??
-# MONTH_DE = 'J[aä]n|Feb|Mär|Apr|Mai|Jun|Jul|Aug|Sep|Okt|Nov|Dez'
+MONTH_EN_LINES    = Reader.parse_month( Source::MONTH_EN )
+MONTH_EN_TO_MM    = build_map( MONTH_EN_LINES )
+MONTH_EN          = build_re( MONTH_EN_LINES )
+
+WEEKDAY_EN_LINES  = Reader.parse_weekday( Source::WEEKDAY_EN )
+WEEKDAY_EN        = build_re( WEEKDAY_EN_LINES )
+
+
+
+MONTH_FR_LINES    = Reader.parse_month( Source::MONTH_FR )
+MONTH_FR_TO_MM    = build_map( MONTH_FR_LINES )
+MONTH_FR          = build_re( MONTH_FR_LINES )
+
+WEEKDAY_FR_LINES  = Reader.parse_weekday( Source::WEEKDAY_FR )
+WEEKDAY_FR        = build_re( WEEKDAY_FR_LINES )
+
+
+
+MONTH_ES_LINES    = Reader.parse_month( Source::MONTH_ES )
+MONTH_ES_TO_MM    = build_map( MONTH_ES_LINES )
+MONTH_ES          = build_re( MONTH_ES_LINES )
+
+
+
+MONTH_DE_LINES    = Reader.parse_month( Source::MONTH_DE )
+MONTH_DE_TO_MM    = build_map( MONTH_DE_LINES )
+MONTH_DE          = build_re( MONTH_DE_LINES )
 
 end  # module DateFormats
 
 
 
-###
-# our own code
-require 'date-formats/version' # let version always go first
 require 'date-formats/formats'
 require 'date-formats/date'
 

data/lib/date-formats/date.rb

@@ -6,21 +6,21 @@ module DateFormats
 class DateFinderBase
 
 private
-  def calc_year( month, day, start_at: )   ## note: start_at required param for now on!!!
+  def calc_year( month, day, start: )  ## note: start required param for now on!!!
 
-    logger.debug "   [calc_year] ????-#{month}-#{day} -- start_at: #{start_at}"
+    logger.debug "   [calc_year] ????-#{month}-#{day} -- start: #{start}"
 
-    if month >= start_at.month
+    if month >= start.month
       # assume same year as start_at event (e.g. 2013 for 2013/14 season)
-      start_at.year
+      start.year
     else
       # assume year+1 as start_at event (e.g. 2014 for 2013/14 season)
-      start_at.year+1
+      start.year+1
     end
   end
 
 
-  def parse_date_time( match_data, start_at: )
+  def parse_date_time( match_data, start: )
 
     # convert regex match_data captures to hash
     # - note: cannont use match_data like a hash (e.g. raises exception if key/name not present/found)
@@ -35,10 +35,13 @@ private
     h[ :month ] = MONTH_EN_TO_MM[ h[:month_en] ]  if h[:month_en]
     h[ :month ] = MONTH_ES_TO_MM[ h[:month_es] ]  if h[:month_es]
     h[ :month ] = MONTH_FR_TO_MM[ h[:month_fr] ]  if h[:month_fr]
+    h[ :month ] = MONTH_DE_TO_MM[ h[:month_de] ]  if h[:month_de]
+    h[ :month ] = MONTH_IT_TO_MM[ h[:month_it] ]  if h[:month_it]
+    h[ :month ] = MONTH_PT_TO_MM[ h[:month_pt] ]  if h[:month_pt]
 
     month   = h[:month]
     day     = h[:day]
-    year    = h[:year]     || calc_year( month.to_i, day.to_i, start_at: start_at ).to_s
+    year    = h[:year]     || calc_year( month.to_i, day.to_i, start: start ).to_s
 
     hours   = h[:hours]    || '00'   # default to 00:00 for HH:MM (hours:minutes)
     minutes = h[:minutes]  || '00'
@@ -52,6 +55,7 @@ private
 end  # class DateFinderBase
 
 
+
 class DateFinder < DateFinderBase
 
   include LogUtils::Logging
@@ -68,7 +72,7 @@ class DateFinder < DateFinderBase
     @formats = FORMATS[ @lang ] || FORMATS['en']
   end
 
-  def find!( line, start_at: )
+  def find!( line, start_at: )     ## todo/fix: change start_at to start only!!!
     # fix: use more lookahead for all required trailing spaces!!!!!
     # fix: use <name capturing group> for month,day,year etc.!!!
 
@@ -84,7 +88,7 @@ class DateFinder < DateFinderBase
       pattern = format[1]
       m=pattern.match( line )
       if m
-        date = parse_date_time( m, start_at: start_at )
+        date = parse_date_time( m, start: start_at )
         ## fix: use md[0] e.g. match for sub! instead of using regex again - why? why not???
         ## fix: use md.begin(0), md.end(0)
         line.sub!( m[0], tag )
@@ -128,7 +132,7 @@ class RsssfDateFinder < DateFinderBase
                    (?<day>\d{1,2})
                      \]/x
 
-  def find!( line, start_at: )
+  def find!( line, start_at: )     ## todo/fix: change start_at to start only!!!
     # fix: use more lookahead for all required trailing spaces!!!!!
     # fix: use <name capturing group> for month,day,year etc.!!!
 
@@ -136,7 +140,7 @@ class RsssfDateFinder < DateFinderBase
     pattern = EN__MONTH_DD__DATE_RE
     m = pattern.match( line )
     if m
-      date = parse_date_time( m, start_at: start_at )
+      date = parse_date_time( m, start: start_at )
       ## fix: use md[0] e.g. match for sub! instead of using regex again - why? why not???
       ## fix: use md.begin(0), md.end(0)
       line.sub!( m[0], tag )

data/lib/date-formats/reader.rb

@@ -0,0 +1,78 @@
+
+module DateFormats
+
+########################
+#   parse words
+class Reader   ## todo/check: rename to WordReader or something for easy (re)use - why? why not?
+
+    def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+      txt = File.open( path, 'r:utf-8' ).read
+      parse( txt )
+    end
+
+    def self.parse( txt )
+      lines = [] # array of lines (with words)
+
+      txt.each_line do |line|
+        line = line.strip
+
+        next if line.empty?
+        next if line.start_with?( '#' )   ## skip comments too
+
+        ## strip inline (until end-of-line) comments too
+        ##   e.g. Janvier  Janv  Jan  ## check janv in use??
+        ##   =>   Janvier  Janv  Jan
+
+        line = line.sub( /#.*/, '' ).strip
+        ## pp line
+
+        values = line.split( /[ \t]+/ )
+        ## pp values
+
+        ## todo/fix -- add check for duplicates
+        lines << values
+      end
+      lines
+    end # method parse
+
+    def self.parse_month( txt )
+        lines = parse( txt )
+        if lines.size != 12
+          puts "*** !!! ERROR !!! reading month names; got #{lines.size} lines - expected 12"
+          exit 1
+        end
+        lines
+    end
+
+    def self.parse_weekday( txt )
+        lines = parse( txt )
+        if lines.size != 7
+          puts "*** !!! ERROR !!! reading weekday names; got #{lines.size} lines - expected 7"
+          exit 1
+        end
+        lines
+    end
+end # class Reader
+
+
+def self.build_re( lines )
+  ## join all words together into a single string e.g.
+  ##   January|Jan|February|Feb|March|Mar|April|Apr|May|June|Jun|...
+  lines.map { |line| line.join('|') }.join('|')
+end
+
+def self.build_map( lines )
+  ## build a lookup map that maps the word to the index (line no) plus 1 e.g.
+  ##   note: index is a string too
+  ##  {"January" => "1",  "Jan" => "1",
+  ##   "February" => "2", "Feb" => "2",
+  ##   "March" => "3",    "Mar" => "3",
+  ##   "April" => "4",    "Apr" => "4",
+  ##   "May" => "5",
+  ##   "June" => "6",     "Jun" => "6", ...
+  lines.each_with_index.reduce( {} ) do |h,(line,i)|
+    line.each { |name| h[ name ] = (i+1).to_s }  ## note: start mapping with 1 (and NOT zero-based, that is, 0)
+    h
+  end
+end
+end # module DateFormats

data/lib/date-formats/source.rb

@@ -0,0 +1,138 @@
+module DateFormats
+module Source
+
+# todo: make more generic for reuse
+### fix:
+##    use  date/en.txt or en.txt etc. --  why? why not?
+
+  MONTH_EN = <<TXT
+January    Jan
+February   Feb
+March      Mar
+April      Apr
+May
+June       Jun
+July       Jul
+August     Aug
+September  Sept  Sep
+October    Oct
+November   Nov
+December   Dec
+TXT
+
+  WEEKDAY_EN = <<TXT
+Monday      Mon
+Tuesday     Tu  Tue  Tues
+Wednesday   Wed
+Thursday    Th  Thu  Thur  Thurs
+Friday      Fri
+Saturday    Sat
+Sunday      Sun
+TXT
+
+
+
+  MONTH_FR = <<TXT
+Janvier    Janv   Jan     ## check janv in use??
+Février    Févr   Fév     ## check fevr in use???
+Mars              Mar
+Avril      Avri   Avr     ## check avri in use??? if not remove
+Mai
+Juin
+Juillet    Juil
+Août
+Septembre  Sept
+Octobre    Octo   Oct     ## check octo in use??
+Novembre   Nove   Nov     ##  check nove in use??
+Décembre   Déce   Déc     ## check dece in use??
+TXT
+
+  WEEKDAY_FR = <<TXT
+Lundi     Lun  L
+Mardi     Mar  Ma
+Mercredi  Mer  Me
+Jeudi     Jeu  J
+Vendredi  Ven  V
+Samedi    Sam  S
+Dimanche  Dim  D
+TXT
+
+
+
+  MONTH_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
+TXT
+
+  MONTH_DE = <<TXT
+Jänner  Januar    Jan  Jän    # note: in Austria - Jänner; in Deutschland Januar allow both ??
+Feber   Februar   Feb
+März              Mär
+April             Apr
+Mai               Mai
+Juni              Jun
+Juli              Jul
+August            Aug
+September         Sep
+Oktober           Okt
+November          Nov
+Dezember          Dez
+TXT
+
+  MONTH_IT = <<TXT
+Gennaio
+Febbraio
+Marzo
+Aprile
+Maggio
+Giugno
+Luglio
+Agosto
+Settembre
+Ottobre
+Novembre
+Dicembre
+TXT
+
+  MONTH_PT = <<TXT
+Janeiro
+Fevereiro
+Março
+Abril
+Maio
+Junho
+Julho
+Agosto
+Setembro
+Outubro
+Novembro
+Dezembro
+TXT
+
+  MONTH_RO = <<TXT
+Ianuarie
+Februarie
+Martie
+Aprilie
+Mai
+Iunie
+Iulie
+August
+Septembrie
+Octombrie
+Noiembrie
+Decembrie
+TXT
+
+end # module Source
+end # module DateFormats

data/lib/date-formats/version.rb

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

data/lib/date/formats.rb

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

data/test/helper.rb

@@ -7,4 +7,4 @@ require 'minitest/autorun'
 
 ## our own code
 
-require 'date-formats'
+require 'date/formats'     ## or require 'date-formats'

data/test/test_date.rb

@@ -4,20 +4,21 @@
 #  to run use
 #     ruby -I ./lib -I ./test test/test_date.rb
 
+
 require 'helper'
 
 class TestDate < MiniTest::Test
 
   def test_date
     data = [
-      [ '19.01.2013 22.00', '2013-01-19 22:00' ],
-      [ '21.01.2013 21.30', '2013-01-21 21:30' ],
-      [ '26.01.2013',       '2013-01-26' ],
-      [ '[26.01.2013]',     '2013-01-26' ],
-      [ '[21.1.]',          '2013-01-21 00:00' ]
+      [ '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]' ],
+      [ '26.01.2013',       '2013-01-26',       '[DD_MM_YYYY]'       ],
+      [ '[26.01.2013]',     '2013-01-26',       '[[DD_MM_YYYY]]'     ],
+      [ '[21.1.]',          '2013-01-21 00:00', '[[DD_MM]]'          ]
     ]
 
-    assert_dates( data, start_at: Date.new( 2013, 1, 1 ) )
+    assert_dates( data, start: Date.new( 2013, 1, 1 ) )
   end
 
   def test_date_fr
@@ -33,7 +34,7 @@ class TestDate < MiniTest::Test
       [ '[Sam 7. Fév]',   '2015-02-07' ],
     ]
 
-    assert_dates( data, start_at: Date.new( 2014, 8, 1 ), lang: 'fr' )
+    assert_dates( data, start: Date.new( 2014, 8, 1 ), lang: 'fr' )
   end
 
   def test_date_en
@@ -55,17 +56,23 @@ class TestDate < MiniTest::Test
       [ '13 June',           '2013-06-13 00:00' ]
     ]
 
-    assert_dates( data, start_at: Date.new( 2013, 1, 1 ), lang: 'en' )
+    assert_dates( data, start: Date.new( 2013, 1, 1 ), lang: 'en' )
   end
 
 
 
 private
-  def assert_dates( data, start_at:, lang: 'en' )
+  def assert_dates( data, start:, lang: 'en' )
     data.each do |rec|
-      line = rec[0]
-      str  = rec[1]
-      value = parse_date( line, start_at: start_at, lang: lang )
+      line         = rec[0]
+      str          = rec[1]
+      value = parse_date( line, start: start, lang: lang )
+
+      tagged_line  = rec[2]  ## optinal tagged line
+      if tagged_line      ## note: line gets tagged inplace!!! (no new string)
+        assert_equal line, tagged_line
+        puts "#{line} == #{tagged_line}"
+      end
 
       if str.index( ':' )
         assert_datetime( DateTime.strptime( str, '%Y-%m-%d %H:%M' ), value )
@@ -93,10 +100,10 @@ private
   end
 
 
-  def parse_date( line, start_at:, lang: )
+  def parse_date( line, start:, lang: )
      # e.g. lets you pass in opts[:start_at] ???
      finder = DateFormats::DateFinder.new( lang: lang )
-     finder.find!( line, start_at: start_at )
+     finder.find!( line, start_at: start )
   end
 
 end # class TestDate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date-formats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -69,7 +69,10 @@ files:
 - lib/date-formats.rb
 - lib/date-formats/date.rb
 - lib/date-formats/formats.rb
+- lib/date-formats/reader.rb
+- lib/date-formats/source.rb
 - lib/date-formats/version.rb
+- lib/date/formats.rb
 - test/helper.rb
 - test/test_date.rb
 - test/test_formats.rb