sportdb-readers 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75121e5975c7428ee0ca635b90a1103d455d784
-  data.tar.gz: 80531e6bc8e447dc191527f0c2368cac99620b63
+  metadata.gz: 34c46804bf8dd427446628b605ecdda05a2bb283
+  data.tar.gz: 3ce074322f2281965d6f3897526f407de3952d46
 SHA512:
-  metadata.gz: eb47f23f83386d6f3bcd9df958ca0e05379c23de572312fa8889ea5066afd9f8c94158b8dc3ad275704c7e557f930f23ffe2cbd0fd814a1357b5627086b964c2
-  data.tar.gz: e8ec9a04a9b2d6190924588206cb9e3ffe625e61a280825bdc79c5faa616a1ef3e717bffdcc722b73866dc2b4a0e68133380f773b3e1a0d45a16ad3a52e892b4
+  metadata.gz: fe151a2000112a722929840be1359181734edbc1f12112ad73fd9e6aafc61eff693ffd69c241da14d5e1ec455677b23e917e17143ac8ac9867b2ec4493dc05fb
+  data.tar.gz: 74b6fd475c43379cd9ef9610f6fab4e1efc9ccbf99f0b5254bb767a999f1ce5aa37c9b6dba6b1fa097fdc139fefe4469b46af71145efcd605822659a7a1f7a6e

data/lib/sportdb/readers/package.rb

@@ -4,6 +4,9 @@ module SportDb
 
     CONF_RE        = Datafile::CONF_RE
     CLUB_PROPS_RE  = Datafile::CLUB_PROPS_RE
+    LEAGUES_RE     = Datafile::LEAGUES_REGEX   ## todo/check: rename to _RE
+    CLUBS_RE       = Datafile::CLUBS_REGEX     ## todo/check: rename to _RE
+
 
     ## note: if pattern includes directory add here (otherwise move to more "generic" datafile) - why? why not?
     MATCH_RE = %r{ /\d{4}-\d{2}        ## season folder e.g. /2019-20
@@ -36,8 +39,24 @@ module SportDb
     def each_match( &blk )      @pack.each( pattern: MATCH_RE, &blk ); end
     def each_club_props( &blk ) @pack.each( pattern: CLUB_PROPS_RE, &blk ); end
 
+    def each_leagues( &blk )    @pack.each( pattern: LEAGUES_RE, &blk ); end
+    def each_clubs( &blk )      @pack.each( pattern: CLUBS_RE, &blk ); end
+
+
+    def read_leagues
+      each_leagues do |entry|
+        SportDb.parse_leagues( entry.read )
+      end
+    end
+
+    def read_clubs
+      each_clubs do |entry|
+        SportDb.parse_clubs( entry.read )
+      end
+    end
+
 
-    def read_club_props( sync: true )
+    def read_club_props( sync: true )   ## todo/fix: remove sync!! - why? why not?
       each_club_props do |entry|
         SportDb.parse_club_props( entry.read, sync: sync )
       end
@@ -75,13 +94,15 @@ module SportDb
     def read( *names,
               season: nil, sync: true )
       if names.empty?   ##  read all datafiles
-        read_club_props( sync: sync )
+        read_leagues()
+        read_clubs()
+        read_club_props( sync: sync )   ## todo/fix: remove sync - why? why not?
         read_conf( season: season, sync: sync )
         read_match( season: season, sync: sync )
       else
         names.each do |name|
           entry = @pack.find( name )
-          ## fix/todo: add read_clubs_props too!!!
+          ## fix/todo: add read_leagues, read_clubs too!!!
           if Datafile.match_conf( name )      ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
             SportDb.parse_conf( entry.read, season: season, sync: sync )
           elsif Datafile.match_club_props( name )

data/lib/sportdb/readers/version.rb

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

data/lib/sportdb/readers.rb

@@ -58,6 +58,17 @@ module SportDb
   end
 
 
+  def self.parse_leagues( txt )
+    recs = SportDb::Import::LeagueReader.parse( txt )
+    Import::config.leagues.add( recs )
+  end
+
+  def self.parse_clubs( txt )
+    recs = SportDb::Import::ClubReader.parse( txt )
+    Import::config.clubs.add( recs )
+  end
+
+
   def self.read( path, season: nil, sync: true )
     pack = if File.directory?( path )          ## if directory assume "unzipped" package
               DirPackage.new( path )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config