sportdb-sync 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cdadfa4b00e61764c6b7b1f62ffb983f89c4a1ff
-  data.tar.gz: 3721087e4b6ff6bf0e604a00cce8658df1cb05bb
+SHA256:
+  metadata.gz: b73ed85dddf1c7c27f9b7e4d5bbcc6989d9e032c44f5458053da0d4adbdafe5a
+  data.tar.gz: ca78db4bdc48da80911d8b33c06e8e87a708d19f8dc02856c2a7d6683b8fb719
 SHA512:
-  metadata.gz: 18c37a874743c779fabc931f8e09c14a30e3e13609242a82cc0d2d5f14319092d103f470a8541eabfef95b0f83c0c98849b54d652fc3f9ff5615299be8e7bc17
-  data.tar.gz: 2dd81facb4bbcd8a36c09d66d894288660724f058121799f5a6c29a64ece00c115eb6c257ef3075b2b8231a01e8e5a70afc6c4cb7f793e61752113acbf577344
+  metadata.gz: 4162570a44409f4b020196a1050ffb5bd78bbf509db6475c73e55bd419a54c8e5ca3996477ca93595ac0822ace0cf82e6ef9d9d99683a5f1bdbb8aef363877f6
+  data.tar.gz: 0ddacac8500613b4649a27aeb7a77e502cc1e31858f3c6fa4e66dc5d175aca78a3d6f9bdd4cff1a9ee04dc00f72a0286cf9722481d9a85356b433387824585f1

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 1.2.0
+
 ### 0.0.1 / 2019-11-04
 
 * Everything is new. First release.

data/Manifest.txt

@@ -10,7 +10,3 @@ lib/sportdb/sync/league.rb
 lib/sportdb/sync/season.rb
 lib/sportdb/sync/sync.rb
 lib/sportdb/sync/version.rb
-test/helper.rb
-test/test_country.rb
-test/test_league.rb
-test/test_misc.rb

data/README.md

@@ -5,7 +5,6 @@
 * bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb-sync](https://rubygems.org/gems/sportdb-sync)
 * rdoc  :: [rubydoc.info/gems/sportdb-sync](http://rubydoc.info/gems/sportdb-sync)
-* forum :: [opensport](http://groups.google.com/group/opensport)
 
 
 
@@ -21,8 +20,10 @@ The `sportdb-sync` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 
+
+
 ## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)
+

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'sportdb-sync' do
   self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email  = 'opensport@googlegroups.com'
+  self.email  = 'gerald.bauer@gmail.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
@@ -20,8 +20,8 @@ Hoe.spec 'sportdb-sync' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-catalogs',  '>= 1.0.0'],
-    ['sportdb-models',    '>= 2.0.2'],
+    ['sportdb-catalogs',  '>= 1.2.0'],
+    ['sportdb-models',    '>= 2.1.0'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/sync/country.rb

@@ -9,7 +9,7 @@ module SportDb
 
     def self.country( q )
        ## note: use built-in countries for mapping country keys/codes
-       country = Import.catalog.countries.find( q )
+       country = Import.world.countries.find( q )
        if country
         ## todo/check:  keep key mapping warning - useful? why? why not?
          if country.key != q.to_s
@@ -24,6 +24,9 @@ module SportDb
 
     ########################
     #  searchers
+    #
+    #  - fix!!!! - remove searchers - why? why not?
+    #                check if used anywhere ????
 
     def self.search!( q )
       country = country( q )

data/lib/sportdb/sync/season.rb

@@ -2,7 +2,7 @@ module SportDb
   module Sync
     class Season
       def self.season( q )    ## helper for season key (rename to norm_key ???)
-        Import::Season.new( q )
+        ::Season.parse( q )
       end
 
 

data/lib/sportdb/sync/sync.rb

@@ -192,7 +192,12 @@ module SportDb
                    end
 
        ### todo/check: what happens if there's more than one match? exception raised??
-       rec = if round_rec
+       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 )
+               ## always assume new record for now
+               ##   check for date or such - why? why not?
+               nil
+             elsif round_rec
                ## add match status too? allows [abandoned] and [replay] in same round
                find_attributes = { round_id: round_rec.id,
                                    team1_id: team1_rec.id,
@@ -217,7 +222,9 @@ module SportDb
                      team1_id: team1_rec.id,
                      team2_id: team2_rec.id,
                      pos:      max_pos,
-                     date:     match.date.to_date,  ## todo/fix: split and add date & time!!!!
+                     # date:     match.date.to_date,  ## todo/fix: split and add date & time!!!!
+                     date:     match.date,  # assume iso format as string e.g. 2021-07-10 !!!
+                     time:     match.time,  # assume iso format as string e.g. 21:00 !!!
                      score1:   match.score1,
                      score2:   match.score2,
                      score1i:  match.score1i,
@@ -233,6 +240,34 @@ module SportDb
          attribs[ :stage_id ] = stage_rec.id   if stage_rec
 
          rec = Model::Match.create!( attribs )
+
+
+         #############################################
+         ### try to update goals
+         ####   quick & dirty v0 - redo !!!!
+         goals = match.goals
+          if goals && goals.size > 0
+            goals.each do |goal|
+               person_rec = Model::Person.find_by(
+                                           name: goal.name )
+               if person_rec.nil?
+                 person_rec = Model::Person.create!( 
+                                key:  goal.name.downcase.gsub( /[^a-z]/, '' ),
+                                name: goal.name
+                 )
+               end
+               Model::Goal.create!(
+                  match_id:  rec.id,
+                  person_id: person_rec.id, 
+                  team_id:   goal.team == 1 ? rec.team1.id 
+                                            : rec.team2.id,
+                  minute:    goal.minute,
+                  offset:    goal.offset,
+                  penalty:   goal.penalty,
+                  owngoal:   goal.owngoal,               
+               )
+            end
+          end
        else
          # update - todo
          puts "!! ERROR - match updates not yet supported (only inserts); sorry"

data/lib/sportdb/sync/version.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 
 module SportDb
@@ -6,8 +5,8 @@ module Module
 module Sync
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
-  PATCH = 2
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -15,7 +14,7 @@ module Sync
   end
 
   def self.banner
-    "sportdb-sync/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "sportdb-sync/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root

data/lib/sportdb/sync.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'sportdb/catalogs'
 require 'sportdb/models'   ## add sql database support
 
@@ -7,13 +5,13 @@ require 'sportdb/models'   ## add sql database support
 
 ###
 # our own code
-require 'sportdb/sync/version' # let version always go first
-require 'sportdb/sync/country'
-require 'sportdb/sync/league'
-require 'sportdb/sync/season'
-require 'sportdb/sync/event'
-require 'sportdb/sync/club'
-require 'sportdb/sync/sync'
+require_relative 'sync/version' # let version always go first
+require_relative 'sync/country'
+require_relative 'sync/league'
+require_relative 'sync/season'
+require_relative 'sync/event'
+require_relative 'sync/club'
+require_relative 'sync/sync'
 
 
 puts SportDb::Module::Sync.banner   # say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-sync
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-catalogs
@@ -16,59 +16,65 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sportdb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.1'
 description: sportdb-sync - sport.db sync helpers for leagues, seasons, clubs, match
   schedules and results, and more
-email: opensport@googlegroups.com
+email: gerald.bauer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -88,15 +94,11 @@ files:
 - lib/sportdb/sync/season.rb
 - lib/sportdb/sync/sync.rb
 - lib/sportdb/sync/version.rb
-- test/helper.rb
-- test/test_country.rb
-- test/test_league.rb
-- test/test_misc.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -113,9 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: sportdb-sync - sport.db sync helpers for leagues, seasons, clubs, match schedules
   and results, and more

data/test/helper.rb

@@ -1,32 +0,0 @@
-## note: use the local version of sportdb gems
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-formats/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-catalogs/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-models/lib' ))
-
-
-## minitest setup
-require 'minitest/autorun'
-
-
-## our own code
-require 'sportdb/sync'
-
-
-## use (switch to) "external" datasets
-SportDb::Import.config.leagues_dir = "../../../openfootball/leagues"
-SportDb::Import.config.clubs_dir   = "../../../openfootball/clubs"
-
-
-COUNTRIES = SportDb::Import.catalog.countries
-LEAGUES   = SportDb::Import.catalog.leagues
-CLUBS     = SportDb::Import.catalog.clubs
-
-
-SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
-SportDb.create_all   ## build schema
-
-## turn on logging to console
-## ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-
-

data/test/test_country.rb

@@ -1,50 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_country.rb
-
-
-require 'helper'
-
-
-class TestCountry < MiniTest::Test
-
-  Country = SportDb::Sync::Country
-
-  def test_find  # note: find uses "data" structs
-    at  = SportDb::Import::Country.new( key: 'at',  name: 'Austria', code: 'AUT' )
-    eng = SportDb::Import::Country.new( key: 'eng', name: 'England', code: 'ENG' )
-
-    rec  = Country.find_or_create( at )
-    rec2 = Country.find_or_create( at )
-
-    rec  = Country.find_or_create( eng )
-    rec2 = Country.find_or_create( eng )
-  end  # method test_find
-
-
-  def test_search  # note: search uses query strings
-    rec = Country.search_or_create!( 'at' )  ## try (iso-alpha2) key
-    assert_equal 'Austria', rec.name
-    assert_equal 'at',      rec.key
-    assert_equal 'AUT',     rec.code
-
-    rec = Country.search_or_create!( 'aut' )  ## try fifa code
-    assert_equal 'Austria', rec.name
-    assert_equal 'at',      rec.key
-    assert_equal 'AUT',     rec.code
-
-
-    rec = Country.search_or_create!( 'eng' )
-    assert_equal 'England', rec.name
-    assert_equal 'eng',     rec.key
-    assert_equal 'ENG',     rec.code
-
-    rec = Country.search_or_create!( 'eng' )
-    assert_equal 'England', rec.name
-    assert_equal 'eng',     rec.key
-    assert_equal 'ENG',     rec.code
-  end
-
-end  # class TestCountry

data/test/test_league.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_league.rb
-
-
-require 'helper'
-
-class TestLeague < MiniTest::Test
-
-  League = SportDb::Sync::League
-
-
-  def test_search
-    rec = League.search_or_create!( 'eng' )
-    assert_equal 'Premier League',  rec.name
-    assert_equal 'eng.1',           rec.key
-    assert_equal 'eng',             rec.country.key
-    assert_equal 'England',         rec.country.name
-    # assert_equal true,              rec.clubs
-
-    rec = League.search!( 'eng' )
-    assert_equal 'Premier League',  rec.name
-    assert_equal 'eng.1',           rec.key
-    assert_equal 'eng',             rec.country.key
-    assert_equal 'England',         rec.country.name
-    ## assert_equal true,              rec.clubs
-
-    ## try 2nd call (just lookup)
-    rec = League.search_or_create!( 'eng' )
-    assert_equal 'Premier League', rec.name
-    assert_equal 'eng.1',          rec.key
-    assert_equal 'eng',            rec.country.key
-    assert_equal 'England',        rec.country.name
-    ## assert_equal true,                 rec.clubs
-  end
-end # class TestLeague

data/test/test_misc.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_misc.rb
-
-
-require 'helper'
-
-class TestMisc < MiniTest::Test
-
-  Season = SportDb::Sync::Season
-
-
-  def test_season
-    rec = Season.search_or_create( '2017-18' )
-    assert_equal '2017/18', rec.name
-    assert_equal '2017/18', rec.key
-
-    rec = Season.search_or_create( '2017/2018' )
-    assert_equal '2017/18', rec.name
-    assert_equal '2017/18', rec.key
-
-    rec = Season.search_or_create( '2017/8' )
-    assert_equal '2017/18', rec.name
-    assert_equal '2017/18', rec.key
-  end
-
-end # class TestMisc