sportdb-models 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8222b8d66c000dbd1e891ea4bc7aad1c43fdb25c
-  data.tar.gz: 5a1cf9608b78f92bde855509e2690025f6604b27
+  metadata.gz: 77ac65c3b4cbd22f7a45a5c1a3fe0397f7ddf41a
+  data.tar.gz: b9f9c90af5b5b65cb4c5ab5bbb7cff38805f84c1
 SHA512:
-  metadata.gz: 99a04b1b354c0655e28a6124f473106792e03d4d5eb7eb5af22a8c4d7b7c48cffdbf0c533fcf83458ae13e9ff524be6d2d18ba689027b46735bd793e8b57f578
-  data.tar.gz: 38ca6f564cc5b228264e1933df462e8dc5aa82739d7b43be4e9bdfe18e2bbfacea2f506168e1788ded408a12c94686f83b5baccfe5ae7e2726b700b97c8eb864
+  metadata.gz: e3b4ef1698e08a54c84c2139a0c025578677a41487ab1a267dce27ac684b033fa0fcc407652631749d21af5f8233c1e70fbf81c33ce71249e7be405030401849
+  data.tar.gz: 83f8c56ad5052e664e8c62d5c48c253c75dfb3c1c68e96155a902a22323c42fd4b5ec05ac1b36a28a06746a69798cfaabf58afd0c68cd8d8ecfd46fb2bd97b9a

data/Manifest.txt

@@ -1,24 +1,12 @@
-HISTORY.md
+CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-config/fixtures/de.yml
-config/fixtures/en.yml
-config/fixtures/es.yml
-config/fixtures/fr.yml
-config/fixtures/it.yml
-config/fixtures/pt.yml
-config/fixtures/ro.yml
-data/seasons.txt
-data/setups/all.txt
 lib/sportdb/calc.rb
-lib/sportdb/csv_reader.rb
 lib/sportdb/deleter.rb
-lib/sportdb/finders/date.rb
 lib/sportdb/finders/goals.rb
 lib/sportdb/finders/scores.rb
 lib/sportdb/indexers/team.rb
-lib/sportdb/lang.rb
 lib/sportdb/mapper_teams.rb
 lib/sportdb/matcher.rb
 lib/sportdb/models.rb
@@ -145,15 +133,12 @@ test/data/world-cup/teams_1974.txt
 test/helper.rb
 test/test_assoc_reader.rb
 test/test_changes.rb
-test/test_csv_reader.rb
 test/test_cursor.rb
-test/test_date.rb
 test/test_event_meta_reader.rb
 test/test_event_reader.rb
 test/test_event_table_reader.rb
 test/test_goals.rb
 test/test_indexer_team.rb
-test/test_lang.rb
 test/test_load.rb
 test/test_pp.rb
 test/test_reader.rb

data/Rakefile

@@ -9,7 +9,7 @@ Hoe.spec 'sportdb-models' do
   self.summary = "sportdb-models - sport.db schema 'n' models for easy (re)use"
   self.description = summary
 
-  self.urls    = ['https://github.com/sportdb/sport.db.models']
+  self.urls    = ['https://github.com/sportdb/sport.db']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'
@@ -17,18 +17,17 @@ Hoe.spec 'sportdb-models' do
   # switch extension to .markdown for gihub formatting
   #  -- NB: auto-changed when included in manifest
   self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['worlddb-models', '>= 2.1.0'],    # Note: pull in all (extra) dependencies va worlddb-models
-    ['persondb-models', '>= 0.4.2'],     # persons (people) table
+    ['worlddb-models', '>= 2.4.0'],    # Note: pull in all (extra) dependencies va worlddb-models
+    ['persondb-models', '>= 0.5.0'],     # persons (people) table
+    ['sportdb-formats', '>= 0.1.2'],
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 1.9.2'
+    required_ruby_version: '>= 2.2.2'
   }
-
 end
-

data/lib/sportdb/models.rb

@@ -2,13 +2,14 @@
 
 
 # core and stlibs  (note: get included via worlddb-models gem; see worlddb-models gem/lib)
-require 'csv'    # used by  CsvGameReader
-
-
 require 'worlddb/models'     # NOTE: include worlddb-models gem (not cli tools gem, that is, worlddb)
 require 'persondb/models'
 
 
+require 'sportdb/formats'   ## todo/fix: move all readers out-of-models AND than (finally) remove sportdb/formats dependency
+
+
+
 # our own code
 
 require 'sportdb/version'    # let version always go first
@@ -51,7 +52,6 @@ require 'sportdb/models/utils'   # e.g. GameCursor
 
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 
-require 'sportdb/finders/date'
 require 'sportdb/finders/scores'
 
 require 'sportdb/utils'
@@ -71,7 +71,7 @@ require 'sportdb/mapper_teams'
 require 'sportdb/finders/goals'   # no: requires FixturesHelpers
 
 require 'sportdb/readers/assoc'
-require 'sportdb/readers/event'           ## old event reader (remove later??) 
+require 'sportdb/readers/event'           ## old event reader (remove later??)
 require 'sportdb/readers/event_table'     ## new "standard" event reader
 require 'sportdb/readers/event_meta'      ## new "standard" event reader for meta data
 require 'sportdb/readers/game'
@@ -88,8 +88,6 @@ require 'sportdb/reader_zip'
 require 'sportdb/indexers/team'
 
 
-require 'sportdb/lang'
-
 require 'sportdb/deleter'
 require 'sportdb/stats'
 
@@ -97,35 +95,15 @@ require 'sportdb/pretty_printer'
 
 ## "simplified" match reader for rsssf-formated/style leagues
 require 'sportdb/rsssf_reader'
-require 'sportdb/csv_reader'
 
 
 module SportDb
 
-  def self.config_path
-    "#{root}/config"
-  end
-
-  def self.data_path
-    "#{root}/data"
-  end
-
   def self.test_data_path
     "#{root}/test/data"
   end
 
 
-  def self.lang
-    # todo/fix: find a better way for single instance ??
-    #  will get us ruby warning:  instance variable @lang not initialized   => find a better way!!!
-    #   just use @lang w/o .nil?  e.g.
-    #  @lang =|| Lang.new   why? why not??  or better use @@lang =|| Lang.new  for class variable!!!
-     if @lang.nil?
-       @lang = Lang.new
-     end
-     @lang
-  end
-
 
   def self.create
     CreateDb.new.up
@@ -159,7 +137,7 @@ module SportDb
   end
 
   def self.read_builtin
-    read_setup( 'setups/all', data_path )
+    puts "!! WARN - deprecated SportDb.read_builtin call - remove!! no longer in use; will get removed soon"
   end
 
 
@@ -221,7 +199,7 @@ module SportDb
     end
 
     ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
-    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3' 
+    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3'
       # quick hack for JRuby sqlite3 support via jdbc
       puts "jruby quick hack - adding jdbc libs for jruby sqlite3 database support"
       require 'jdbc/sqlite3'
@@ -234,7 +212,7 @@ module SportDb
     ActiveRecord::Base.establish_connection( config )
     # ActiveRecord::Base.logger = Logger.new( STDOUT )
 
-    ## if sqlite3 add (use) some pragmas for speedups 
+    ## if sqlite3 add (use) some pragmas for speedups
     if config[:adapter] == 'sqlite3'
       ## check/todo: if in memory e.g. ':memory:' no pragma needed!!
       con = ActiveRecord::Base.connection

data/lib/sportdb/version.rb

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

data/test/test_assoc_reader.rb

@@ -3,8 +3,6 @@
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_assoc_reader.rb
-#  or better
-#     rake -I ./lib test
 
 
 require 'helper'
@@ -153,7 +151,7 @@ class TestAssocReaderXX < MiniTest::Test    # note: TestAssocReader alreay defin
     assocreader.read()
 
     assert_equal 20, Assoc.count
-    
+
     ## add countries
     countries = [['mx', 'Mexico', 'MEX'],
                  ['us', 'United States', 'USA'],

data/test/test_changes.rb

@@ -1,5 +1,9 @@
 # encoding: utf-8
 
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_changes.rb
+
 require 'helper'
 
 class TestChanges < MiniTest::Test
@@ -23,11 +27,11 @@ class TestChanges < MiniTest::Test
       score1p:  nil,
       score2p:  nil
     }
-    
+
     assert_equal  false, game1.check_for_changes( game_attribs )
     assert_equal  true,  game2.check_for_changes( game_attribs )
   end
-  
+
   def test_play_at
     game1 = Game.new
     game1.score1 = 1
@@ -44,7 +48,7 @@ class TestChanges < MiniTest::Test
       score2:  2,
       play_at: DateTime.new( 2012, 11, 5 )
     }
-    
+
     assert_equal  false, game1.check_for_changes( game_attribs )
     assert_equal  true,  game2.check_for_changes( game_attribs )
   end
@@ -65,10 +69,10 @@ class TestChanges < MiniTest::Test
       score2:  2,
       group_id: 1
     }
-    
+
     assert_equal  false, game1.check_for_changes( game_attribs )
     assert_equal  true,  game2.check_for_changes( game_attribs )
   end
 
-  
+
 end # class TestChanges

data/test/test_cursor.rb

@@ -1,12 +1,17 @@
 # encoding: utf-8
 
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_cursor.rb
+
+
 require 'helper'
 
 class TestCursor < MiniTest::Test
 
   def test_games
     games = []
-    
+
     games << Game.new( score1: 3, score2: 1, play_at: DateTime.new(2013, 8, 9) )
     games << Game.new( score1: 1, score2: 3, play_at: DateTime.new(2013, 8, 10) )
     games << Game.new( score1: 2, score2: 0, play_at: DateTime.new(2013, 8, 10) )

data/test/test_event_meta_reader.rb

@@ -3,8 +3,6 @@
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_event_meta_reader.rb
-#  or better
-#     rake -I ./lib test
 
 
 require 'helper'
@@ -47,4 +45,3 @@ class TestEventMetaReaderXX < MiniTest::Test  # note: TestEventMetaReader alreay
   end
 
 end # class TestEventMetaReader
-

data/test/test_event_reader.rb

@@ -3,8 +3,6 @@
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_event_reader.rb
-#  or better
-#     rake -I ./lib test
 
 
 require 'helper'
@@ -31,7 +29,7 @@ class TestEventReaderXX < MiniTest::Test  # note: TestEventReader alreay defined
   def test_bl
     r = TestEventReader.from_file( 'at-austria/2015_16/1-bundesliga' )
     r.read
-    
+
     pp r.fixtures
 
     assert_equal ['1-bundesliga-i', '1-bundesliga-ii'], r.fixtures
@@ -59,10 +57,8 @@ class TestEventReaderXX < MiniTest::Test  # note: TestEventReader alreay defined
 
     r = TestEventReader.from_file( 'at-austria/2015_16/cup' )
     r.read
- 
+
     assert true   ## if we get here; assume everything ok
   end
 
 end # class TestEventReader
-
-

data/test/test_event_table_reader.rb

@@ -3,8 +3,6 @@
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_event_table_reader.rb
-#  or better
-#     rake -I ./lib test
 
 
 require 'helper'
@@ -52,10 +50,8 @@ class TestEventTableReaderXX < MiniTest::Test  # note: TestEventTableReader alre
 
     r = TestEventReader.from_file( 'at-austria/2015_16/cup' )
     r.read
- 
+
     assert true   ## if we get here; assume everything ok
   end
 
 end # class TestEventReader
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2019-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: persondb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: sportdb-formats
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -71,31 +85,19 @@ email: opensport@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
-- config/fixtures/de.yml
-- config/fixtures/en.yml
-- config/fixtures/es.yml
-- config/fixtures/fr.yml
-- config/fixtures/it.yml
-- config/fixtures/pt.yml
-- config/fixtures/ro.yml
-- data/seasons.txt
-- data/setups/all.txt
 - lib/sportdb/calc.rb
-- lib/sportdb/csv_reader.rb
 - lib/sportdb/deleter.rb
-- lib/sportdb/finders/date.rb
 - lib/sportdb/finders/goals.rb
 - lib/sportdb/finders/scores.rb
 - lib/sportdb/indexers/team.rb
-- lib/sportdb/lang.rb
 - lib/sportdb/mapper_teams.rb
 - lib/sportdb/matcher.rb
 - lib/sportdb/models.rb
@@ -222,15 +224,12 @@ files:
 - test/helper.rb
 - test/test_assoc_reader.rb
 - test/test_changes.rb
-- test/test_csv_reader.rb
 - test/test_cursor.rb
-- test/test_date.rb
 - test/test_event_meta_reader.rb
 - test/test_event_reader.rb
 - test/test_event_table_reader.rb
 - test/test_goals.rb
 - test/test_indexer_team.rb
-- test/test_lang.rb
 - test/test_load.rb
 - test/test_pp.rb
 - test/test_reader.rb
@@ -246,7 +245,7 @@ files:
 - test/test_standings_ii.rb
 - test/test_utils.rb
 - test/test_winner.rb
-homepage: https://github.com/sportdb/sport.db.models
+homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
@@ -260,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="