worlddb-models 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fd3e4a124d077f78bb176f7a6bc5b57ae15e5a9
-  data.tar.gz: 4cc9e212e7fb37bb21d557a262698411daacb754
+  metadata.gz: 03a22edaff5cdbe119a10429130a8465dcc5a59c
+  data.tar.gz: c3c71f45eebfbbd56c1a9675838803674050252e
 SHA512:
-  metadata.gz: 563ffc1f779a443c5126c41c8ab6385a653a74634cacbbc7d6a397f17d83be00c73b40356c1d2c7878122f8ad96138d71a5dbef934b4fa3123958add12319534
-  data.tar.gz: 1bf7aa7c891b4d404a60a08d3e24abecaeb042a71758f1463c5704104bd85ca1c2d0f06e0e1131d24de083f4d98e8736894f8fd60116f114238e2cbb3d03db04
+  metadata.gz: 0a5b509f87918c6032a1185b5c0d7f349c2abf013e5c6125f1556d455108349dec022b76f05ae92667c822e7bf71409a74c3f120f935a19fa15bf58eef9727c6
+  data.tar.gz: 180eb5093b77c214acdccb0aa9d1ee4c5f699f75cfc0c5d6b4f51c576ec697a14a052135744bc16a44d447b7f3be3009b1abc7abc2bca9e3fd9528e421ec6864

data/Manifest.txt

@@ -43,7 +43,7 @@ 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/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
@@ -67,6 +67,7 @@ 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
@@ -74,4 +75,3 @@ 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_state_tree_reader_name_finder.rb

data/lib/worlddb/models.rb

@@ -195,4 +195,4 @@ end  # module WorldDb
 
 
 # say hello
-puts WorldDb.banner    if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)
+puts WorldDb.banner    if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG

data/lib/worlddb/models/name.rb

@@ -9,6 +9,81 @@ class Name < ActiveRecord::Base
   belongs_to :place,   class_name: 'Place',    foreign_key: 'place_id'
 
 
+  def place_object  # returns "typed" place object e.g. state, part, county, muni, city, etc.
+
+    case place_kind
+      when 'STAT'  ## state
+        place.state
+      when 'PART'  ## part
+        place.part
+      when 'COUN'  ## county
+        place.county
+      when 'MUNI'  ## muni
+        place.muni
+      when 'CITY'  ## city
+        place.city
+    else
+      puts "*** error [Name#place_object] - unknown place_kind #{place_kind}"
+      fail "[Name#place_object] - unknown place_kind #{place_kind}"
+    end # end case
+  end
+
+  #########
+  # finders
+  #
+  # -- search scoped by country
+
+  def self.find_states( name, country_id )  # note: requires country_id (for search scope)
+    Name.joins(
+                :place => :state
+              ).where(
+                :name                => name,
+                :place_kind          => 'STAT',
+                :'states.country_id' => country_id )
+  end
+
+  def self.find_cities( name, country_id ) # note: requires country_id (for search scope)  -- add version w/ state_id scope - why?? why not??
+    Name.joins(
+                :place => :city
+              ).where(
+                :name       => name,
+                :place_kind => 'CITY',
+                :'cities.country_id' => country_id )
+  end
+
+  ## -- search scoped by state
+
+  def self.find_parts( name, state_id )  # note requires state_id (for search scope)
+    Name.joins(
+                :place => :part
+              ).where(
+                :name                => name,
+                :place_kind          => 'PART',
+                :'parts.state_id' => state_id )
+  end
+
+  def self.find_counties( name, state_id )  # note requires state_id (for search scope)
+    Name.joins(
+                :place => :county
+              ).where(
+                :name                => name,
+                :place_kind          => 'COUN',
+                :'counties.state_id' => state_id )
+  end
+
+  def self.find_munis( name, state_id )    # note requires state_id (for search scope)
+    Name.joins(
+                :place => :muni
+              ).where(
+                :name             => name,
+                :place_kind       => 'MUNI',
+                :'munis.state_id' => state_id )
+  end
+
+
+  ########
+  # create
+
   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!

data/lib/worlddb/models/place.rb

@@ -8,8 +8,10 @@ class Place < ActiveRecord::Base
   ## todo: depending on type
   ##  has_one continent, country, state, city etc.
   has_one :state,  class_name: 'State',  foreign_key: 'place_id'
