sportdb 1.8.21 → 1.8.22

data/lib/sportdb/readers/game.rb

@@ -653,23 +653,36 @@ class GameReader
     end
 
     unless @patch_round_ids_pos.empty?
+
+      # step 0: check for offset (last_round_pos)
+      if @last_round_pos
+        offset = @last_round_pos
+        logger.info "  +++ patch round pos - use offset; start w/ #{offset}"
+      else
+        offset = 0
+        logger.debug "  patch round pos - no offset; start w/ 0"
+      end
+
       # step 1: sort by date
       # step 2: update pos
       # note: use uniq - to allow multiple round headers (possible?)
       Round.order( 'start_at asc').find( @patch_round_ids_pos.uniq ).each_with_index do |r,idx|
         # note: starts counting w/ zero(0)
-        logger.debug "[#{idx+1}] patch round pos for #{r.title}:"
+        logger.debug "[#{idx+1}] patch round pos >#{offset+idx+1}< for #{r.title}:"
         round_attribs = {
-          pos: idx+1
+          pos: offset+idx+1
         }
 
         # update title if Matchday XXXX  e.g. use Matchday 1 etc.
         if r.title.starts_with?('Matchday')
-          round_attribs[:title] = "Matchday #{idx+1}"
+          round_attribs[:title] = "Matchday #{offset+idx+1}"
         end
 
         logger.debug round_attribs.to_json
         r.update_attributes!( round_attribs )
+
+        # update last_round_pos offset too
+        @last_round_pos = [offset+idx+1,@last_round_pos||0].max
       end
     end
 

data/lib/sportdb/utils_round.rb

@@ -115,21 +115,11 @@ module SportDb
 
 
   def find_round_pos!( line )
-    ## fix/todo:
-    ##  if no round found assume last_pos+1 ??? why? why not?
-
-    # extract optional round pos from line
+    # pass #1) extract optional round pos from line
     # e.g.  (1)   - must start line 
     regex_pos = /^[ \t]*\((\d{1,3})\)[ \t]+/
 
- 
-    #### fix:
-    ## use/make keywords required
-    # e.g. Round of 16  -> should NOT match 16!
-    # Round 16 - ok
-    #  thus, check for required keywords
-
-    ## find free standing number
+    # pass #2) find free standing number  e.g. Matchday 3 or Round 5 or 3. Spieltag etc.
     # note: /\b(\d{1,3})\b/
     #   will match -12
     #  thus, use space required - will NOT match  -2 e.g. Group-2 Play-off
@@ -145,8 +135,25 @@ module SportDb
     elsif line =~ regex_num
       ## assume number in title is pos (e.g. Jornada 3, 3 Runde etc.)
       ## NB: do NOT remove pos from string (will get removed by round title)
-      logger.debug "   pos: >#{$1}<"
-      return $1.to_i
+
+      num = $1.to_i  # note: clone capture; keep a copy (another regex follows; will redefine $1)
+
+      #### fix:
+      #  use/make keywords required
+      #  e.g. Round of 16  -> should NOT match 16!
+      #    Spiel um Platz 3  (or 5) etc -> should NOT match 3!
+      #  Round 16 - ok
+      #  thus, check for required keywords
+
+      ## quick hack for round of 16
+      # todo: mask match e.g. Round of xxx ... and try again - might include something
+      #  reuse pattern for Group XX Replays for example
+      if line =~ /^\s*Round of \d{1,3}\b/
+         return nil
+      end
+
+      logger.debug "   pos: >#{num}<"
+      return num
     else
       ## fix: add logger.warn no round pos found in line
       return nil

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.21'
+  VERSION = '1.8.22'
 end
 
 

data/test/test_lang.rb

@@ -23,18 +23,18 @@ class TestLang < MiniTest::Unit::TestCase
      round << '|Quarterfinals|Quarter-finals|Quarters|Quarterfinal|Last 8'
      round << '|Semifinals|Semi-finals|Semis|Last 4'
      round << '|Fifth place match|Fifth place|5th place match|5th place final|5th place|Match for fifth place|Match for 5th place'
-     round << '|Third place match|Third place|3rd place match|3rd place final|3rd place|Match for third place|Match for 3rd place|Third-place play-off|Third place play-off'
+     round << '|Third place match|Third-place match|Third place|3rd place match|3rd place final|3rd place|Match for third place|Match for 3rd place|Third-place play-off|Third place play-off'
      round << '|Final|Finals'
-     round << '|Play-off|Play-offs|Play-off for quarter-finals'
+     round << '|Playoff|Playoffs|Play-off|Play-offs|Play-off for quarter-finals'
 
      knockout_round = 'Round of 32|Last 32'
      knockout_round << '|Round of 16|Last 16|8th finals'
      knockout_round << '|Quarterfinals|Quarter-finals|Quarters|Quarterfinal|Last 8'
      knockout_round << '|Semifinals|Semi-finals|Semis|Last 4'
      knockout_round << '|Fifth place match|Fifth place|5th place match|5th place final|5th place|Match for fifth place|Match for 5th place'
-     knockout_round << '|Third place match|Third place|3rd place match|3rd place final|3rd place|Match for third place|Match for 3rd place|Third-place play-off|Third place play-off'
+     knockout_round << '|Third place match|Third-place match|Third place|3rd place match|3rd place final|3rd place|Match for third place|Match for 3rd place|Third-place play-off|Third place play-off'
      knockout_round << '|Final|Finals'
-     knockout_round << '|Play-off|Play-offs|Play-off for quarter-finals'
+     knockout_round << '|Playoff|Playoffs|Play-off|Play-offs|Play-off for quarter-finals'
 
      assert_equal group, lang.group
      assert_equal round, lang.round

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.21
+  version: 1.8.22
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74073370 !ruby/object:Gem::Requirement
+  requirement: &68241960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74073370
+  version_requirements: *68241960
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74073050 !ruby/object:Gem::Requirement
+  requirement: &68241240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74073050
+  version_requirements: *68241240
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74072750 !ruby/object:Gem::Requirement
+  requirement: &68255670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74072750
+  version_requirements: *68255670
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74072350 !ruby/object:Gem::Requirement
+  requirement: &68255160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74072350
+  version_requirements: *68255160
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &74071960 !ruby/object:Gem::Requirement
+  requirement: &68254520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74071960
+  version_requirements: *68254520
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74071660 !ruby/object:Gem::Requirement
+  requirement: &68254010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74071660
+  version_requirements: *68254010
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &74071320 !ruby/object:Gem::Requirement
+  requirement: &68253470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *74071320
+  version_requirements: *68253470
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74071090 !ruby/object:Gem::Requirement
+  requirement: &68253190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74071090
+  version_requirements: *68253190
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74070660 !ruby/object:Gem::Requirement
+  requirement: &68252660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *74070660
+  version_requirements: *68252660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74070340 !ruby/object:Gem::Requirement
+  requirement: &68252210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *74070340
+  version_requirements: *68252210
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: