sportdb-models 1.19.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1524cb3a76b16ce80f8b2d484b11f8ab11002f6
-  data.tar.gz: 209a229871e299fab7ac5ca8b90765052fc7da5f
+  metadata.gz: a2dca58496a25d977a305dabb59fb4068f6a27d0
+  data.tar.gz: 454d482974847f5fee5d025e03449f9058c0b48f
 SHA512:
-  metadata.gz: a9c48d1be59422f7fb7726e6121e909aceb9dc3a2306caea036ea19a5a64ebd5f4f7ff828009bf23810f48884d26b970b0f63718fa46ff37e7649e78b3b20f98
-  data.tar.gz: 3e77eb48eafbf666afc8a92e5f6ea7d9403e157745b8abb508367292910dc3a355324cacc8a236b434cc7936d90876ff3bff95f177686378c33c0a025cf058fe
+  metadata.gz: 2588e9757f5277b9f2088cd4b2222cb2712372a25b8ab01cb8346ae908c6c2c8ea8e3a7b9dd3e93d2a69117d30158dfc92a1d914dcb638826d34ecbf90619ecb
+  data.tar.gz: 517e715c5c132c1ae5e9c5794ec91f556a5b2bc56efe3b9429df1f4f50cdecc0bd3fcf48a3bae7c41e3407eeb2198a744a2aec1004ac6968d34e61aa3b36470a

data/CHANGELOG.md

@@ -1,21 +1,21 @@
-### 0.4.0 / 2012-10-16
-
-* Add plain text fixture reader/loader
-* Add --generate/g option for generating fixtures from the DB using templates 
-
-### 0.3.1 / 2012-10-14
-
-* Move models into its own namespace, that is, SportDB::Models
-* Add ActiveRecord logging for --verbose option
-
-### 0.3.0 / 2012-10-07
-
-* Add --delete option to delete all records
-
-### 0.2.0 / 2012-10-06
-
-* Add --load option for builtin fixtures
-
-### 0.1.0 / 2012-10-06
-
+### 0.4.0 / 2012-10-16
+
+* Add plain text fixture reader/loader
+* Add --generate/g option for generating fixtures from the DB using templates 
+
+### 0.3.1 / 2012-10-14
+
+* Move models into its own namespace, that is, SportDB::Models
+* Add ActiveRecord logging for --verbose option
+
+### 0.3.0 / 2012-10-07
+
+* Add --delete option to delete all records
+
+### 0.2.0 / 2012-10-06
+
+* Add --load option for builtin fixtures
+
+### 0.1.0 / 2012-10-06
+
 * Everything is new. First release

data/Manifest.txt

@@ -2,46 +2,35 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-lib/sportdb/calc.rb
-lib/sportdb/deleter.rb
 lib/sportdb/models.rb
-lib/sportdb/models/assoc.rb
-lib/sportdb/models/assoc_assoc.rb
-lib/sportdb/models/badge.rb
-lib/sportdb/models/event.rb
-lib/sportdb/models/event_ground.rb
-lib/sportdb/models/event_team.rb
-lib/sportdb/models/forward.rb
-lib/sportdb/models/game.rb
-lib/sportdb/models/goal.rb
-lib/sportdb/models/ground.rb
-lib/sportdb/models/group.rb
-lib/sportdb/models/group_team.rb
-lib/sportdb/models/league.rb
-lib/sportdb/models/person.rb
-lib/sportdb/models/roster.rb
-lib/sportdb/models/round.rb
-lib/sportdb/models/season.rb
-lib/sportdb/models/stage.rb
-lib/sportdb/models/stage_team.rb
-lib/sportdb/models/stats/alltime_standing.rb
-lib/sportdb/models/stats/alltime_standing_entry.rb
-lib/sportdb/models/stats/event_standing.rb
-lib/sportdb/models/stats/event_standing_entry.rb
-lib/sportdb/models/stats/group_standing.rb
-lib/sportdb/models/stats/group_standing_entry.rb
-lib/sportdb/models/team.rb
-lib/sportdb/models/team_compat.rb
+lib/sportdb/models/deleter.rb
+lib/sportdb/models/formats.rb
+lib/sportdb/models/models/assoc.rb
+lib/sportdb/models/models/badge.rb
+lib/sportdb/models/models/event.rb
+lib/sportdb/models/models/forward.rb
+lib/sportdb/models/models/goal.rb
+lib/sportdb/models/models/ground.rb
+lib/sportdb/models/models/group.rb
+lib/sportdb/models/models/league.rb
+lib/sportdb/models/models/lineup.rb
+lib/sportdb/models/models/match.rb
+lib/sportdb/models/models/person.rb
+lib/sportdb/models/models/round.rb
+lib/sportdb/models/models/season.rb
+lib/sportdb/models/models/stage.rb
+lib/sportdb/models/models/stats/alltime_standing.rb
+lib/sportdb/models/models/stats/event_standing.rb
+lib/sportdb/models/models/stats/group_standing.rb
+lib/sportdb/models/models/team.rb
+lib/sportdb/models/models/world/city.rb
+lib/sportdb/models/models/world/continent.rb
+lib/sportdb/models/models/world/country.rb
+lib/sportdb/models/models/world/state.rb
+lib/sportdb/models/schema.rb
+lib/sportdb/models/stats.rb
 lib/sportdb/models/utils.rb
-lib/sportdb/models/world/city.rb
-lib/sportdb/models/world/continent.rb
-lib/sportdb/models/world/country.rb
-lib/sportdb/models/world/state.rb
-lib/sportdb/patterns.rb
-lib/sportdb/schema.rb
-lib/sportdb/standings.rb
-lib/sportdb/stats.rb
-lib/sportdb/version.rb
+lib/sportdb/models/version.rb
 test/helper.rb
 test/test_changes.rb
 test/test_cursor.rb

data/README.md

@@ -1,31 +1,31 @@
-# 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
-
-![](sportdb-models.png)
-
-
-## 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!
+# 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
+
+![](sportdb-models.png)
+
+
+## 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!

data/Rakefile

@@ -1,32 +1,32 @@
-require 'hoe'
-require './lib/sportdb/version.rb'
-
-
-Hoe.spec 'sportdb-models' do
-
-  self.version = SportDb::VERSION
-
-  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.author  = 'Gerald Bauer'
-  self.email   = 'opensport@googlegroups.com'
-
-  # switch extension to .markdown for gihub formatting
-  #  -- NB: auto-changed when included in manifest
-  self.readme_file  = 'README.md'
-  self.history_file = 'CHANGELOG.md'
-
-  self.extra_deps = [
-    ['worlddb-models',        '>= 2.4.0'],    # Note: pull in all (extra) dependencies va worlddb-models
-    ['persondb-models',       '>= 0.5.0'],     # persons (people) table
-  ]
-
-  self.licenses = ['Public Domain']
-
-  self.spec_extras = {
-    required_ruby_version: '>= 2.2.2'
-  }
-end
+require 'hoe'
+require './lib/sportdb/models/version.rb'
+
+
+Hoe.spec 'sportdb-models' do
+
+  self.version = SportDb::Module::Models::VERSION
+
+  self.summary = "sportdb-models - sport.db schema 'n' models for easy (re)use"
+  self.description = summary
+
+  self.urls    = { home: 'https://github.com/sportdb/sport.db' }
+
+  self.author  = 'Gerald Bauer'
+  self.email   = 'opensport@googlegroups.com'
+
+  # switch extension to .markdown for gihub formatting
+  #  -- NB: auto-changed when included in manifest
+  self.readme_file  = 'README.md'
+  self.history_file = 'CHANGELOG.md'
+
+  self.extra_deps = [
+    ['worlddb-models',        '>= 2.4.0'],    # Note: pull in all (extra) dependencies va worlddb-models
+    ['persondb-models',       '>= 0.5.0'],     # persons (people) table
+  ]
+
+  self.licenses = ['Public Domain']
+
+  self.spec_extras = {
+    required_ruby_version: '>= 2.2.2'
+  }
+end

data/lib/sportdb/models.rb

@@ -1,159 +1,212 @@
-# 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 'sportdb/version'    # let version always go first
-
-require 'sportdb/patterns'
-require 'sportdb/models/forward'
-require 'sportdb/models/world/city'
-require 'sportdb/models/world/country'
-require 'sportdb/models/world/continent'
-require 'sportdb/models/world/state'
-require 'sportdb/models/assoc'
-require 'sportdb/models/assoc_assoc'
-require 'sportdb/models/badge'
-require 'sportdb/models/event'
-require 'sportdb/models/event_ground'
-require 'sportdb/models/event_team'
-require 'sportdb/models/game'
-require 'sportdb/models/goal'
-require 'sportdb/models/ground'
-require 'sportdb/models/group'
-require 'sportdb/models/group_team'
-require 'sportdb/models/league'
-require 'sportdb/models/person'
-require 'sportdb/models/roster'
-require 'sportdb/models/round'
-require 'sportdb/models/season'
-require 'sportdb/models/stage'
-require 'sportdb/models/stage_team'
-require 'sportdb/models/team'
-require 'sportdb/models/team_compat'   ### fix/todo: move to compat gem !!!!!
-
-
-require 'sportdb/models/stats/alltime_standing'
-require 'sportdb/models/stats/alltime_standing_entry'
-require 'sportdb/models/stats/event_standing'
-require 'sportdb/models/stats/event_standing_entry'
-require 'sportdb/models/stats/group_standing'
-require 'sportdb/models/stats/group_standing_entry'
-
-require 'sportdb/models/utils'   # e.g. GameCursor
-
-
-require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
-
-
-require 'sportdb/calc'       # fix/todo: obsolete - replace w/ standings
-require 'sportdb/standings'
-
-require 'sportdb/deleter'
-require 'sportdb/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
-
-  # 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={} )
-
-    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' )
-
-      if db.scheme == 'postgres'
-        config = {
-          adapter: 'postgresql',
-          host: db.host,
-          port: db.port,
-          username: db.user,
-          password: db.password,
-          database: db.path[1..-1],
-          encoding: 'utf8'
-        }
-      else # assume sqlite3
-       config = {
-         adapter: db.scheme, # sqlite3
-         database: db.path[1..-1] # sport.db (NB: cut off leading /, thus 1..-1)
-      }
-      end
-    end
-
-    ## 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'
-      ## check/todo: if in memory e.g. ':memory:' no pragma needed!!
-      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
-
-
-## say hello
-puts SportDb.banner   if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
+# 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
+
+