sportdb 1.6.14 → 1.6.15

data/lib/sportdb/utils.rb

@@ -173,6 +173,9 @@ module SportDb::FixtureHelpers
     #  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/
+
 
     month_abbrev_en = "Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec"
 
@@ -181,7 +184,7 @@ module SportDb::FixtureHelpers
 
 
     if line =~ regex_db
-      value = '%d-%02d-%02d %02d:%02d' % [$1, $2, $3, $4, $5]
+      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
@@ -191,14 +194,14 @@ module SportDb::FixtureHelpers
 
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_db2
-      value = '%d-%02d-%02d 12:00' % [$1, $2, $3]
+      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, $2, $1, $4, $5]
+      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
@@ -213,7 +216,7 @@ module SportDb::FixtureHelpers
       #  get year from event start date!!!!
       #  do NOT hard code!!!!
 
-      value = '2012-%02d-%02d %02d:%02d' % [$2, $1, $3, $4]
+      value = '2012-%02d-%02d %02d:%02d' % [$2.to_i, $1.to_i, $3.to_i, $4.to_i]
       logger.debug "   date: >#{value}<"
 
       ## todo: lets you configure year
@@ -221,9 +224,19 @@ module SportDb::FixtureHelpers
       
       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_en
-      value = '%d-%s-%02d %02d:%02d' % [$3, $2, $1, $4, $5]
+      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]' )

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.14'
+  VERSION = '1.6.15'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-06-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &18220920 !ruby/object:Gem::Requirement
+  requirement: &16592544 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *18220920
+  version_requirements: *16592544
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &18220452 !ruby/object:Gem::Requirement
+  requirement: &16591860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *18220452
+  version_requirements: *16591860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18219588 !ruby/object:Gem::Requirement
+  requirement: &16582848 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *18219588
+  version_requirements: *16582848
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18219000 !ruby/object:Gem::Requirement
+  requirement: &16581960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *18219000
+  version_requirements: *16581960
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: