worlddb 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d659b0a6e54a1035ee66d2a01ab34766703d09
-  data.tar.gz: c813625ec34d148179e5950346b415a791729f11
+  metadata.gz: 5409171705fa17c821d82dacaaedd35c511cb655
+  data.tar.gz: a821bfda1ff817abb8c528a5c94c2394a610d0e5
 SHA512:
-  metadata.gz: ff6dfd3b729c340fc7bf63050d87ac4dd72c5def886f9ae03626a8c71753228b359b3ad4378cdc6a48e4fe22c66c4228971284f08b0423f4d0837365833701a3
-  data.tar.gz: 2af456f08c297e815dcdc5faa3b737b6676a770f78016dd8959764b2306da522c8096da32899a1b399278a1fd2ea2c225fa973421a40c812ed96a92f25421aba
+  metadata.gz: 6ba8eff38e8715905a39ca1ca321b3d6eae33bb5a497d264ed744c277b533075493d794de0cddd51a703ff68fdc4ce752591453d83ad9a5174dfd6b9494f3000
+  data.tar.gz: 2871b28c04af9277cea4fec82ca1a8fb3261b49772f4cb372d0681a63d14deb27616f743466c9afc94719ad15d6167fd6a61a9702d6601febf87b7b78fca0dd9

data/Manifest.txt

@@ -1,10 +1,11 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-bin/worlddb
-lib/worlddb.rb
-lib/worlddb/cli/main.rb
-lib/worlddb/cli/opts.rb
-lib/worlddb/cli/version.rb
-lib/worlddb/console.rb
+HISTORY.md
+Manifest.txt
+README.md
+Rakefile
+assets/webservice-worlddb-32x32.png
+bin/worlddb
+lib/worlddb.rb
+lib/worlddb/cli/main.rb
+lib/worlddb/cli/opts.rb
+lib/worlddb/cli/version.rb
+lib/worlddb/console.rb

data/README.md

@@ -1,9 +1,9 @@
 # worlddb
 
-world.db Command Line Tool in Ruby
+world.db Command Line Tool
 
-* home  :: [github.com/worlddb/world.db.tools](https://github.com/worlddb/world.db.tools)
-* bugs  :: [github.com/worlddb/world.db.tools/issues](https://github.com/worlddb/world.db.tools/issues)
+* home  :: [github.com/worlddb/world.db](https://github.com/worlddb/world.db)
+* bugs  :: [github.com/worlddb/world.db/issues](https://github.com/worlddb/world.db/issues)
 * gem   :: [rubygems.org/gems/worlddb](https://rubygems.org/gems/worlddb)
 * rdoc  :: [rubydoc.info/gems/worlddb](http://rubydoc.info/gems/worlddb)
 * forum :: [groups.google.com/group/openmundi](https://groups.google.com/group/openmundi)
@@ -12,9 +12,9 @@ world.db Command Line Tool in Ruby
 ## Usage Command Line
 
 The worlddb gem lets you load plain text fixtures into your database
-(and also includes schema n models for easy reuse). 
+(and also includes schema n models for easy reuse).
 
-~~~
+```
 SYNOPSIS
     worlddb [global options] command [command options] [arguments...]
 
@@ -37,12 +37,12 @@ COMMANDS
     stats         - Show stats
     test          - (Debug) Test command suite
     help          - Shows a list of commands or help for one command
-~~~
+```
 
 
 ### `setup` Command
 
-~~~
+```
 NAME
     setup - Create DB schema 'n' load all world data
 
@@ -55,12 +55,12 @@ COMMAND OPTIONS
 EXAMPLES
     worlddb setup --include ./world.db
     worlddb setup us --include ./world.db
-~~~
+```
 
 
 ### `update` Command
 
-~~~
+```
 NAME
     update - Update all world data
 
@@ -74,12 +74,12 @@ COMMAND OPTIONS
 EXAMPLES
     worlddb update --include ./world.db
     worlddb update --include ./world.db --delete
-~~~
+```
 
 
 ### `load` Command
 
-~~~
+```
 NAME
     load - Load world fixtures
 
@@ -92,7 +92,7 @@ COMMAND OPTIONS
 
 EXAMPLES
     worlddb load --include ./world.db europe/countries
-~~~
+```
 
 
 ## Install
@@ -102,13 +102,11 @@ Just install the gem:
     $ gem install worlddb
 
 
-## Free Open Public Domain Datasets
-
-- [`world.db`](https://github.com/openmundi) - free open public domain countries, regions, cities n more data for use in any (programming) language
-
 
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `worlddb` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 

data/Rakefile

@@ -3,21 +3,22 @@ require './lib/worlddb/cli/version.rb'
 
 
 Hoe.spec 'worlddb' do
-  
-  self.version = WorldDbCli::VERSION
+
+  self.version = WorldDbTool::VERSION
 
   self.summary = "worlddb - world.db command line tool"
   self.description = summary
 
-  self.urls    = ['https://github.com/worlddb/world.db.tools']
+  self.urls    = ['https://github.com/worlddb/world.db']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'openmundi@googlegroups.com'
 
   self.extra_deps = [
-    ['worlddb-models', '>=2.3.0'],
+    ['worlddb-models', '>=2.4.0'],
     ### ['worlddb-service'],
 
+    ['webservice', '>=0.6.1'],
     ['datafile', '>= 0.2.2'],
     ['fetcher', '>= 0.4.5'],
 
@@ -35,7 +36,7 @@ Hoe.spec 'worlddb' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 1.9.2'
+    required_ruby_version: '>= 2.3'
   }
 
 end

data/lib/worlddb.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
-require 'worlddb/models'   # NOTE: depends on core (aka worlddb-models)
+require 'worlddb/models'   # Note: depends on core (aka worlddb-models)
+
+require 'webservice'
 
 require 'fetcher'
 require 'datafile'
@@ -24,4 +26,61 @@ module WorldDb
 end  # module WorldDb
 
 
+
+####
+##  used for server/service command
+##   "preconfigured" base class for webservice
+class WorldDbService < Webservice::Base
+  include WorldDb::Models   # e.g. Continent, Country, State, City, etc.
+
+  ## (auto-)add some (built-in) routes
+
+  get '/version(s)?' do
+    {
+      "worlddb":        WorldDbTool::VERSION,
+      "worlddb/models": WorldDb::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
+    {
+      "countries":      WorldDb::Model::Country.count,
+      "states":         WorldDb::Model::State.count,
+      "cities":         WorldDb::Model::City.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-worlddb-32x32.png'
+  end
+
+  get '/webservice-worlddb-32x32.png' do
+    send_file "#{WorldDbTool.root}/assets/webservice-worlddb-32x32.png"
+  end
+
+end # class WorldDbService
+
+
+
 WorldDb.main   if __FILE__ == $0

data/lib/worlddb/cli/main.rb

@@ -8,11 +8,11 @@ module WorldDb
 
   class Tool
      def initialize
-       LogUtils::Logger.root.level = :info   # set logging level to info 
+       LogUtils::Logger.root.level = :info   # set logging level to info
      end
 
      def run( args )
-       puts WorldDbCli.banner
+       puts WorldDbTool.banner
        Toolii.run( args )
      end
   end
@@ -38,12 +38,12 @@ module WorldDb
    end
 
 logger = LogUtils::Logger.root
-opts   = WorldDb::Opts.new 
+opts   = WorldDb::Opts.new
 
 
 program_desc 'world.db command line tool'
 
-version WorldDbCli::VERSION
+version WorldDbTool::VERSION
 
 =begin
 ### add to help use new sections
@@ -86,7 +86,7 @@ command [:build,:b] do |c|
   c.action do |g,o,args|
 
     datafile = Datafile::Datafile.load_file( './Datafile' )
-    datafile.download  # datafile step 1 - download all datasets/zips 
+    datafile.download  # datafile step 1 - download all datasets/zips
 
     connect_to_db( opts )
 
@@ -142,7 +142,7 @@ command [:new,:n] do |c|
 
     ## step 2: same as command build (todo - reuse code)
     datafile = Datafile::Datafile.load_file( './Datafile' )
-    datafile.download  # datafile step 1 - download all datasets/zips 
+    datafile.download  # datafile step 1 - download all datasets/zips
 
     connect_to_db( opts )  ### todo: check let connect go first?? - for logging (logs) to db  ???
 
@@ -159,9 +159,9 @@ end  # command setup
 desc 'Create DB schema'
 command [:create] do |c|
   c.action do |g,o,args|
-    
+
     connect_to_db( opts )
-    
+
     WorldDb.create_all
 
     puts 'Done.'
@@ -180,10 +180,10 @@ command [:setup,:s] do |c|
   c.action do |g,o,args|
 
     connect_to_db( opts )
- 
+
     ## todo: document optional setup profile arg (defaults to all)
     setup = args[0] || 'all'
-    
+
     WorldDb.create_all
 
     WorldDb.read_setup( "setups/#{setup}", opts.data_path )
@@ -234,7 +234,7 @@ command [:load, :l] do |c|
   c.action do |g,o,args|
 
     connect_to_db( opts )
-    
+
     if o[:delete].present?
       ## todo/fix: also delete TagDb.delete!
       WorldDb.delete!
@@ -271,9 +271,11 @@ command :props do |c|
   c.action do |g,o,args|
 
     connect_to_db( opts )
-    
+
     ### fix: use ConfDb.dump or similar  (for reuse) !!!
-    ## WorldDb.props
+    ConfDb::Models::Prop.all.each do |prop|
+      puts "#{prop.key}  |  #{prop.value}"
+    end
 
     puts 'Done.'
   end
@@ -286,16 +288,57 @@ command :logs do |c|
 
     connect_to_db( opts )
 
-    ### fix: use LogDb.dump or similar (for reuse) !!!!    
+    ### fix: use LogDb.dump or similar (for reuse) !!!!
     LogDb::Models::Log.all.each do |log|
       puts "[#{log.level}] -- #{log.msg}"
     end
-    
+
     puts 'Done.'
   end
 end
 
 
+
+desc 'Start web service (HTTP JSON API)'
+arg_name 'NAME'   # optional setup profile name
+command [:serve,:server,:s] do |c|
+
+  c.action do |g,o,args|
+
+    ## todo: document optional script arg (defaults to service)
+    script      = args[0] || 'service'
+
+    ## todo/fix: add support for (default) Service (with no extension)
+
+    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/worlddb/world.db.service/raw/master/#{script}.rb", script_path )
+    end
+
+
+    code = File.read_utf8( script_path )
+
+    connect_to_db( opts )
+
+    WorldDb.tables   ## print table stats
+
+    WorldDbService.class_eval( code )  ## note: MUST use class_eval (do NOT use instance_eval)  !!!
+
+    puts "dump routes:"
+    pp WorldDbService.routes
+
+    puts "starting server..."
+    WorldDbService.run!
+
+    puts 'Done.'
+  end
+end # command serve
+
+
 desc '(Debug) Test command suite'
 command :test do |c|
   c.action do |g,o,args|
@@ -307,11 +350,11 @@ command :test do |c|
     pp o
     puts "g (#{g.class.name}):"
     pp g
-    
+
     LogUtils::Logger.root.debug 'test debug msg'
     LogUtils::Logger.root.info 'test info msg'
     LogUtils::Logger.root.warn 'test warn msg'
-    
+
     puts 'Done.'
   end
 end
@@ -351,4 +394,3 @@ end
 
   end  # class Toolii
 end  # module WorldDb
-

data/lib/worlddb/cli/version.rb

@@ -3,10 +3,10 @@
 # Note: WorldDb::VERSION gets used by core, that is, worlddb-models
 
 
-module WorldDbCli    # todo/check - rename to WorldDbTool or WorldDbCommands or WorldDbShell ??
+module WorldDbTool    # todo/check - rename to WorldDbTool or WorldDbCommands or WorldDbShell ??
 
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
-  MINOR = 3
+  MINOR = 4
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
@@ -22,4 +22,4 @@ module WorldDbCli    # todo/check - rename to WorldDbTool or WorldDbCommands or
     "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
   end
 
-end # module WorldDbCli
+end # module WorldDbTool

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: webservice
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: datafile
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: worlddb - world.db command line tool
 email: openmundi@googlegroups.com
 executables:
@@ -122,13 +136,14 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- assets/webservice-worlddb-32x32.png
 - bin/worlddb
 - lib/worlddb.rb
 - lib/worlddb/cli/main.rb
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/cli/version.rb
 - lib/worlddb/console.rb
-homepage: https://github.com/worlddb/world.db.tools
+homepage: https://github.com/worlddb/world.db
 licenses:
 - Public Domain
 metadata: {}
@@ -142,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -150,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: worlddb - world.db command line tool