worlddb 2.0.9 → 2.1.0

data/lib/worlddb/console.rb

@@ -1,15 +1,10 @@
-## for use to run with interactive ruby (irb)
-##  e.g.  irb -r worlddb/console
+# encoding: utf-8
 
-require 'worlddb'
 
-# some ruby stdlibs
+## for use to run with interactive ruby (irb)
+##  e.g.  irb -r worlddb/console
 
-require 'logger'
-require 'pp'   # pretty printer
-require 'uri'
-require 'json'
-require 'yaml'
+require 'worlddb/models'
 
 
 ## shortcuts for models
@@ -28,7 +23,7 @@ City       = WorldDb::Model::City
 
 DB_CONFIG = {
   adapter:  'sqlite3',
-  database: 'world.db'
+  database: './world.db'
 }
 
 pp DB_CONFIG

metadata

@@ -1,101 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: props
+  name: worlddb-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: tagutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -146,7 +90,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -155,45 +98,8 @@ files:
 - 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
 homepage: https://github.com/worlddb/world.db.ruby
 licenses:
 - Public Domain
@@ -220,10 +126,4 @@ rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: worlddb - world.db command line tool
-test_files:
-- test/test_model_comp.rb
-- test/test_models.rb
-- test/test_model_city.rb
-- test/test_fixture_matchers.rb
-- test/test_model_country.rb
-- test/test_model_region.rb
+test_files: []

data/lib/worlddb/deleter.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-
-  class Deleter
-    
-    ## make models available in worlddb module by default with namespace
-    #  e.g. lets you use City instead of Models::City 
-    include WorldDb::Models
-
-    def run
-      # for now delete all tables
-      
-      ## Tagging.delete_all   # - use TagDb.delete!
-      ## Tag.delete_all
-
-      CountryCode.delete_all
-      Name.delete_all
-      Place.delete_all
-      City.delete_all
-      Region.delete_all
-      Country.delete_all
-      Continent.delete_all
-      Usage.delete_all
-      Lang.delete_all
-
-      #  Prop.delete_all    # - use ConfDb.delete!
-    end
-
-  end # class Deleter
-
-end # module WorldDb

data/lib/worlddb/matcher.rb

@@ -1,143 +0,0 @@
-# encoding: UTF-8
-
-module WorldDb
-
-module Matcher
-
-  def match_xxx_for_country( name, xxx )  # xxx e.g. cities|regions|beers|breweries
-    #      auto-add required country code (from folder structure)
-    #  note: always let match_xxx_for_country_n_region go first
-
-    # note: allow  /cities and /1--hokkaido--cities
-    xxx_pattern = "(?:#{xxx}|[0-9]+--[^\\/]+?--#{xxx})"    # note: double escape \\ required for backslash
-
-    ##
-    ## todo: add $-anchor at the end of pattern - why? why not?? (will include .txt or .yaml??)
-
-    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/#{xxx_pattern}/         ||    # (1)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/#{xxx_pattern}/ ||    # (2)
-       name =~ /(?:^|\/)([a-z]{2,3})\/#{xxx_pattern}/                ||    # (3)
-       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--[^\/]+\/#{xxx_pattern}/ ||   # (4)
-       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+--#{xxx}/    # (5)
-
-      country_key = $1.dup
-      yield( country_key )
-      true # bingo - match found
-      
-      ######
-      # (1)  new style: e.g. /at-austria/beers or ^at-austria!/cities
-      #
-      # (2)  new-new style e.g. /1--at-austria--central/cities
-      #
-      # (3)  classic style: e.g. /at/beers (europe/at/cities)
-      #
-      # (4) new style w/ region w/o abbrev/code e.g. /ja-japon/1--hokkaido/cities
-      #
-      # (5)  compact style (country part of filename):
-      #   e.g. /at-austria--cities or /europe/at-austria--cities
-    else
-      false # no match found
-    end
-  end
-
-
-  def match_xxx_for_country_n_region( name, xxx ) # xxx e.g. wine|wineries
-
-    # auto-add required country n region code (from folder structure)
-
-    ## -- allow opt_folders after long regions (e.g. additional subregion/zone)
-    ## -- allow anything (prefixes) before -- for xxx
-    #       e.g.  at-austria!/1--n-niederoesterreich--eastern/wagram--wines
-    #             at-austria!/1--n-niederoesterreich--eastern/wagram--wagram--wines
-
-    # note: allow  /cities and /1--hokkaido--cities and /hokkaido--cities too
-    xxx_pattern = "(?:#{xxx}|[^\\/]+--#{xxx})"    # note: double escape \\ required for backslash
-    
-    ## allow optional folders -- TODO: add restriction ?? e.g. must be 4+ alphas ???
-    opt_folders_pattern = "(?:\/[^\/]+)*"
-    ## note: for now only (style #2) n (style #3)  that is long region allow opt folders
-
-    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/  ||                # (1)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+#{opt_folders_pattern}\/#{xxx_pattern}/ || # (2)
-       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+#{opt_folders_pattern}\/#{xxx_pattern}/         || # (3)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/            # (4)
-
-      #######
-      # nb: country must start name (^) or coming after / e.g. europe/at-austria/...
-      # (1)
-      # new style: e.g.  /at-austria/w-wien/cities or
-      #                  ^at-austria!/w-wien/cities
-      # (2)
-      # new new style e.g.  /1--at-austria--central/1--w-wien--eastern/cities
-      #
-      # (3)
-      #  new new mixed style e.g.  /at-austria/1--w-wien--eastern/cities
-      #      "classic" country plus new new region
-      #
-      # (4)
-      #  new new mixed style e.g.  /1--at-austria--central/w-wien/cities
-      #      new new country plus "classic" region
-
-      country_key = $1.dup
-      region_key  = $2.dup
-      yield( country_key, region_key )
-      true # bingo - match found
-    else
-      false # no match found
-    end
-  end
-
-
-  def match_cities_for_country( name, &blk )
-    ## todo: check if there's a better (more ruby way) to pass along code block ??
-    ## e.g. try
-    ##   match_xxx_for_country( name, 'cities') { |country_key| yield(country_key) }
-
-    match_xxx_for_country( name, 'cities', &blk )
-  end
-
-  def match_regions_for_country( name, &blk )
-    ## also try synonyms e.g. old regions (if not match for states)
-    found = match_xxx_for_country( name, 'states', &blk )
-    found = match_xxx_for_country( name, 'regions', &blk ) unless found
-    found
-  end
-
-  def match_regions_abbr_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
-    ## also try synonyms e.g. old regions (if not match for states)
-    found = match_xxx_for_country( name, 'states\.abbr', &blk )
-    found = match_xxx_for_country( name, 'regions\.abbr', &blk ) unless found
-    found
-  end
-
-  def match_regions_iso_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
-    ## also try synonyms e.g. old regions (if not match for states)
-    found = match_xxx_for_country( name, 'states\.iso', &blk )
-    found = match_xxx_for_country( name, 'regions\.iso', &blk ) unless found
-    found 
-  end
-
-  def match_regions_nuts_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
-    ## also try synonyms e.g. old regions (if not match for states)
-    found = match_xxx_for_country( name, 'states\.nuts', &blk )
-    found = match_xxx_for_country( name, 'regions\.nuts', &blk ) unless found
-    found
-  end
-
-
-  def match_countries_for_continent( name )
-    if name =~ /^([a-z][a-z\-_]+[a-z])\/countries/     # e.g. africa/countries or america/countries
-      ### NB: continent changed to regions (e.g. middle-east, caribbean, north-america, etc.)
-      ## auto-add continent (from folder structure) as tag
-      ## fix: allow dash/hyphen/minus in tag
-      continent = $1.dup
-      yield( continent )
-      true
-    else
-      false # no match found
-    end
-  end
-
-end # module Matcher
-
-end # module WorldDb

data/lib/worlddb/models/city.rb

