sportdb 1.8.18 → 1.8.19

data/lib/sportdb/finders/date.rb

@@ -7,20 +7,31 @@ 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 = 'January|Jan|'+
+             'February|Feb|'+
+             'March|Mar|'+
+             'April|Apr|'+
+             'May|'+
+             'June|Jun|'+
+             'July|Jul|'+
+             'August|Aug|'+
+             'September|Sept|Sep|'+
+             'October|Oct|'+
+             'November|Nov|'+
+             'December|Dec'
   MONTH_EN_TO_MM = {
-        'Jan' => '1',
-        'Feb' => '2',
+        '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',
-        'Sep' => '9', 'Sept' => '9',
-        'Oct' => '10',
-        'Nov' => '11',
-        'Dec' => '12' }
+        'Aug' => '8', 'August' => '8',
+        'Sep' => '9', 'Sept' => '9', 'September' => '9',
+        'Oct' => '10', 'October' => '10',
+        'Nov' => '11', 'November' => '11',
+        'Dec' => '12', 'December' =>'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  = {
@@ -134,6 +145,19 @@ class DateFinder
                 (?<minutes>\d{2})
                   \b/x
 
+###
+# fix: pass in lang (e.g. en or es)
+#  only process format for lang plus fallback to en?
+#   e.g.  EN__DD_MONTH and ES__DD_MONTH depend on order for match (first listed will match)
+
+  # e.g. 12 May  => D|DD.MMM  w/ implied year and implied hours
+  EN__DD_MONTH__DATE_REGEX = /\b
+                (?<day>\d{1,2})
+                   \s
+                (?<month_en>#{MONTH_EN})
+                   \b/x
+
+
   # e.g.  Jun/12 2011 14:00
   EN__MONTH_DD_YYYY__DATE_TIME_REGEX = /\b
                    (?<month_en>#{MONTH_EN})
@@ -197,6 +221,7 @@ class DateFinder
     [ '[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 ],
+    [ '[EN_DD_MONTH]',             EN__DD_MONTH__DATE_REGEX ],
     [ '[ES_DD_MONTH]',             ES__DD_MONTH__DATE_REGEX ]
   ]
 

data/lib/sportdb/readers/game.rb

@@ -374,14 +374,32 @@ class GameReader
       ##
       # note: start_at and end_at are dates ONLY (note datetime)
       #  - do NOT pass in hours etc. in query
-      #  old:  date.end_of_day, date.beginning_of_day
-      #  new:  date.to_date, date.to_date
-      
-      ## pp Round.all
-      
-      round = Round.where( 'event_id = ? AND (start_at <= ? AND end_at >= ?)',
+      #  again use -->  date.end_of_day, date.beginning_of_day
+      #  new: not working:  date.to_date, date.to_date
+      #    will not find round if  start_at same as date !! (in theory hours do not matter)
+
+      ###
+      # hack:
+      #  special case for sqlite3 (date compare not working reliable; use casts)
+      #  fix: move to  adapter_name to activerecord_utils as sqlite? or similar?
+
+      if ActiveRecord::Base.connection.adapter_name.downcase.starts_with?( 'sqlite' )
+        logger.debug( "  [sqlite] using sqlite-specific query for date compare for rounds finder" )
+        round = Round.where( 'event_id = ? AND (    julianday(start_at) <= julianday(?)'+
+                                               'AND julianday(end_at)   >= julianday(?))',
+                               @event.id, date.to_date, date.to_date).first
+      else  # all other dbs (postgresql, mysql, etc.)
+        round = Round.where( 'event_id = ? AND (start_at <= ? AND end_at >= ?)',
                              @event.id, date.to_date, date.to_date).first
-      ## pp round
+      end
+
+      pp round
+      if round.nil?
+        logger.warn( "  !!!! no round match found for date #{date}" )
+        pp Round.all
+      end
+
+      ## note: will crash (round.pos) if round is nil
       logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
     else
       ## use round from last round header

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.18'
+  VERSION = '1.8.19'
 end
 
 

data/test/test_date.rb

@@ -27,12 +27,16 @@ class TestDate < MiniTest::Unit::TestCase
 
       [ 'Jan/26 2011',       '2011-01-26' ],
       [ 'Jan/26 2011',       '2011-01-26 12:00' ],
-      
+
       [ 'Jan/26',            '2013-01-26' ],
       [ 'Jan/26',            '2013-01-26 12:00' ],
+      [ '26 January',        '2013-01-26' ],
+      [ '26 January',        '2013-01-26 12:00' ],
 
       [ 'Jun/13',            '2013-06-13' ],
-      [ 'Jun/13',            '2013-06-13 12:00' ]
+      [ 'Jun/13',            '2013-06-13 12:00' ],
+      [ '13 June',           '2013-06-13' ],
+      [ '13 June',           '2013-06-13 12:00' ]
     ]
     
     assert_dates( data, start_at: DateTime.new( 2013, 1, 1 ) )

data/test/test_round_def.rb

@@ -21,6 +21,16 @@ class TestRoundDef < MiniTest::Unit::TestCase
           title: 'Matchday 1',
           ko: false,
           start_at: Date.new( 2014, 6, 12 ) }],
+      [ 'Matchday 1  |  12 June',
+        { pos:1,
+          title: 'Matchday 1',
+          ko: false,
+          start_at: Date.new( 2014, 6, 12 ) }],
+      [ 'Matchday 1  |  13 July',
+        { pos:1,
+          title: 'Matchday 1',
+          ko: false,
+          start_at: Date.new( 2014, 7, 13 ) }],
       [ 'Matchday 13 |  Tue Jun/24',
         { pos: 13,
           title: 'Matchday 13',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.18
+  version: 1.8.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74539620 !ruby/object:Gem::Requirement
+  requirement: &74965970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74539620
+  version_requirements: *74965970
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74538650 !ruby/object:Gem::Requirement
+  requirement: &74964650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74538650
+  version_requirements: *74964650
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74537420 !ruby/object:Gem::Requirement
+  requirement: &74963290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74537420
+  version_requirements: *74963290
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74534960 !ruby/object:Gem::Requirement
+  requirement: &74957330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74534960
+  version_requirements: *74957330
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &74532380 !ruby/object:Gem::Requirement
+  requirement: &74956650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74532380
+  version_requirements: *74956650
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74526380 !ruby/object:Gem::Requirement
+  requirement: &74954700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74526380
+  version_requirements: *74954700
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &74524870 !ruby/object:Gem::Requirement
+  requirement: &75046310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *74524870
+  version_requirements: *75046310
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74524290 !ruby/object:Gem::Requirement
+  requirement: &75044290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74524290
+  version_requirements: *75044290
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74522390 !ruby/object:Gem::Requirement
+  requirement: &75043540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *74522390
+  version_requirements: *75043540
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74519770 !ruby/object:Gem::Requirement
+  requirement: &75042130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *74519770
+  version_requirements: *75042130
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: