sportdb-formats 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b22ea9a05b89006e8048871b2616d5a4fadd4fcb435dc1fd33c1194a6182de
-  data.tar.gz: '069b114b3679b2f0bf1fda38c4b97b52a949d7e3e0ab1e9cad41e0f08b540c28'
+  metadata.gz: a9f1a3d4643a73600d020fd3e34356df44f869eda7a0e1e06479819142f22a57
+  data.tar.gz: 1ae30d054bb50a52785bc13c6f3d568129d28cc5c0f10b88bae964ea88263c94
 SHA512:
-  metadata.gz: 29f00ceff229bc2e8445ee6ef6c2c0a7ecd27b00c899535130f10f480ec0526b18d5e3df30e78f1577f35f6e65fe6aafff2f99ef587eb869445b9b9ab5f20c2c
-  data.tar.gz: c97c1568d3b063ba2e25afa21c07479ac4f098df7c0bf2e5a3701a5ef2eb9d8c2c56415573191bae0cb7fbbc07e8ee229eca30fdeda9b1a0713615cdf4c46b5a
+  metadata.gz: 752dad1c1f27f0ced1b410232d1b187551eda65e7e1a3be55000b3fa00b669bcfc943da7df1c858eafbabc83b05e9914c86d95e8fc14dc6f4fd7b72bcb1b73da
+  data.tar.gz: b92e4b47d4570f54ebd04e3153b05038df6bc5e1f622a45e87d034af38aa5fb31ab7c6d81f4d391a1c99370e5948f13e3f4dff6a00e069d73429e490ec61de91

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.2.0
+### 1.2.1
 
 ### 0.0.1 / 2019-10-28
 

data/lib/sportdb/formats/goals.rb

@@ -209,6 +209,10 @@ class GoalsParser
   include LogUtils::Logging
 
 
+  ### todo/fix:
+  ##    let's use stringscanner for parsing line - why? why not?
+
+
   # note: use ^ for start of string only!!!
   # - for now slurp everything up to digits (inlc. spaces - use strip to remove)
   # todo/check: use/rename to NAME_UNTIL_REGEX ??? ( add lookahead for spaces?)
@@ -220,18 +224,21 @@ class GoalsParser
   # todo/check: change to MINUTE_REGEX ??
   # add MINUTE_SKIP_REGEX or MINUTE_SEP_REGEX /^[ ,]+/
   # todo/fix:  split out  penalty and owngoal flag in PATTERN constant for reuse
+  #   note - offset  90+10 possible!!!!
+  #    note - allow  p/pen./pen  or  o.g. or og
   MINUTES_REGEX = /^      # note: use ^ for start of string only!!!
                     (?<minute>[0-9]{1,3})
                     (?:\+
-                      (?<offset>[1-9]{1})
+                      (?<offset>[0-9]{1,2})
                     )?
                     '
                     (?:[ ]*
                       \(
-                      (?<type>P|pen\.|o\.g\.)
+                      (?<type>p|pen\.?|
+                              og|o\.g\.)
                       \)
                     )?
-                  /x
+                  /ix
 
 
 
@@ -256,22 +263,21 @@ class GoalsParser
       player = GoalsPlayerStruct.new
       player.name = name
 
-      minute_hash = get_minute_hash!( line )
-      while minute_hash
+      minute_hash = nil 
+      while minute_hash=get_minute_hash!( line )   ## note: returns nil if no (regex) match
         logger.debug "  found minutes >#{minute_hash.inspect}< - remaining >#{line}<"
 
         minute = GoalsMinuteStruct.new
         minute.minute = minute_hash[:minute].to_i
         minute.offset = minute_hash[:offset].to_i  if minute_hash[:offset]
         if minute_hash[:type]
-          minute.owngoal = true  if minute_hash[:type] =~ /o\.g\./
-          minute.penalty = true  if minute_hash[:type] =~ /P|pen\./
+          minute.owngoal = true  if minute_hash[:type] =~ /og|o\.g\./i
+          minute.penalty = true  if minute_hash[:type] =~ /p|pen\.?/i
         end
         player.minutes << minute
 
         # remove commas and spaces (note: use ^ for start of string only!!!)
         line.sub!( /^[ ,]+/, '' )
-        minute_hash = get_minute_hash!( line )
       end
 
       players << player
@@ -297,6 +303,8 @@ private
     m = MINUTES_REGEX.match( line ) # note: use ^ for start of string only!!!
     if m
       h = {}
+      ## todo/fix - hash conversion no longer need in ruby 3+!!
+      ##               double check - and remove (simplify) !!!!
       # - note: do NOT forget to turn name into symbol for lookup in new hash (name.to_sym)
       m.names.each { |n| h[n.to_sym] = m[n] } # or use match_data.names.zip( match_data.captures ) - more cryptic but "elegant"??
 

data/lib/sportdb/formats/match/match_parser.rb

@@ -362,6 +362,27 @@ class MatchParser   ## simple match parser for team match schedules
   end
 
 
+  ### todo/check - include (optional) leading space in regex - why? why not?
+  NUM_RE = /^[ ]*\(
+                    (?<num>[0-9]{1,3})
+                  \)
+           /x
+
+  def find_num!( line )
+      ## check for leading match number e.g.
+      ##    (1) Fri Jun/14 21:00         Germany   5-1 (3-0)  Scotland 
+      m = line.match( NUM_RE )
+      if m
+        num = m[:num].to_i(10)  ## allows 01/02/07 etc. -- why? why not?
+        match_str = m[0]
+        line.sub!( match_str, '[NUM]' )
+        num
+      else
+        nil
+      end
+  end
+
+
   def try_parse_game( line )
     # note: clone line; for possible test do NOT modify in place for now
     # note: returns true if parsed, false if no match
@@ -405,11 +426,16 @@ class MatchParser   ## simple match parser for team match schedules
       return false
     end
 
+
+    ## try optional match number e.g. 
+    ##        (1) Fri Jun/14 21:00         Germany   5-1 (3-0)  Scotland 
+    num = find_num!( line )
+    ## pos = find_game_pos!( line )
+
     ## find (optional) match status e.g. [abandoned] or [replay] or [awarded]
     ##                                   or [cancelled] or [postponed] etc.
     status = find_status!( line )   ## todo/check: allow match status also in geo part (e.g. after @) - why? why not?
 
-    ## pos = find_game_pos!( line )
 
       date      = find_date!( line, start: @start )  ## date or datetime (but NOT time!)
 
@@ -475,7 +501,8 @@ class MatchParser   ## simple match parser for team match schedules
     else  # assume date is nil
     end        
 
-    @matches << Import::Match.new( date:    date_str,
+    @matches << Import::Match.new( num:     num,
+                                   date:    date_str,
                                    time:    time_str,
                                    team1:   team1,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team1.name)
                                    team2:   team2,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team2.name)

data/lib/sportdb/formats/search/sport.rb

@@ -298,11 +298,11 @@ class TeamSearch
       else
         if league.clubs?
           if league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
-            @club.find!( name )
+            @clubs.find!( name )
           else  ## assume clubs in domestic/national league tournament
              ## note - search by league countries (may incl. more than one country 
              ##             e.g. us incl. ca, fr incl. mc, ch incl. li, etc.
-            @club.find_by!( name: name, league: league )
+            @clubs.find_by!( name: name, league: league )
           end
         else   ## assume national teams (not clubs)
           @national_teams.find!( name )

data/lib/sportdb/formats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs