worlddb 1.8.2 → 2.0.0

data/test/helper.rb

@@ -24,9 +24,16 @@ require 'active_record'
 require 'worlddb'
 require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
 
-Country = WorldDb::Model::Country
-Region  = WorldDb::Model::Region
-City    = WorldDb::Model::City
+
+Name      = WorldDb::Model::Name
+Place     = WorldDb::Model::Place
+Continent = WorldDb::Model::Continent
+Country   = WorldDb::Model::Country
+Region    = WorldDb::Model::Region
+City      = WorldDb::Model::City
+
+Lang      = WorldDb::Model::Lang
+Usage     = WorldDb::Model::Usage
 
 
 def setup_in_memory_db
@@ -49,6 +56,9 @@ def setup_in_memory_db
   ## build schema
 
   LogDb.create
+  ConfDb.create
+
+  TagDb.create
   WorldDb.create
 end
 

data/test/test_model_city.rb

@@ -0,0 +1,60 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+class TestModelCity < MiniTest::Unit::TestCase
+
+  def setup
+    #  delete all countries, regions, 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 )
+
+    w = Region.create!( key: 'w',
+                        name: 'Wien',
+                        country_id: at.id )
+
+    new_attributes = {
+      key:        'wien',
+      name:       'Wien',
+      alt_names:  '',
+      country_id: at.id
+    }
+
+    values = [
+      'W', 
+      '1_731_236',
+      'm:1_724_000'
+    ]
+
+    c = City.create_or_update_from_attribs( new_attributes, values )
+
+    c2 = City.find_by_key!( new_attributes[:key] )
+    assert_equal c2.id, c.id
+
+    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 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  'Austria', c.country.name
+  end
+
+
+end # class TestModelCity

data/test/test_model_comp.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+class TestModelComp < MiniTest::Unit::TestCase
+
+  def setup
+    #  delete all countries, regions, cities in in-memory only db
+    WorldDb.delete!
+  end
+
+
+  def test_title
+    at = Country.create!( key: 'at',
+                          title: 'Austria',
+                          code: 'AUT',
+                          pop: 8_414_638,
+                          area: 83_871 )
+
+    w = Region.create!( key: 'w',
+                        title: 'Wien',
+                        country_id: at.id )
+
+    new_attributes = {
+      key:        'wien',
+      title:      'Wien'
+    }
+
+    c = City.create!(  key:        new_attributes[:key],
+                       title:      new_attributes[:title],  # note: assign "old" title attrib
+                       region_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[:key],  c.key
+    assert_equal false,     c.m
+    assert_equal w.id,      c.region_id
+    assert_equal at.id,     c.country_id
+  end
+
+
+end # class TestModelComp
+

data/test/test_model_country.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestModelCountry < MiniTest::Unit::TestCase
+
+  def setup
+    #  delete all countries, regions, cities in in-memory only db
+    WorldDb.delete!
+  end
+
+  def test_load_values
+
+    new_attributes = {
+      key:      'at',
+      name:     'Austria',
+      alt_names: ''
+    }
+
+    values = [
+      'AUT',
+      '83_871',
+      '8_414_638',
+      'un|fifa|uefa|eu|euro|schengen|central_europe|western_europe'
+    ]
+
+    c = Country.create_or_update_from_attribs( new_attributes, values )
+
+    c2 = Country.find_by_key!( new_attributes[:key] )
+    assert_equal c.id, c2.id
+
+    assert_equal new_attributes[:name], c.name
+    assert_equal 8_414_638,             c.pop
+    assert_equal 83_871,                c.area
+    ## todo: assert tag count; add supra:eu etc.
+
+    ### test place
+    assert_equal  new_attributes[:name], c.place.name
+  end
+
+
+end # class TestModelCountry
+

data/test/test_model_region.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+class TestModelRegion < MiniTest::Unit::TestCase
+
+  def setup
+    #  delete all countries, regions, 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'
+    ]
+
+    r = Region.create_or_update_from_attribs( new_attributes, values )
+
+    r2 = Region.find_by_key!( new_attributes[:key] )
+    assert_equal r.id, r2.id
+
+    assert_equal new_attributes[:name],  r.name 
+    assert_equal 415,                    r.area 
+    assert_equal at.id,                  r.country_id
+
+    ### test place
+    assert_equal  new_attributes[:name], r.place.name
+
+    ## test assocs
+    assert_equal  'Austria', r.country.name
+  end
+
+end # class TestModelRegion
+

data/test/test_models.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+class TestModels < MiniTest::Unit::TestCase
+
+  def setup
+    #  delete all countries, regions, cities in in-memory only db
+    WorldDb.delete!
+  end
+
+  def test_counts
+    assert_equal 0, Name.count
+    assert_equal 0, Place.count
+    assert_equal 0, Continent.count
+    assert_equal 0, Country.count
+    assert_equal 0, Region.count
+    assert_equal 0, City.count
+
+    assert_equal 0, Lang.count
+    assert_equal 0, Usage.count
+    
+    WorldDb.tables
+  end
+
+  def test_place_assoc_counts
+    # assert_equal 0, Continent.new.place.count
+    # assert_equal 0, Country.new.place.count
+    # assert_equal 0, Region.new.place.count
+    # assert_equal 0, City.new.place.count
+  end
+
+end # class TestModels
+

metadata

@@ -1,82 +1,138 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.8.2
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: props
+  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: &21659688 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *21659688
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: commander
-  requirement: &21659316 !ruby/object:Gem::Requirement
-    none: false
+  name: tagutils
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21659316
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &21658944 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21658944
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21658572 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *21658572
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21658176 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *21658176
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.6'
 description: worlddb - world.db command line tool
 email: openmundi@googlegroups.com
 executables:
 - worlddb
 extensions: []
 extra_rdoc_files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -88,26 +144,44 @@ files:
 - 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_comp.rb
+- lib/worlddb/models/forward.rb
 - lib/worlddb/models/lang.rb
-- lib/worlddb/models/prop.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/tag.rb
-- lib/worlddb/models/tagging.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/reader.rb
+- lib/worlddb/readers/base.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/utils.rb
 - lib/worlddb/version.rb
 - test/helper.rb
 - test/test_fixture_matchers.rb
-- test/test_values.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
 - .gemtest
 homepage: https://github.com/geraldb/world.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -115,23 +189,25 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: worlddb
-rubygems_version: 1.8.16
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: worlddb - world.db command line tool
 test_files:
 - test/test_fixture_matchers.rb
-- test/test_values.rb
+- test/test_models.rb
+- test/test_model_city.rb
+- test/test_model_comp.rb
+- test/test_model_country.rb
+- test/test_model_region.rb