sportdb-models 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c8072de5db8829c62e3b726472af30146ebf320
-  data.tar.gz: ad299b7cd1fe9e2e604ac09d69894df443a6d46b
+SHA256:
+  metadata.gz: 4f4d65007750a5f87beb091e967c48e761908b79f736d8a919b165c8d8657616
+  data.tar.gz: 8ab5b00ce91188d10bbb8e915f0e6f3469d84ddb62528c47b6436db1eddbacf1
 SHA512:
-  metadata.gz: 34d296b375d07d2b3345796fb13d85482f27b46d36b954d65eff33db37d35a8debde350032bc55e5f21e62eb4efbdea9911498c9bb37f0a4d7b99ec720420337
-  data.tar.gz: ceadae3f743055cc344fff0badf8a43f145f9390cee78b9e64f7725768e3cbb00fd6a0899e9e52e8ffc67f4520f8d585efdae23fec6eb6bb72471f7d736b8d32
+  metadata.gz: d315bc6659797ce8c9afc9bb0feedb8ac14e25766eb65caedf36da082666bc0f284f0def80d62fa8b04e3789bb7f7caecd6859ca38bed607e82ffcf6a70309bf
+  data.tar.gz: c0216968600f67c288576b73efbcce26706a949ffa8e4822d74541a904ba797a55f82a4ad604d86acf5c86806f4d4204a0b1af2d0b8ae15e840c0df050ee4228

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 2.1.0
+
 ### 0.4.0 / 2012-10-16
 
 * Add plain text fixture reader/loader

data/Manifest.txt

@@ -31,7 +31,3 @@ lib/sportdb/models/schema.rb
 lib/sportdb/models/stats.rb
 lib/sportdb/models/utils.rb
 lib/sportdb/models/version.rb
-test/helper.rb
-test/test_changes.rb
-test/test_cursor.rb
-test/test_winner.rb

data/README.md

@@ -1,14 +1,12 @@
 # sportdb-models gem - sport.db schema 'n' models for easy (re)use
 
-<!--
-[![Build Status](https://secure.travis-ci.org/geraldb/sport.db.ruby.png?branch=master)](http://travis-ci.org/geraldb/sport.db.ruby)
--->
+
 
 * home  :: [github.com/sportdb/sport.db](https://github.com/sportdb/sport.db)
 * bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb-models](https://rubygems.org/gems/sportdb-models)
 * rdoc  :: [rubydoc.info/gems/sportdb-models](http://rubydoc.info/gems/sportdb-models)
-* forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)
+
 
 
 ## Usage Models
@@ -18,14 +16,13 @@
 
 ## License
 
-![](https://publicdomainworks.github.io/buttons/zero88x31.png)
-
 The `sportdb-models` 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

@@ -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']
+  self.urls    = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'

data/lib/sportdb/models/models/lineup.rb

@@ -2,7 +2,10 @@
 module SportDb
   module Model
 
-### use Squad for name? - alias??
+### todo/fix - yes, use Squad for name
+###     use lineup table for match (specific) players lineup/formation 
+##          NOT league (all season) squad !!!!!
+
 
 class Lineup < ActiveRecord::Base
 

data/lib/sportdb/models/models/team.rb

@@ -16,8 +16,9 @@ class Team < ActiveRecord::Base
   has_many :home_matches, class_name: 'Match', foreign_key: 'team1_id'
   has_many :away_matches, class_name: 'Match', foreign_key: 'team2_id'
 
-  validates :key,  format: { with: TEAM_KEY_RE,  message: TEAM_KEY_MESSAGE }
-  validates :code, format: { with: TEAM_CODE_RE, message: TEAM_CODE_MESSAGE }, allow_nil: true
+  ## note: for now allow any key and code
+  ## validates :key,  format: { with: TEAM_KEY_RE,  message: TEAM_KEY_MESSAGE }
+  ## validates :code, format: { with: TEAM_CODE_RE, message: TEAM_CODE_MESSAGE }, allow_nil: true
 
   has_many :event_teams, class_name: 'EventTeam'  # join table (events+teams)
   has_many :events, :through => :event_teams

data/lib/sportdb/models/schema.rb

@@ -208,8 +208,13 @@ create_table :matches do |t|
 
 
   t.date      :date      # optional play date  - todo/fix: split into play_date AND play_time!!!
-  t.time      :time
+  ## note:  activerecord(rails) will auto-add date (2000-01-01) to hours/time!!!
+  ##   work around - save a string type!!!!
+  ##  e.g.  19:00 etc.
+  ## t.time      :time
+  t.string    :time
 
+  
   t.boolean    :postponed, null: false, default: false
   ## t.date   :date2   # optional old date (when postponed)
   ## t.date   :date3   # optional old date (when postponed twice)

data/lib/sportdb/models/version.rb

@@ -1,11 +1,9 @@
-# encoding: utf-8
-
 module SportDb
 module Module
 module Models
   MAJOR = 2
-  MINOR = 0
-  PATCH = 2
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -13,13 +11,12 @@ module Models
   end
 
   def self.banner
-    "sportdb-models/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "sportdb-models/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
+    File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )
   end
-
 end  # module Models
 end  # module Module
 

data/lib/sportdb/models.rb

@@ -1,48 +1,45 @@
-# encoding: utf-8
-
-
 # core and stlibs  (note: get included via worlddb-models gem; see worlddb-models gem/lib)
 require 'worlddb/models'     # NOTE: include worlddb-models gem (not cli tools gem, that is, worlddb)
 require 'persondb/models'
 
 
 # our own code
+require_relative 'models/version'    # let version always go first
 
-require 'sportdb/models/version'    # let version always go first
+require_relative 'models/formats'
+require_relative 'models/models/forward'
 
-require 'sportdb/models/formats'
-require 'sportdb/models/models/forward'
+require_relative 'models/models/world/city'
+require_relative 'models/models/world/country'
+require_relative 'models/models/world/continent'
+require_relative 'models/models/world/state'
 
-require 'sportdb/models/models/world/city'
-require 'sportdb/models/models/world/country'
-require 'sportdb/models/models/world/continent'
-require 'sportdb/models/models/world/state'
+require_relative 'models/models/assoc'
+require_relative 'models/models/badge'
+require_relative 'models/models/event'
+require_relative 'models/models/goal'
+require_relative 'models/models/ground'
+require_relative 'models/models/group'
+require_relative 'models/models/league'
+require_relative 'models/models/lineup'
+require_relative 'models/models/match'
+require_relative 'models/models/person'
+require_relative 'models/models/round'
+require_relative 'models/models/season'
+require_relative 'models/models/stage'
+require_relative 'models/models/team'
 
-require 'sportdb/models/models/assoc'
-require 'sportdb/models/models/badge'
-require 'sportdb/models/models/event'
-require 'sportdb/models/models/goal'
-require 'sportdb/models/models/ground'
-require 'sportdb/models/models/group'
-require 'sportdb/models/models/league'
-require 'sportdb/models/models/lineup'
-require 'sportdb/models/models/match'
-require 'sportdb/models/models/person'
-require 'sportdb/models/models/round'
-require 'sportdb/models/models/season'
-require 'sportdb/models/models/stage'
-require 'sportdb/models/models/team'
+require_relative 'models/models/stats/alltime_standing'
+require_relative 'models/models/stats/event_standing'
+require_relative 'models/models/stats/group_standing'
 
-require 'sportdb/models/models/stats/alltime_standing'
-require 'sportdb/models/models/stats/event_standing'
-require 'sportdb/models/models/stats/group_standing'
+require_relative 'models/schema'       # note: requires sportdb/models (include SportDB::Models)
 
-require 'sportdb/models/schema'       # note: requires sportdb/models (include SportDB::Models)
+require_relative 'models/utils'   # e.g. MatchCursor
 
-require 'sportdb/models/utils'   # e.g. MatchCursor
+require_relative 'models/deleter'
+require_relative 'models/stats'
 
-require 'sportdb/models/deleter'
-require 'sportdb/models/stats'
 
 
 module SportDb
@@ -62,6 +59,38 @@ module SportDb
     SportDb.create
   end
 
+  def self.auto_migrate!
+    ### todo/fix:
+    ##    check props table and versions!!!!!
+
+    # first time? - auto-run db migratation, that is, create db tables
+    unless LogDb::Model::Log.table_exists?
+      LogDb.create     # add logs table
+    end
+
+    unless ConfDb::Model::Prop.table_exists?
+      ConfDb.create    # add props table
+    end
+
+
+    unless TagDb::Model::Tag.table_exists?
+      TagDb.create    # add tags & taggings tables
+    end
+
+    unless WorldDb::Model::Place.table_exists?
+      WorldDb.create   # add places, & co. tables
+    end
+
+    unless PersonDb::Model::Person.table_exists?
+      PersonDb.create  # add persons table
+    end
+
+    unless SportDb::Model::League.table_exists?
+      SportDb.create
+    end
+  end # method auto_migrate!
+
+
   # delete ALL records (use with care!)
   def self.delete!
     puts '*** deleting sport table records/data...'
@@ -74,8 +103,14 @@ module SportDb
   end
 
 
-  def self.connect( config={} )
+  ###  use/change to **config - to allow "inline" conif with keywords
+  ##          (without enclosing {}) - why? why not?
+  def self.connect!( config={} )  # convenience shortcut w/ automigrate
+    connect( config )
+    auto_migrate!
+  end
 
+  def self.connect( config={} )
     if config.empty?
       puts "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
 
@@ -132,19 +167,43 @@ module SportDb
   end
 
 
+
+  def self.open( path )  ## shortcut for sqlite only
+    config = {
+      adapter:  'sqlite3',
+      database: path  # e.g. ':memory', './sport.db'
+    }
+    connect!( config )
+  end
+
   def self.setup_in_memory_db
     # Database Setup & Config
-    ActiveRecord::Base.logger = Logger.new( STDOUT )
+    ##  add logger as option - why? why not?
+    ##  e.g.  open_mem( logger: true ) or
+    ##         always possible to add logger "manually" before 
+    ##         thus, no need for option/flag really ??
+    ## ActiveRecord::Base.logger = Logger.new( STDOUT )
     ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-    connect( adapter:  'sqlite3',
-             database: ':memory:' )
+   
+    config = {
+      adapter:  'sqlite3',
+      database: ':memory:'
+    }
+    connect( config )
 
     ## build schema
     create_all
   end # setup_in_memory_db (using SQLite :memory:)
 
 
+  ###########
+  #   add more aliases/alt names for in memory db - why? why not?
+  ##    rename to open_mem for canonical name - why? why not?
+  class << self
+     alias_method :open_mem,       :setup_in_memory_db
+     alias_method :open_memory,    :setup_in_memory_db
+     alias_method :open_in_memory, :setup_in_memory_db
+  end
 end  # module SportDb
 
 
@@ -155,17 +214,19 @@ module SportDb
 #  add alias why? why not?
 #
 #  more aliases to consider:
-#   - Tournament for Event?
-#   - Cup for League?
-#   - Roster for Lineup?
-#   - Stadium for Ground?  - why? why not?
+#   - Roster for Squad/Lineup?
+#   - Stadium / Venue for Ground?  - why? why not?
+#
+#   use Competition/Tournament for League/Cup alias
+#
+#   Event => LeagueSeason (League+Season) - use LeagueSeason alias - why? why not?
 
 
-Competition = Event
-Comp        = Event
+### fix - use Squad for (all) LeagueSeason players
+##        use Lineup for players for one match!!!!
 
 LineUp = Lineup
-Squad  = Lineup
+Squad  = Lineup   #### fix - do NOT use squad and lineup as alias (see above)!!!!
 
 Game = Match  ## add (old) alias - why? why not?
   end # module Model

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -42,30 +42,36 @@ dependencies:
   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-models - sport.db schema 'n' models for easy (re)use
 email: opensport@googlegroups.com
 executables: []
@@ -108,15 +114,11 @@ files:
 - lib/sportdb/models/stats.rb
 - lib/sportdb/models/utils.rb
 - lib/sportdb/models/version.rb
-- test/helper.rb
-- test/test_changes.rb
-- test/test_cursor.rb
-- test/test_winner.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -133,9 +135,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-models - sport.db schema 'n' models for easy (re)use
 test_files: []

data/test/helper.rb

@@ -1,46 +0,0 @@
-## minitest setup
-require 'minitest/autorun'
-
-
-## our own code
-require 'sportdb/models'
-
-
-#####################
-# Models shortcuts
-
-Country    = WorldDb::Model::Country
-
-Person     = PersonDb::Model::Person
-
-League      = SportDb::Model::League
-Season      = SportDb::Model::Season
-Event       = SportDb::Model::Event
-Team        = SportDb::Model::Team
-Lineup      = SportDb::Model::Lineup
-Assoc       = SportDb::Model::Assoc
-AssocAssoc  = SportDb::Model::AssocAssoc
-
-Round       = SportDb::Model::Round
-Group       = SportDb::Model::Group
-Stage       = SportDb::Model::Stage
-Match       = SportDb::Model::Match
-MatchCursor = SportDb::Model::MatchCursor
-
-
-EventStanding        = SportDb::Model::EventStanding
-EventStandingEntry   = SportDb::Model::EventStandingEntry
-GroupStanding        = SportDb::Model::GroupStanding
-GroupStandingEntry   = SportDb::Model::GroupStandingEntry
-AlltimeStanding      = SportDb::Model::AlltimeStanding
-AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
-
-
-#################################
-# setup db -> schema / tables
-
-SportDb.setup_in_memory_db
-
-## test helpers here
-SportDb.delete!
-SportDb.tables

data/test/test_changes.rb

@@ -1,78 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_changes.rb
-
-require 'helper'
-
-class TestChanges < MiniTest::Test
-
-  def test_score
-    match1 = Match.new
-    match1.score1 = 1
-    match1.score2 = 2
-
-    match2 = Match.new
-    match2.score1   = 1
-    match2.score2   = 1
-    match2.score1p  = 5
-    match2.score2p  = 3
-
-    match_attribs = {
-      score1: 1,
-      score2: 2,
-      score1et: nil,
-      score2et: nil,
-      score1p:  nil,
-      score2p:  nil
-    }
-
-    assert_equal  false, match1.check_for_changes( match_attribs )
-    assert_equal  true,  match2.check_for_changes( match_attribs )
-  end
-
-  def test_date
-    match1 = Match.new
-    match1.score1 = 1
-    match1.score2 = 2
-    match1.date   = Date.new( 2012, 11, 5 )
-
-    match2 = Match.new
-    match2.score1   = 1
-    match2.score2   = 2
-    match2.date     = DateTime.new( 2012, 12, 24 )
-
-    match_attribs = {
-      score1:  1,
-      score2:  2,
-      date: DateTime.new( 2012, 11, 5 )
-    }
-
-    assert_equal  false, match1.check_for_changes( match_attribs )
-    assert_equal  true,  match2.check_for_changes( match_attribs )
-  end
-
-  def test_group_id
-    match1 = Match.new
-    match1.score1 = 1
-    match1.score2 = 2
-    match1.group_id = 1
-
-    match2 = Match.new
-    match2.score1   = 1
-    match2.score2   = 2
-    match2.group_id = 2
-
-    match_attribs = {
-      score1:  1,
-      score2:  2,
-      group_id: 1
-    }
-
-    assert_equal  false, match1.check_for_changes( match_attribs )
-    assert_equal  true,  match2.check_for_changes( match_attribs )
-  end
-
-
-end # class TestChanges

data/test/test_cursor.rb

@@ -1,55 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_cursor.rb
-
-
-require 'helper'
-
-class TestCursor < MiniTest::Test
-
-  def test_matches
-    matches = []
-
-    matches << Match.new( score1: 3, score2: 1, date: Date.new(2013, 8, 9) )
-    matches << Match.new( score1: 1, score2: 3, date: Date.new(2013, 8, 10) )
-    matches << Match.new( score1: 2, score2: 0, date: Date.new(2013, 8, 10) )
-    matches << Match.new( score1: 3, score2: 2, date: Date.new(2013, 8, 12) )  # new_week
-
-    MatchCursor.new( matches ).each do |match,state|
-      if state.index == 0
-        assert_equal 3, match.score1
-        assert_equal 1, match.score2
-        assert_equal true, state.new_date?
-        assert_equal true, state.new_year?
-        assert_equal true, state.new_week?
-      end
-
-      if state.index == 1
-        assert_equal 1, match.score1
-        assert_equal 3, match.score2
-        assert_equal true, state.new_date?
-        assert_equal false, state.new_year?
-        assert_equal false, state.new_week?
-      end
-
-      if state.index == 2
-        assert_equal 2, match.score1
-        assert_equal 0, match.score2
-        assert_equal false, state.new_date?
-        assert_equal false, state.new_year?
-        assert_equal false, state.new_week?
-      end
-
-      if state.index == 3
-        assert_equal 3, match.score1
-        assert_equal 2, match.score2
-        assert_equal true,  state.new_date?
-        assert_equal true,  state.new_week?
-        assert_equal false, state.new_year?
-      end
-    end
-  end
-
-end # class TestCursor

data/test/test_winner.rb

@@ -1,100 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_winner.rb
-
-
-require 'helper'
-
-class TestWinner < MiniTest::Test
-
-  def test_1_2
-    match = Match.new
-    match.score1 = 1
-    match.score2 = 2
-    match.calc_winner
-
-    assert_equal 2,     match.winner90
-    assert_equal 2,     match.winner
-    assert_equal true,  match.winner2?
-    assert_equal false, match.winner1?
-    assert_equal false, match.draw?
-  end
-
-  def test_1_1
-    match = Match.new
-    match.score1 = 1
-    match.score2 = 1
-    match.calc_winner
-
-    assert_equal 0,     match.winner90
-    assert_equal 0,     match.winner
-    assert_equal true,  match.draw?
-    assert_equal false, match.winner1?
-    assert_equal false, match.winner2?
-  end
-
-  def test_2_1
-    match = Match.new
-    match.score1 = 2
-    match.score2 = 1
-    match.calc_winner
-
-    assert_equal 1,     match.winner90
-    assert_equal 1,     match.winner
-    assert_equal true,  match.winner1?
-    assert_equal false, match.winner2?
-    assert_equal false, match.draw?
-  end
-
-  def test_1_1__2_1
-    match = Match.new
-    match.score1   = 1
-    match.score2   = 1
-    match.score1et = 2
-    match.score2et = 1
-    match.calc_winner
-
-    assert_equal 0,     match.winner90
-    assert_equal 1,     match.winner
-    assert_equal true,  match.winner1?
-    assert_equal false, match.winner2?
-    assert_equal false, match.draw?
-  end
-
-  def test_1_1__2_2__3_5
-    match = Match.new
-    match.score1   = 1
-    match.score2   = 1
-    match.score1et = 2
-    match.score2et = 2
-    match.score1p  = 3
-    match.score2p  = 5
-    match.calc_winner
-
-    assert_equal 0,     match.winner90
-    assert_equal 2,     match.winner
-    assert_equal true,  match.winner2?
-    assert_equal false, match.winner1?
-    assert_equal false, match.draw?
-  end
-
-  def test_1_1_x_3_5
-    match = Match.new
-    match.score1   = 1
-    match.score2   = 1
-    match.score1et = nil
-    match.score2et = nil
-    match.score1p  = 3
-    match.score2p  = 5
-    match.calc_winner
-
-    assert_equal 0,     match.winner90
-    assert_equal 2,     match.winner
-    assert_equal true,  match.winner2?
-    assert_equal false, match.winner1?
-    assert_equal false, match.draw?
-  end
-
-end # class TestWinner