sportdb 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb22190265ec1fc73dcb5fefb94b2e17f0d6f76
-  data.tar.gz: 20c73bc926cacd534a953918ebcd85c7166f8126
+  metadata.gz: 8451fab0cbb5df17ec44d2b7a2f4d615a94386d8
+  data.tar.gz: 0d2d22268defa874b937e8e647c1a9716484a71a
 SHA512:
-  metadata.gz: 788a5bff9b99c75a749447ae4bca6ea683b95db9712259917c8eedb9b19956d74454a19ff7c73a3f13caf3aab54ad86429770698f929ae261a06bc237d27bd49
-  data.tar.gz: 92f960a874354b994c67d256b106446f1a62ed6afab7e0f15e95e8f834b3d8b192fa514ec1bef19a6b868d985c1d62add37b7680b6d43d64da1dfbdd56166a8f
+  metadata.gz: b00d40e1a4f71ffe3ba277e12f560987e62302210356fd2ede3918a58c2062fb60c36369d3eb94231fbd5a6348424a22459b39f74502a9e0dc05e24ef50fde70
+  data.tar.gz: 1c9fc7b21bca4f53de2fc8267b7d87cd5a9a6804099e8080ad161047b6380688199cf847308863fac4e20d9b0d20205b616d23513d6c3248232902bff360c425

data/Rakefile

@@ -22,13 +22,13 @@ Hoe.spec 'sportdb' do
   self.extra_deps = [
     ['sportdb-readers', '>= 1.0.2'],
 
-    ['fetcher',  '>= 0.4.5'],    ## check if included already in datafil ??
-    ['datafile', '>= 0.3.1'],
+    ['fetcher',    '>= 0.4.5'],    ## check if included already in datafil ??
+    ['datafile',   '>= 0.3.1'],
+    ['webservice', '>= 0.7.0'],
 
-    ### sportdb addons
+    ### incl. sportdb addons - why? why not?
     ## ['sportdb-keys'],
     ## ['sportdb-update'],
-    ['sportdb-service', '>= 0.4.1'],
 
     ## 3rd party
     ['gli', '>= 2.19.0'],

data/lib/sportdb.rb

@@ -27,16 +27,71 @@ module SportDb
 end  # module SportDb
 
 
-#####
-# auto-load/require some addons
 
-## puts 'before auto-load (require) sportdb addons'
-## puts '  before sportdb/update'
-## require 'sportdb/update'
+##################
+# add web service support / machinery
+
+require 'webservice'
+
+####
+##  used for server/service command
+##   "preconfigured" base class for webservice
+class SportDbService < Webservice::Base
+  include SportDb::Models   # e.g. League, Season, Team, etc.
+
+  ## (auto-)add some (built-in) routes
+
+  get '/version(s)?' do
+    {
+      "sportdb":        SportDbCli::VERSION,  ## todo/fix: change to DbTool!!!
+      "sportdb/models": SportDb::VERSION,
+      ## todo/fix: add beerdb/note version - if present
+      ## todo/fix: add worlddb/models version
+      ## todo/fix: add some more libs - why? why not??
+      "activerecord":  [ActiveRecord::VERSION::MAJOR,ActiveRecord::VERSION::MINOR,ActiveRecord::VERSION::TINY].join('.'),
+      "webservice":    Webservice::VERSION,
+      "rack":          "#{Rack::RELEASE} (#{Rack::VERSION.join('.')})",     ## note: VERSION is the protocoll version as an array e.g.[1,2]
+      "ruby":          "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]",
+    }
+  end
+
+  get '/(stats|tables)' do
+    {
+      "teams":        SportDb::Model::Team.count,
+      "games":        SportDb::Model::Game.count,
+      "events":       SportDb::Model::Event.count,
+      "leagues":      SportDb::Model::League.count,
+      "seasons":      SportDb::Model::Season.count,
+      "countries":    WorldDb::Model::Country.count,
+      "system": {
+        "props":      ConfDb::Models::Prop.count,
+        "logs":       LogDb::Models::Log.count,
+      }
+    }
+  end
+
+  get '/props(.:format)?' do    # note: add format - lets you use props.csv and props.html
+    ConfDb::Models::Prop.all
+  end
+
+  get '/logs(.:format)?' do
+    LogDb::Models::Log.all
+  end
+
+
+  ## add favicon support
+  # get '/favicon.ico' do
+    ## use 302 to redirect
+    ##  note: use strg+F5 to refresh page (clear cache for favicon.ico)
+  #  redirect '/webservice-sportdb-32x32.png'
+  # end
+
+  # get '/webservice-beerdb-32x32.png' do
+  #  send_file "#{SportDbCli.root}/assets/webservice-sportdb-32x32.png"
+  # end
+
+end  # class SportDbService
 
-puts '  before sportdb/service'
-require 'sportdb/service'
-puts 'after auto-load (require) sportdb addons'
 
 
 SportDb.main   if __FILE__ == $0

data/lib/sportdb/cli/main.rb

@@ -186,40 +186,40 @@ command [:new,:n] do |c|
 end  # command setup
 
 
-
 desc 'Start web service (HTTP JSON API)'
-command [:serve,:server] do |c|
+arg_name 'NAME'   # optional setup profile name
+command [:serve,:server,:s] do |c|
 
   c.action do |g,o,args|
 
-    connect_to_db( opts )
+    ## todo: document optional script arg (defaults to service)
+    script = args[0] || 'service'
+
+    ## todo/fix: add support for (default) Service (with no extension)
 
-    # note: server (HTTP service) not included in standard default require
-    ##   -- note - now included!!!
-    ## require 'sportdb/service'
-
-# make sure connections get closed after every request e.g.
-#
-#  after do
-#   ActiveRecord::Base.connection.close
-#  end
-#
-
-    ## note:  ConnectionManagement removed from ActiveRecord 4+
-    ##   see github.com/rails/rails/issues/26947
-    ## puts 'before add middleware ConnectionManagement'
-    ## SportDb::Service::Server.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-    ## puts 'after add middleware ConnectionManagement'
-    ## todo: check if we can check on/dump middleware stack
-
-    ## rack middleware might not work with multi-threaded thin web server; close it ourselfs
-    SportDb::Service::Server.after do
-      puts "  #{Thread.current.object_id} -- make sure db connections gets closed after request"
-      # todo: check if connection is open - how?
-      ActiveRecord::Base.connection.close
+    script_path = "#{script}.rb"     ## auto-add .rb extension
+
+    unless File.exist?( script_path ) ## if file doesn't exist try to fetch service script
+      script_path = "./#{script}.rb"   ## use / save script in local (current) working dir/folder
+      worker = Fetcher::Worker.new
+      ## note: lets use http:// instead of https:// for now - lets us use person proxy (NOT working w/ https for now)
+      worker.copy( "http://github.com/sportdb/sport.db.service/raw/master/#{script}.rb", script_path )
     end
 
-    SportDb::Service::Server.run!
+
+    code = File.open( script_path, 'r:utf-8' ) { |f| f.read }
+
+    connect_to_db( opts )
+
+    SportDb.tables   ## print table stats
+
+    SportDbService.class_eval( code )  ## note: MUST use class_eval (do NOT use instance_eval)  !!!
+
+    puts "dump routes:"
+    pp SportDbService.routes
+
+    puts "starting server..."
+    SportDbService.run!
 
     puts 'Done.'
   end
@@ -227,6 +227,7 @@ end # command serve
 
 
 
+
 desc 'Show logs'
 command :logs do |c|
   c.action do |g,o,args|

data/lib/sportdb/cli/version.rb

@@ -6,8 +6,8 @@
 module SportDbCli    # todo/check - rename to SportDbTool or SportDbCommands or SportDbShell ??
 
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
-  MINOR = 2
-  PATCH = 1
+  MINOR = 3
+  PATCH = 0
   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: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-readers
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: sportdb-service
+  name: webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement