beerdb 0.6.10 → 0.6.11

data/lib/beerdb/models/brewery.rb

@@ -40,6 +40,27 @@ class Brewery < ActiveRecord::Base
   end
 
 
+
+  ## todo/fix:
+  #    move to textutils - use AddressHelper ??
+  #  todo: add _in_adr or _in_addr to name
+
+  def self.find_city_for_country( country_key, address )
+
+    lines = address.split( '//' )
+
+    if country_key == 'at' || country_key == 'de'
+      # first line strip numbers (assuming zip code) and whitespace
+      line1 = lines[0]
+      line1 = line1.gsub( /\b[0-9]+\b/, '' )   # use word boundries (why? why not?)
+      line1 = line1.strip
+      line1   # assume its the city
+    else
+      nil   # unsupported country/address schema for now
+    end
+  end
+
+
   def self.create_or_update_from_values( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!
@@ -141,6 +162,61 @@ class Brewery < ActiveRecord::Base
 
     rec.update_attributes!( new_attributes )
 
+
+    ##############################
+    # auto-add city if not present and country n region present
+    
+    if new_attributes[:city_id].blank? &&
+       new_attributes[:country_id].present? &&
+       new_attributes[:region_id].present?
+       
+      country_key = rec.country.key
+
+      if county_key == 'at' || country_key == 'de'
+
+        ## todo: use find_city_in_adr_for_country ?? too long ?? use adr or addr
+        city_title = find_city_for_country( country_key, new_attributes[:address] )
+        
+        if city_title.present?
+          
+          # remove optional english translation in square brackets ([]) e.g. Wien [Vienna]
+          city_title = TextUtils.strip_translations( city_title )
+          # remove optional longer title part in {} e.g. Ottakringer {Bio} or {Alkoholfrei}
+          city_title = TextUtils.strip_tags( city_title )
+          
+          city_key = TextUtils.title_to_key( city_title )
+
+          city = City.find_by_key( city_key )
+
+          city_attributes = {
+            title:      city_title,
+            country_id: rec.country_id,
+            region_id:  rec.region_id
+            ### fix/todo: add new autoadd flag too?
+          }
+
+          if city.present?
+            logger.info "update City #{city.id}-#{city.key}:"
+          else
+            logger.info "create City:"
+            city = City.new
+            city_attributes[ :key ] = city_key   # NB: new record; include/update key
+          end
+
+          logger.info city_attributes.to_json
+
+          city.update_attributes!( city_attributes )
+          
+          ## now at last add city_id to brewery!
+          rec.city_id = city.id
+          rec.save!
+        else
+          logger.warn "auto-add city (#{country_key}) >>#{new_attributes[:address]}<< failed; no city title found"
+        end
+      end
+    end
+
+
     ###################
     # auto-add brands if presents
 

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.10'
+  VERSION = '0.6.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83105520 !ruby/object:Gem::Requirement
+  requirement: &76843520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83105520
+  version_requirements: *76843520
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &83105270 !ruby/object:Gem::Requirement
+  requirement: &76843280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83105270
+  version_requirements: *76843280
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &83105040 !ruby/object:Gem::Requirement
+  requirement: &76843050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *83105040
+  version_requirements: *76843050
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83104810 !ruby/object:Gem::Requirement
+  requirement: &76842820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83104810
+  version_requirements: *76842820
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83104590 !ruby/object:Gem::Requirement
+  requirement: &76842600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *83104590
+  version_requirements: *76842600
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: