worlddb-models 2.2.2 → 2.3.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
@@ -179,22 +179,21 @@ files:
 - README.md
 - Rakefile
 - lib/worlddb/deleter.rb
+- lib/worlddb/helpers/value_helper.rb
 - lib/worlddb/matcher.rb
+- lib/worlddb/matcher_adm.rb
 - lib/worlddb/models.rb
 - lib/worlddb/models/city.rb
-- lib/worlddb/models/city_compat.rb
+- lib/worlddb/models/city_base.rb
 - lib/worlddb/models/continent.rb
-- lib/worlddb/models/continent_compat.rb
 - lib/worlddb/models/country.rb
 - lib/worlddb/models/country_code.rb
-- lib/worlddb/models/country_compat.rb
 - lib/worlddb/models/forward.rb
 - lib/worlddb/models/lang.rb
-- lib/worlddb/models/lang_compat.rb
 - lib/worlddb/models/name.rb
 - lib/worlddb/models/place.rb
-- lib/worlddb/models/region.rb
-- lib/worlddb/models/region_compat.rb
+- lib/worlddb/models/state.rb
+- lib/worlddb/models/state_base.rb
 - lib/worlddb/models/tagdb/tag.rb
 - lib/worlddb/models/tagdb/tagging.rb
 - lib/worlddb/models/usage.rb
@@ -202,35 +201,54 @@ files:
 - lib/worlddb/reader.rb
 - lib/worlddb/reader_file.rb
 - lib/worlddb/reader_zip.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/state.rb
+- lib/worlddb/readers/state_tree.rb
 - lib/worlddb/readers/usage.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
+- test/adm/test_fixture_matcher_tree.rb
+- test/adm/test_read_adm.rb
+- test/adm/test_read_tree.rb
 - test/data/at-austria/1--b-burgenland/counties.txt
 - test/data/at-austria/2--n-niederoesterreich/counties.txt
 - test/data/at-austria/3--w-wien/counties.txt
+- test/data/at-austria/orte.txt
 - test/data/at-austria/setups/adm.txt
+- test/data/at-austria/setups/tree.txt
 - test/data/at-austria/states.txt
 - test/data/de-deutschland/3--by-bayern/1--oberbayern/counties.txt
 - test/data/de-deutschland/3--by-bayern/4--oberfranken/counties.txt
-- test/data/de-deutschland/3--by-bayern/districts.txt
+- test/data/de-deutschland/3--by-bayern/4--oberfranken/orte.txt
+- test/data/de-deutschland/3--by-bayern/4--oberfranken/orte_ii.txt
+- test/data/de-deutschland/3--by-bayern/parts.txt
+- test/data/de-deutschland/orte.txt
 - test/data/de-deutschland/setups/adm.txt
+- test/data/de-deutschland/setups/tree.txt
 - test/data/de-deutschland/states.txt
 - test/helper.rb
-- test/test_fixture_matcher_adm2.rb
-- test/test_fixture_matcher_adm3.rb
 - test/test_fixture_matchers.rb
 - test/test_fixture_matchers_ii.rb
 - test/test_model_city.rb
-- test/test_model_comp.rb
+- test/test_model_compat.rb
 - test/test_model_country.rb
-- test/test_model_region.rb
+- test/test_model_state.rb
+- test/test_model_states_at.rb
+- test/test_model_states_de.rb
 - test/test_models.rb
-- test/test_read_adm.rb
+- test/test_parse_city.rb
+- test/test_parse_country.rb
+- test/test_parse_state.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
@@ -258,13 +276,23 @@ signing_key:
 specification_version: 4
 summary: worlddb -  world.db schema 'n' models for easy (re)use
 test_files:
-- test/test_model_comp.rb
 - test/test_models.rb
-- test/test_read_adm.rb
+- test/adm/test_read_tree.rb
+- test/adm/test_fixture_matcher_tree.rb
+- test/adm/test_read_adm.rb
+- test/adm/test_fixture_matcher_adm2.rb
+- 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_model_region.rb
-- test/test_fixture_matcher_adm2.rb
-- test/test_fixture_matcher_adm3.rb
+- test/test_parse_city.rb
+- test/test_model_compat.rb
+- test/test_model_states_de.rb
+- test/test_state_tree_reader_at.rb
+- test/test_state_tree_reader_de.rb
+- test/test_parse_state.rb
 - test/test_fixture_matchers_ii.rb
+- test/test_model_states_at.rb

data/lib/worlddb/models/city_compat.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-class City
-
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) } # order by title (a-z)
-
-
-  def synonyms()       alt_names;      end
-  def synonyms=(value) self.alt_names = value; end
-
-  def title_w_synonyms( opts={} )  all_names( opts );  end    # depreciated: use all_names instead
-
-end # class Cities
-
-  end # module Model
-end # module WorldDb
-

data/lib/worlddb/models/continent_compat.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-class Continent
-
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) } # order by title (a-z)
-
-  def synonyms()       alt_names;      end
-  def synonyms=(value) self.alt_names = value; end
-
-end # class Continent
-
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/country_compat.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-
-class Country
-
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) }   # order by title (a-z)
-
-  def iso2()       alpha2;              end
-  def iso2=(value) self.alpha2 = value; end
-
-  def iso3()       alpha3;              end
-  def iso3=(value) self.alpha3 = value; end
-
-
-  def synonyms()       alt_names;      end
-  def synonyms=(value) self.alt_names = value; end
-
-  def title_w_synonyms( opts={} )  all_names( opts );  end    # depreciated: use all_names instead
-
-
-end # class Country
-
-  end # module Model
-end # module WorldDb
-

data/lib/worlddb/models/lang_compat.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-
-class Lang
-
-  #####################################################
-  # alias for name (remove! add depreciated api call ???)
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) }   # order by title (a-z)
-
-end # class Lang
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/region_compat.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-class Region
-  
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) } # order by title (a-z)
-
-  def synonyms()       alt_names;      end
-  def synonyms=(value) self.alt_names = value; end
-
-  def title_w_synonyms( opts={} )  all_names( opts );  end    # depreciated: use all_names instead
-
-
-end # class Region
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/readers/region.rb

@@ -1,79 +0,0 @@
-# encoding: UTF-8
-
-module WorldDb
-
-class RegionReader
-
-  include LogUtils::Logging
-
-## make models available by default with namespace
-#  e.g. lets you use Usage instead of Model::Usage
-  include Models
-
-## value helpers e.g. is_year?, is_taglist? etc.
-  include TextUtils::ValueHelper
-
-
-  def self.from_zip( zip_file, entry_path, more_attribs={} )
-    ## get text content from zip
-
-    entry = zip_file.find_entry( entry_path )
-
-    ## todo/fix: add force encoding to utf-8 ??
-    ##  check!!!
-    ##  clean/prepprocess lines
-    ##  e.g. CR/LF (/r/n) to LF (e.g. /n)
-    text = entry.get_input_stream().read()
-
-    ## NOTE: needs logger ref; only available in instance methods; use global logger for now
-    logger = LogUtils::Logger.root
-    logger.debug "text.encoding.name (before): #{text.encoding.name}"
-#####
-# NB: ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
-## NB:
-# for now "hardcoded" to utf8 - what else can we do?
-# - note: force_encoding will NOT change the chars only change the assumed encoding w/o translation
-    text = text.force_encoding( Encoding::UTF_8 )
-    logger.debug "text.encoding.name (after): #{text.encoding.name}"     
-
-    ## todo:
-    # NB: for convenience: convert fancy unicode dashes/hyphens to plain ascii hyphen-minus
-    ## text = TextUtils.convert_unicode_dashes_to_plain_ascii( text, path: path )
-
-    self.from_string( text, more_attribs )
-  end
-
-  def self.from_file( path, more_attribs={} )
-    ## note: 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, more_attribs )
-  end
-
-  def self.from_string( text, more_attribs={} )
-    RegionReader.new( text, more_attribs )
-  end
-
-
-  def skip_tags?()   @skip_tags == true;  end
-  def strict?()      @strict == true;     end
-
-  def initialize( text, more_attribs={} )
-    ## todo/fix: how to add opts={} ???
-
-    @text         = text
-    @more_attribs = more_attribs
-  end
-
-
-  def read()
-    reader = ValuesReader.from_string( @text, @more_attribs )
-
-    reader.each_line do |attribs, values|
-      opts = { skip_tags: skip_tags? }
-      Region.create_or_update_from_attribs( attribs, values, opts )
-    end
-  end
-
-end # class RegionReader
-end # module WorldDb

data/test/test_fixture_matcher_adm2.rb

@@ -1,62 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_fixture_matcher_adm2.rb
-
-
-require 'helper'
-
-
-class TestFixtureMatcherAdm2 < MiniTest::Test
-
-  include WorldDb::Matcher
-
-  def test_de
-    de = [
-       'de-deutschland!/by-bayern/districts',
-       'de-deutschland/by-bayern/districts',
-       'de-deutschland!/3--by-bayern/districts',
-       'de-deutschland/3--by-bayern/districts',
-       'europe/de-deutschland!/3--by-bayern/districts',
-       'europe/de-deutschland/3--by-bayern/districts',
-    ]
-    assert_match_adm2_for_country( de, 'de', 'by' )
-  end # method test_de
-
-  def test_at
-    at = [
-       'at-austria!/n-niederoesterreich/counties',
-       'at-austria/n-niederoesterreich/counties',
-       'at-austria!/1--n-niederoesterreich/counties',
-       'at-austria/1--n-niederoesterreich/counties',
-       'at-austria!/1--n-niederoesterreich/counties',
-       'europe/at-austria/1--n-niederoesterreich/counties',
-    ]
-    assert_match_adm2_for_country( at, 'at', 'n' )
-  end # method test_at
-
-
-  def test_at_more
-    b = [ 'at-austria!/1--b-burgenland/counties' ]
-    n = [ 'at-austria!/2--n-niederoesterreich/counties' ]
-    w = [ 'at-austria!/3--w-wien/counties' ]
-
-    assert_match_adm2_for_country( b, 'at', 'b' )
-    assert_match_adm2_for_country( n, 'at', 'n' )
-    assert_match_adm2_for_country( w, 'at', 'w' )
-  end
-
-
-private
-  def assert_match_adm2_for_country( ary, expected_country_key, expected_region_key )
-    ary.each do |name|
-      found = match_adm2_for_country( name ) do |country_key,region_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}"
-      end
-      assert found, "no match for '#{name}'"
-    end
-  end
-
-end # class TestFixtureMatcherAdm2

data/test/test_model_region.rb

@@ -1,50 +0,0 @@
-# encoding: utf-8
-
-
-require 'helper'
-
-class TestModelRegion < MiniTest::Test
-
-  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
-