sportdb 1.8.5 → 1.8.6

data/README.md

@@ -128,6 +128,25 @@ EXAMPLES
 ~~~
 
 
+## Usage in Ruby (Console / Interactive Shell)
+
+
+Try the built-in console script. In your interactive Ruby shell type:
+
+    >> require 'sportdb/console'
+    # => Welcome to sport.db, version 1.9.7 (world.db, version 1.9.3)!
+
+This will try to connect to the `sport.db` SQLite database in your working folder.
+To get started try some queries, for example:
+
+    >> Team.count
+    # => 157
+    >> t = Team.find_by_key( 'barcelona' )
+    # => ...
+
+and so on.
+
+
 
 ## Install
 

data/bin/sportdb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'sportdb'
-SportDb.main
+
+SportDb.main

data/lib/sportdb/cli/main.rb

@@ -266,9 +266,10 @@ desc 'Show stats'
 command :stats do |c|
   c.action do |g,o,args|
 
-    connect_to_db( opts ) 
+    connect_to_db( opts )
     
     SportDb.tables
+    WorldDb.tables
     
     puts 'Done.'
   end

data/lib/sportdb/console.rb

@@ -17,30 +17,31 @@ require 'yaml'
 ##
 ##  todo/fix: just use include SportDb::Models  - why? why not? is it possible/working?
 
-Badge   = SportDb::Models::Badge
-Event   = SportDb::Models::Event
-Game    = SportDb::Models::Game
-Goal    = SportDb::Models::Goal
-Group   = SportDb::Models::Group
-League  = SportDb::Models::League
-Person  = SportDb::Models::Person
-Race    = SportDb::Models::Race
-Record  = SportDb::Models::Record
-Roster  = SportDb::Models::Roster
-Round   = SportDb::Models::Round
-Run     = SportDb::Models::Run
-Season  = SportDb::Models::Season
-Team    = SportDb::Models::Team
-Track   = SportDb::Models::Track
-
-
-Tag       = WorldDb::Models::Tag
-Tagging   = WorldDb::Models::Tagging
-Continent = WorldDb::Models::Continent
-Country   = WorldDb::Models::Country
-Region    = WorldDb::Models::Region
-City      = WorldDb::Models::City
-Prop      = WorldDb::Models::Prop
+Badge   = SportDb::Model::Badge
+Event   = SportDb::Model::Event
+Game    = SportDb::Model::Game
+Goal    = SportDb::Model::Goal
+Group   = SportDb::Model::Group
+League  = SportDb::Model::League
+Person  = SportDb::Model::Person
+Race    = SportDb::Model::Race
+Record  = SportDb::Model::Record
+Roster  = SportDb::Model::Roster
+Round   = SportDb::Model::Round
+Run     = SportDb::Model::Run
+Season  = SportDb::Model::Season
+Team    = SportDb::Model::Team
+Track   = SportDb::Model::Track
+
+
+Tag       = WorldDb::Model::Tag
+Tagging   = WorldDb::Model::Tagging
+Continent = WorldDb::Model::Continent
+Country   = WorldDb::Model::Country
+Region    = WorldDb::Model::Region
+City      = WorldDb::Model::City
+Prop      = WorldDb::Model::Prop
+
 
 ## connect to db
 
@@ -56,9 +57,17 @@ ActiveRecord::Base.establish_connection( DB_CONFIG )
 
 puts "Welcome to sport.db, version #{SportDb::VERSION} (world.db, version #{WorldDb::VERSION})!"
 
+## print tables stats (e.g. no of records)
+puts 'sport.db'
+puts '--------'
 SportDb.tables
 
-puts "Ready."
+puts 'world.db'
+puts '--------'
+WorldDb.tables
+
+puts 'Ready.'
+
 
 ## add some predefined shortcuts
 

data/lib/sportdb/data/keys.rb

@@ -1,34 +1,42 @@
 # encoding: utf-8
 
+
 ### todo/fix: move to sportdb-data gem/plugin/addon ??
+### fix: rename to ::Key (singular) - why? why not??
 
 
-### fix: rename to ::Key (singular) - why? why not??
+module SportDb
+
+  module EventKeys
+    # use constants for known keys; lets us define aliases (if things change)
+    AT_2011_12     = 'at.2011/12'
+    AT_2012_13     = 'at.2012/13'
+    AT_2013_14     = 'at.2013/14'
+
+    AT_CUP_2012_13 = 'at.cup.2012/13'
+    AT_CUP_2013_14 = 'at.cup.2013/14'
+
+    CL_2012_13     = 'cl.2012/13'
+    CL_2013_14     = 'cl.2013/14'
+
+    EURO_2008      = 'euro.2008'
+    EURO_2012      = 'euro.2012'
+
+    WORLD_2010     = 'world.2010'
+    WORLD_2014     = 'world.2014'
+
+    WORLD_QUALI_EUROPE_2014  = 'world.quali.europe.2014'
+    WORLD_QUALI_AMERICA_2014 = 'world.quali.america.2014'
+
+    ##################################################################
+    # NB: see github/openfootball (leagues.txt) for keys in use
+  end  # module EventKeys
+
+
+
+  module Keys
+    ## all keys  - used by anybody? really needed? check back later
+    include EventKeys
+  end
 
-module SportDb::Keys
-
-    module EventKeys
-  # use constants for known keys; lets us define aliases (if things change)
-
-  
-  AT_2011_12     = 'at.2011/12'
-  AT_2012_13     = 'at.2012/13'
-  AT_CUP_2012_13 = 'at.cup.2012/13'
-  
-  CL_2012_13     = 'cl.2012/13'
-  
-  EURO_2008      = 'euro.2008'
-  EURO_2012      = 'euro.2012'
-
-  WORLD_2010     = 'world.2010'
-  
-  WORLD_QUALI_EUROPE_2014  = 'world.quali.europe.2014'
-  WORLD_QUALI_AMERICA_2014 = 'world.quali.america.2014'
-
-  ############################
-  ## NB: see db/leagues.rb for keys in use
-    end 
-    
-    include SportDb::Keys::EventKeys
-
-end # module SportDb::Keys
+end # module SportDb

data/lib/sportdb/data/models.rb

@@ -1,43 +1,35 @@
 # encoding: utf-8
 
-module SportDb::Model
-
-  ## add convenience finders to some model classes
-  
-  class Event
-
-  include SportDb::Keys::EventKeys
-
-  def self.find_at_2012_13!
-    self.find_by_key!( AT_2012_13 )
-  end
-  
-  def self.find_at_cup_2012_13!
-    self.find_by_key!( AT_CUP_2012_13 )
-  end
-  
-  def self.find_cl_2012_13!
-    self.find_by_key!( CL_2012_13 )
-  end
-  
-  def self.find_euro_2012!
-    self.find_by_key!( EURO_2012 )
-  end
-  
-  def self.find_world_2010!
-    self.find_by_key!( WORLD_2010 )
-  end
-  
-  def self.find_world_quali_europe_2014!
-    self.find_by_key!( WORLD_QUALI_EUROPE_2014 )
-  end
-  
-  def self.find_world_quali_america_2014!
-    self.find_by_key!( WORLD_QUALI_AMERICA_2014 )
-  end
-    
-  end # class Event
-
-end # module SportDb::Model
+module SportDb
+  module Model
 
 
+## add convenience finders to some model classes
+
+class Event
+
+  include SportDb::EventKeys
+
+  def self.find_at_2012_13!()       self.find_by_key!( AT_2012_13 )      end
+  def self.find_at_2013_14!()       self.find_by_key!( AT_2013_14 )      end
+
+  def self.find_at_cup_2012_13!()   self.find_by_key!( AT_CUP_2012_13 )  end
+  def self.find_at_cup_2013_14!()   self.find_by_key!( AT_CUP_2013_14 )  end
+
+  def self.find_cl_2012_13!()       self.find_by_key!( CL_2012_13 )      end
+  def self.find_cl_2013_14!()       self.find_by_key!( CL_2013_14 )      end
+
+  def self.find_euro_2008!()        self.find_by_key!( EURO_2008 )       end
+  def self.find_euro_2012!()        self.find_by_key!( EURO_2012 )       end
+
+  def self.find_world_2010!()       self.find_by_key!( WORLD_2010 )      end
+  def self.find_world_2014!()       self.find_by_key!( WORLD_2014 )      end
+
+  def self.find_world_quali_europe_2014!()   self.find_by_key!( WORLD_QUALI_EUROPE_2014 )  end
+  def self.find_world_quali_america_2014!()  self.find_by_key!( WORLD_QUALI_AMERICA_2014 ) end
+
+end # class Event
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/deleter.rb

@@ -4,7 +4,7 @@ module SportDb
   class Deleter
     ######
     # NB: make models available in sportdb module by default with namespace
-    #  e.g. lets you use Team instead of Models::Team 
+    #  e.g. lets you use Team instead of Model::Team
     include SportDb::Models
 
     def run

data/lib/sportdb/reader.rb

@@ -35,7 +35,7 @@ class Reader
 
 
 ## make models available in sportdb module by default with namespace
-#  e.g. lets you use Team instead of Models::Team 
+#  e.g. lets you use Team instead of Model::Team
   include SportDb::Models
   include SportDb::Matcher # lets us use match_teams_for_country etc.
 
@@ -373,13 +373,21 @@ class Reader
       elsif key == 'grounds' || key == 'stadiums' || key == 'venues'
         ## assume grounds value is an array
         
+        ##
+        ## note: for now we allow invalid ground keys
+        ##  will skip keys not found
+        
         ground_ids = []
         value.each do |item|
           ground_key = item.to_s.strip
-          ground = Ground.find_by_key!( ground_key )
-          ground_ids << ground.id
+          ground = Ground.find_by_key( ground_key )
+          if ground.nil?
+            puts "[warn] ground/stadium w/ key >#{ground_key}< not found; skipping ground"
+          else
+            ground_ids << ground.id
+          end
         end
-        
+
         event_attribs['ground_ids'] = ground_ids
       elsif key == 'teams'
         ## assume teams value is an array

data/lib/sportdb/updater.rb

@@ -7,7 +7,7 @@ module SportDb
 
     ######
     # NB: make models available in sportdb module by default with namespace
-    #  e.g. lets you use Team instead of Models::Team 
+    #  e.g. lets you use Team instead of Model::Team
     include SportDb::Models
 
 

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.5'
+  VERSION = '1.8.6'
 end
 
 

data/test/helper.rb

@@ -25,6 +25,15 @@ require 'logutils/db'   # NB: explict require required for LogDb (not automatic)
 require 'sportdb'
 
 
+#######################
+#
+#  for reuse
+#   --- move to sportdb/test.rb ???
+#    SportDb.setup_in_memory_db  ??? why? why not??  or
+#    SportDb.setup_test_db  - alias ??
+
+
+
 def setup_in_memory_db
   # Database Setup & Config
 
@@ -49,5 +58,12 @@ def setup_in_memory_db
   SportDb.create
 end
 
+####
+# Models shortcuts
+
+Game       = SportDb::Model::Game
+GameCursor = SportDb::Model::GameCursor
+
+
 
 setup_in_memory_db()

data/test/test_changes.rb

@@ -5,11 +5,11 @@ require 'helper'
 class TestChanges < MiniTest::Unit::TestCase
 
   def test_scores
-    game1 = SportDb::Models::Game.new
+    game1 = Game.new
     game1.score1 = 1
     game1.score2 = 2
 
-    game2 = SportDb::Models::Game.new
+    game2 = Game.new
     game2.score1   = 1
     game2.score2   = 1
     game2.score1p  = 5
@@ -29,12 +29,12 @@ class TestChanges < MiniTest::Unit::TestCase
   end
   
   def test_play_at
-    game1 = SportDb::Models::Game.new
+    game1 = Game.new
     game1.score1 = 1
     game1.score2 = 2
     game1.play_at = DateTime.new( 2012, 11, 5 )
 
