beerdb 0.6.1 → 0.6.2

data/lib/beerdb/models/brewery.rb

@@ -136,7 +136,48 @@ class Brewery < ActiveRecord::Base
 
     if value_brands.present?
       logger.debug " auto-adding brands >#{value_brands}<"
-      # fix: to be done!
+
+      # remove optional english translation in square brackets ([]) e.g. Wien [Vienna]
+      value_brands = value_brands.gsub( /\[.+\]/, '' )
+
+      # remove optional longer title part in () e.g. Las Palmas (de Gran Canaria), Palma (de Mallorca)
+      value_brands = value_brands.gsub( /\(.+\)/, '' )
+      
+      # remove optional longer title part in {} e.g. Ottakringer {Bio} or {Alkoholfrei}
+      value_brands = value_brands.gsub( /\{.+\}/, '' )
+      
+      value_brand_titles = value_brands.split( ',' )
+      
+      # pass 1) remove leading n trailing spaces
+      value_brand_titles = value_brand_titles.map { |value| value.strip }
+      
+      value_brand_titles.each do |brand_title|
+        
+        # autogenerate key from title
+        brand_key = title_to_key( brand_title )
+
+        brand = Brand.find_by_key( brand_key )
+
+        brand_attributes = {
+          title:      brand_title,
+          brewery_id: rec.id,
+          country_id: rec.country_id,
+          region_id:  rec.region_id,
+          city_id:    rec.city_id
+        }
+
+        if brand.present?
+          logger.debug "update Brand #{brand.id}-#{brand.key}:"
+        else
+          logger.debug "create Brand:"
+          brand = Brand.new
+          brand_attributes[ :key ] = brand_key   # NB: new record; include/update key
+        end
+      
+        logger.debug brand_attributes.to_json
+
+        brand.update_attributes!( brand_attributes )
+      end
     end
 
     ##################
@@ -161,6 +202,93 @@ class Brewery < ActiveRecord::Base
 
   end # method create_or_update_from_values
 
+  ### todo/fix:
+  # reuse method - put into helper in textutils or somewhere else ??
+
+  def title_to_key( title )
+
+      ## NB: downcase does NOT work for accented chars (thus, include in alternatives)
+      key = title.downcase
+
+      ## remove all whitespace and punctuation
+      key = key.gsub( /[ \t_\-\.()\[\]'"\/]/, '' )
+
+      ## remove special chars (e.g. %°&)
+      key = key.gsub( /[%&°]/, '' )
+
+      ##  turn accented char into ascii look alike if possible
+      ##
+      ## todo: add some more
+      ## see http://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references  for more
+      
+      ## todo: add unicode codepoint name
+      
+      alternatives = [
+        ['ß', 'ss'],
+        ['æ', 'ae'],
+        ['ä', 'ae'],
+        ['ā', 'a' ],  # e.g. Liepājas
+        ['á', 'a' ],  # e.g. Bogotá, Králové
+        ['ã', 'a' ],  # e.g  São Paulo
+        ['ă', 'a' ],  # e.g. Chișinău
+        ['â', 'a' ],  # e.g  Goiânia
+        ['å', 'a' ],  # e.g. Vålerenga
+        ['ą', 'a' ],  # e.g. Śląsk
+        ['ç', 'c' ],  # e.g. São Gonçalo, Iguaçu, Neftçi
+        ['ć', 'c' ],  # e.g. Budućnost
+        ['č', 'c' ],  # e.g. Tradiční, Výčepní
+        ['é', 'e' ],  # e.g. Vélez, Králové
+        ['è', 'e' ],  # e.g. Rivières
+        ['ê', 'e' ],  # e.g. Grêmio
+        ['ě', 'e' ],  # e.g. Budějovice
+        ['ĕ', 'e' ],  # e.g. Svĕtlý
+        ['ė', 'e' ],  # e.g. Vėtra
+        ['ë', 'e' ],  # e.g. Skënderbeu
+        ['ğ', 'g' ],  # e.g. Qarabağ
+        ['ì', 'i' ],  # e.g. Potosì
+        ['í', 'i' ],  # e.g. Ústí
+        ['ł', 'l' ],  # e.g. Wisła, Wrocław
+        ['ñ', 'n' ],  # e.g. Porteño
+        ['ň', 'n' ],  # e.g. Plzeň, Třeboň
+        ['ö', 'oe'],
+        ['ő', 'o' ],  # e.g. Győri
+        ['ó', 'o' ],  # e.g. Colón, Łódź, Kraków
+        ['õ', 'o' ],  # e.g. Nõmme
+        ['ø', 'o' ],  # e.g. Fuglafjørdur, København
+        ['ř', 'r' ],  # e.g. Třeboň
+        ['ș', 's' ],  # e.g. Chișinău, București
+        ['ş', 's' ],  # e.g. Beşiktaş
+        ['š', 's' ],  # e.g. Košice
+        ['ť', 't' ],  # e.g. Měšťan
+        ['ü', 'ue'],
+        ['ú', 'u' ],  # e.g. Fútbol
+        ['ū', 'u' ],  # e.g. Sūduva
+        ['ů', 'u' ],  # e.g. Sládkův
+        ['ı', 'u' ],  # e.g. Bakı   # use u?? (Baku) why-why not?
+        ['ý', 'y' ],  # e.g. Nefitrovaný
+        ['ź', 'z' ],  # e.g. Łódź
+        ['ž', 'z' ],  # e.g. Domžale, Petržalka
+
+        ['Č', 'c' ],  # e.g. České
+        ['İ', 'i' ],  # e.g. İnter
+        ['Í', 'i' ],  # e.g. ÍBV
+        ['Ł', 'l' ],  # e.g. Łódź
+        ['Ö', 'oe' ], # e.g. Örebro
+        ['Ř', 'r' ],  # e.g. Řezák
+        ['Ś', 's' ],  # e.g. Śląsk
+        ['Š', 's' ],  # e.g. MŠK
+        ['Ş', 's' ],  # e.g. Şüvälan
+        ['Ú', 'u' ],  # e.g. Ústí, Újpest
+        ['Ž', 'z' ]   # e.g. Žilina
+      ]
+      
+      alternatives.each do |alt|
+        key = key.gsub( alt[0], alt[1] )
+      end
+
+      key
+  end # method title_to_key
+
 end # class Brewery
 
 

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &81839750 !ruby/object:Gem::Requirement
+  requirement: &84738480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *81839750
+  version_requirements: *84738480
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &81839530 !ruby/object:Gem::Requirement
+  requirement: &84738260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *81839530
+  version_requirements: *84738260
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &81839310 !ruby/object:Gem::Requirement
+  requirement: &84738040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *81839310
+  version_requirements: *84738040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81839090 !ruby/object:Gem::Requirement
+  requirement: &84737820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *81839090
+  version_requirements: *84737820
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81838870 !ruby/object:Gem::Requirement
+  requirement: &84737600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *81838870
+  version_requirements: *84737600
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: