worlddb-models 2.2.2 → 2.3.0

data/test/data/at-austria/2--n-niederoesterreich/counties.txt

@@ -7,8 +7,9 @@
 ##  ?? Gemeinden
 ##  ?? Ortschaften
 
-Krems an der Donau,                 52 km²,   24_085  # KS
-St. Pölten,                        108 km²,   52_145 # P
+ks, Krems an der Donau (Stadt),         52 km²,   24_085  # KS
+p,  St. Pölten (Stadt),                108 km²,   52_145 # P
+
 Waidhofen an der Ybbs,             132 km²,   11_341 # WY
 Wiener Neustadt,                    61 km²,   42_273  # WN
 Amstetten,                        1188 km²,   112_944 # AM 
@@ -19,13 +20,14 @@ Gmünd,                             786 km²,   37_420  # GD
 Hollabrunn,                       1011 km²,   50_065  # HL
 Horn,                              784 km²,   31_273  # HO
 Korneuburg,                        627 km²,   76_370  # KO
-Krems-Land (Krems an der Donau),   924 km²,   55_945  # KR
+
+kr, Krems-Land (Krems an der Donau),   924 km²,   55_945  # KR
 Lilienfeld,                        932 km²,   26_040  # LF 
 Melk,                             1014 km²,   76_369  # ME
 Mistelbach,                       1291 km²,   74_150  # MI
 Mödling,                           277 km²,   115_677 # MD   
 Neunkirchen,                      1146 km²,   85_539  # NK 
-St. Pölten-Land (St. Pölten),     1122 km²,   97_365  #  PL
+pl, St. Pölten-Land (St. Pölten),     1122 km²,   97_365  #  PL
 Scheibbs,                         1023 km²,   41_073   # SB   
 Tulln (Tulln an der Donau),        658 km²,   72_104  # TU  
 Waidhofen an der Thaya,            669 km²,   26_424   # WT

data/test/data/at-austria/orte.txt

@@ -0,0 +1,23 @@
+3     Niederösterreich
+301   .. Krems an der Donau (Stadt)
+30101 .... Krems an der Donau                     ## SS; 3500; 3506 3541
+03148 ...... Gneixendorf                          ## 3500
+03149 ...... Krems an der Donau                   ## 3500 3506
+03150 ...... Landersdorf                          ## 3500
+03151 ...... Lerchenfeld                          ## 3500
+03152 ...... Rehberg                              ## 3500 3541
+03153 ...... Stein an der Donau                   ## 3500
+04164 ...... Egelsee                              ## 3500
+04165 ...... Scheibenhof                          ## 3500
+04237 ...... Angern                               ## 3506
+04238 ...... Brunnkirchen                         ## 3506
+04239 ...... Hollenburg                           ## 3506
+04240 ...... Thallern                             ## 3506
+302   .. St. Pölten (Stadt)
+30201 .... St. Pölten                             ## SS; 3100; 3104 3105 3107 3140 3151 3385
+03154 ...... Harland                              ## 3100 3104
+03155 ...... Oberradlberg                         ## 3105
+03156 ...... Oberwagram                           ## 3100
+03157 ...... Ragelsdorf                           ## 3107
+03158 ...... St. Pölten                           ## 3100 3104 3107 3151
+03159 ...... Spratzern                            ## 3100 3151

data/test/data/at-austria/setups/tree.txt

@@ -0,0 +1,9 @@
+
+# note: same as admin plus tree (orte.txt)
+
+at-austria!/states
+at-austria!/1--b-burgenland/counties
+at-austria!/2--n-niederoesterreich/counties
+at-austria!/3--w-wien/counties
+
+at-austria!/orte

data/test/data/de-deutschland/3--by-bayern/4--oberfranken/counties.txt

@@ -20,23 +20,24 @@
 
 # 4 kreisfreie Städte und
 
-Bamberg (Kreisfreie Stadt)
-Bayreuth (Kreisfreie Stadt)
-Coburg (Kreisfreie Stadt)
-Hof (Kreisfreie Stadt)
+ba, Bamberg (Stadt)
+bt, Bayreuth (Stadt)
+co, Coburg (Stadt)
+ho, Hof (Stadt)
 
 
 # 9 Landkreise
 ## how to deal w/ same name?? (same keys)
 ##  - use bambergland, bayreuthland etc. for key ??
 
-Bamberg-Landkreis   ## (Landkreis)
-Bayreuth-Landkreis  ## (Landkreis)
-Coburg-Landkreis    ## (Landkreis)
-Hof-Landkreis       ## (Landkreis)
+baland, Bamberg (Land)    ## (Landkreis)
+btland, Bayreuth (Land)   ## (Landkreis)
+coland, Coburg (Land)     ## (Landkreis)
+holand, Hof (Land)        ## (Landkreis)
+
+fo,  Forchheim    ## Landkreis
+kc,  Kronach      ## Landkreis
+ku,  Kulmbach     ## Landkreis
+lif, Lichtenfels  ## Landkreis
+wun, Wunsiedel i. Fichtelgebirge  ## Landkreis
 
-Forchheim (Landkreis)
-Kronach (Landkreis)
-Kulmbach (Landkreis)
-Lichtenfels (Landkreis)
-Wunsiedel im Fichtelgebirge (Landkreis)

data/test/data/de-deutschland/3--by-bayern/4--oberfranken/orte.txt

@@ -0,0 +1,104 @@
+2     Bayern
+24    .. Oberfranken
+241   .... Bamberg (Stadt)     ## Kreisfreie Stadt
+      ...... Bamberg
+      ........ Bamberg
+242   .... Bayreuth (Stadt)    ## Kreisfreie Stadt
+      ...... Bayreuth
+      ........ Bayreuth
+243   .... Coburg (Stadt)      ## Kreisfreie Stadt
+      ...... Coburg
+      ........ Coburg 
+244   .... Hof (Stadt)         ## Kreisfreie Stadt
+      ...... Hof
+      ........ Hof
+
+245   .... Bamberg (Land)      ## Landkreis   -- 36 Gemeinden; see de.wikipedia.org/wiki/Landkreis_Bamberg
+             ## 4 Städte
+      ...... Baunach        ## (4013, 30,9 km²)
+      ........ Baunach
+      ...... Hallstadt      ## (8364, 14,5 km²)
+      ........ Hallstadt    ## (7588)
+      ........ Dörfleins    ## (1380)
+      ...... Scheßlitz      ## (7184, 94,9 km²)
+      ........ Scheßlitz
+      ........ Köttensdorf
+      ........ Würgau
+      ...... Schlüsselfeld  ## (5712, 70,2 km²)
+
+             ## 8 Märkte
+      ...... Burgebrach             ## (6553, 87,9 km²)
+      ...... Burgwindheim           ## (1311, 37,4 km²)
+      ...... Buttenheim             ## (3472, 30 km²)
+      ...... Ebrach                 ## (1830, 29,6 km²)
+      ...... Heiligenstadt i. OFr.  ## (3525, 76,7 km²)
+      ........ Heiligenstadt i. OFr.
+      ........ Oberleinleiter
+      ...... Hirschaid              ## (11.919, 41 km²)
+      ...... Rattelsdorf            ## (4568, 39,6 km²)
+      ........ Rattelsdorf
+      ........ Mürsbach
+      ........ Freudeneck
+      ........ Höfen
+      ........ Ebing
+      ...... Zapfendorf             ## (4954, 30,6 km²)
+
+             ## 24 Gemeinden
+      ...... Altendorf              ## (2012, 8,6 km²)
+      ...... Bischberg              ## (6012, 17,5 km²)
+      ...... Breitengüßbach         ## (4586, 16,9 km²)
+      ........ Breitengüßbach
+      ...... Frensdorf              ## (4865, 44 km²)
+      ...... Gerach                 ## (946, 7,8 km²)
+      ...... Gundelsheim            ## (3378, 3,8 km²)
+      ...... Kemmern                ## (2544, 8,3 km²)
+      ........ Kemmern
+      ...... Königsfeld             ## (1335, 42,7 km²)
+      ........ Königsfeld
+      ........ Huppendorf
+      ...... Lauter                 ## (1139, 12,8 km²)
+      ........ Lauter               ## (601)
+      ........ Appendorf            ## (213)
+      ...... Lisberg                ## (1813, 8,4 km²)
+      ...... Litzendorf             ## (6057, 25,9 km²)
+      ........ Litzendorf
+      ........ Schammelsdorf
+      ........ Melkendorf
+      ........ Lohndorf
+      ........ Tiefenellern
+      ...... Memmelsdorf            ## (8854, 26,2 km²)
+      ........ Memmelsdorf
+      ........ Merkendorf
+      ........ Drosendorf      
+      ...... Oberhaid               ## (4590, 27,2 km²)
+      ........ Oberhaid
+      ........ Staffelbach
+      ...... Pettstadt                  ## (1940, 9,9 km²)
+      ...... Pommersfelden              ## (2851, 35,7 km²)
+      ...... Priesendorf                ## (1470, 8,4 km²)
+      ...... Reckendorf                 ## (2033, 13,1 km²)
+      ........ Reckendorf
+      ...... Schönbrunn im Steigerwald  ## (1880, 24,7 km²)
+      ...... Stadelhofen                ## (1250, 41 km²)
+      ........ Stadelhofen
+      ........ Steinfeld
+      ........ Schederndorf
+      ...... Stegaurach                 ## (6842, 23,9 km²)
+      ...... Strullendorf               ## (7807, 31,7 km²)
+      ........ Strullendorf
+      ........ Geisfeld
+      ........ Roßdorf am Forst
+      ...... Viereth-Trunstadt          ## (3562, 15,8 km²)
+      ...... Walsdorf                   ## (2575, 16,2 km²)
+      ...... Wattendorf                 ## (679, 22,2 km²)
+      ........ Wattendorf
+
+246   .... Bayreuth (Land)     ## Landkreis
+247   .... Coburg (Land)       ## Landkreis
+248   .... Forchheim
+249   .... Hof (Land)          ## Landkreis
+24A   .... Kronach
+24B   .... Kulmbach
+24C   .... Lichtenfels
+24D   .... Wunsiedel i. Fichtelgebirge
+

data/test/data/de-deutschland/3--by-bayern/4--oberfranken/orte_ii.txt

@@ -0,0 +1,17 @@
+2     Bayern
+24    .. Oberfranken
+241   .... Bamberg (Stadt)     ## Kreisfreie Stadt
+      ...... Bamberg
+      ........ Bamberg
+242   .... Bayreuth (Stadt)    ## Kreisfreie Stadt
+      ...... Bayreuth
+      ........ Bayreuth
+
+245   .... Bamberg (Land)      ## Landkreis   -- 36 Gemeinden; see de.wikipedia.org/wiki/Landkreis_Bamberg
+             ## 4 Städte
+      ...... Baunach        ## (4013, 30,9 km²)
+      ........ Baunach
+      ...... Hallstadt      ## (8364, 14,5 km²)
+      ........ Hallstadt    ## (7588)
+      ........ Dörfleins    ## (1380)
+

data/test/data/de-deutschland/3--by-bayern/{districts.txt → parts.txt}

@@ -1,7 +1,7 @@
 ########################################
 #  Bayern
 #
-#  7 Regierungsbezirke  (administrative districts or governmental districts - use unit/division?)
+#  7 Regierungsbezirke  (administrative districts or governmental districts)
 
 ob,   Oberbayern,    München,     17_530 km²      # 091 OB
 nb,   Niederbayern,  Landshut,    10_329 km²      # 092 NB

