worlddb-models 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a22edaff5cdbe119a10429130a8465dcc5a59c
-  data.tar.gz: c3c71f45eebfbbd56c1a9675838803674050252e
+  metadata.gz: d06a2518a318298eff8f73429f1749a7fbf34ecd
+  data.tar.gz: b7a44ae9fe82a65bbd07850be27f3c39dea61ebf
 SHA512:
-  metadata.gz: 0a5b509f87918c6032a1185b5c0d7f349c2abf013e5c6125f1556d455108349dec022b76f05ae92667c822e7bf71409a74c3f120f935a19fa15bf58eef9727c6
-  data.tar.gz: 180eb5093b77c214acdccb0aa9d1ee4c5f699f75cfc0c5d6b4f51c576ec697a14a052135744bc16a44d447b7f3be3009b1abc7abc2bca9e3fd9528e421ec6864
+  metadata.gz: 32c39e3a9e4125d73ff577bab22c77f4de3f0a23c412ba63eb0d071fc9b2f6efefed1d4ee9ee3b04766cb02200068b94bc3381d172be747ffdaf12f4d6ac655b
+  data.tar.gz: 5ce179dc7f659933102c05de9dd9a475c072e0a46a1194f1998344abd4bb02c0afeffd51fdd39b6526b3e87a03d820043fe394d8305603b52bb9e1cd5e899e7f

data/Manifest.txt

@@ -1,77 +1,78 @@
-HISTORY.md
-Manifest.txt
-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_base.rb
-lib/worlddb/models/continent.rb
-lib/worlddb/models/country.rb
-lib/worlddb/models/country_code.rb
-lib/worlddb/models/forward.rb
-lib/worlddb/models/lang.rb
-lib/worlddb/models/name.rb
-lib/worlddb/models/place.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
-lib/worlddb/patterns.rb
-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/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/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/districts.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/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_matchers.rb
-test/test_fixture_matchers_ii.rb
-test/test_model_city.rb
-test/test_model_compat.rb
-test/test_model_country.rb
-test/test_model_state.rb
-test/test_model_states_at.rb
-test/test_model_states_de.rb
-test/test_models.rb
-test/test_name_finders.rb
-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
+HISTORY.md
+Manifest.txt
+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_base.rb
+lib/worlddb/models/continent.rb
+lib/worlddb/models/country.rb
+lib/worlddb/models/country_code.rb
+lib/worlddb/models/forward.rb
+lib/worlddb/models/lang.rb
+lib/worlddb/models/name.rb
+lib/worlddb/models/place.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
+lib/worlddb/patterns.rb
+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/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/serializers/city.rb
+lib/worlddb/serializers/country.rb
+lib/worlddb/stats.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/districts.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/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_matchers.rb
+test/test_fixture_matchers_ii.rb
+test/test_model_city.rb
+test/test_model_compat.rb
+test/test_model_country.rb
+test/test_model_state.rb
+test/test_model_states_at.rb
+test/test_model_states_de.rb
+test/test_models.rb
+test/test_name_finders.rb
+test/test_name_parser.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

data/README.md

@@ -2,8 +2,8 @@
 
 worlddb-models gem - world.db schema 'n' models for easy (re)use
 
