sportdb-models 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3708f265e85ff08b23288dbb6a0d9a9d99892e
-  data.tar.gz: 0143b37e2c0eeab01bde7aaa6d66619bd81f5a4e
+  metadata.gz: 5f0d4c37492676024c57f08909596a413991d8b9
+  data.tar.gz: 7793d7a13474b8a2cea45b94fcbd4261b7e87984
 SHA512:
-  metadata.gz: b7835c911d31c45e12a4a4d07f29188f4bbd95cbf1a8534ed5dd025f42e02f39832763ccaf73c35847be8f4a89ef004ca7d33103ae28a7a17faf602b503d901d
-  data.tar.gz: 072c3f07aebb20fc10bb6df827d4a87274aa7dce0c5ad7ad9dd78c2f2555103084a871b24fa9c22b9b1c021da443343704a3ee75f66cebc9c760494e92d39966
+  metadata.gz: 275bf0569a3622579837ce8866621365176d7c91d6655a5051e3163ef000b86210fb88afc34da2edf873e219e13f2841ad2c15d925bbfc5f19a61deab0de6d6c
+  data.tar.gz: ff8bb5dafa8741e6e5d3c514ee32ec67cbd74c2a8a40d2f8af19cb2ac0f212741de72c2e29da12765ec6b0ac3b10845f0c83891ecfa67b3ae2514699b32b119b

data/lib/sportdb/models.rb

@@ -82,32 +82,36 @@ module SportDb
       ### 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
+      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'
+    ## 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 "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
@@ -115,8 +119,11 @@ module SportDb
     # 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!!
+    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;' )
@@ -126,7 +133,6 @@ module SportDb
 
 
   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?
@@ -144,9 +150,17 @@ end  # module SportDb
 
 
 module SportDb
-  module Models
+  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
 
@@ -154,7 +168,7 @@ LineUp = Lineup
 Squad  = Lineup
 
 Game = Match  ## add (old) alias - why? why not?
-  end # module Models
+  end # module Model
 end # module SportDb
 
 

data/lib/sportdb/models/models/match.rb

@@ -127,7 +127,8 @@ class Match < ActiveRecord::Base
 
 
   # match over?
-  def over?()     play_at <= Time.now;  end
+  ##  todo/fix: add back time (hours/minutes) to date if present!!!!
+  def over?()     date <= Date.today;  end
 
   ## fix/todo: already added by ar magic ??? remove code
   def knockout?() knockout == true;  end

data/lib/sportdb/models/version.rb

@@ -5,7 +5,7 @@ module Module
 module Models
   MAJOR = 2
   MINOR = 0
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models