sportdb-readers 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdad0e950d6144fe9de65be3f4a87057b05e1f03e168237c44c5f0c9f2d3f0b3
-  data.tar.gz: 541e0de0a923297dc7b1b7349319e77bcaa31ac5405bb3f2cdd111f522230985
+  metadata.gz: f272d4ffee7d8d56aa09bc05ec0280ab252ef793cc26090206e4dad41824cd43
+  data.tar.gz: 3343b9b089991220fa61584f166a229ce1bd35aad695a0aef76ac692fc62825e
 SHA512:
-  metadata.gz: d36e0affcfc3fbdd5fbb50fabcbaebce34935f48a257c7ab7e918cf2cf1a96bdf3b7d2737f05adf75f9094ade927c88806d1fef5ce9d792feaac852534125e86
-  data.tar.gz: 797fd4250e078bf2255e38830358cedeea761ea85236e7084f08fd04ba71b2831890267c7a2268cc92312556149dda33a7ef893d0a5878ce9474be221ba50d9b
+  metadata.gz: 665bd28de289348d82f8bb3157e08601f20ebe35794c3e1694802fb77df34151bb15589a784c615c3c83fb3c1ad30a0e66f51a0c4a34a366dd666be3b1249d41
+  data.tar.gz: d330593cd5ae11a2a887ef365e69c3cd02486623e9a0fbca132466eef7408b65a455ab9ee1cad6f55f6f1d706c7f901f816f23bb01060fd28457ca6df5879092

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2.0.0
+### 2.1.0
 
 ### 0.0.1 / 2019-10-29
 

data/Manifest.txt

@@ -4,7 +4,6 @@ NOTES.md
 README.md
 Rakefile
 lib/sportdb/readers.rb
-lib/sportdb/readers/conf_reader.rb
 lib/sportdb/readers/match_reader.rb
 lib/sportdb/readers/package.rb
 lib/sportdb/readers/sync/club.rb

data/Rakefile

@@ -20,8 +20,7 @@ Hoe.spec 'sportdb-readers' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-formats',   '>= 2.0.0'],
-    ['sportdb-catalogs',  '>= 1.2.1'],
+    ['sportdb-formats',   '>= 2.0.1'],
     ['sportdb-models',    '>= 2.1.0'],
   ]
 

data/lib/sportdb/readers/match_reader.rb

@@ -1,3 +1,9 @@
+###
+# todo/fix:
+#    add optional stage to
+#           group, round to make uniquie
+#     same group or round name is different (record) if differant stage !!!!
+
 
 module SportDb
 class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? why not?
@@ -29,17 +35,43 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
     @txt = txt
   end
 
+
+
   def parse( season: nil )
-    secs = LeagueOutlineReader.parse( @txt, season: season )
-    pp secs
+    secs =  QuickLeagueOutlineReader.parse( @txt )
+    ## pp secs
+
+########
+#  step 1 - prepare secs
+    # -- filter seasons if filter present
+   secs = filter_secs( sec, season: season )   if season
+
+    ## -- check & map; replace inline (string with data struct record)
+    secs.each do |sec|
+      sec[:season] = Season.parse( sec[:season ] )
+      sec[:league] = Import::League.find!( sec[:league] )
+
+ ##
+ ## quick hack - assume "Regular" or "Regular Season"
+ ##    as default stage (thus, no stage)
+     if sec[:stage]
+       sec[:stage] = nil   if ['Regular',
+                               'Regular Season',
+                               'Regular Stage',
+                              ].include?( sec[:stage] )
+      end
+    end
 
+
+###
+#  step 2 - handle secs
     secs.each do |sec|   ## sec(tion)s
       season = sec[:season]
       league = sec[:league]
       stage  = sec[:stage]
       lines  = sec[:lines]
 
-      ### check if event info availabe - use start_date;
+      ### check if event info available - use start_date;
       ##    otherwise we have to guess (use a "synthetic" start_date)
       event_info = catalog.events.find_by( season: season,
                                            league: league )
@@ -74,51 +106,18 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
       pp groups
 
 
-
+      ##################################
       ## step 1: map/find teams
 
       ## note: loop over keys (holding the names); values hold the usage counter!! e.g. 'Arsenal' => 2, etc.
-      mods = nil
-      if league.clubs? && league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
-
-        ## quick hack - use "dynamic" keys for keys
-          uefa_el_q = Import::League.match_by( code: 'uefa.el.quali' )[0]
-          uefa_cl_q = Import::League.match_by( code: 'uefa.cl.quali' )[0]
-          uefa_cl   = Import::League.match_by( code: 'uefa.cl' )[0]
-          uefa_el   = Import::League.match_by( code: 'uefa.el' )[0]
-
-          pp [uefa_el_q, uefa_cl_q, uefa_cl, uefa_el]
-
-                ### quick hack mods for popular/known ambigious club names
-                ##    todo/fix: make more generic / reuseable!!!!
-                mods = {}
-                ## europa league uses same mods as champions league
-                mods[ uefa_el_q.key ] =
-                mods[ uefa_cl_q.key ] =
-                mods[ uefa_el.key ] =
-                mods[ uefa_cl.key ] = catalog.clubs.build_mods(
-                  { 'Liverpool | Liverpool FC' => 'Liverpool FC, ENG',
-                    'Arsenal  | Arsenal FC'    => 'Arsenal FC, ENG',
-                    'Barcelona'                => 'FC Barcelona, ESP',
-                    'Valencia'                 => 'Valencia CF, ESP',
-                    'Rangers FC'               => 'Rangers FC, SCO',
-                  })
-       end
-
        # puts " [debug] auto_conf_teams:"
        # pp auto_conf_teams
 
-
- ## todo/fix
- ##  ** !!! ERROR - too many matches (2) for club >Barcelona<:
- ## [<Club: FC Barcelona (ESP)>, <Club: Barcelona Guayaquil (ECU)>]
-
        puts "league:"
        pp league
 
        teams = catalog.teams.find_by!( name:   auto_conf_teams,
-                                       league: league,
-                                       mods:   mods )
+                                       league: league )
 
        puts " [debug] teams:"
        pp teams
@@ -223,5 +222,34 @@ class MatchReader    ## todo/check: rename to MatchReaderV2 (use plural?) why? w
   end # method parse
 
 
+
+
+
+#####
+#  filter by season helpers
+  def filter_secs( secs, season: )
+    filtered_secs = []
+    filter = norm_seasons( season )
+    secs.each do |sec|
+      if filter.include?( Season.parse( sec[:season] ).key )
+        filtered_secs << sec
+      else
+        puts "  skipping season >#{sec[:season]}< NOT matched by filter"
+      end
+    end
+    filtered_secs
+  end
+
+  def norm_seasons( season_or_seasons )     ## todo/check: add alias norm_seasons - why? why not?
+      seasons = if season_or_seasons.is_a?( Array )  # is it an array already
+                  season_or_seasons
+                elsif season_or_seasons.is_a?( Range )  # e.g. Season(1999)..Season(2001) or such
+                  season_or_seasons.to_a
+                else  ## assume - single entry - wrap in array
+                  [season_or_seasons]
+                end
+
+      seasons.map { |season| Season( season ).key }
+  end
 end # class MatchReader
 end # module SportDb

data/lib/sportdb/readers/package.rb

@@ -3,33 +3,6 @@ module SportDb
   class Package
 
     ## note: add readers here; for full class def see the sourcein sportdb-formats!!!
-
-    def read_leagues
-      each_leagues { |entry| SportDb.parse_leagues( entry.read ) }
-    end
-
-    def read_clubs
-      each_clubs { |entry| SportDb.parse_clubs( entry.read ) }
-    end
-
-    def read_club_props
-      each_club_props { |entry| SportDb.parse_club_props( entry.read ) }
-    end
-
-
-    def read_conf( *names, season: nil )
-      if names.empty?   ## no (entry) names passed in; read in all
-        each_conf do |entry|
-          SportDb.parse_conf( entry.read, season: season )
-        end
-      else
-        names.each do |name|
-          entry = @pack.find( name )
-          SportDb.parse_conf( entry.read, season: season )
-        end
-      end
-    end
-
     def read_match( *names, season: nil )
       if names.empty?   ## no (entry) names passed in; read in all
         each_match do |entry|
@@ -43,29 +16,8 @@ module SportDb
       end
     end
 
-
-    def read( *names, season: nil )
-      if names.empty?   ##  read all datafiles
-        read_leagues()
-        read_clubs()
-        read_club_props()
-        ## note:  skip conf(iguration)s for now!!!!!!!
-        ## read_conf( season: season )
-        read_match( season: season )
-      else
-        names.each do |name|
-          entry = @pack.find( name )
-          ## fix/todo: add read_leagues, read_clubs too!!!
-          if match_conf?( name )      ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
-            SportDb.parse_conf( entry.read, season: season )
-          elsif match_club_props?( name )
-            SportDb.parse_club_props( entry.read )
-          else   ## assume "regular" match datafile or check pattern and report error on fail - why? why not?
-            SportDb.parse_match( entry.read, season: season )
-          end
-        end
-      end
-    end
+    ## note: read is same as read_match for now!!!
+    ##         in the future add (again) more formats (see attic for history)
+    alias_method :read, :read_match
   end   # class Package
-
 end   # module SportDb

data/lib/sportdb/readers/sync/match.rb

@@ -20,6 +20,8 @@ module Sync
        ##  and lookup by name AND stage??
 
 
+
+
        round_rec = if match.round
                      ## query for round - allow string or round rec
                      round_name  = match.round.is_a?( String ) ? match.round : match.round.name
@@ -57,8 +59,8 @@ module Sync
                    end
 
        ### todo/check: what happens if there's more than one match? exception raised??
-       rec = if ['N. N.'].include?( team1_name ) && ## some special cases - always assume new record for now (to avoid ambigious update conflict)
-                ['N. N.'].include?( team2_name )
+       rec = if ['N. N.', 'N.N.'].include?( team1_name ) && ## some special cases - always assume new record for now (to avoid ambigious update conflict)
+                ['N. N.', 'N.N.'].include?( team2_name )
                ## always assume new record for now
                ##   check for date or such - why? why not?
                nil
@@ -137,6 +139,10 @@ module Sync
        else
          # update - todo
          puts "!! ERROR - match updates not yet supported (only inserts); sorry"
+         pp match
+         puts "---"
+         puts "found match record:"
+         pp rec
          exit 1
        end
        rec

data/lib/sportdb/readers/version.rb

@@ -3,9 +3,8 @@
 module SportDb
 module Module
 module Readers
-
   MAJOR = 2    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/sportdb/readers.rb

@@ -1,5 +1,4 @@
 require 'sportdb/formats'
-require 'sportdb/catalogs'
 require 'sportdb/models'
 
 
@@ -17,7 +16,6 @@ require_relative 'readers/sync/more'
 require_relative 'readers/sync/match'  ## note  - let match sync go last
 
 ## add readers & friends
-require_relative 'readers/conf_reader'
 require_relative 'readers/match_reader'
 require_relative 'readers/package'
 
@@ -27,20 +25,10 @@ require_relative 'readers/package'
 ##
 ##  add convenience shortcut helpers
 module SportDb
-  def self.read_conf( path, season: nil )  ConfReader.read( path, season: season ); end
-  def self.parse_conf( txt, season: nil )  ConfReader.parse( txt, season: season ); end
-
   ### todo/check: add alias read_matches - why? why not?
   def self.read_match( path, season: nil )  MatchReader.read( path, season: season ); end
   def self.parse_match( txt, season: nil )  MatchReader.parse( txt, season: season ); end
 
-  def self.read_club_props( path )  Import::ClubPropsReader.read( path ); end
-  def self.parse_club_props( txt )  Import::ClubPropsReader.parse( txt ); end
-
-  def self.parse_leagues( txt ) recs = Import::LeagueReader.parse( txt ); Import.catalog.leagues.add( recs ); end
-  def self.parse_clubs( txt )   recs = Import::ClubReader.parse( txt );   Import.catalog.clubs.add( recs ); end
-
-
   def self.read( path, season: nil )
     pack = if File.directory?( path )          ## if directory assume "unzipped" package
               DirPackage.new( path )