+  has_one :part,   class_name: 'Part',   foreign_key: 'place_id'
   has_one :county, class_name: 'County', foreign_key: 'place_id'
   has_one :muni,   class_name: 'Muni',   foreign_key: 'place_id'
+  has_one :city,   class_name: 'City',   foreign_key: 'place_id'
   ## add more types..
 
 end  # class Place

data/lib/worlddb/readers/state_tree.rb

@@ -36,68 +36,38 @@ class StateTreeReader < ReaderBaseWithMoreAttribs
       puts "    #{names.join( ' › ' )}:"
       puts "      key: >#{node.key}<, level: >#{node.level}<, value: >#{node.value}<"
 
-      ## use name for lookup - use where() to find - might match more than 1 record!!
-      ##   todo/fix: check for multiple or no matches!!!
-      ##   todo/fix: check how to add state.id scope (and country.id scope) etc.
-      ##   add state.id to name - why? why not?
-      ##  move finders to name model for reuse (and testing) - why? why not ??
       if node.level == state_level  # 1
-        ##  was: rec = State.where( "name like '#{node.value}%'" ).first 
-        names = Name.joins(
-                       :place => :state
-                     ).find_by(
-                        :name                => node.value,
-                        :place_kind          => 'STAT',
-                        :'states.country_id' => country.id )
-        rec = if names.nil?
-          nil
-        else
-          names.place.state   # get first record; fix: use where instead of find_by etc.
-        end
+        recs = Name.find_states( node.value, country.id )
       elsif node.level == part_level # 2 
         state = stack[0]
-        rec = Part.where( "name like '#{node.value}%' AND state_id = #{state.id}" ).first
+        recs = Name.find_parts( node.value, state.id )
       elsif node.level == county_level  # 2 or 3
         state = stack[0]
-        ## was: rec = County.where( "name like '#{node.value}%' AND state_id = #{state.id}" ).first
-        names = Name.joins(
-                       :place => :county
-                     ).find_by(
-                       :name                => node.value,
-                       :place_kind          => 'COUN',
-                       :'counties.state_id' => state.id )
-        rec = if names.nil?
-          nil
-        else
-          names.place.county   # get first record
-        end
+        recs = Name.find_counties( node.value, state.id )
       elsif node.level == muni_level   # 3 or 4
         state = stack[0]
-        ## was: rec = Muni.where( "name like '#{node.value}%' AND state_id = #{state.id}" ).first
-        names = Name.joins(
-                       :place => :muni
-                     ).find_by(
-                        :name             => node.value,
-                        :place_kind       => 'MUNI',
-                        :'munis.state_id' => state.id )
-        rec = if names.nil?
-          nil
-        else
-          names.place.muni   # get first record
-        end
+        recs = Name.find_munis( node.value, state.id )
       elsif node.level == city_level  # 4 or 5
         ## note: city requires country scope for lookup
         ## todo/fix: how to deal with cities with the same name
         ##   in the same country (and same state and same county etc.) ??? - add some examples here
-        rec = City.where( "name like '#{node.value}%' AND country_id = #{country.id}" ).first
+        recs = Name.find_cities( node.value, country.id )
       else
         puts "*** (fatal) error: unknown level for tree node: #{node.inspect}"
-        ## todo/fix: exit here
+        fail "[StateTreeReader] unknown level for tree node: #{node.inspect}"
       end
 
 
-      if rec.present?
-        puts "ok - record match found: #{rec.inspect}"
+      if recs.size > 0
+        if recs.size == 1
+          puts "ok - record match found: #{recs.inspect}"      
+          rec = recs[0].place_object  # e.g. state,part,county,muni,city,etc.
+        else
+          puts "** ok - #{recs.size} record(s) match found: #{recs.inspect}"
+          ## fix/todo: note - uses always first entry for now;
+          ##   make lookup/matching more intelligent/usable!!
+          rec = recs[0].place_object  # e.g. state,part,county,muni,city,etc.
+        end
       else
         ## note: for now only auto-adds munis n cities
         if node.level == muni_level  # 3 or 4
@@ -129,7 +99,7 @@ class StateTreeReader < ReaderBaseWithMoreAttribs
                               country_id: country.id )
         else
           puts "*** (fatal) error: record not found for tree node: #{node.inspect}"
-          ## todo/fix: exit here
+          fail "[StateTreeReader] record not found for tree node: #{node.inspect}"
         end
       end
 
@@ -137,7 +107,9 @@ class StateTreeReader < ReaderBaseWithMoreAttribs
 
       if level_diff > 0
         logger.debug "[StateTreeReader]    up  +#{level_diff}"
-        ## FIX!!! todo/check/verify/assert: always must be +1
+        if level_diff > 1
+          fail "[StateTreeReader] level diff MUST be +1 is +#{level_diff}"
+        end
       elsif level_diff < 0
         logger.debug "[StateTreeReader]    down #{level_diff}"
         level_diff.abs.times { stack.pop }

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

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

@@ -1,7 +1,9 @@
 
 at-austria!/states
+
 at-austria!/1--b-burgenland/counties
 at-austria!/2--n-niederoesterreich/counties
-at-austria!/3--w-wien/counties
+
+at-austria!/3--w-wien/districs
 
 

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

@@ -2,8 +2,11 @@
 # 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
+
+at-austria!/3--w-wien/districts
+

data/test/{test_state_tree_reader_name_finder.rb → test_name_finders.rb}

@@ -2,12 +2,12 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_state_tree_reader_name_finder.rb
+#     ruby -I ./lib -I ./test test/test_name_finders.rb
 
 
 require 'helper'
 
-class TestStateTreeReaderNameFinder < MiniTest::Test
+class TestNameFinders < MiniTest::Test
 
   def setup
     #  delete all countries, states, cities in in-memory only db
@@ -24,14 +24,25 @@ class TestStateTreeReaderNameFinder < MiniTest::Test
     reader = WorldDb::Reader.new( "#{WorldDb.root}/test/data/at-austria" )
     reader.load_setup( 'setups/adm' )
 
+    recs = Name.find_states( 'Wien', at.id )
+    pp recs
+    
+    recs = Name.find_cities( 'Krems', at.id )
+    pp recs
+
+
+    ####
+    # -- finders scoped by state
+
     n = State.find_by!( key: 'n' )
 
+    recs = Name.find_parts( 'Waldviertel', n.id )
+    pp recs
 
     ## find counties w/ state_id using names 
-    names = Name.joins( :place => :county ).where(
-                                              :name                => 'Horn',
-                                              :place_kind          => 'COUN',
-                                              :'counties.state_id' => n.id )
+    recs = Name.find_counties( 'Horn', n.id )
+    pp recs
+    
     ## results in:
     ## SELECT "names".* FROM "names"
     ##   INNER JOIN "places" ON "places"."id" = "names"."place_id"
@@ -41,14 +52,11 @@ class TestStateTreeReaderNameFinder < MiniTest::Test
     ##     AND "counties"."state_id" = 2
     ## [["name", "Horn"], ["place_kind", "COUN"]]
 
-    pp names
 
 
-    ## find munies w/ state_id using names 
-    names = Name.joins( :place => :muni ).where(
-                                                :name             => 'Horn',
-                                                :place_kind       => 'MUNI',
-                                                :'munis.state_id' => n.id )
+    ## find munis w/ state_id using names 
+    recs = Name.find_munis( 'Horn', n.id )
+    pp recs
 
     ## results in:
     ## SELECT "names".* FROM "names"
@@ -59,9 +67,7 @@ class TestStateTreeReaderNameFinder < MiniTest::Test
     ##     AND "munis"."state_id" = 2
     ##  [["name", "Horn"], ["place_kind", "MUNI"]]
 
-    pp names
-
   end
 
-end # class TestStateTreeReaderNameFinder
+end # class TestNameFinders
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -219,7 +219,7 @@ files:
 - 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/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
@@ -243,6 +243,7 @@ files:
 - 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
@@ -250,7 +251,6 @@ files:
 - test/test_report_country.rb
 - test/test_state_tree_reader_at.rb
 - test/test_state_tree_reader_de.rb
-- test/test_state_tree_reader_name_finder.rb
 homepage: https://github.com/worlddb/world.db.models
 licenses:
 - Public Domain
@@ -289,8 +289,8 @@ test_files:
 - test/test_model_state.rb
 - test/test_model_city.rb
 - test/test_fixture_matchers.rb
-- test/test_state_tree_reader_name_finder.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