sportdb 1.9.15 → 1.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5d5f460f4f9a47f7972f979e24a3c5652e07a8
-  data.tar.gz: a703aeb762e8fedefdf6e91e4f92bad6c59c1bd4
+  metadata.gz: f652191b23c1c3acab00a7b950f7b93ec6bce4f4
+  data.tar.gz: 85fe028e22fa00c0ee763ba6f472c0d23016009e
 SHA512:
-  metadata.gz: 059df898468b056c66c0a1a08cbcac20ce4b55519069d5cd90251e7c00db9d96de01fba73d6a3a2695c0f5f62e1d90c23f08a28ebe92d7d5b49d2a672d4fd4f8
-  data.tar.gz: 84e24316d647343aa7cebc1872bb07728984df9b9d2942ecc6431ab20e1bfca1b2848cd9c7c3b3c49b70992ce26f8594adc250d091ef69dc45600b7d08e4764d
+  metadata.gz: e175cc5dbd766ef735bb4c00a7d2afd47466c1aa3543fe2911a26b696b80b2b18a832ad85e2dc9f9575804a441b6c2471daa2779c1bfec8cbdd2452bbd202877
+  data.tar.gz: 21136016a7ea1294f86f1064bc9f604613936d6f8e016fd53144337f1894fa5b7ee8e4453bb3aa83cb5a82e556764509e7d0befd4793fe6583b7c200ad5b5c27

data/lib/sportdb.rb

@@ -65,12 +65,6 @@ require 'sportdb/models/stats/group_standing_entry'
 
 require 'sportdb/models/utils'   # e.g. GameCursor
 
-## add backwards compatible n convenience namespace
-###  move to forward.rb ?? - why? why not??
-module SportDb
-  Models = Model
-end
-
 
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 
@@ -150,6 +144,17 @@ module SportDb
     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.read_setup( setup, include_path )
     reader = Reader.new( include_path )
     reader.load_setup( setup )
@@ -197,40 +202,69 @@ module SportDb
 
 
   def self.stats
-    stats = Stats.new
-    stats.tables
-    stats.props
+    Stats.new.tables   # NOTE: same as tables (remove??? why? why not??)
   end
 
   def self.tables
     Stats.new.tables
   end
 
-  ### fix:
-  ## remove - use ConfDb.dump or similar -- add api depreciated
-  def self.props
-    Stats.new.props
+
+  def self.connect( db_config={} )
+
+    if db_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
+    else
+      config = db_config  # use passed in config hash
+    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 )
   end
 
 
   def self.setup_in_memory_db
-    # Database Setup & Config
 
+    # Database Setup & Config
     ActiveRecord::Base.logger = Logger.new( STDOUT )
     ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
 
-    ## NB: every connect will create a new empty in memory db
-    ActiveRecord::Base.establish_connection(
-                           adapter:  'sqlite3',
-                           database: ':memory:' )
+    self.connect( adapter:  'sqlite3',
+                  database: ':memory:' )
 
     ## build schema
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    SportDb.create
+    SportDb.create_all
 
     ## read builtins - why? why not?
     SportDb.read_builtin
@@ -257,4 +291,4 @@ if __FILE__ == $0
 else
    ## say hello
   puts SportDb.banner
-end
+end

data/lib/sportdb/cli/main.rb

@@ -76,27 +76,10 @@ def connect_to_db( options )
 
   puts "working directory: #{Dir.pwd}"
 
-  db_config = {
-    :adapter  => 'sqlite3',
-    :database => "#{options.db_path}/#{options.db_name}"
-  }
-
-  ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
-  if RUBY_PLATFORM =~ /java/ && db_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 db_config
+  SportDb.connect( adapter: 'sqlite3',
+                   database: "#{options.db_path}/#{options.db_name}" )
 
-  ActiveRecord::Base.establish_connection( db_config )
-  
-  LogDb.setup  # start logging to db
+  LogDb.setup  # start logging to db (that is, save logs in logs table in db)
 end
 
 
@@ -105,14 +88,9 @@ command [:create] do |c|
   c.action do |g,o,args|
     
     connect_to_db( opts )
-    
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    SportDb.create
-    
+
+    SportDb.create_all
+
     SportDb.read_builtin   # e.g. seasons.txt etc
     
     puts 'Done.'
@@ -130,12 +108,7 @@ command [:build,:b] do |c|
 
     connect_to_db( opts )
 
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    SportDb.create
+    SportDb.create_all
 
     SportDb.read_builtin   # e.g. seasons.txt etc
 
@@ -194,12 +167,7 @@ command [:new,:n] do |c|
 
     connect_to_db( opts )  ### todo: check let connect go first?? - for logging (logs) to db  ???
 
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    SportDb.create
+    SportDb.create_all
 
     SportDb.read_builtin   # e.g. seasons.txt etc
 
@@ -231,12 +199,7 @@ command [:setup,:s] do |c|
     ## todo: document optional setup profile arg (defaults to all)
     setup = args[0] || 'all'
     
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
-    PersonDb.create
-    SportDb.create
+    SportDb.create_all
 
     SportDb.read_builtin   # e.g. seasons.txt etc
     
@@ -396,8 +359,9 @@ command :props do |c|
 
     connect_to_db( opts )
     
-    SportDb.props
-    
+    ### fix: SportDb.props
+    ##  use ConfDb.props or similar!!!
+
     puts 'Done.'
   end
 end

data/lib/sportdb/models/forward.rb

@@ -25,7 +25,10 @@ module SportDb
   class Goal  < ActiveRecord::Base ; end
 
   end
-end
+
+  ## add backwards compatible n convenience namespace
+  Models = Model
+end # module SportDb
 
 
 module WorldDb

data/lib/sportdb/stats.rb

@@ -2,7 +2,7 @@
 module SportDb
   
   class Stats
-    include SportDb::Models
+    include Models
 
     def tables
       puts "  #{League.count} leagues  /  #{Season.count} seasons"
@@ -22,15 +22,6 @@ module SportDb
 ##      puts "  #{Record.count} records (race|run+person recs)"
     end
 
-    ## fix/chek:
-    #  move to Prop gem / reuse code from Prop gem
-    def props
-      puts "Props:"
-      Prop.order( 'created_at asc' ).all.each do |prop|
-        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-      end
-    end
-  
   end  # class Stats
 
-end  # module SportDb
+end  # module SportDb

data/lib/sportdb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.15
+  version: 1.9.16
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props