data/test/data/de-deutschland/orte.txt

@@ -0,0 +1,12 @@
+2     Bayern
+24    .. Oberfranken
+241   .... Bamberg (Stadt)     ## Kreisfreie Stadt
+      ...... Bamberg
+      ........ Bamberg
+
+#####
+# todo: for testing add berlin and some more
+
+9     Berlin
+91    .. Berlin
+

data/test/data/de-deutschland/setups/adm.txt

@@ -3,6 +3,6 @@
 
 
 de-deutschland!/states
-de-deutschland!/3--by-bayern/districts
+de-deutschland!/3--by-bayern/parts
 de-deutschland!/3--by-bayern/1--oberbayern/counties
 de-deutschland!/3--by-bayern/4--oberfranken/counties

data/test/data/de-deutschland/setups/tree.txt

@@ -0,0 +1,9 @@
+
+# note: same as admin plus tree (orte.txt)
+
+de-deutschland!/states
+de-deutschland!/3--by-bayern/parts
+de-deutschland!/3--by-bayern/1--oberbayern/counties
+de-deutschland!/3--by-bayern/4--oberfranken/counties
+
+de-deutschland!/3--by-bayern/4--oberfranken/orte

data/test/helper.rb

@@ -14,8 +14,15 @@ Name      = WorldDb::Model::Name
 Place     = WorldDb::Model::Place
 Continent = WorldDb::Model::Continent
 Country   = WorldDb::Model::Country
-Region    = WorldDb::Model::Region
+
+State     = WorldDb::Model::State
+Part      = WorldDb::Model::Part
+County    = WorldDb::Model::County
+Muni      = WorldDb::Model::Muni
+
+Metro     = WorldDb::Model::Metro
 City      = WorldDb::Model::City
+District  = WorldDb::Model::District
 
 Lang      = WorldDb::Model::Lang
 Usage     = WorldDb::Model::Usage

data/test/test_fixture_matchers.rb

@@ -16,7 +16,7 @@ class TestFixtureMatchers < MiniTest::Test
       'at-austria/cities',
       'at-austria!/cities',
       'at-austria!/1--niederoesterreich--eastern--cities',
-      'at-austria!/1--niederoesterreich--eastern/cities',   # region w/o code/abbrev
+      'at-austria!/1--niederoesterreich--eastern/cities',   # state w/o code/abbrev
       'at-austria!/1--niederoesterreich--eastern/1--waldviertel--cities'
     ]
 
@@ -41,7 +41,7 @@ class TestFixtureMatchers < MiniTest::Test
       'europe/1--at-austria--central/beers',
       'europe/1--at-austria--central/1--niederosterreich--eastern--beers',
       'at-austria!/1--niederoesterreich--eastern--beers',
-      'at-austria!/1--niederoesterreich--eastern/beers',    # region w/o code/abbrev
+      'at-austria!/1--niederoesterreich--eastern/beers',    # state w/o code/abbrev
       'at-austria!/1--niederoesterreich--eastern/1--waldviertel--beers'
     ]
 
@@ -68,7 +68,7 @@ class TestFixtureMatchers < MiniTest::Test
   end # method test_country
 
 
-  def test_country_n_region
+  def test_country_n_state
 
     beers_at = [
       'europe/at-austria/w-wien/beers',
@@ -86,9 +86,9 @@ class TestFixtureMatchers < MiniTest::Test
     ]
 
     beers_at.each do |name|
-      found = match_xxx_for_country_n_region( name, 'beers' ) do |country_key,region_key|
+      found = match_xxx_for_country_n_state( name, 'beers' ) do |country_key,state_key|
         assert_equal country_key, 'at'
-        assert_equal region_key,  'w'
+        assert_equal state_key,  'w'
       end
       assert found
     end
@@ -100,13 +100,12 @@ class TestFixtureMatchers < MiniTest::Test
     ]
 
     breweries_at.each do |name|
-      found = match_xxx_for_country_n_region( name, 'breweries' ) do |country_key,region_key|
+      found = match_xxx_for_country_n_state( name, 'breweries' ) do |country_key,state_key|
         assert_equal country_key, 'at'
-        assert_equal region_key,  'w'
+        assert_equal state_key,  'w'
       end
       assert found
     end
-  end # method test_country_n_region
+  end # method test_country_n_state
 
-
-end # class TestFixtureMatchers
+end # class TestFixtureMatchers

data/test/test_fixture_matchers_ii.rb

@@ -12,7 +12,7 @@ class TestFixtureMatchersII < MiniTest::Test
 
   include WorldDb::Matcher
 
-  def test_country_n_region_breweries_franken
+  def test_country_n_state_breweries_franken
     breweries_franken = [
        'de-deutschland/by-bayern/franken!/1--oberfranken/100_000+_breweries',
        'de-deutschland/by-bayern/franken!/1--oberfranken/20_000+-breweries',
@@ -28,10 +28,10 @@ class TestFixtureMatchersII < MiniTest::Test
        'de-deutschland/by-bayern/franken!/3--unterfranken/breweries_100_000+',
        'de-deutschland/by-bayern/franken!/3--unterfranken/breweries_20_000+',
     ]
-    assert_match_xxx_for_country_n_region( breweries_franken, 'breweries', 'de', 'by' )
-  end # method test_country_n_region_breweries
+    assert_match_xxx_for_country_n_state( breweries_franken, 'breweries', 'de', 'by' )
+  end # method test_country_n_state_breweries
 
-  def test_country_n_region_breweries_bayern
+  def test_country_n_state_breweries_bayern
     breweries_bayern = [
       'de-deutschland/3--by-bayern!/1--oberbayern/breweries_(l)',
       'de-deutschland/3--by-bayern!/1--oberbayern/breweries_(m)',
@@ -46,29 +46,29 @@ class TestFixtureMatchersII < MiniTest::Test
       'de-deutschland/3--by-bayern!/4--schwaben/breweries_100_000+',
       'de-deutschland/3--by-bayern!/4--schwaben/breweries_20_000+',
     ]
-    assert_match_xxx_for_country_n_region( breweries_bayern, 'breweries', 'de', 'by' )
-  end # method test_country_n_region_breweries
+    assert_match_xxx_for_country_n_state( breweries_bayern, 'breweries', 'de', 'by' )
+  end # method test_country_n_state_breweries
 
 
-  def test_country_n_region_brewpubs_franken
+  def test_country_n_state_brewpubs_franken
     brewpubs_franken = [
        'de-deutschland/by-bayern/franken!/3--unterfranken/brewpubs',
     ]
-    assert_match_xxx_for_country_n_region( brewpubs_franken, 'brewpubs', 'de', 'by' )
+    assert_match_xxx_for_country_n_state( brewpubs_franken, 'brewpubs', 'de', 'by' )
   end
 
-  def test_country_n_region_brewpubs_bayern
+  def test_country_n_state_brewpubs_bayern
     brewpubs_bayern = [
       'de-deutschland/3--by-bayern!/1--oberbayern/brewpubs',
       'de-deutschland/3--by-bayern!/2--niederbayern/brewpubs',
       'de-deutschland/3--by-bayern!/3--oberpfalz/brewpubs',
       'de-deutschland/3--by-bayern!/4--schwaben/brewpubs',
     ]
-    assert_match_xxx_for_country_n_region( brewpubs_bayern, 'brewpubs', 'de', 'by' )
+    assert_match_xxx_for_country_n_state( brewpubs_bayern, 'brewpubs', 'de', 'by' )
   end
 
 
-  def test_country_n_region_beers_franken
+  def test_country_n_state_beers_franken
     beers_franken = [
        'de-deutschland/by-bayern/franken!/1--oberfranken/100_000+_beers',
        'de-deutschland/by-bayern/franken!/1--oberfranken/beers',
@@ -76,10 +76,10 @@ class TestFixtureMatchersII < MiniTest::Test
        'de-deutschland/by-bayern/franken!/1--oberfranken/steigerwald-bamberg--beers',
        'de-deutschland/by-bayern/franken!/3--unterfranken/beers_100_000+',
     ]
-    assert_match_xxx_for_country_n_region( beers_franken, 'beers', 'de', 'by' )
-  end # method test_country_n_region_beers
+    assert_match_xxx_for_country_n_state( beers_franken, 'beers', 'de', 'by' )
+  end # method test_country_n_state_beers
 
-  def test_country_n_region_beers_bayern
+  def test_country_n_state_beers_bayern
     beers_bayern = [
       'de-deutschland/3--by-bayern!/1--oberbayern/beers--muenchen',
       'de-deutschland/3--by-bayern!/1--oberbayern/beers_l',
@@ -91,19 +91,20 @@ class TestFixtureMatchersII < MiniTest::Test
       'de-deutschland/3--by-bayern!/3--oberpfalz/beers_100_000+',
       'de-deutschland/3--by-bayern!/4--schwaben/beers_100_000+',
     ]
-    assert_match_xxx_for_country_n_region( beers_bayern, 'beers', 'de', 'by' )
-  end # method test_country_n_region_beers
+    assert_match_xxx_for_country_n_state( beers_bayern, 'beers', 'de', 'by' )
+  end # method test_country_n_state_beers
 
 
 private
-  def assert_match_xxx_for_country_n_region( ary, xxx, expected_country_key, expected_region_key )
+  def assert_match_xxx_for_country_n_state( ary, xxx, expected_country_key, expected_state_key )
     ary.each do |name|
-      found = match_xxx_for_country_n_region( name, xxx ) do |country_key,region_key|
+      found = match_xxx_for_country_n_state( name, xxx ) do |country_key,state_key|
         assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
-        assert_equal region_key,  expected_region_key,   "#{expected_region_key} expected is #{region_key}"
+        assert_equal state_key,  expected_state_key,   "#{expected_state_key} expected is #{state_key}"
       end
       assert found, "no match for '#{name}'"
     end
   end
 
 end # class TestFixtureMatchersII
+

data/test/test_model_city.rb

@@ -1,12 +1,15 @@
 # encoding: utf-8
 
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_model_city.rb
 
 require 'helper'
 
 class TestModelCity < MiniTest::Test
 
   def setup
-    #  delete all countries, regions, cities in in-memory only db
+    #  delete all countries, states, cities in in-memory only db
     WorldDb.delete!
   end
 
@@ -18,7 +21,7 @@ class TestModelCity < MiniTest::Test
                           pop:  8_414_638,
                           area: 83_871 )
 
-    w = Region.create!( key: 'w',
+    w = State.create!( key: 'w',
                         name: 'Wien',
                         country_id: at.id )
 
@@ -42,19 +45,33 @@ class TestModelCity < MiniTest::Test
 
     assert_equal new_attributes[:name], c.name
     assert_equal 1_731_236, c.pop
-    assert_equal 1_724_000, c.popm
-    assert_equal true,      c.m 
-    assert_equal w.id,      c.region_id
+    assert_equal w.id,      c.state_id
     assert_equal at.id,     c.country_id
-    
+
     ### test place
     assert_equal  new_attributes[:name], c.place.name
 
     ## test assocs
-    assert_equal  'Wien',    c.region.name
-    assert_equal  'Austria', c.region.country.name
+    assert_equal  'Wien',    c.state.name
+    assert_equal  'Austria', c.state.country.name
     assert_equal  'Austria', c.country.name
-  end
 
 
+    #####
+    # check (auto-)added metro record
+
+    m = Metro.find_by_key!( new_attributes[:key] )
+    assert_equal new_attributes[:name], m.name
+    assert_equal 1_724_000,  m.pop
+    assert_equal at.id,      m.country_id
+    
+    ## test assocs
+    assert_equal  1,         m.cities.count
+    assert_equal  'Wien',    m.cities.first.name
+    assert_equal  'Austria', m.country.name
+
+    assert_equal  'Wien',    c.metro.name
+    assert_equal  m.id,      c.metro.id
+  end
+
 end # class TestModelCity

data/test/{test_model_comp.rb → test_model_compat.rb}

@@ -3,46 +3,48 @@
 
 require 'helper'
 
-class TestModelComp < MiniTest::Test
+class TestModelCompat < MiniTest::Test
 
   def setup
-    #  delete all countries, regions, cities in in-memory only db
+    #  delete all countries, states, cities in in-memory only db
     WorldDb.delete!
   end
 
 
   def test_title
+   
+   ## todo: change :name to :title -- why? why not?? 
+
     at = Country.create!( key: 'at',
-                          title: 'Austria',
+                          name: 'Austria',
                           code: 'AUT',
                           pop: 8_414_638,
                           area: 83_871 )
 
-    w = Region.create!( key: 'w',
-                        title: 'Wien',
+    w = State.create!( key: 'w',
+                        name: 'Wien',
                         country_id: at.id )
 
     new_attributes = {
       key:        'wien',
-      title:      'Wien'
+      name:      'Wien'
     }
 
     c = City.create!(  key:        new_attributes[:key],
-                       title:      new_attributes[:title],  # note: assign "old" title attrib
-                       region_id:  w.id,
+                       name:       new_attributes[:name],  # note: assign "old" title attrib
+                       state_id:  w.id,
                        country_id: at.id )
 
     c2 = City.find_by_key!( new_attributes[:key] )
     assert_equal c2.id, c.id
 
-    assert_equal new_attributes[:title], c.name
-    assert_equal new_attributes[:title], c.title
+    assert_equal new_attributes[:name], c.name
+    assert_equal new_attributes[:name], c.title    ## todo: move to comapt 
     assert_equal new_attributes[:key],  c.key
-    assert_equal false,     c.m
-    assert_equal w.id,      c.region_id
+    assert_equal w.id,      c.state_id
     assert_equal at.id,     c.country_id
   end
 
 
-end # class TestModelComp
+end # class TestModelCompat
 

data/test/test_model_country.rb

@@ -5,7 +5,7 @@ require 'helper'
 class TestModelCountry < MiniTest::Test
 
   def setup
-    #  delete all countries, regions, cities in in-memory only db
+    #  delete all countries, states, cities in in-memory only db
     WorldDb.delete!
   end
 

data/test/test_model_state.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_model_state.rb
+
+
+require 'helper'
+
+class TestModelState < MiniTest::Test
+
+  def setup
+    #  delete all countries, states, cities in in-memory only db
+    WorldDb.delete!
+  end
+
+  def test_load_values
+
+    at = Country.create!( key: 'at',
+                          name: 'Austria',
+                          code: 'AUT',
+                          pop: 8_414_638,
+                          area: 83_871 )
+
+    new_attributes = {
+      key:        'w',
+      name:       'Wien',
+      alt_names:  '',
+      country_id: at.id
+    }
+
+    values = [
+      '415 km²',
+      'eastern austria'
+    ]
+
+    st = State.create_or_update_from_attribs( new_attributes, values )
+
+    st2 = State.find_by_key!( new_attributes[:key] )
+    assert_equal st.id, st2.id
+
+    assert_equal new_attributes[:name],  st.name 
+    assert_equal 415,                    st.area 
+    assert_equal at.id,                  st.country_id
+
+    ### test place
+    assert_equal  new_attributes[:name], st.place.name
+
+    ## test assocs
+    assert_equal  'Austria', st.country.name
+  end
+
+end # class TestModelState
+