worlddb 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f834f636b29a1231453e74665621584e008559d3
-  data.tar.gz: ac4fa3099c8d7862b87ee474fe5e942e4679a93a
+  metadata.gz: e9b04e3e102e14c97044c018ad3fdeb210120fcf
+  data.tar.gz: 7500c45d9013183766d9ef85f24d79238b275ade
 SHA512:
-  metadata.gz: d616d30efdda6a37fe07dc07e39e3fabc97b769839fb2eaf294dd4708afda4981fac8968a16b0c33c2dc43daedc796b10572966ab4510e1e20c7aa57cbdba5d4
-  data.tar.gz: 9d8bce8fb4ad6eac3a65b7daa0697b11ccb1276464d9758a291d4b00e50ccbe65d0b976d726f66ec4e220eb007a99c76a01164fdb594828d1d972f8a50bac80b
+  metadata.gz: 7f0dce7d75e23232b6807b8098bee330cf3c57292302fc142978ee0e665f8af22f91479bd51899339caf21ace1f977f2e7f7a81f3abbd99d4e6e598d9b23469a
+  data.tar.gz: d933d6e0f68f77e00cda45c1771a840414fe04d0ec41cea704984fe82b64a4af7529d8dbd92f51a0a16f3e7d0a741f3a8f9cc468f168f73915621409977bd1c3

data/HISTORY.md

@@ -1,4 +1,4 @@
-### 0.0.1 / 2012-11-05
+### 0.0.1 / 2014-12-05
 
 * Everything is new. First release
 

data/Manifest.txt

@@ -6,42 +6,5 @@ bin/worlddb
 lib/worlddb.rb
 lib/worlddb/cli/main.rb
 lib/worlddb/cli/opts.rb
+lib/worlddb/cli/version.rb
 lib/worlddb/console.rb
-lib/worlddb/deleter.rb
-lib/worlddb/matcher.rb
-lib/worlddb/models/city.rb
-lib/worlddb/models/city_comp.rb
-lib/worlddb/models/continent.rb
-lib/worlddb/models/continent_comp.rb
-lib/worlddb/models/country.rb
-lib/worlddb/models/country_code.rb
-lib/worlddb/models/country_comp.rb
-lib/worlddb/models/forward.rb
-lib/worlddb/models/lang.rb
-lib/worlddb/models/lang_comp.rb
-lib/worlddb/models/name.rb
-lib/worlddb/models/place.rb
-lib/worlddb/models/region.rb
-lib/worlddb/models/region_comp.rb
-lib/worlddb/models/tagdb/tag.rb
-lib/worlddb/models/tagdb/tagging.rb
-lib/worlddb/models/usage.rb
-lib/worlddb/patterns.rb
-lib/worlddb/reader.rb
-lib/worlddb/reader_file.rb
-lib/worlddb/reader_zip.rb
-lib/worlddb/readers/city.rb
-lib/worlddb/readers/country.rb
-lib/worlddb/readers/lang.rb
-lib/worlddb/readers/region.rb
-lib/worlddb/readers/usage.rb
-lib/worlddb/schema.rb
-lib/worlddb/stats.rb
-lib/worlddb/version.rb
-test/helper.rb
-test/test_fixture_matchers.rb
-test/test_model_city.rb
-test/test_model_comp.rb
-test/test_model_country.rb
-test/test_model_region.rb
-test/test_models.rb

data/README.md

@@ -95,72 +95,6 @@ EXAMPLES
 ~~~
 
 
-
-## Usage Models
-
-`Country` Model - Example:
-
-    at = Country.find_by! key: 'at'
-    at.name
-    # => 'Austria'
-    at.pop
-    # => 8_414_638
-    at.area
-    # => 83_871
-    
-    at.regions.count
-    # => 9
-    at.regions
-    # => [ 'Wien', 'Niederösterreich', 'Oberösterreich', ... ]
-
-    at.cities.by_pop
-    # => [ 'Wien', 'Graz', 'Linz', 'Salzburg', 'Innsbruck' ... ]
-
-
-`City` Model - Example:
-
-    c = City.find_by! key: 'wien'
-    c.name
-    # => 'Wien'
-    c.country.name
-    # => 'Austria'
-    c.country.continent.name
-    # => 'Europe'
-
-    la = City.find_by! key: 'losangeles'
-    la.name
-    # => 'Los Angeles'
-    la.region.name
-    # => 'California'
-    la.region.key
-    # => 'ca'
-    la.country.name
-    # => 'United States'
-    la.country.key
-    # => 'us'
-    la.country.continent.name
-    # => 'North America'
-
-
-`Tag` Model - Example:
-
-    euro = Tag.find_by! key: 'euro'
-    euro.countries.count
-    # => 17
-    euro.countries
-    # => ['Austria, 'Belgium', 'Cyprus', ... ]
-    
-    flanders = Tag.find_by! key: 'flanders'
-    flanders.regions.count
-    # => 5
-    flanders.regions
-    # => ['Antwerpen', 'Brabant Wallon', 'Limburg', 'Oost-Vlaanderen', 'West-Vlaanderen']
-    flanders.regions.first.country.name
-    # => 'Belgium'
-
-and so on.
-
-
 ## Install
 
 Just install the gem:
