worlddb-models 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7ca070ea7895fb6595ea3c09d9081945bb9810
-  data.tar.gz: eabe0f34bb806d94ea6a24fe69fcf8656b9aad22
+  metadata.gz: 7fd3e4a124d077f78bb176f7a6bc5b57ae15e5a9
+  data.tar.gz: 4cc9e212e7fb37bb21d557a262698411daacb754
 SHA512:
-  metadata.gz: 31b2084fb1d59c8e663d36e25be45aa03111f51af310923369b64336f3d628436686a7c39fa8044dd39cb98eb1830fce55fafa41362a55499ebcc4b300e23675
-  data.tar.gz: e2651f5001624057d10444c333c4d4a497ec4044f02a8cf2ad67183a19a974b866ffbe4e50f28030296a9fbed841d75620c1e3ff9df9771cde814f5c4415ebdc
+  metadata.gz: 563ffc1f779a443c5126c41c8ab6385a653a74634cacbbc7d6a397f17d83be00c73b40356c1d2c7878122f8ad96138d71a5dbef934b4fa3123958add12319534
+  data.tar.gz: 1bf7aa7c891b4d404a60a08d3e24abecaeb042a71758f1463c5704104bd85ca1c2d0f06e0e1131d24de083f4d98e8736894f8fd60116f114238e2cbb3d03db04

data/Manifest.txt

@@ -74,3 +74,4 @@ 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/Rakefile

@@ -17,7 +17,7 @@ Hoe.spec 'worlddb-models' do
   self.extra_deps = [
     ['props',     '>= 1.1.2'],         # settings / prop(ertie)s / env / INI
     ['logutils',  '>= 0.6.1'],     # logging
-    ['textutils', '>= 1.3.0'], 
+    ['textutils', '>= 1.3.1'], 
 
     ['tagutils',              '>= 0.3.0'],  # tags n categories for activerecord
     ['activerecord-utils',    '>= 0.2.0'],

data/lib/worlddb/models/name.rb

@@ -6,6 +6,8 @@ module WorldDb
 
 class Name < ActiveRecord::Base
 
+  belongs_to :place,   class_name: 'Place',    foreign_key: 'place_id'
+
 
   def self.parse( *args )
     ## remove (extract) attribs hash (if last arg is a hash n present)

data/lib/worlddb/models/place.rb

@@ -7,6 +7,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 :county, class_name: 'County', foreign_key: 'place_id'
+  has_one :muni,   class_name: 'Muni',   foreign_key: 'place_id'
+  ## add more types..
 
 end  # class Place
 

data/lib/worlddb/readers/state_tree.rb

@@ -36,17 +36,55 @@ 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
-        rec = State.where( "name like '#{node.value}%'" ).first 
+        ##  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
       elsif node.level == part_level # 2 
         state = stack[0]
         rec = Part.where( "name like '#{node.value}%' AND state_id = #{state.id}" ).first
       elsif node.level == county_level  # 2 or 3
         state = stack[0]
-        rec = County.where( "name like '#{node.value}%' AND state_id = #{state.id}" ).first
+        ## 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
       elsif node.level == muni_level   # 3 or 4
         state = stack[0]
-        rec = Muni.where( "name like '#{node.value}%' AND state_id = #{state.id}" ).first
+        ## 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
       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

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

data/test/test_state_tree_reader_name_finder.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_state_tree_reader_name_finder.rb
+
+
+require 'helper'
+
+class TestStateTreeReaderNameFinder < MiniTest::Test
+
+  def setup
+    #  delete all countries, states, cities in in-memory only db
+    WorldDb.delete!
+  end
+  
+  def test_at
+    at = Country.create!( key: 'at',
+                     name: 'Austria',
+                     code: 'AUT',
+                     pop: 0,
+                     area: 0 )
+
+    reader = WorldDb::Reader.new( "#{WorldDb.root}/test/data/at-austria" )
+    reader.load_setup( 'setups/adm' )
+
+    n = State.find_by!( key: 'n' )
+
+
+    ## find counties w/ state_id using names 
+    names = Name.joins( :place => :county ).where(
+                                              :name                => 'Horn',
+                                              :place_kind          => 'COUN',
+                                              :'counties.state_id' => n.id )
+    ## results in:
+    ## SELECT "names".* FROM "names"
+    ##   INNER JOIN "places" ON "places"."id" = "names"."place_id"
+    ##   INNER JOIN "counties" ON "counties"."place_id" = "places"."id"
+    ##   WHERE "names"."name" = ?
+    ##     AND "names"."place_kind" = ?
+    ##     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 )
+
+    ## results in:
+    ## SELECT "names".* FROM "names"
+    ##   INNER JOIN "places" ON "places"."id" = "names"."place_id"
+    ##   INNER JOIN "munis" ON "munis"."place_id" = "places"."id"
+    ##   WHERE "names"."name" = ?
+    ##     AND "names"."place_kind" = ?
+    ##     AND "munis"."state_id" = 2
+    ##  [["name", "Horn"], ["place_kind", "MUNI"]]
+
+    pp names
+
+  end
+
+end # class TestStateTreeReaderNameFinder
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,7 @@ 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
@@ -288,6 +289,7 @@ 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_parse_city.rb
 - test/test_report_country.rb