worlddb 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45f7ea9e8342b1543e5b5ffc4a3248eb556f3ba2
-  data.tar.gz: 8e8fc8668c5ff107626dc1300212fad1cf7b84cc
+  metadata.gz: af58d58c38775a19ef1a319c7a2964dfb38f690d
+  data.tar.gz: 5370d2cd74dab599b22b62413fffdb57372d259d
 SHA512:
-  metadata.gz: fef9a54a76351aa639ce10ed5e423daec71aef3b366ec9a0b9b457751b8f12170a2fde3433f0a36bcb9996bed6959c741ed3246091f433725ac6442ac1564df5
-  data.tar.gz: 8e3e5f08bf075a1da28d5af49e252798dae7383a30fff7e5e5d368babb8e15736729eac3dce83245407b950127ff775c6b0d29d4ea069f0810210765ca61878c
+  metadata.gz: f59a8cf313525cb89e6d7ebfac67e6bc2329b26cc17d3ee0ecaf5e026298ab43a50c6cfb6163e88b23fabdc34a656e0c77720e90a917a1daa127b2f3183cb325
+  data.tar.gz: f030026f39270272136a0b68556c093c4a5264e670c088235cbfad7ac88e6fae5e5c687161654acf0c5411af3c4e19c7dc82c8bb6c1810402cf1aec0fc50f81e

data/lib/worlddb/reader.rb

@@ -154,14 +154,15 @@ class ReaderBase
         logger.debug "create Continent:"
         rec = Continent.new
       end
-      
+
       logger.debug attribs.to_json
-   
+
       rec.update_attributes!( attribs )
 
     end # each lines
   end # load_continent_defs
 
+
   def load_codes( name )
     reader = create_line_reader( name )
 
@@ -181,12 +182,8 @@ class ReaderBase
       end
 
       ## try to find country
-      cty = Country.find_by_name( country_name )
-      if cty.nil?
-        ## retry: remove all () enclosed
-        cty = Country.find_by_name( country_name.gsub( /\([^)]+\)/, '' ).strip )
-      end
-      
+      cty = find_country( country_name )
+
       if cty.nil?
         logger.warn "no country match found for >#{country_name}<; skipping line; in [#{name}]"
         next
@@ -215,8 +212,49 @@ class ReaderBase
 
       cty.save!
     end
+  end # method load_codes
+
+
+####
+# helper methods
+##
+## todo: move to country model !!!!!!
+##   find a good name Country.find  not really possible
+##   superfind ??  use search!!! search_by_name()  Country.search() or lookup?
+##
+## todo: also add City.search_by_name etc. !!!
+
+  def find_country( country_name )
+
+    name = country_name.strip
+
+    ## 1) first try 1:1 (exact) match
+    cty = Country.find_by_name( name )   # NOTE: assume AR escapes quotes in name ??
+    if cty.nil?
+      ## 2) retry: remove all () enclosed
+      name = name.gsub( /\([^)]+\)/, '' ).strip
+      cty = Country.find_by_name( name )
+
+      ### NOTE: escape ' for sql like clause
+      ##   for now use '' for escapes, that is, double quotes
+      ##  check - working for postgresql n sqlite?? 
+      name_esc = name.gsub( /'/, "''" )
+
+      ## 3) retry: use SQL like match
+      ##    % is used to match *zero* or more occurrences of any characters
+      ##  todo: check if it matches zero too
+      if cty.nil?
+        cty = Country.where( "name LIKE '%#{name_esc}%'" ).first
+      end
+
+      ## 4) retry: use SQL like match for alternative names match
+      if cty.nil?
+        cty = Country.where( "alt_names LIKE '%#{name_esc}%'" ).first
+      end
+    end
+    cty  # return cty (country); nil if not found
+  end # method find_country
 
-  end
 
 
 end # class ReaderBase

data/lib/worlddb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props