sportdb-models 2.0.3 → 2.1.0

data/lib/sportdb/models/version.rb

@@ -1,27 +1,26 @@
-module SportDb
-module Module
-module Models
-  MAJOR = 2
-  MINOR = 0
-  PATCH = 3
-  VERSION = [MAJOR,MINOR,PATCH].join('.')
-
-  def self.version
-    VERSION
-  end
-
-  def self.banner
-    "sportdb-models/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
-  end
-
-end  # module Models
-end  # module Module
-
-  #################
-  ## add convenience shortcuts
-  VERSION = Module::Models::VERSION
-end  # module SportDb
+module SportDb
+module Module
+module Models
+  MAJOR = 2
+  MINOR = 1
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  def self.banner
+    "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__)))) )
+  end
+end  # module Models
+end  # module Module
+
+  #################
+  ## add convenience shortcuts
+  VERSION = Module::Models::VERSION
+end  # module SportDb

data/lib/sportdb/models.rb

@@ -1,212 +1,240 @@
-# 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 'sportdb/models/version'    # let version always go first
-
-require 'sportdb/models/formats'
-require 'sportdb/models/models/forward'
-
-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 '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 'sportdb/models/models/stats/alltime_standing'
-require 'sportdb/models/models/stats/event_standing'
-require 'sportdb/models/models/stats/group_standing'
-
-require 'sportdb/models/schema'       # note: requires sportdb/models (include SportDB::Models)
-
-require 'sportdb/models/utils'   # e.g. MatchCursor
-
-require 'sportdb/models/deleter'
-require 'sportdb/models/stats'
-
-
-module SportDb
-
-  def self.create
-    CreateDb.new.up
-    ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
-  end
-
-  def self.create_all
-    ## build schema - convenience helper
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    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...'
-    Deleter.new.run
-  end # method delete!
-
-
-  def self.tables
-    Stats.new.tables
-  end
-
-
-  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']}<"
-
-      ### change default to ./sport.db ?? why? why not?
-      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///sport.db' )
-
-      config =  if db.scheme == 'postgres'
-                    { adapter: 'postgresql',
-                      host:     db.host,
-                      port:     db.port,
-                      username: db.user,
-                      password: db.password,
-                      database: db.path[1..-1],
-                      encoding: 'utf8'
-                    }
-                  else # assume sqlite3
-                    { adapter:  db.scheme,       # sqlite3
-                      database: db.path[1..-1]   # sport.db (NB: cut off leading /, thus 1..-1)
-                    }
-                  end
-    else
-      ## note: for compatibility lets you also pass-in/use string keys
-      ##   e.g. YAML.load uses/returns always string keys - always auto-convert to symbols
-      config = config.symbolize_keys
-    end
-
-
-    ## todo/check/fix: move jruby "hack" to attic - why? why not?
-    ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
-    ## 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'
-    ##  require 'active_record/connection_adapters/jdbc_adapter'
-    ##  require 'active_record/connection_adapters/jdbcsqlite3_adapter'
-    ## end
-
-    puts "Connecting to db using settings: "
-    pp config
-    ActiveRecord::Base.establish_connection( config )
-    # ActiveRecord::Base.logger = Logger.new( STDOUT )
-
-    ## if sqlite3 add (use) some pragmas for speedups
-    if config[:adapter]  == 'sqlite3'  &&
-       config[:database] != ':memory:'
-      ## note: if in memory database e.g. ':memory:' no pragma needed!!
-      ## try to speed up sqlite
-      ##   see http://www.sqlite.org/pragma.html
-      con = ActiveRecord::Base.connection
-      con.execute( 'PRAGMA synchronous=OFF;' )
-      con.execute( 'PRAGMA journal_mode=OFF;' )
-      con.execute( 'PRAGMA temp_store=MEMORY;' )
-    end
-  end
-
-
-  def self.setup_in_memory_db
-    # Database Setup & Config
-    ActiveRecord::Base.logger = Logger.new( STDOUT )
-    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-    connect( adapter:  'sqlite3',
-             database: ':memory:' )
-
-    ## build schema
-    create_all
-  end # setup_in_memory_db (using SQLite :memory:)
-
-
-end  # module SportDb
-
-
-
-module SportDb
-  module Model
-##################
-#  add alias why? why not?
-#
-#  more aliases to consider:
-#   - Tournament for Event?
-#   - Cup for League?
-#   - Roster for Lineup?
-#   - Stadium for Ground?  - why? why not?
-
-
-Competition = Event
-Comp        = Event
-
-LineUp = Lineup
-Squad  = Lineup
-
-Game = Match  ## add (old) alias - why? why not?
-  end # module Model
-end # module SportDb
-
-
-
-## say hello
-puts SportDb::Module::Models.banner
-
-
+# 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_relative 'models/formats'
+require_relative '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_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_relative 'models/models/stats/alltime_standing'
+require_relative 'models/models/stats/event_standing'
+require_relative 'models/models/stats/group_standing'
+
+require_relative 'models/schema'       # note: requires sportdb/models (include SportDB::Models)
+
+require_relative 'models/utils'   # e.g. MatchCursor
+
+require_relative 'models/deleter'
+require_relative 'models/stats'
+
+
+
+module SportDb
+
+  def self.create
+    CreateDb.new.up
+    ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
+  end
+
+  def self.create_all
+    ## build schema - convenience helper
+    LogDb.create
+    ConfDb.create
+    TagDb.create
+    WorldDb.create
+    PersonDb.create
+    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...'
+    Deleter.new.run
+  end # method delete!
+
+
+  def self.tables
+    Stats.new.tables
+  end
+
+
+  ###  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']}<"
+
+      ### change default to ./sport.db ?? why? why not?
+      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///sport.db' )
+
+      config =  if db.scheme == 'postgres'
+                    { adapter: 'postgresql',
+                      host:     db.host,
+                      port:     db.port,
+                      username: db.user,
+                      password: db.password,
+                      database: db.path[1..-1],
+                      encoding: 'utf8'
+                    }
+                  else # assume sqlite3
+                    { adapter:  db.scheme,       # sqlite3
+                      database: db.path[1..-1]   # sport.db (NB: cut off leading /, thus 1..-1)
+                    }
+                  end
+    else
+      ## note: for compatibility lets you also pass-in/use string keys
+      ##   e.g. YAML.load uses/returns always string keys - always auto-convert to symbols
+      config = config.symbolize_keys
+    end
+
+
+    ## todo/check/fix: move jruby "hack" to attic - why? why not?
+    ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
+    ## 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'
+    ##  require 'active_record/connection_adapters/jdbc_adapter'
+    ##  require 'active_record/connection_adapters/jdbcsqlite3_adapter'
+    ## end
+
+    puts "Connecting to db using settings: "
+    pp config
+    ActiveRecord::Base.establish_connection( config )
+    # ActiveRecord::Base.logger = Logger.new( STDOUT )
+
+    ## if sqlite3 add (use) some pragmas for speedups
+    if config[:adapter]  == 'sqlite3'  &&
+       config[:database] != ':memory:'
+      ## note: if in memory database e.g. ':memory:' no pragma needed!!
+      ## try to speed up sqlite
+      ##   see http://www.sqlite.org/pragma.html
+      con = ActiveRecord::Base.connection
+      con.execute( 'PRAGMA synchronous=OFF;' )
+      con.execute( 'PRAGMA journal_mode=OFF;' )
+      con.execute( 'PRAGMA temp_store=MEMORY;' )
+    end
+  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
+    ##  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?
+   
+    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
+
+
+
+module SportDb
+  module Model
+##################
+#  add alias why? why not?
+#
+#  more aliases to consider:
+#   - 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?
+
+
+### fix - use Squad for (all) LeagueSeason players
+##        use Lineup for players for one match!!!!
+
+LineUp = 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
+end # module SportDb
+
+
+
+## say hello
+puts SportDb::Module::Models.banner
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
 description: sportdb-models - sport.db schema 'n' models for easy (re)use
 email: opensport@googlegroups.com
 executables: []
@@ -114,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
@@ -139,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