sportdb-importers 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a21cdc02ddf3bef0f067f6bab0d369d0618ac0c
-  data.tar.gz: bd325b2ce078afaa1ecc32a8ab2280dd463b22e8
+  metadata.gz: 03d3875605ad42d0fd7876f036c2bbbe2dd8999d
+  data.tar.gz: 92435a82e496ef1ca09a9e44395038a81c7b5b21
 SHA512:
-  metadata.gz: 320f53db2ab141a2994f7b0b8280daef4b066a951894270228c1671f10498db7c4e502f4418f588155b21309086c240ed92ed135318098167ff4225e5dda5f46
-  data.tar.gz: fc0b0adeeae78f515e7c6b1a8d6878dfc21b62d3c6ff1fef8155225a0a23551bd2e9c330e687b737a2e5c16880fd625220dd28d2dae21d15ccd144582f0a5f1b
+  metadata.gz: ac4fea2f6fc7b2fc7d5d981e792977bd1bb44ae8de3bcd72bacae4583828f02f76a1785f9e91f7d68036e10b4743f1cd561e610b1e41612b058c634f5f1b1537
+  data.tar.gz: 2ff8b5dc6f53994431cba566e2031834aa61fd2d6f668a8d4a61af177783791b4981946b58e587ddd2a199f8fa6469ce006925b607111529359503afc627479e

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec 'sportdb-importers' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-sync', '>= 1.0.0'],
+    ['sportdb-sync', '>= 1.1.0'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/importers.rb

@@ -33,10 +33,10 @@ def read_csv( start: nil )    ### todo/fix - rename to read_csv !!!!!!
       event = CsvEventImporter.parse( entry.read, league:  league_key,
                                                   season:  season_key )
 
-      puts "added #{event.title} - from source >#{entry.name}<"
+      puts "added #{event.name} - from source >#{entry.name}<"
       puts "  #{event.teams.size} teams"
+      puts "  #{event.matches.size} matches"
       puts "  #{event.rounds.size} rounds"
-      puts "  #{event.games.size} games"
     end  # each datafile
   end # each season
 end # method import
@@ -63,10 +63,10 @@ def self.read_csv( path )
     event = CsvEventImporter.read( full_path, league: league_key,
                                               season: season_key )
 
-    puts "added #{event.title} - from source >#{path}<"
+    puts "added #{event.name} - from source >#{path}<"
     puts "  #{event.teams.size} teams"
+    puts "  #{event.matches.size} matches"
     puts "  #{event.rounds.size} rounds"
-    puts "  #{event.games.size} games"
   end
 end
 end  # module SportDb

data/lib/sportdb/importers/import.rb

@@ -92,12 +92,12 @@ class CsvEventImporter
 
 
     ## add catch-all/unclassified "dummy" round
-    round_rec = Model::Round.create!(
-      event_id: event_rec.id,
-      title:    'Matchday ??? / Missing / Catch-All',   ## find a better name?
-      pos:      999,
-      start_at: event_rec.start_at.to_date
-    )
+    # round_rec = Model::Round.create!(
+    #  event_id: event_rec.id,
+    #  title:    'Matchday ??? / Missing / Catch-All',   ## find a better name?
+    #  pos:      999,
+    #  start_at: event_rec.start_at.to_date
+    # )
 
     ## add matches
     matches.each do |match|
@@ -108,12 +108,17 @@ class CsvEventImporter
         puts "!!! WARN: skipping match - play date missing!!!!!"
         pp match
       else
-        rec = Model::Game.create!(
+        ## find last pos - check if it can be nil?  yes, is nil if no records found
+        max_pos = Model::Match.where( event_id: event_rec.id ).maximum( 'pos' )
+        max_pos = max_pos ? max_pos+1 : 1
+
+        rec = Model::Match.create!(
+                event_id: event_rec.id,
                 team1_id: team1_rec.id,
                 team2_id: team2_rec.id,
-                round_id: round_rec.id,
-                pos:      999,    ## make optional why? why not? - change to num?
-                play_at:  Date.strptime( match.date, '%Y-%m-%d' ),
+                ## round_id: round_rec.id,  -- note: now optional
+                pos:      max_pos,
+                date:     Date.strptime( match.date, '%Y-%m-%d' ),
                 score1:   match.score1,
                 score2:   match.score2,
                 score1i:  match.score1i,

data/lib/sportdb/importers/version.rb

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

data/test/test_import.rb

@@ -41,9 +41,9 @@ class TestImport < MiniTest::Test
                                      )
 
     assert_equal 20,   event_rec.teams.count
-    assert_equal 380,  event_rec.games.count
+    assert_equal 380,  event_rec.matches.count
 
-    rec = event_rec.games.first
+    rec = event_rec.matches.first
     assert_equal 'Arsenal FC',          rec.team1.name
     assert_equal 'Leicester City FC',   rec.team2.name
     assert_equal 4,   rec.score1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-importers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-sync
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement