footballdb-leagues 2019.12.16 → 2020.5.10

data/lib/footballdb/leagues/auto.rb

@@ -0,0 +1,30 @@
+## our own code (without "top-level" shortcuts e.g. "modular version")
+require 'footballdb/leagues'
+
+
+###
+#  add convenience top-level shortcuts / aliases
+
+module SportDb
+  module Import
+
+  class Catalog
+    def build_country_index()  CountryIndex.new( Fifa.countries ); end
+    def build_league_index()   FootballDb::Import.build_league_index; end
+
+    def countries() @countries ||= build_country_index; end
+    def leagues()   @leagues   ||= build_league_index; end
+  end
+
+  configure do |config|
+     config.catalog = Catalog.new
+  end
+
+  end # module Import
+end # module SportDb
+
+
+### add top-level (global) convenience alias
+League = SportDb::Import.catalog.leagues
+
+

data/lib/footballdb/leagues/version.rb

@@ -4,9 +4,9 @@
 module FootballDb
 module Leagues
 
-  MAJOR = 2019    ## todo: namespace inside version or something - why? why not??
-  MINOR = 12
-  PATCH = 16
+  MAJOR = 2020    ## todo: namespace inside version or something - why? why not??
+  MINOR = 5
+  PATCH = 10
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/footballdb/leagues.rb

@@ -1,10 +1,6 @@
-# encoding: utf-8
-
-
 ###
-#  sport.db gems / libraries
+#  sport.db gems / libraries via fifa
 require 'fifa'
-require 'sportdb/leagues'
 
 
 ###
@@ -15,60 +11,18 @@ require 'footballdb/leagues/version' # let version always go first
 module FootballDb
 module Import
 
-## add "fake" configuration for stand-alone usage
-class Configuration
-  def initialize
-    recs       = Fifa.countries
-    @countries = SportDb::Import::CountryIndex.new( recs )
-  end
-
-  def countries() @countries; end
-end
-
-
-
-
-class League    ## todo/check: use a module instead of class - why? why not?
-  def self.leagues()    league_index.leagues; end     ## return all leagues (struct-like) records
-  def self.all()        leagues; end  ## use ActiveRecord-like alias for leagues
-
-  def self.mappings()   league_index.mappings; end
-
-  def self.match( name )               league_index.match( name ); end
-  def self.match_by( name:, country: ) league_index.match_by( name: name, country: country ); end
-
-
-  def self.league_index
-    @league_index ||= build_league_index
-    @league_index
-  end
-
-private
   def self.build_league_index
-    if defined?( SportDb::Import::Configuration )
-       # assume running "inside" sportdb - (re)use sportdb configuration
-    else
-       # assume running "stand-alone" - setup configuration for countries / country mapping
-       config = Configuration.new
-       SportDb::Import::LeagueReader.config = config
-       SportDb::Import::LeagueIndex.config  = config
-    end
-
-    recs = SportDb::Import::LeagueReader.read( "#{FootballDb::Leagues.data_dir}/leagues.txt" )
-    league_index = SportDb::Import::LeagueIndex.new
-    league_index.add( recs )
-    league_index
+    recs = SportDb::Import::League.read( "#{FootballDb::Leagues.data_dir}/leagues.txt" )
+    index = SportDb::Import::LeagueIndex.new
+    index.add( recs )
+    index
   end
-end # class League
 
 end # module Import
 end # module FootballDb
 
 
-
-### add top-level (global) convenience alias
-League = FootballDb::Import::League
+puts FootballDb::Leagues.banner   # say hello
 
 
 
-puts FootballDb::Leagues.banner   # say hello

data/test/helper.rb

@@ -1,10 +1,7 @@
-## $:.unshift(File.dirname(__FILE__))
-
 ## minitest setup
 
 require 'minitest/autorun'
 
 
 ## our own code
-
-require 'footballdb/leagues'
+require 'footballdb/leagues/auto'

data/test/test_league.rb

@@ -11,12 +11,12 @@ class TestLeague < MiniTest::Test
 
   def test_match
     m = League.match( 'English Premier League' )
-    assert_equal 'English Premier League', m[0].name
-    assert_equal 'eng.1',                  m[0].key
-    assert_equal 'England',                m[0].country.name
+    assert_equal 'Premier League', m[0].name
+    assert_equal 'eng.1',          m[0].key
+    assert_equal 'England',        m[0].country.name
 
     m = League.match( 'ENG PL' )
-    assert_equal 'English Premier League', m[0].name
+    assert_equal 'Premier League', m[0].name
     assert_equal 'eng.1',                  m[0].key
     assert_equal 'England',                m[0].country.name
   end
@@ -26,7 +26,7 @@ class TestLeague < MiniTest::Test
     assert m.size > 1     ## more than one match expected
 
     m = League.match_by( name: 'Premier League', country: 'eng' )
-    assert_equal 'English Premier League', m[0].name
+    assert_equal 'Premier League', m[0].name
     assert_equal 'eng.1',                  m[0].key
     assert_equal 'England',                m[0].country.name
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: footballdb-leagues
 version: !ruby/object:Gem::Version
-  version: 2019.12.16
+  version: 2020.5.10
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-leagues
+  name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: fifa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.27
+        version: 2020.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.27
+        version: 2020.5.10
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -82,10 +82,11 @@ files:
 - Rakefile
 - config/leagues.txt
 - lib/footballdb/leagues.rb
+- lib/footballdb/leagues/auto.rb
 - lib/footballdb/leagues/version.rb
 - test/helper.rb
 - test/test_league.rb
-homepage: https://github.com/sportdb/sport.db
+homepage: https://github.com/sportdb/football.db
 licenses:
 - Public Domain
 metadata: {}