@@ -53,17 +41,9 @@ module SportDb
     if pack
        pack.read( season: season )
     else
-      if Package.conf?( path )      ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
-        read_conf( path, season: season )
-      elsif Package.club_props?( path )
-        read_club_props( path )
-      else                                ## assume "regular" match datafile
-        read_match( path, season: season )
-      end
+       read_match( path, season: season )
     end
   end  # method read
-
-
 end # module SportDb
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-formats
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: sportdb-catalogs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: sportdb-models
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +89,6 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/readers.rb
-- lib/sportdb/readers/conf_reader.rb
 - lib/sportdb/readers/match_reader.rb
 - lib/sportdb/readers/package.rb
 - lib/sportdb/readers/sync/club.rb

data/lib/sportdb/readers/conf_reader.rb

@@ -1,99 +0,0 @@
-
-module SportDb
-
-
-class ConfReader    ## todo/check: rename to EventsReaderV2 (use plural?) why? why not?
-
-  def self.read( path, season: nil )   ## use - rename to read_file or from_file etc. - why? why not?
-    txt = File.open( path, 'r:utf-8' ) {|f| f.read }
-    parse( txt, season: season )
-  end
-
-  def self.parse( txt, season: nil )
-    new( txt ).parse( season: season )
-  end
-
-
-  include Logging
-
-  def initialize( txt )
-    @txt = txt
-  end
-
-  def parse( season: nil )
-    secs = LeagueOutlineReader.parse( @txt, season: season )
-    pp secs
-
-    ## pass 1 - check & map; replace inline (string with record)
-    secs.each do |sec|    # sec(tion)s
-
-      conf = ConfParser.parse( sec[:lines] )
-
-      league = sec[:league]
-      teams = []    ## convert lines to teams
-
-      if league.clubs?
-        if league.intl?
-          conf.each do |name, rec|
-            country_key = rec[:country]
-            teams << catalog.clubs.find_by!( name: name,
-                                            country: country_key )
-          end
-        else
-          conf.each do |name, _|
-            ## note: rank and standing gets ignored (not used) for now
-            teams << catalog.clubs.find_by!( name:  name,
-                                             league: league )
-          end
-        end
-      else   ### assume national teams
-        conf.each do |name, _|
-          ## note: rank and standing gets ignored (not used) for now
-          teams << catalog.national_teams.find!( name )
-        end
-      end
-
-
-      sec[:teams] = teams
-
-      sec.delete( :lines )   ## remove lines entry
-    end
-
-
-    ## pass 2 - import (insert/update) into db
-    secs.each do |sec|   # sec(tion)s
-       ## todo/fix: always return Season struct record in LeagueReader - why? why not?
-       event_rec  = Sync::Event.find_or_create_by( league: sec[:league],
-                                                   season: sec[:season] )
-
-       stage_rec  = if sec[:stage]
-                      Sync::Stage.find_or_create( sec[:stage], event: event_rec )
-                    else
-                      nil
-                    end
-
-       ## todo/fix: check if all teams are unique
-       ##   check if uniq works for club/national_team record (struct) - yes,no ??
-       teams = sec[:teams]
-       teams = teams.uniq
-
-       ## add to database
-       team_recs     =  stage_rec ? stage_rec.teams    : event_rec.teams
-       team_ids      =  stage_rec ? stage_rec.team_ids : event_rec.team_ids
-
-       new_team_recs = Sync::Team.find_or_create( teams )
-       new_team_recs.each do |team_rec|
-         ## add teams to event
-         ##   for now check if team is alreay included
-         ##   todo/fix: clear/destroy_all first - why? why not!!!
-         team_recs << team_rec    unless team_ids.include?( team_rec.id )
-       end
-    end
-
-    true   ## todo/fix: return true/false or something
-  end # method read
-
-  def catalog() Import.catalog; end  ## shortcut convenience helper
-
-end # class ConfReader
-end # module SportDb