sportdb 1.8.15 → 1.8.16

data/Manifest.txt

@@ -19,6 +19,7 @@ lib/sportdb/console.rb
 lib/sportdb/data/keys.rb
 lib/sportdb/data/models.rb
 lib/sportdb/deleter.rb
+lib/sportdb/finders/date.rb
 lib/sportdb/lang.rb
 lib/sportdb/matcher.rb
 lib/sportdb/models/badge.rb

data/lib/sportdb.rb

@@ -65,6 +65,7 @@ end
 
 
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
+require 'sportdb/finders/date'
 require 'sportdb/utils'
 require 'sportdb/utils_date'
 require 'sportdb/utils_group'

data/lib/sportdb/finders/date.rb

@@ -0,0 +1,271 @@
+# encoding: utf-8
+
+module SportDb
+
+class DateFinder
+
+  include LogUtils::Logging
+
+  # todo: make more generic for reuse
+  MONTH_EN = 'Jan|Feb|March|Mar|April|Apr|May|June|Jun|July|Jul|Aug|Sept|Sep|Oct|Nov|Dec'
+  MONTH_EN_TO_MM = {
+        'Jan' => '1',
+        'Feb' => '2',
+        'Mar' => '3', 'March' => '3',
+        'Apr' => '4', 'April' => '4',
+        'May' => '5',
+        'Jun' => '6', 'June' => '6',
+        'Jul' => '7', 'July' => '7',
+        'Aug' => '8',
+        'Sep' => '9', 'Sept' => '9',
+        'Oct' => '10',
+        'Nov' => '11',
+        'Dec' => '12' }
+
+  MONTH_ES = 'Enero|Ene|Feb|Marzo|Mar|Abril|Abr|Mayo|May|Junio|Jun|Julio|Jul|Agosto|Ago|Sept|Set|Sep|Oct|Nov|Dic'
+  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' }
+
+  # 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'
+
+
+  # e.g. 2012-09-14 20:30   => YYYY-MM-DD HH:MM
+  #  nb: allow 2012-9-3 7:30 e.g. no leading zero required
+  # regex_db
+  DB__DATE_TIME_REGEX = /\b
+                 (?<year>\d{4})
+                   -
+                 (?<month>\d{1,2})
+                   -
+                 (?<day>\d{1,2})
+                  \s+
+                 (?<hours>\d{1,2})
+                   :
+                 (?<minutes>\d{2})
+                  \b/x
+
+  # e.g. 2012-09-14  w/ implied hours (set to 12:00)
+  #  nb: allow 2012-9-3 e.g. no leading zero required
+  # regex_db2
+  DB__DATE_REGEX = /\b
+                    (?<year>\d{4})
+                       -
+                    (?<month>\d{1,2})
+                       -
+                    (?<day>\d{1,2})
+                     \b/x
+
+  # e.g. 14.09.2012 20:30   => DD.MM.YYYY HH:MM
+  #  nb: allow 2.3.2012 e.g. no leading zero required
+  #  nb: allow hour as 20.30
+  # regex_de
+  DD_MM_YYYY__DATE_TIME_REGEX = /\b
+                          (?<day>\d{1,2})
+                            \.
+                          (?<month>\d{1,2})
+                            \.
+                          (?<year>\d{4})
+                            \s+
+                          (?<hours>\d{1,2})
+                            [:.]
+                          (?<minutes>\d{2})
+                            \b/x
+
+  # e.g. 14.09. 20:30  => DD.MM. HH:MM
+  #  nb: allow 2.3.2012 e.g. no leading zero required
+  #  nb: allow hour as 20.30  or 3.30 instead of 03.30
+  # regex_de2
+  DD_MM__DATE_TIME_REGEX = /\b
+                        (?<day>\d{1,2})
+                           \.
+                        (?<month>\d{1,2})
+                           \.
+                           \s+
+                        (?<hours>\d{1,2})
+                           [:.]
+                        (?<minutes>\d{2})
+                          \b/x
+
+  # e.g. 14.09.2012  => DD.MM.YYYY w/ implied hours (set to 12:00)
+  # regex_de3
+  DD_MM_YYYY__DATE_REGEX = /\b
+                    (?<day>\d{1,2})
+                      \.
+                    (?<month>\d{1,2})
+                      \.
+                    (?<year>\d{4})
+                      \b/x
+
+  # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
+  #  note: allow end delimiter ] e.g. [Sa 12.01.] or end-of-string ($) too
+  #  note: we use a lookahead for last part e.g. (?:\s+|$|[\]]) - do NOT cosume
+  # regex_de4
+  DD_MM__DATE_REGEX = /\b
+                     (?<day>\d{1,2})
+                        \.
+                     (?<month>\d{1,2})
+                        \.
+                     (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too
+
+
+  # e.g. 12 May 2013 14:00  => D|DD.MMM.YYYY H|HH:MM
+  EN__DD_MONTH_YYYY__DATE_TIME_REGEX = /\b
+                (?<day>\d{1,2})
+                   \s
+                (?<month_en>#{MONTH_EN})
+                   \s
+                (?<year>\d{4})
+                   \s+
+                (?<hours>\d{1,2})
+                  :
+                (?<minutes>\d{2})
+                  \b/x
+
+  # e.g.  Jun/12 14:00  w/ implied year H|HH:MM
+  EN__MONTH_DD__DATE_TIME_REGEX = /\b
+                   (?<month_en>#{MONTH_EN})
+                     \/
+                   (?<day>\d{1,2})
+                     \s+
+                   (?<hours>\d{1,2})
+                     :
+                   (?<minutes>\d{2})
+                     \b/x
+
+  # e.g. Jun/12 2013  w/ implied hours (set to 12:00)
+  EN__MONTH_DD_YYYY__DATE_REGEX = /\b
+                (?<month_en>#{MONTH_EN})
+                   \/
+                (?<day>\d{1,2})
+                   \s
+                (?<year>\d{4})
+                  \b/x
+
+  # e.g.  Jun/12  w/ implied year and implied hours (set to 12:00)
+  EN__MONTH_DD__DATE_REGEX = /\b
+                   (?<month_en>#{MONTH_EN})
+                      \/
+                   (?<day>\d{1,2})
+                     \b/x
+
+
+  # e.g.  12 Ene  w/ implied year and implied hours (set to 12:00)
+  ES__DD_MONTH__DATE_REGEX = /\b
+                   (?<day>\d{1,2})
+                     \s
+                   (?<month_es>#{MONTH_ES})
+                     \b/x
+
+
+
+  # map table - 1) tag, 2) regex - note: order matters; first come-first matched/served
+  FORMATS = [
+    [ '[YYYY_MM_DD_hh_mm]',        DB__DATE_TIME_REGEX         ],
+    [ '[YYYY_MM_DD]',              DB__DATE_REGEX              ],
+    [ '[DD_MM_YYYY_hh_mm]',        DD_MM_YYYY__DATE_TIME_REGEX ],
+    [ '[DD_MM_hh_mm]',             DD_MM__DATE_TIME_REGEX ],
+    [ '[DD_MM_YYYY]',              DD_MM_YYYY__DATE_REGEX ],
+    [ '[DD_MM]',                   DD_MM__DATE_REGEX ],
+    [ '[EN_DD_MONTH_YYYY_hh_mm]',  EN__DD_MONTH_YYYY__DATE_TIME_REGEX ],
+    [ '[EN_MONTH_DD_hh_mm]',       EN__MONTH_DD__DATE_TIME_REGEX ],
+    [ '[EN_MONTH_DD_YYYY]',        EN__MONTH_DD_YYYY__DATE_REGEX ],
+    [ '[EN_MONTH_DD]',             EN__MONTH_DD__DATE_REGEX ],
+    [ '[ES_DD_MONTH]',             ES__DD_MONTH__DATE_REGEX ]
+  ]
+
+
+
+  def initialize
+    # nothing here for now
+  end
+
+  def find!( line, opts={} )
+    # fix: use more lookahead for all required trailing spaces!!!!!
+    # fix: use <name capturing group> for month,day,year etc.!!!
+
+    #
+    # fix: !!!!
+    #   date in [] will become [[DATE.DE4]] - when getting removed will keep ]!!!!
+    #   fix: change regex to \[[A-Z0-9.]\]  !!!!!!  plus add unit test too!!!
+    #
+ 
+    md = nil
+    FORMATS.each do |format|
+      tag     = format[0]
+      pattern = format[1]
+      md=pattern.match( line )
+      if md
+        date = parse_date_time( md, opts )
+        ## 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!( md[0], tag )
+        ## todo/fix: make sure match data will not get changed (e.g. using sub! before parse_date_time)
+        return date
+      end
+      # no match; continue; try next pattern
+    end
+
+    return nil  # no match found
+  end
+
+private
+  def calc_year( month, day, opts )
+    start_at = opts[:start_at]
+
+    logger.debug "   [calc_year] ????-#{month}-#{day} -- start_at: #{start_at}"
+
+    if month >= start_at.month
+      # assume same year as start_at event (e.g. 2013 for 2013/14 season)
+      start_at.year
+    else
+      # assume year+1 as start_at event (e.g. 2014 for 2013/14 season)
+      start_at.year+1
+    end
+  end
+
+  def parse_date_time( match_data, opts={} )
+    
+    # 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)
+    h = {}
+    # - note: do NOT forget to turn name into symbol for lookup in new hash (name.to_sym)
+    match_data.names.each { |name| h[name.to_sym] = match_data[name] }  # or use match_data.names.zip( match_data.captures )  - more cryptic but "elegant"??
+
+    ## puts "[parse_date_time] match_data:"
+    ## pp h
+    logger.debug "   [parse_date_time] hash: >#{h.inspect}<"
+
+    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]
+
+    month   = h[:month]
+    day     = h[:day]
+    year    = h[:year]     || calc_year( month.to_i, day.to_i, opts ).to_s
+
+    hours   = h[:hours]    || '12'   # default to 12:00 for HH:MM (hours:minutes)
+    minutes = h[:minutes]  || '00'
+
+    value = '%d-%02d-%02d %02d:%02d' % [year.to_i, month.to_i, day.to_i, hours.to_i, minutes.to_i]
+    logger.debug "   date: >#{value}<"
+
+    DateTime.strptime( value, '%Y-%m-%d %H:%M' )
+  end
+
+
+end # class DateFinder
+
+
+end # module SportDb

data/lib/sportdb/patterns.rb

@@ -33,5 +33,6 @@ module SportDb
   TEAM_CODE_PATTERN = '\A[A-Z][A-Z0-9][A-Z0-9_]?\z'
   TEAM_CODE_PATTERN_MESSAGE = "expected two or three uppercase letters A-Z (and 0-9_; must start with A-Z) /#{TEAM_CODE_PATTERN}/"
 
+
 end # module SportDb
 

data/lib/sportdb/utils_date.rb

@@ -8,19 +8,8 @@ module SportDb
     line =~ /=>/
   end
 
-  def calculate_year( day, month, start_at )
-    if month >= start_at.month
-      # assume same year as start_at event (e.g. 2013 for 2013/14 season)
-      start_at.year
-    else
-      # assume year+1 as start_at event (e.g. 2014 for 2013/14 season)
-      start_at.year+1
-    end
-  end
-
 
   def find_date!( line, opts={} )
-
     ## NB: lets us pass in start_at/end_at date (for event)
     #   for auto-complete year
 
@@ -28,201 +17,8 @@ module SportDb
     # and return it
     # NB: side effect - removes date from line string
     
-    # e.g. 2012-09-14 20:30   => YYYY-MM-DD HH:MM
-    #  nb: allow 2012-9-3 7:30 e.g. no leading zero required
-    regex_db = /\b(\d{4})-(\d{1,2})-(\d{1,2})\s+(\d{1,2}):(\d{2})\b/
-    
-    # e.g. 2012-09-14  w/ implied hours (set to 12:00)
-    #  nb: allow 2012-9-3 e.g. no leading zero required
-    regex_db2 = /\b(\d{4})-(\d{1,2})-(\d{1,2})\b/
-
-    # e.g. 14.09. 20:30  => DD.MM. HH:MM
-    #  nb: allow 2.3.2012 e.g. no leading zero required
-    #  nb: allow hour as 20.30  or 3.30 instead of 03.30
-    regex_de = /\b(\d{1,2})\.(\d{1,2})\.\s+(\d{1,2})[:.](\d{2})\b/
-
-    # e.g. 14.09.2012 20:30   => DD.MM.YYYY HH:MM
-    #  nb: allow 2.3.2012 e.g. no leading zero required
-    #  nb: allow hour as 20.30
-    regex_de2 = /\b(\d{1,2})\.(\d{1,2})\.(\d{4})\s+(\d{1,2})[:.](\d{2})\b/
-
-    # e.g. 14.09.2012  => DD.MM.YYYY w/ implied hours (set to 12:00)
-    regex_de3 = /\b(\d{1,2})\.(\d{1,2})\.(\d{4})\b/
-
-    # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
-    #  note: allow end delimiter ] e.g. [Sa 12.01.] or end-of-string ($) too
-    #  note: we use a lookahead for last part e.g. (?:\s+|$|[\]]) - do NOT cosume
-    regex_de4 = /\b(\d{1,2})\.(\d{1,2})\.(?=\s+|$|[\]])/    ## note: allow end-of-string/line too
-
-    # fix: !!!!
-    #   date in [] will become [[DATE.DE4]] - when getting removed will keep ]!!!!
-    #   fix: change regex to \[[A-Z0-9.]\]  !!!!!!  plus add unit test too!!!
-    #
-    # fix: use more lookahead for all required trailing spaces!!!!!
-    # fix: use <name capturing group> for month,day,year etc.!!!
-
-    # todo: make more generic for reuse
-    month_abbrev_en = 'Jan|Feb|March|Mar|April|Apr|May|June|Jun|July|Jul|Aug|Sept|Sep|Oct|Nov|Dec'
-    month_abbrev_en_to_i = {
-        'Jan' => 1,
-        'Feb' => 2,
-        'Mar' => 3, 'March' => 3,
-        'Apr' => 4, 'April' => 4,
-        'May' => 5,
-        'Jun' => 6, 'June' => 6,
-        'Jul' => 7, 'July' => 7,
-        'Aug' => 8,
-        'Sep' => 9, 'Sept' => 9,
-        'Oct' => 10,
-        'Nov' => 11,
-        'Dec' => 12 }
-
-
-    # e.g. 12 May 2013 14:00  => D|DD.MMM.YYYY H|HH:MM
-    regex_en = /\b(\d{1,2})\s(#{month_abbrev_en})\s(\d{4})\s+(\d{1,2}):(\d{2})\b/
-
-
-    # e.g.  Jun/12 14:00  w/ implied year H|HH:MM
-    regex_en2  = /\b(#{month_abbrev_en})\/(\d{1,2})\s+(\d{1,2}):(\d{2})\b/
-
-    # e.g.  Jun/12  w/ implied year and implied hours (set to 12:00)
-    regex_en21 = /\b(#{month_abbrev_en})\/(\d{1,2})\b/
-
-    # todo/fix - add de and es too!!
-    # note: in Austria - Jänner - in Deutschland Januar allow both ??
-    month_abbrev_de = 'J[aä]n|Feb|Mär|Apr|Mai|Jun|Jul|Aug|Sep|Okt|Nov|Dez'
-
-    month_abbrev_es = 'Enero|Ene|Feb|Marzo|Mar|Abril|Abr|Mayo|May|Junio|Jun|Julio|Jul|Agosto|Ago|Sept|Set|Sep|Oct|Nov|Dic'
-    month_abbrev_es_to_i = {
-        '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 }
-
-    # e.g.  12 Ene  w/ implied year and implied hours (set to 12:00)
-    regex_es21 = /\b(\d{1,2})\s(#{month_abbrev_es})\b/
-
-    if line =~ regex_db
-      value = '%d-%02d-%02d %02d:%02d' % [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i]
-      logger.debug "   date: >#{value}<"
-
-      ## todo: lets you configure year
-      ##  and time zone (e.g. cet, eet, utc, etc.)
-      
-      line.sub!( regex_db, '[DATE.DB]' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_db2
-      value = '%d-%02d-%02d 12:00' % [$1.to_i, $2.to_i, $3.to_i]
-      logger.debug "   date: >#{value}<"
-
-      line.sub!( regex_db2, '[DATE.DB2]' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_de2
-      value = '%d-%02d-%02d %02d:%02d' % [$3.to_i, $2.to_i, $1.to_i, $4.to_i, $5.to_i]
-      logger.debug "   date: >#{value}<"
-
-      ## todo: lets you configure year
-      ##  and time zone (e.g. cet, eet, utc, etc.)
-      
-      line.sub!( regex_de2, '[DATE.DE2]' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_de
-
-      year = calculate_year( $1.to_i, $2.to_i, opts[:start_at] )
-
-      value = '%d-%02d-%02d %02d:%02d' % [year, $2.to_i, $1.to_i, $3.to_i, $4.to_i]
-      logger.debug "   date: >#{value}<"
-
-      ## todo: lets you configure year
-      ##  and time zone (e.g. cet, eet, utc, etc.)
-      
-      line.sub!( regex_de, '[DATE.DE]' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_de3
-      value = '%d-%02d-%02d 12:00' % [$3.to_i, $2.to_i, $1.to_i]
-      logger.debug "   date: >#{value}<"
-
-      ## todo: lets you configure year
-      ##  and time zone (e.g. cet, eet, utc, etc.)
-      
-      line.sub!( regex_de3, '[DATE.DE3]' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_de4
-
-      year = calculate_year( $1.to_i, $2.to_i, opts[:start_at] )
-
-      value = '%d-%02d-%02d 12:00' % [year, $2.to_i, $1.to_i]
-      logger.debug "   date: >#{value}<"
-
-      ## todo: lets you configure year
-      ##  and time zone (e.g. cet, eet, utc, etc.)
-
-      ### NOTE: needs a trailing space
-      #   not if regex ends w/ whitespace e.g. /s+
-      #  make sure sub! adds a space at the end
-      #   e.g. '[DATE.DE4]' becomes '[DATE.DE4] '
-
-      line.sub!( regex_de4, '[DATE.DE4] ' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_en
-      value = '%d-%s-%02d %02d:%02d' % [$3.to_i, $2, $1.to_i, $4.to_i, $5.to_i]
-      logger.debug "   date: >#{value}<"
-
-      line.sub!( regex_en, '[DATE.EN]' )
-
-      return DateTime.strptime( value, '%Y-%b-%d %H:%M' )   ## %b - abbreviated month name (e.g. Jan,Feb, etc.)
-    elsif line =~ regex_en2
-      day     = $2.to_i
-      month   = month_abbrev_en_to_i[ $1 ]
-      year    = calculate_year( day, month, opts[:start_at] )
-      hours   = $3.to_i
-      minutes = $4.to_i
-
-      value = '%d-%02d-%02d %02d:%02d' % [year, month, day, hours, minutes]
-      logger.debug "   date: >#{value}<"
-
-      line.sub!( regex_en2, '[DATE.EN2] ' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_en21
-      day   = $2.to_i
-      month = month_abbrev_en_to_i[ $1 ]
-      year = calculate_year( day, month, opts[:start_at] )
-
-      value = '%d-%02d-%02d 12:00' % [year, month, day]
-      logger.debug "   date: >#{value}<"
-
-      line.sub!( regex_en21, '[DATE.EN21] ' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    elsif line =~ regex_es21
-      day   = $1.to_i
-      month = month_abbrev_es_to_i[ $2 ]
-      year = calculate_year( day, month, opts[:start_at] )
-
-      value = '%d-%02d-%02d 12:00' % [year, month, day]
-      logger.debug "   date: >#{value}<"
-
-      line.sub!( regex_es21, '[DATE.ES21] ' )
-
-      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-    else
-      return nil
-    end
+    finder = DateFinder.new
+    finder.find!( line, opts )
   end
 
   end # module FixtureHelpers

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.15'
+  VERSION = '1.8.16'
 end
 
 

data/test/test_date.rb

@@ -1,18 +1,31 @@
 # encoding: utf-8
 
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_date.rb
+
 require 'helper'
 
 class TestDate < MiniTest::Unit::TestCase
 
   def test_date
+    start_at = DateTime.new( 2013, 1, 1 )
+
     assert_datetime DateTime.new( 2013, 1, 19, 22 ),     parse_date( '19.01.2013 22.00' )
     assert_datetime DateTime.new( 2013, 1, 21, 21, 30 ), parse_date( '21.01.2013 21.30' )
 
     assert_date     DateTime.new( 2013, 1, 26 ),         parse_date( '26.01.2013' )
+    assert_date     DateTime.new( 2013, 1, 26 ),         parse_date( '[26.01.2013]' )
+
+    assert_datetime DateTime.new( 2013, 1, 21, 12, 00 ), parse_date( '[21.1.]', start_at: start_at )
   end
 
+
   def test_date_en
-    start_at = DateTime.new( 2013, 1, 25 )
+    start_at = DateTime.new( 2013, 1, 1 )
+
+    assert_date     DateTime.new( 2011, 1, 26 ),         parse_date( 'Jan/26 2011', start_at: start_at )
+    assert_datetime DateTime.new( 2011, 1, 26, 12, 00 ), parse_date( 'Jan/26 2011', start_at: start_at )
 
     assert_date     DateTime.new( 2013, 1, 26 ),         parse_date( 'Jan/26', start_at: start_at )
     assert_datetime DateTime.new( 2013, 1, 26, 12, 00 ), parse_date( 'Jan/26', start_at: start_at )
@@ -30,7 +43,7 @@ private
     assert_equal exp.month, act.month 
     assert_equal exp.day,   act.day
   end
-  
+
   def assert_time( exp, act )
     assert_equal exp.hour, act.hour
     assert_equal exp.min,  act.min
@@ -41,15 +54,11 @@ private
     assert_time( exp, act )
   end
 
-  class Reader
-    include LogUtils::Logging      # add logger
-    include SportDb::FixtureHelpers
-  end
 
   def parse_date( line, opts={} )
      # e.g. lets you pass in opts[:start_at] ???
-     reader = Reader.new
-     reader.find_date!( line, opts )
+     finder = SportDb::DateFinder.new
+     finder.find!( line, opts )
   end
 
 end # class TestScores

metadata

@@ -1,155 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.15
+  version: 1.8.16
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72538960 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72538960
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72537120 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72537120
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72529170 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72529170
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72528110 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+  version_requirements: *72528110
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72527770 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72527770
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72527230 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.3'
+  version_requirements: *72527230
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72526900 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.6
+  version_requirements: *72526900
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72526650 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72526650
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72526110 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+  version_requirements: *72526110
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72524490 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *72524490
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -181,6 +152,7 @@ files:
 - lib/sportdb/data/keys.rb
 - lib/sportdb/data/models.rb
 - lib/sportdb/deleter.rb
+- lib/sportdb/finders/date.rb
 - lib/sportdb/lang.rb
 - lib/sportdb/matcher.rb
 - lib/sportdb/models/badge.rb
@@ -288,7 +260,6 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -306,29 +277,31 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files:
-- test/test_changes.rb
-- test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
-- test/test_reader.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
+- test/test_cursor.rb
 - test/test_scores.rb
-- test/test_utils.rb
 - test/test_winner.rb
+- test/test_round_def.rb
+- test/test_utils.rb
+- test/test_round_header.rb
+- test/test_reader.rb
+- test/test_changes.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4459c37fc4ca396f49c2c42a8a0dbb671c1eb7e9
-  data.tar.gz: de9e5e62f8de5fb9b45a78534e43368d5404b70f
-SHA512:
-  metadata.gz: ca0972bd7ecc76d8d2aaf7ba8b12690b8145b68c80b64c630ae446a47e622cba84bcae477e9b6bacd89b6ff856716bbd3db00a0a11ce8f472e8b72d1eadd736f
-  data.tar.gz: 7aa791e995880106aa051855db62fa92cb63bd57671f1af0f835a457055c11bf12ec9fa0b26ff61cf9f6ffc1655678d9dbe685660939d72db7a45dba7472c680