@@ -1,240 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-###
-##  Todo:
-##  use four classes instead of one ?
-#    e.g. Use class class Metro n class City n class District n class CityBase ?? - why? why not?
-#
-#  find a better name for CityBase ??
-#     Locality ??
-#      or CityCore or CityStd or CityAll or CityGeneric
-#      or CityLike or CityTable or CityTbl or ???
-
-class City < ActiveRecord::Base
-  
-  extend TextUtils::TagHelper  # will add self.find_tags, self.find_tags_in_attribs!, etc.
-
-  # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
-  #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, self.is_address?, self.is_taglist? etc.
-
-
-  self.table_name = 'cities'
-
-  belongs_to :place,   class_name: 'Place',   foreign_key: 'place_id'
-  belongs_to :country, class_name: 'Country', foreign_key: 'country_id'
-  belongs_to :region,  class_name: 'Region',  foreign_key: 'region_id'
-
-  ## self referencing hierachy within cities e.g. m|metro > c|city > d|district
-
-  ## fix: use condition check for m|d|c flag?? why? why not? (NB: flags are NOT exclusive e.g. possible metro|city)
-  
-  ## (1) metro - level up
-  has_many   :cities,    class_name: 'City',  foreign_key: 'city_id'
-
-  ## (2) city
-  belongs_to :metro,     class_name: 'City',  foreign_key: 'city_id'   ## for now alias for parent - use parent?
-  has_many   :districts, class_name: 'City',  foreign_key: 'city_id'   ## for now alias for cities - use cities?
-
-  ## (3) district - level down
-  belongs_to :city,      class_name: 'City',  foreign_key: 'city_id'  ## for now alias for parent - use parent?
-
-  has_many_tags
-
-  ###
-  #  NB: use is_  for flags to avoid conflict w/ assocs (e.g. metro?, city? etc.)
-  
-  def is_metro?()    m? == true;  end
-  def is_city?()     c? == true;  end
-  def is_district?() d? == true;  end
-
-  before_create :on_create
-  before_update :on_update
-
-  def on_create
-    place_rec = Place.create!( name: name, kind: place_kind )
-    self.place_id = place_rec.id 
-  end
-
-  def on_update
-    ## fix/todo: check - if name or kind changed - only update if changed ?? why? why not??
-    place.update_attributes!( name: name, kind: place_kind )
-  end
-
-  def place_kind   # use place_kind_of_code ??
-    ### fix/todo: make sure city records won't overlap (e.g. using metro n city flag at the same time; use separate records)
-#//////////////////////////////////
-#// fix: add nested record syntax e.g. city w/ metro population
-#//  use (metro: 4444)  e.g. must start with (<nested_type>: props) !!! or similar
-#//
-    if is_metro?
-      'MTRO'
-    elsif is_district?
-      'DIST'
-    else
-      'CITY'
-    end
-  end
-
-
-  validates :key,  format: { with: /#{CITY_KEY_PATTERN}/, message: CITY_KEY_PATTERN_MESSAGE }
-  validates :code, format: { with: /#{CITY_CODE_PATTERN}/, message: CITY_CODE_PATTERN_MESSAGE }, allow_nil: true
-
-
-  scope :by_key,   ->{ order( 'key asc' )  }  # order by key (a-z)
-  scope :by_name,  ->{ order( 'name asc' ) } # order by title (a-z)
-  scope :by_pop,   ->{ order( 'pop desc' ) }  # order by pop(ulation)
-  scope :by_popm,  ->{ order( 'popm desc' ) } # order by pop(ulation) metropolitan area
-  scope :by_area,  ->{ order( 'area desc' ) }  # order by area (in square km)
-
-
-  def all_names( opts={} )
-    ### fix:
-    ## allow to passing in sep or separator e.g. | or other
-
-    return name if alt_names.blank?
-    
-    buf = ''
-    buf << name
-    buf << ' | '
-    buf << alt_names.split('|').join(' | ')
-    buf
-  end
-
-
-  def self.create_or_update_from_values( values, more_attribs={} )
-    ## key & title & country required
-
-    attribs, more_values = find_key_n_title( values )
-    attribs = attribs.merge( more_attribs )
-
-    ## check for optional values
-    City.create_or_update_from_attribs( attribs, more_values )
-  end
-
-
-  def self.create_or_update_from_titles( titles, more_attribs = {} )
-    # ary of titles e.g. ['Wien', 'Graz'] etc.
-
-    titles.each do |title|
-      values = [title]
-      City.create_or_update_from_values( values, more_attribs ) 
-    end # each city
-  end  # method create_or_update_from_titles
-
-
-
-  def self.create_or_update_from_attribs( new_attributes, values, opts={} )
-    #   attribs -> key/value pairs e.g. hash
-    #   values  -> ary of string values/strings (key not yet known; might be starting of value e.g. city:wien)
-
-    ## opts e.g. :skip_tags true|false
-
-    ## fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
-
-    value_numbers     = []
-    value_tag_keys    = []
-      
-    ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-    value_tag_keys += find_tags_in_attribs!( new_attributes )
-
-    new_attributes[ :c ] = true   # assume city type by default (use metro,district to change in fixture)
-
-    ## check for optional values
-
-    values.each_with_index do |value,index|
-      if match_region_for_country( value, new_attributes[:country_id] ) do |region|
-           new_attributes[ :region_id ] = region.id
-         end
-      elsif match_country( value ) do |country|
-              new_attributes[ :country_id ] = country.id
-            end
-      elsif match_metro( value ) do |city|
-              new_attributes[ :city_id ] = city.id
-            end
-      elsif match_metro_pop( value ) do |num|  # m:
-              new_attributes[ :popm ] = num
-              new_attributes[ :m ] = true   #  auto-mark city as m|metro too
-            end
-      elsif match_metro_flag( value ) do |_|  # metro(politan area)
-              new_attributes[ :c ] = false   # turn off default c|city flag; make it m|metro only
-              new_attributes[ :m ] = true
-            end
-      elsif match_city( value ) do |city|  # parent city for district
-              new_attributes[ :city_id ] = city.id
-              new_attributes[ :c ] = false # turn off default c|city flag; make it d|district only
-              new_attributes[ :d ] = true
-            end
-      elsif match_km_squared( value ) do |num|   # allow numbers like 453 km²
-              value_numbers << num
-            end
-      elsif match_number( value ) do |num|    # numeric (nb: can use any _ or spaces inside digits e.g. 1_000_000 or 1 000 000)
-              value_numbers << num
-            end
-      elsif value =~ /#{CITY_CODE_PATTERN}/  ## assume three-letter code
-        new_attributes[ :code ] = value
-      elsif (values.size==(index+1)) && is_taglist?( value )   # tags must be last entry
-        logger.debug "   found tags: >>#{value}<<"
-        value_tag_keys += find_tags( value )
-      else
-        # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}<"
-      end
-    end # each value
-
-    if value_numbers.size > 0
-      new_attributes[ :pop  ] = value_numbers[0]   # assume first number is pop for cities
-      new_attributes[ :area ] = value_numbers[1]  
-    end
-
-    rec = City.find_by_key( new_attributes[ :key ] )
-
-    if rec.present?
-      logger.debug "update City #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create City:"
-      rec = City.new
-    end
-
-    logger.debug new_attributes.to_json
-
-    rec.update_attributes!( new_attributes )
-
-      ##################
-      ## add taggings
-
-      ## todo/fix: reuse - move add taggings into method etc.
-
-      if value_tag_keys.size > 0
-
-        if opts[:skip_tags].present?
-          logger.debug "   skipping add taggings (flag skip_tag)"
-        else
-          value_tag_keys.uniq!  # remove duplicates
-          logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
-
-          ### fix/todo: check tag_ids and only update diff (add/remove ids)
-
-          value_tag_keys.each do |key|
-            tag = Tag.find_by_key( key )
-            if tag.nil?  # create tag if it doesn't exit
-              logger.debug "   creating tag >#{key}<"
-              tag = Tag.create!( key: key )
-            end
-            rec.tags << tag
-          end
-        end
-      end
-
-    rec
-  end # method create_or_update_from_values
-
-
-end # class Cities
-
-  end # module Model
-end # module WorldDb