-    game2 = SportDb::Models::Game.new
+    game2 = Game.new
     game2.score1   = 1
     game2.score2   = 2
     game2.play_at = DateTime.new( 2012, 12, 24 )
@@ -50,12 +50,12 @@ class TestChanges < MiniTest::Unit::TestCase
   end
 
   def test_group_id
-    game1 = SportDb::Models::Game.new
+    game1 = Game.new
     game1.score1 = 1
     game1.score2 = 2
     game1.group_id = 1
 
-    game2 = SportDb::Models::Game.new
+    game2 = Game.new
     game2.score1   = 1
     game2.score2   = 2
     game2.group_id = 2

data/test/test_cursor.rb

@@ -7,12 +7,12 @@ class TestCursor < MiniTest::Unit::TestCase
   def test_games
     games = []
     
-    games << SportDb::Models::Game.new( score1: 3, score2: 1, play_at: DateTime.new(2013, 8, 9) )
-    games << SportDb::Models::Game.new( score1: 1, score2: 3, play_at: DateTime.new(2013, 8, 10) )
-    games << SportDb::Models::Game.new( score1: 2, score2: 0, play_at: DateTime.new(2013, 8, 10) )
-    games << SportDb::Models::Game.new( score1: 3, score2: 2, play_at: DateTime.new(2013, 8, 12) )  # new_week
+    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) )
+    games << Game.new( score1: 3, score2: 2, play_at: DateTime.new(2013, 8, 12) )  # new_week
 
-    SportDb::Models::GameCursor.new( games ).each do |game,state|
+    GameCursor.new( games ).each do |game,state|
       if state.index == 0
         assert_equal 3, game.score1
         assert_equal 1, game.score2

data/test/test_winner.rb

@@ -5,7 +5,7 @@ require 'helper'
 class TestWinner < MiniTest::Unit::TestCase
 
   def test_1_2
-    game = SportDb::Models::Game.new
+    game = Game.new
     game.score1 = 1
     game.score2 = 2
     game.calc_winner
@@ -18,7 +18,7 @@ class TestWinner < MiniTest::Unit::TestCase
   end
 
   def test_1_1
-    game = SportDb::Models::Game.new
+    game = Game.new
     game.score1 = 1
     game.score2 = 1
     game.calc_winner
@@ -31,7 +31,7 @@ class TestWinner < MiniTest::Unit::TestCase
   end
 
   def test_2_1
-    game = SportDb::Models::Game.new
+    game = Game.new
     game.score1 = 2
     game.score2 = 1
     game.calc_winner
@@ -44,7 +44,7 @@ class TestWinner < MiniTest::Unit::TestCase
   end
 
   def test_1_1__2_1
-    game = SportDb::Models::Game.new
+    game = Game.new
     game.score1   = 1
     game.score2   = 1
     game.score1et = 2
@@ -59,7 +59,7 @@ class TestWinner < MiniTest::Unit::TestCase
   end
 
   def test_1_1__2_2__3_5
-    game = SportDb::Models::Game.new
+    game = Game.new
     game.score1   = 1
     game.score2   = 1
     game.score1et = 2
@@ -76,7 +76,7 @@ class TestWinner < MiniTest::Unit::TestCase
   end
 
   def test_1_1_x_3_5
-    game = SportDb::Models::Game.new
+    game = Game.new
     game.score1   = 1
     game.score2   = 1
     game.score1et = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &20942556 !ruby/object:Gem::Requirement
+  requirement: &20428068 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *20942556
+  version_requirements: *20428068
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &20939616 !ruby/object:Gem::Requirement
+  requirement: &20427156 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *20939616
+  version_requirements: *20427156
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &20837484 !ruby/object:Gem::Requirement
+  requirement: &20426016 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *20837484
+  version_requirements: *20426016
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20834256 !ruby/object:Gem::Requirement
+  requirement: &20424108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20834256
+  version_requirements: *20424108
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20832636 !ruby/object:Gem::Requirement
+  requirement: &20455920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *20832636
+  version_requirements: *20455920
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: