beerdb 0.6.12 → 0.6.13

data/lib/beerdb/models/brewery.rb

@@ -47,6 +47,8 @@ class Brewery < ActiveRecord::Base
 
   def self.find_city_for_country( country_key, address )
 
+    return nil if address.blank?    # do NOT process nil or empty address lines; sorry
+
     lines = address.split( '//' )
 
     if country_key == 'at' || country_key == 'de'
@@ -54,9 +56,12 @@ class Brewery < ActiveRecord::Base
       line1 = lines[0]
       line1 = line1.gsub( /\b[0-9]+\b/, '' )   # use word boundries (why? why not?)
       line1 = line1.strip
+      
+      return nil if line1.blank?   # nothing left sorry; better return nil
+      
       line1   # assume its the city
     else
-      nil   # unsupported country/address schema for now
+      nil   # unsupported country/address schema for now; sorry
     end
   end
 
@@ -174,6 +179,8 @@ class Brewery < ActiveRecord::Base
 
       if country_key == 'at' || country_key == 'de'
 
+        ## todo: how to handle nil/empty address lines?
+
         ## 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] )
         
@@ -197,6 +204,8 @@ class Brewery < ActiveRecord::Base
 
           if city.present?
             logger.info "update City #{city.id}-#{city.key}:"
+            # todo: check - any point in updating city? for now no new attributes
+            #   update only for title - title will change?
           else
             logger.info "create City:"
             city = City.new
@@ -206,12 +215,12 @@ class Brewery < ActiveRecord::Base
           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"
+          logger.warn "auto-add city (#{country_key}) for #{new_attributes[:key]} >>#{new_attributes[:address]}<< failed; no city title found"
         end
       end
     end

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.12'
+  VERSION = '0.6.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &72702360 !ruby/object:Gem::Requirement
+  requirement: &79691710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *72702360
+  version_requirements: *79691710
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &72702100 !ruby/object:Gem::Requirement
+  requirement: &79691460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *72702100
+  version_requirements: *79691460
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &72701870 !ruby/object:Gem::Requirement
+  requirement: &79691230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *72701870
+  version_requirements: *79691230
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72701650 !ruby/object:Gem::Requirement
+  requirement: &79691000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *72701650
+  version_requirements: *79691000
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &72701420 !ruby/object:Gem::Requirement
+  requirement: &79690780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *72701420
+  version_requirements: *79690780
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: