sportdb-sync 1.1.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d6f63ecc82fe0773b77ffac62a59b62a70ac018
-  data.tar.gz: cf11d7385ccde200b85638cd1de92b830ab2696c
+SHA256:
+  metadata.gz: 3bdf919dce7808af99d9c66bf40176532535fecdb8545a03217451a872b6671f
+  data.tar.gz: f8f4274d7155b6685bfdf023fd9c1a9de204786d1bbbdb615dbbc11ecb0639fc
 SHA512:
-  metadata.gz: e7ed1a5553ff8d1a79dcbc56efbe9b681dd6aeaa20c18fb1e1a85541329163ef53afc2217609955e66e295155c58edb0e247308b93cfa15e143e86e3d7e5e700
-  data.tar.gz: e21fed2e8925f362b9c5b135db21f5d466e4758f04d8f591762db3e37ad4f55814c0337a7c256ec8c8c398dd7d767cb221a51f8c1dd71bb830c4b35999afc1a0
+  metadata.gz: d81a3eae0228f7e21914eb203a5fec6b300299c8b3fdbeef2fb549d81f48c2f0c73400440fbf9eda1171e22298f9c9f40730daf3ff27c57b153d894f162b61ca
+  data.tar.gz: ae09a9f1d26a09318d37e12e4857defcef1ce9b030ec9d46f9307a6b77db5d3097f1aed8c5596bf498655db1a7bc17a757f06a87e263db58511d92e72e636b7e

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 1.2.1
+
 ### 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

@@ -222,7 +222,10 @@ 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!!!!
+                     num:      match.num,   ## note - might be nil (not nil for euro, world cup, etc.)
+                     # 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,
@@ -238,6 +241,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 = 3
+  MINOR = 2
+  PATCH = 1
   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.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2024-06-27 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