sportdb-formats 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216e15369403af5707b3d2c6d82fcd6c72e2712d
-  data.tar.gz: 5c73e0e7ce7309b2c8fb86e38d90d1d566f80688
+  metadata.gz: 4cdd2bc410771494ed506a24d384ca3c8b1c9684
+  data.tar.gz: 066f5288da503a00efe280369f57d6cd65bf4bf7
 SHA512:
-  metadata.gz: 8033e4db4d7b047b37ec8b3be61657d15df72b7a6c6295317ca8c9cd19c0f578f2ecd75c25cf11b0dcb9218c1ff3e8d2a8e0efb0c59ae235b568b353ef55c9d6
-  data.tar.gz: e5b510b45d4c28c6d83d6baa43ef954e78ae64af116c8305a983b5c54d2fda486425a793b48c8332dcf8cf5c441da37f7183602d50a7e07066049995b5940f0f
+  metadata.gz: f61edee9495047fc49dfb5720c7afc1e0e316e5fab024d8fc0b1bd5fcdad70524f6e22d24d8fad0aa679380565e0a0c7e36fae79c170655f8a7a496dee170aca
+  data.tar.gz: b378202d2c8152ac46386618d3c69c03d802b1439e74175f8d84fad304ce111edb0bb1cd848fc969848ce55e0cf8de15a46bec322351d5d199652ed16d41b164

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

@@ -100,6 +100,9 @@ module SportDb
          ## optional headers - note: find_header returns nil if header NOT found
          header_stage = find_header( headers, ['Stage'] )
          headers_mapping[:stage]  =  header_stage   if header_stage
+
+         header_league = find_header( headers, ['League'] )
+         headers_mapping[:league] = header_league   if header_league
       else
          ## else try footballdata.uk and others
          headers_mapping[:team1]  = find_header( headers, ['HomeTeam', 'HT', 'Home'] )
@@ -290,13 +293,17 @@ module SportDb
                  end
       end
 
+      league = nil
+      league = row[ headers_mapping[ :league ]]   if headers_mapping[ :league ]
+
 
       match = Import::Match.new( date:    date,
                                  team1:   team1,   team2:   team2,
                                  score1:  score1,  score2:  score2,
                                  score1i: score1i, score2i: score2i,
                                  round:   round,
-                                 stage:   stage )
+                                 stage:   stage,
+                                 league:  league )
       matches << match
     end
 

data/lib/sportdb/formats/package.rb

@@ -73,6 +73,10 @@ module SportDb
                        /[a-z0-9_.-]+\.csv$  ## note: allow dot (.) too e.g /eng.1.csv
                     }x
 
+    ### add "generic" pattern to find all csv datafiles
+    CSV_RE = %r{ (?: ^|/ )
+                   [a-z0-9_.-]+\.csv$  ## note: allow dot (.) too e.g /eng.1.csv
+               }x
 
 
     ## move class-level "static" finders to DirPackage (do NOT work for now for zip packages) - why? why not?
@@ -118,6 +122,7 @@ module SportDb
    end
    ## add match_match and match_match_csv  - why? why not?
 
+
    class << self
      alias_method :match_teams?, :match_teams
      alias_method :teams?,       :match_teams
@@ -212,6 +217,8 @@ module SportDb
       end
     end
     def each_match_csv( &blk )  each( pattern: MATCH_CSV_RE, &blk ); end
+    def each_csv( &blk )        each( pattern: CSV_RE, &blk );       end
+
     def each_club_props( &blk ) each( pattern: CLUB_PROPS_RE, &blk ); end
 
     def each_leagues( &blk )    each( pattern: LEAGUES_RE, &blk ); end

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

@@ -20,7 +20,8 @@ class Match
               :group,
               :conf1,    :conf2,      ## special case for mls e.g. conference1, conference2 (e.g. west, east, central)
               :country1, :country2,    ## special case for champions league etc. - uses FIFA country code
-              :comments
+              :comments,
+              :league      ## (optinal) added as text for now (use struct?)
 
   def initialize( **kwargs )
     update( kwargs )  unless kwargs.empty?
@@ -47,6 +48,9 @@ class Match
     @group    = kwargs[:group]    if kwargs.has_key? :group
     @comments = kwargs[:comments] if kwargs.has_key? :comments
 
+    @league   = kwargs[:league]   if kwargs.has_key? :league
+
+
     if kwargs.has_key?( :score )   ## check all-in-one score struct for convenience!!!
       score = kwargs[:score]
       if score.nil?   ## reset all score attribs to nil!!

data/lib/sportdb/formats/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gerald Bauer