worlddb-models 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65089aa526d90b22ff73acc40835c46ef784c93
-  data.tar.gz: 07883ca048c28555a3d27d1ba9a25a9b1a5de377
+  metadata.gz: af7ca070ea7895fb6595ea3c09d9081945bb9810
+  data.tar.gz: eabe0f34bb806d94ea6a24fe69fcf8656b9aad22
 SHA512:
-  metadata.gz: f9c7c04d0c3d9b7d6240865abfbc523ba464ed30d90c8433afe11826ba9e7fe770ef18176b6785f922e9ca4c51c56d6a55e253813c149ef49c0ac24a62f9b523
-  data.tar.gz: 9e615c49999dc69f574b9f50c8c14d1f489e5dd279e99e772f6629fee56b50fa7dab2445ae2b351a1efb833454694544d4c7762746b1b82774913323c691fa37
+  metadata.gz: 31b2084fb1d59c8e663d36e25be45aa03111f51af310923369b64336f3d628436686a7c39fa8044dd39cb98eb1830fce55fafa41362a55499ebcc4b300e23675
+  data.tar.gz: e2651f5001624057d10444c333c4d4a497ec4044f02a8cf2ad67183a19a974b866ffbe4e50f28030296a9fbed841d75620c1e3ff9df9771cde814f5c4415ebdc

data/Manifest.txt

@@ -32,9 +32,9 @@ lib/worlddb/readers/lang.rb
 lib/worlddb/readers/state.rb
 lib/worlddb/readers/state_tree.rb
 lib/worlddb/readers/usage.rb
+lib/worlddb/reports/country_report.rb
 lib/worlddb/schema.rb
 lib/worlddb/stats.rb
-lib/worlddb/tree_reader.rb
 lib/worlddb/version.rb
 test/adm/test_fixture_matcher_adm2.rb
 test/adm/test_fixture_matcher_adm3.rb
@@ -71,6 +71,6 @@ test/test_name_parser.rb
 test/test_parse_city.rb
 test/test_parse_country.rb
 test/test_parse_state.rb
+test/test_report_country.rb
 test/test_state_tree_reader_at.rb
 test/test_state_tree_reader_de.rb
-test/test_tree_reader.rb

data/Rakefile

@@ -17,7 +17,7 @@ Hoe.spec 'worlddb-models' do
   self.extra_deps = [
     ['props',     '>= 1.1.2'],         # settings / prop(ertie)s / env / INI
     ['logutils',  '>= 0.6.1'],     # logging
-    ['textutils', '>= 1.2.2'], 
+    ['textutils', '>= 1.3.0'], 
 
     ['tagutils',              '>= 0.3.0'],  # tags n categories for activerecord
     ['activerecord-utils',    '>= 0.2.0'],

data/lib/worlddb/models.rb

@@ -75,7 +75,7 @@ require 'worlddb/reader_zip'
 require 'worlddb/deleter'
 require 'worlddb/stats'
 
-require 'worlddb/tree_reader'
+require 'worlddb/reports/country_report'
 
 
 module WorldDb

data/lib/worlddb/models/city.rb

@@ -19,16 +19,6 @@ class City < CityBase
     'CITY'
   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
-
-
 end # class City
 
 

data/lib/worlddb/models/city_base.rb

@@ -71,13 +71,27 @@ class CityBase < ActiveRecord::Base
   end
 
 
-
   def self.parse( *args )
     ## remove (extract) attribs hash (if last arg is a hash n present)
     more_attribs = args.last.is_a?(Hash) ? args.pop : {}  ## extract_options!
-    values       = args
-  
-    self.create_or_update_from_values( values, more_attribs )
+
+    ## check if array passed in for batch (multi record) parse
+    ##  - fix/todo: add to all other parse model methods too!!!! it's a standard (feature)
+    if args.size == 1 && args[0].is_a?(Array)
+      ## e.g. City.parse( [ 'Vienna', 'Salzburg' ] )
+      ##  note: works for now only w/ *single* name/title records
+      ##  add support for array in array too - why? why not?
+      ##  e.g. City.parse( [['Vienna', 'VIE'],
+      ##                    ['Salzbrug', 'SZB']] )
+      ary = args[0]
+      ## note: return array of new objs
+      ary.map { |value| self.create_or_update_from_values( [value], more_attribs ) }
+    else
+      ## standard (sinlge) record case
+      ##  e.g.  City.parse( 'Vienna', 'VIE', '1 800 000' )
+      values  = args
+      self.create_or_update_from_values( values, more_attribs )
+    end
   end
 
 

data/lib/worlddb/models/country.rb

@@ -311,7 +311,7 @@ class Country < ActiveRecord::Base
       #################
       ## auto add capital cities
 
-      City.create_or_update_from_titles( value_cities, country_id: rec.id )
+      City.parse( value_cities, country_id: rec.id )
 
       ##################
       ## add taggings 

data/lib/worlddb/models/name.rb

@@ -1,73 +1,6 @@
 # encoding: utf-8
 
 
-##
-# todo: move to textutils!!!
-
-class NameParser
-
-  include LogUtils::Logging
-
-  def parse( chunks )
-    ## todo/fix: (re)use nameparser - for now "simple" inline version
-    ##  fix!!! - note: for now lang gets ignored
-    ##  fix: add hanlde
-    ##  Leuven[nl]|Louvain[fr] Löwen[de]
-    ##  Antwerpen[nl]|Anvers[fr] [Antwerp]
-    ##  Brussel[nl]•Bruxelles[fr]   -> official bi-lingual name
-    ##  etc.
-
-    ## values - split into names (name n lang pairs)
-    ## note: assumes (default) lang from more_attribs unless otherwise marked e.g. [] assume en etc.
-
-    ## split chunks into values
-    values = []
-    chunks.each do |chunk|
-      next if chunk.nil? || chunk.blank?  ## skip nil or empty/blank chunks
-
-      parts = chunk.split( '|' )   # 1)  split |
-
-      parts.each do |part|
-        s = StringScanner.new( part )
-        s.skip( /[ \t]+/)   # skip whitespaces
-
-        while s.eos? == false
-          if s.check( /\[/ )
-            ## scan everything until the end of bracket (e.g.])
-            ##  fix!!! - note: for now lang gets ignored
-            value = s.scan( /\[[^\]]+\]/)
-            value = value[1...-1]   # strip enclosing [] e.g. [Bavaria] => Bavaria
-          else
-            ## scan everything until the begin of bracket (e.g.[)
-            value = s.scan( /[^\[]+/)
-            value = value.strip
-          end
-          values << value
-
-          s.skip( /[ \t]+/)  # skip whitespaces
-          logger.debug( "[NameParser] eos?: #{s.eos?}, rest: >#{s.rest}<" )
-        end
-      end
-    end
-
-    logger.debug( "[NameParser] values=#{values.inspect}")
-
-    names = []
-    values.each do |value|
-      name = value
-      ## todo: split by bullet ? (official multilang name) e.g. Brussel • Bruxelles
-      ## todo: process variants w/ () e.g. Krems (a. d. Donau) etc. ??
-      names << name
-    end
-
-    logger.debug( "[NameParser] names=#{names.inspect}")
-
-    names
-  end # method parse
-end # class NameParser
-
-
-
 module WorldDb
   module Model
 

data/lib/worlddb/models/state_base.rb

@@ -21,11 +21,6 @@ class StateBase < ActiveRecord::Base
   validates :key,  format: { with: /#{STATE_KEY_PATTERN}/,  message: STATE_KEY_PATTERN_MESSAGE }
   validates :code, format: { with: /#{STATE_CODE_PATTERN}/, message: STATE_CODE_PATTERN_MESSAGE }, allow_nil: true
 
-  ### recursive self-reference - use "generic" node??
-  ## has_many :nodes, class_name: 'State', foreign_key: 'state_id'
-  # belongs_to :parent,  class_name: 'State', foreign_key: 'state_id'
-  # has_many   :states,  class_name: 'State', foreign_key: 'state_id'  ## substates
-
   ## begin compat
   def title()       name;              end
   def title=(value) self.name = value; end
@@ -143,13 +138,13 @@ class StateBase < ActiveRecord::Base
     # note: was self.find_by_key_and_country_id
     if self == State
       ## note: state scoped by country (all others by top-level state and NOT country)
-      rec = self.where(
+      rec = self.find_by(
                     key:         new_attributes[ :key ],
-                    country_id:  new_attributes[ :country_id] ).first
+                    country_id:  new_attributes[ :country_id] )
     else
-      rec = self.where(
+      rec = self.find_by(
                     key:      new_attributes[ :key ],
-                    state_id: new_attributes[ :state_id] ).first
+                    state_id: new_attributes[ :state_id] )
     end
 
     if rec.present?
@@ -168,12 +163,12 @@ class StateBase < ActiveRecord::Base
     # auto add capital cities
     #  - note: get added to top-level state (e.g. adm1)
 
-    City.create_or_update_from_titles( value_cities,
-                                            state_id:  rec.state_id,
-                                            country_id: rec.country_id )
+    City.parse( value_cities,
+                   state_id:   rec.state_id,
+                   country_id: rec.country_id )  # note: will return an array of (new) city records
 
     ### todo/fix: add captial ref to country/state
-    ## todo/fix: use update_from_title and only allow one capital city
+    ## todo/fix: only allow one capital city (now it's an array)
 
 
     ##################

data/lib/worlddb/reports/country_report.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+
+module WorldDb
+
+class CountryReport
+
+  include Models
+
+  def initialize( key )  # pass in country model - why, why not ??
+    @key = key
+  end
+
+
+  def report
+    buf = ''
+
+    c = Country.find_by!( key: @key)
+
+    buf << "Country Report for #{c.name} (#{c.key}), "
+    buf << "#{c.states.count} states"
+    buf << "\n\n"  # print newline
+
+    ## loop over states
+    parts_count    = 0
+    counties_count = 0
+    munis_count    = 0
+    cities_count   = 0
+    c.states.each do |state|
+      buf << "%-36s  |" % ["#{state.name} (#{state.key})"]
+      buf << "  %3d parts" % [state.parts.count]
+      buf << "  %3d counties" % [state.counties.count]
+      buf << "  %3d munis" % [state.munis.count]
+      buf << "  %3d cities" % [state.cities.count]
+      buf << "\n"  # print newline
+
+      parts_count    += state.parts.count
+      counties_count += state.counties.count
+      munis_count    += state.munis.count
+      cities_count    += state.cities.count
+
+      state.parts.each do |part|
+        buf << "  %-34s  |" % ["#{part.name} (#{part.key})"]
+        buf << "  %3d counties" % [part.counties.count]
+        ## buf << "  %3d munis" % [state.munis.count] -- add munis possilbe??
+        buf << "\n"  # print newline
+      end # each part
+    end # each state
+
+    buf << "\n"  # print newline
+    buf << "Total:  "
+    buf << "  #{parts_count} parts, "
+    buf << "  #{counties_count} counties, "
+    buf << "  #{munis_count} munis, "
+    buf << "  #{cities_count} cities"
+    buf << "\n"  # print newline
+
+    puts buf
+  end
+
+end # class CountryReport
+
+end # module WorldDb
+

data/lib/worlddb/schema.rb

@@ -146,16 +146,9 @@ create_table :states do |t|
   t.string :alt_names  # comma separated list of alternate names (synonyms)
 
   t.references :country,  null: false
-  t.references :state      ## parent state (optional for now - may be null for top level e.g. state/province)
   t.integer    :level,    null: false, default: 1  # default assumes 1 e.g. state/province/etc.
   ### change to l (instead of level)!!!! - shorter, why, why not???
 
-  ## flags (use single int named flags - why? why not?  
-  ### fix: use a generic kind string type flag!!!!!!
-  ## t.boolean :s,  null: false, default: false   # state flag (use adm1? or a1)
-  ## t.boolean :p,  null: false, default: false   # governmental district falg (use adm2? or a2)  - check is Oberfranken/Oberbayern admin2 in Bayern (DE) ?? - note: might be optional (than adm3 becomes adm2)
-  ## t.boolean :c,  null: false, default: false   # county (or bezirk etc.) (use adm3? or a3?)
-
   t.integer :pop     # optional population count
   t.integer :area    # optional area in square km (sq. km)
   t.timestamps
@@ -249,12 +242,6 @@ create_table :zones do |t|
   # to be done
 end
 
-## create_table :city_rels do |t|   ## city relationships (w/ states/admins) -- part of state/zone
-##   t.references :city,   null: false
-##   t.references :state  ## optional ?? either state/admin or zone ?? use polymorphic assoc or use node w/ kind for place?
-##   t.references :zone    ## tourist zone e.g. fraenkische schweiz, wachau, steigerwald, etc. - use own join table???
-## end
-
 
 create_table :cities do |t|
   t.string     :name,   null: false
@@ -262,6 +249,7 @@ create_table :cities do |t|
   t.references :place,  null: false
   t.string     :code     # short three letter code (ITAT/airport code e.g. NYC or VIE)
   t.string     :alt_names  # comma separated list of alternate names (synonyms)
+
   t.references :country,  null: false
   t.references :state    # optional for now (e.g. state, bundesland, etc.)  -- ADM1
   t.references :part     # optional for now (e.g. regierungsbezirk, etc.)   -- x   /ADM2
@@ -273,9 +261,6 @@ create_table :cities do |t|
   t.integer :pop     # optional population count (city proper); see metro for metro pop
   t.integer :area    # optional area in square km (sq. km)
 
-  ## t.float   :lat   # optional for now  --  FIX: remove?? moved to places
-  ## t.float   :lng   # optional for now  --  FIX: remove?? moved to places
-
   ### t.boolean :capital, null: false, default: false  # is national captial?
 
   t.timestamps

data/lib/worlddb/version.rb

@@ -5,7 +5,7 @@ module WorldDb
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
   MINOR = 3
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_report_country.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_report_country.rb
+
+
+require 'helper'
+
+class TestReportCountry < MiniTest::Test
+
+  ## note: special tests
+  ##   run on its own - will NOT run with test suite
+  ##   requires its own connection
+
+  def xxx_test_at
+
+    ## connect to ./austria.db
+    WorldDb.connect( adapter: 'sqlite3', database: './austria.db' )
+
+    r = WorldDb::CountryReport.new( 'at' )
+    r.report
+  end
+
+  def xxx_test_de
+    ## connect to ./deutschland.db
+    WorldDb.connect( adapter: 'sqlite3', database: './deutschland.db' )
+
+    r = WorldDb::CountryReport.new( 'de' )
+    r.report
+  end
+
+
+end # class TestReportCountry

data/test/test_state_tree_reader_at.rb

@@ -31,7 +31,7 @@ class TestStateTreeReaderAt < MiniTest::Test
     reader.read
 
     n = State.find_by!( key: 'n' )
-    assert_equal 'Niederösterreich [Lower Austria]',  n.name
+    assert_equal 'Niederösterreich',  n.name
     assert_equal 25,                                  n.counties.count
 
     ks = County.find_by!( key: 'ks' )
@@ -47,7 +47,7 @@ class TestStateTreeReaderAt < MiniTest::Test
     assert_equal 'Gneixendorf',                      gneixendorf.name
     assert_equal 'Krems an der Donau',               gneixendorf.muni.name
     assert_equal 'Krems an der Donau (Stadt)',       gneixendorf.muni.county.name
-    assert_equal 'Niederösterreich [Lower Austria]', gneixendorf.muni.county.state.name
+    assert_equal 'Niederösterreich', gneixendorf.muni.county.state.name
   end
 
 end # class TestStateTreeReaderAt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
@@ -208,9 +208,9 @@ files:
 - lib/worlddb/readers/state.rb
 - lib/worlddb/readers/state_tree.rb
 - lib/worlddb/readers/usage.rb
+- lib/worlddb/reports/country_report.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/stats.rb
-- lib/worlddb/tree_reader.rb
 - lib/worlddb/version.rb
 - test/adm/test_fixture_matcher_adm2.rb
 - test/adm/test_fixture_matcher_adm3.rb
@@ -247,9 +247,9 @@ files:
 - test/test_parse_city.rb
 - test/test_parse_country.rb
 - test/test_parse_state.rb
+- test/test_report_country.rb
 - test/test_state_tree_reader_at.rb
 - test/test_state_tree_reader_de.rb
-- test/test_tree_reader.rb
 homepage: https://github.com/worlddb/world.db.models
 licenses:
 - Public Domain
@@ -286,11 +286,11 @@ test_files:
 - test/adm/test_fixture_matcher_adm3.rb
 - test/test_parse_country.rb
 - test/test_model_state.rb
-- test/test_tree_reader.rb
 - test/test_model_city.rb
 - test/test_fixture_matchers.rb
 - test/test_model_country.rb
 - test/test_parse_city.rb
+- test/test_report_country.rb
 - test/test_model_compat.rb
 - test/test_model_states_de.rb
 - test/test_state_tree_reader_at.rb

data/lib/worlddb/tree_reader.rb

@@ -1,97 +0,0 @@
-# encoding: utf-8
-
-
-# fix: move into TextUtils namespace/module!!
-
-class TreeReader
-
-  include LogUtils::Logging
-
-  def self.from_file( path )
-    ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
-    ## - see textutils/utils.rb
-   text = File.read_utf8( path )
-   self.from_string( text )
-  end
-
-  def self.from_string( text )
-    self.new( text )
-  end
-
-  def initialize( text )
-    @text = text
-  end
-
-  TreeItem = Struct.new( :level, :key, :value )
-
-  KEY_REGEX     = /
-                      ([0-9][0-9A-Za-z]*)   ## key starting with a nummer
-                        |
-                      ([a-z]+)   ## key all lowercase e.g. bt,n,etc.
-                        |
-                      ([A-Z]+)   ## key all uppercase e.g. BT,N,etc
-                  /x
-
-  LEVEL_REGEX   = /\.+/     ## e.g. .. or .... etc.
-
-
-  def each_line  
-    stack    = []     # note: last_level  => stack.size; starts w/ 0
-    times    = 2      # assume two indents factor (e.g. .. =2, ....=3 etc. ) for now
-
-    reader = LineReader.from_string( @text )
-    reader.each_line do |line|
-
-      logger.debug "[TreeReader]  line (before) => >#{line}<"
-
-      s = StringScanner.new( line )
-      s.skip( /[ \t]+/ )   # remove whitespace
-
-      key = s.scan( KEY_REGEX )
-      if key
-        s.skip( /[ \t]+/ )   # remove whitespace
-      end
-
-      level_str = s.scan( LEVEL_REGEX )
-      if level_str
-        ## FIX!! todo/check: make sure level_str.size is a multiple of two !! (e.g. 2,4,6,etc.)
-        level = (level_str.size/times)+1
-        s.skip( /[ \t]+/ )   # remove whitespace
-      else
-        level = 1   ## no level found; assume top level (start w/ 1)
-      end
-
-      ## assume rest is record
-      rest = s.rest  ## was: s.scan( /.+/ )
-
-      level_diff = level - stack.size
-
-      if level_diff > 0
-        logger.debug "[TreeReader]    up  +#{level_diff}"
-        ## FIX!!! todo/check/verify/assert: always must be +1
-      elsif level_diff < 0
-        logger.debug "[TreeReader]    down #{level_diff}"
-        level_diff.abs.times { stack.pop }
-        stack.pop
-      else
-        ## same level
-        stack.pop
-      end
-
-      item = TreeItem.new
-      item.level = level
-      item.key   = key
-      item.value = rest
-
-      stack.push( item )
-
-      ## for debugging - show tree item (note) hierarchy 
-      names = stack.map { |it| "(#{it.level}) #{it.value}" }
-      logger.debug "[TreeReader]    #{names.join( ' › ' )}  -- key: >#{key}<, level: >#{level}<, rest: >#{rest}<"
-
-      yield( stack )
-    end
-  end # method each_line
-
-end # class TreeReader
-

data/test/test_tree_reader.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_tree_reader.rb
-
-
-require 'helper'
-
-class TestTreeReader < MiniTest::Test
-
-  def setup
-    #  delete all countries, states, cities in in-memory only db
-    WorldDb.delete!
-  end
-
-
-  def test_oberfranken
-    reader = TreeReader.from_file( "#{WorldDb.root}/test/data/de-deutschland/3--by-bayern/4--oberfranken/orte.txt" )
- 
-    reader.each_line do |_|
-      ## do nothing for now
-    end
-    
-    assert true ## assume everything ok if we get here
-  end
-
-  def test_de
-    reader = TreeReader.from_file( "#{WorldDb.root}/test/data/de-deutschland/orte.txt" )
- 
-    reader.each_line do |_|
-      ## do nothing for now
-    end
-
-    assert true ## assume everything ok if we get here
-  end
-
-end # class TestTreeReader
-