@@ -182,4 +116,3 @@ Use it as you please with no restrictions whatsoever.
 
 Send them along to the [Open Mundi (world.db) Database Forum/Mailing List](http://groups.google.com/group/openmundi).
 Thanks!
-

data/Rakefile

@@ -1,10 +1,10 @@
 require 'hoe'
-require './lib/worlddb/version.rb'
+require './lib/worlddb/cli/version.rb'
 
 
 Hoe.spec 'worlddb' do
   
-  self.version = WorldDb::VERSION
+  self.version = WorldDbCli::VERSION
 
   self.summary = "worlddb - world.db command line tool"
   self.description = summary
@@ -15,16 +15,12 @@ Hoe.spec 'worlddb' do
   self.email   = 'openmundi@googlegroups.com'
 
   self.extra_deps = [
-    ['props'],         # settings / prop(ertie)s / env / INI
-    ['logutils'],     # logging
-    ['textutils', '>= 0.9.9'], # e.g.  >= 0.6 && <= 1.0  ## will include logutils, props
-    ['tagutils'],     # tags n categories for activerecord
+    ['worlddb-models', '>=2.1.0'],
+    ### ['worlddb-service'],
 
      ## 3rd party
-    ['gli', '>= 2.9'],
-    ['rubyzip'],       ## todo: pull in via textutils ??
-    ['activerecord']  # NB: will include activesupport,etc.
-    ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
+    ['gli', '>= 2.12.2'],
+    ['sqlite3']   # Note: will include sqlite for activerecord; use worlddb-models for apps etc.
   ]
 
   # switch extension to .markdown for gihub formatting
@@ -36,7 +32,7 @@ Hoe.spec 'worlddb' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    :required_ruby_version => '>= 1.9.2'
+    required_ruby_version: '>= 1.9.2'
   }
 
 end

data/lib/worlddb.rb

@@ -1,74 +1,18 @@
-###
-# NB: for local testing run like:
-#
-# 1.9.x: ruby -Ilib lib/worlddb.rb
+# encoding: utf-8
 
-# core and stlibs
+require 'worlddb/models'   # NOTE: depends on core (aka worlddb-models)
 
-require 'pp'
-require 'logger'
-require 'optparse'
-require 'fileutils'
-require 'uri'
-require 'erb'
-require 'json'
-require 'yaml'
 
-
-# 3rd party gems / libs
-
-require 'zip'       ## rubyzip gem
-
-require 'active_record'   ## todo: add sqlite3? etc.
-
-require 'logutils'
-require 'textutils'
-require 'tagutils'
-require 'props'
-require 'props/db'  # includes ConfDb (ConfDb::Model::Prop, etc.)
+require 'gli'
+require 'logutils/activerecord'     # add support for logging to db
 
 
 # our own code
 
-require 'worlddb/version'   # always goes first
-
-require 'worlddb/patterns'  # regex patterns (constants)
-require 'worlddb/models/forward'
-
-require 'worlddb/models/name'
-require 'worlddb/models/place'
-require 'worlddb/models/continent'
-require 'worlddb/models/continent_comp'
-require 'worlddb/models/country'
-require 'worlddb/models/country_comp'
-require 'worlddb/models/country_code'
-require 'worlddb/models/region'
-require 'worlddb/models/region_comp'
-require 'worlddb/models/city'
-require 'worlddb/models/city_comp'
-require 'worlddb/models/lang'
-require 'worlddb/models/lang_comp'
-require 'worlddb/models/usage'
+require 'worlddb/cli/version'   # version always goes first
 
-require 'worlddb/models/tagdb/tag'
-require 'worlddb/models/tagdb/tagging'
-
-
-
-require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
-require 'worlddb/matcher'
-
-require 'worlddb/readers/lang'
-require 'worlddb/readers/usage'
-require 'worlddb/readers/country'
-require 'worlddb/readers/region'
-require 'worlddb/readers/city'
-
-require 'worlddb/reader'
-require 'worlddb/reader_file'
-require 'worlddb/reader_zip'
-require 'worlddb/deleter'
-require 'worlddb/stats'
+# additional for cli only
+require 'worlddb/cli/opts'
 
 
 module WorldDb
@@ -78,130 +22,7 @@ module WorldDb
     ## Runner.new.run(ARGV) - old code
   end
 
-  def self.create
-    CreateDb.new.up
-    ConfDb::Model::Prop.create!( key: 'db.schema.world.version', value: VERSION )
-  end
-
-  def self.create_all
-    LogDb.create    # add logs table
-    ConfDb.create   # add props table
-    TagDb.create    # add tags, taggings table
-    WorldDb.create
-  end
-
-
-  def self.read( ary, include_path )
-    reader = Reader.new( include_path )
-    ary.each do |name|
-      reader.load( name )
-    end
-  end
-
-
-  def self.read_setup( setup, include_path, opts={} )
-    reader = Reader.new( include_path, opts )
-    reader.load_setup( setup )
-  end
-
-  def self.read_setup_from_zip( zip_name, setup, include_path, opts={} ) ## todo/check - use a better (shorter) name ??
-    reader = ZipReader.new( zip_name, include_path, opts )
-    reader.load_setup( setup )
-    reader.close
-  end
-
-  def self.read_all( include_path, opts={} )  # load all builtins (using plain text reader); helper for convenience
-    read_setup( 'setups/all', include_path, opts )
-  end # method read_all
-
-
-  # delete ALL records (use with care!)
-  def self.delete!
-    puts '*** deleting world table records/data...'
-    Deleter.new.run
-  end # method delete!
-
-  def self.delete_all!( opts={} )
-    LogDb.delete!
-    ConfDb.delete!
-    TagDb.delete!
-    WorldDb.delete!
-  end
-
-
- ####
- ## todo: remove stats ??? why? why not? better use .tables
-  def self.stats
-    Stats.new.tables
-  end
-
-  def self.tables
-    Stats.new.tables
-  end
-
-
-  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:///world.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] # world.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
-    ActiveRecord::Base.logger = Logger.new( STDOUT )
-    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-    self.connect( adapter:  'sqlite3',
-                  database: ':memory:' )
-
-    ## build schema
-    WorldDb.create_all
-  end # setup_in_memory_db (using SQLite :memory:)
-
 end  # module WorldDb
 
 
-if __FILE__ == $0
-  WorldDb.main
-else
-  puts WorldDb.banner    # say hello
-end
+WorldDb.main   if __FILE__ == $0

data/lib/worlddb/cli/main.rb

@@ -1,18 +1,13 @@
 # encoding: utf-8
 
-require 'gli'
  
 include GLI::App
 
-# our own code / additional for cli only
-
-require 'logutils/db'     # add support for logging to db
-require 'worlddb/cli/opts'
 
 
 program_desc 'world.db command line tool'
 
-version WorldDb::VERSION
+version WorldDbCli::VERSION
 
 
 LogUtils::Logger.root.level = :info   # set logging level to info 
@@ -60,7 +55,7 @@ switch [:q, :quiet], negatable: false
 
 
 def connect_to_db( options )
-  puts WorldDb.banner
+  puts WorldDbCli.banner
 
   puts "working directory: #{Dir.pwd}"
 
@@ -237,7 +232,7 @@ pre do |g,c,o,args|
   opts.merge_gli_options!( g )
   opts.merge_gli_options!( o )
 
-  puts WorldDb.banner
+  puts WorldDbCli.banner
 
   if opts.verbose?
     LogUtils::Logger.root.level = :debug

data/lib/worlddb/{version.rb → cli/version.rb}

@@ -1,10 +1,13 @@
+# encoding: utf-8
 
-module WorldDb
+# Note: WorldDb::VERSION gets used by core, that is, worlddb-models
+
+
+module WorldDbCli    # todo/check - rename to WorldDbTool or WorldDbCommands or WorldDbShell ??
 
-  # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 9
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -16,8 +19,7 @@ module WorldDb
   end
 
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
   end
 
-end
-
+end # module WorldDbCli