-* home  :: [github.com/worlddb/world.db.models](https://github.com/worlddb/world.db.models)
-* bugs  :: [github.com/worlddb/world.db.models/issues](https://github.com/worlddb/world.db.models/issues)
+* home  :: [github.com/worlddb/world.db](https://github.com/worlddb/world.db)
+* bugs  :: [github.com/worlddb/world.db/issues](https://github.com/worlddb/world.db/issues)
 * gem   :: [rubygems.org/gems/worlddb-models](https://rubygems.org/gems/worlddb-models)
 * rdoc  :: [rubydoc.info/gems/worlddb-models](http://rubydoc.info/gems/worlddb-models)
 * forum :: [groups.google.com/group/openmundi](https://groups.google.com/group/openmundi)
@@ -29,7 +29,7 @@ Everything is a place.
     # => 8_414_638
     at.area
     # => 83_871
-    
+
     at.states.count
     # => 9
     at.states
@@ -71,7 +71,7 @@ Everything is a place.
     # => 17
     euro.countries
     # => ['Austria, 'Belgium', 'Cyprus', ... ]
-    
+
     flanders = Tag.find_by! key: 'flanders'
     flanders.states.count
     # => 5
@@ -85,6 +85,8 @@ and so on.
 
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `worlddb-models` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 

data/lib/worlddb/models.rb

@@ -57,6 +57,10 @@ require 'worlddb/models/tagdb/tagging'
 require 'worlddb/helpers/value_helper'  # Note: extends module TextUtils(!!)::ValueHelper
 
 
+require 'worlddb/serializers/city'
+require 'worlddb/serializers/country'
+
+
 require 'worlddb/schema'       # Note: requires worlddb/models (include WorldDB::Models)
 require 'worlddb/matcher'
 require 'worlddb/matcher_adm'
@@ -163,7 +167,7 @@ module WorldDb
     end
 
     ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
-    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3' 
+    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3'
       # quick hack for JRuby sqlite3 support via jdbc
       puts "jruby quick hack - adding jdbc libs for jruby sqlite3 database support"
       require 'jdbc/sqlite3'

data/lib/worlddb/models/city.rb

@@ -19,6 +19,11 @@ class City < CityBase
     'CITY'
   end
 
+
+  def as_tab( opts={} )
+    CitySerializer.new( self ).as_tab
+  end
+
 end # class City
 
 

data/lib/worlddb/models/country.rb

@@ -4,7 +4,7 @@ module WorldDb
   module Model
 
 ########
-# Country / Supra (e.g. European Union) / Territory (e.g. Puerto Rico) or Dependency (e.g. Dependent territory) 
+# Country / Supra (e.g. European Union) / Territory (e.g. Puerto Rico) or Dependency (e.g. Dependent territory)
 
 class Country < ActiveRecord::Base
 
@@ -62,10 +62,14 @@ class Country < ActiveRecord::Base
   scope :by_net,      ->{ order( 'net asc' ) }    # internet cc top level domain; ccTLD
 
 
+  def as_tab( opts={} )
+    CountrySerializer.new( self ).as_tab
+  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
@@ -94,7 +98,7 @@ class Country < ActiveRecord::Base
       'TERR'
     elsif is_misc?  ## misc(ellaneous) country or dependent territory
       # todo: use different marker?
-      # territory w/ shared or disputes claims e.g Antartica/Western Sahara/Paracel Islands pg Spratly Islands/etc. 
+      # territory w/ shared or disputes claims e.g Antartica/Western Sahara/Paracel Islands pg Spratly Islands/etc.
       'MISC'
     else
       'CNTY'
@@ -103,8 +107,8 @@ class Country < ActiveRecord::Base
 
 
   ###
-  #  NB: use is_  for flags to avoid conflict w/ assocs 
-  
+  #  NB: use is_  for flags to avoid conflict w/ assocs
+
   def is_supra?()      s? == true;  end
   def is_country?()    c? == true;  end
   def is_dependency?() d? == true;  end
@@ -116,7 +120,7 @@ class Country < ActiveRecord::Base
     ## allow to passing in sep or separator e.g. | or other
 
     return name if alt_names.blank?
-    
+
     buf = ''
     buf << name
     buf << ' | '
@@ -149,7 +153,7 @@ class Country < ActiveRecord::Base
 
       ### NOTE: escape ' for sql like clause
       ##   for now use '' for escapes, that is, double quotes
-      ##  check - working for postgresql n sqlite?? 
+      ##  check - working for postgresql n sqlite??
       name_esc = name.gsub( /'/, "''" )
 
       ## 3) retry: use SQL like match
@@ -180,7 +184,7 @@ class Country < ActiveRecord::Base
     ## 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 )
   end
 
@@ -236,13 +240,13 @@ class Country < ActiveRecord::Base
         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 =~ /#{COUNTRY_CODE_PATTERN}/  ## three letter code 
+        elsif value =~ /#{COUNTRY_CODE_PATTERN}/  ## 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
-          
+
           ### assume it is the capital city - mark it for auto add
           value_cities << value
           next
@@ -261,7 +265,7 @@ class Country < ActiveRecord::Base
             # auto-add tags
             area = value_numbers[0]
             pop  = value_numbers[1]
-            
+
             # categorize into brackets
             if area >= 1_000_000
               value_tag_keys << 'area_1_000_000_n_up'
@@ -277,7 +281,7 @@ class Country < ActiveRecord::Base
             value_tag_keys << 'area_100_000_n_up'  if area >= 100_000
             value_tag_keys << 'area_1_000_n_up'    if area >=   1_000
 
-            
+
             # categorize into brackets
             if pop >= 100_000_000
               value_tag_keys << 'pop_100m_n_up'
@@ -288,7 +292,7 @@ class Country < ActiveRecord::Base
             else
               value_tag_keys << 'pop_1m_n_less'
             end
-            
+
             # include all
             value_tag_keys << 'pop_10m_n_up'  if pop >= 10_000_000
             value_tag_keys << 'pop_1m_n_up'   if pop >=  1_000_000
@@ -303,9 +307,9 @@ class Country < ActiveRecord::Base
         logger.debug "create Country:"
         rec = Country.new
       end
-      
+
       logger.debug new_attributes.to_json
-   
+
       rec.update_attributes!( new_attributes )
 
       #################
@@ -314,10 +318,10 @@ class Country < ActiveRecord::Base
       City.parse( value_cities, country_id: rec.id )
 
       ##################
-      ## add taggings 
+      ## add taggings
 
       if value_tag_keys.size > 0
-        
+
         if opts[:skip_tags].present?
           logger.debug "   skipping add taggings (flag skip_tag)"
         else

data/lib/worlddb/serializers/city.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+module WorldDb::Model
+
+
+  ## todo/check:
+  ##   add as_tab(ular) to CityBase for all classes - why? why not??
+
+  class CitySerializer
+
+    def initialize( city )
+      @city = city
+    end
+
+    attr_reader :city
+
+    def as_tab  # as_tabular (returns an array of records/hashes)
+
+      ## add virtual column like kind for metro, metro|city, city, district
+
+      ## todo add region.title if present
+
+      data = { key:      city.key,
+               title:    city.title,
+               code:     city.code,
+               pop:      city.pop,
+               popm:     city.popm,
+               area:     city.area,
+               synonyms: city.synonyms,
+               country:  city.country.title }
+      data
+    end
+
+  end # class CitySerializer
+
+end # module WorldDb::Model

data/lib/worlddb/serializers/country.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+module WorldDb::Model
+
+
+  ## todo/check:
+  ##   add as_tab(ular) to CityBase for all classes - why? why not??
+
+  class CountrySerializer
+
+    def initialize( country )
+      @country = country
+    end
+
+    attr_reader :country
+
+    def as_tab  # as_tabular (returns an array of records/hashes)
+
+      ## todo: add tags too??
+      data = { key:      country.key,
+               title:    country.title,
+               code:     country.code,
+               pop:      country.pop,
+               area:     country.area,
+               synonyms: country.synonyms }
+       data
+    end
+  end # class CountrySerializer
+
+end # module WorldDb::Model

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 = 4
+  PATCH = 5
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -21,4 +21,3 @@ module WorldDb
   end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: worlddb -  world.db schema 'n' models for easy (re)use
 email: openmundi@googlegroups.com
 executables: []
@@ -173,7 +173,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -210,6 +209,8 @@ files:
 - lib/worlddb/readers/usage.rb
 - lib/worlddb/reports/country_report.rb
 - lib/worlddb/schema.rb
+- lib/worlddb/serializers/city.rb
+- lib/worlddb/serializers/country.rb
 - lib/worlddb/stats.rb
 - lib/worlddb/version.rb
 - test/adm/test_fixture_matcher_adm2.rb
@@ -248,7 +249,6 @@ 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
 homepage: https://github.com/worlddb/world.db.models
@@ -273,30 +273,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: worlddb -  world.db schema 'n' models for easy (re)use
-test_files:
-- test/test_name_parser.rb
-- test/test_models.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_model_city.rb
-- test/test_fixture_matchers.rb
-- test/test_model_country.rb
-- test/test_name_finders.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
-- test/test_state_tree_reader_de.rb
-- test/test_parse_state.rb
-- test/test_fixture_matchers_ii.rb
-- test/test_model_states_at.rb
+test_files: []

data/test/test_report_country.rb

@@ -1,34 +0,0 @@
-# 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