beerdb 0.6.3 → 0.6.4

data/lib/beerdb/models/brewery.rb

@@ -29,7 +29,6 @@ class Brewery < ActiveRecord::Base
   end
 
 
-
   def self.create_or_update_from_values( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!
@@ -92,7 +91,7 @@ class Brewery < ActiveRecord::Base
         # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
         new_attributes[ :web ] = value
       elsif value =~ /\/{2}/  # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
-        new_attributes[ :address ] = value
+        new_attributes[ :address ] = normalize_address( value )
       elsif value =~ /^brands:/   # brands:
         value_brands = value[7..-1]  ## cut off brands: prefix
         value_brands = value_brands.strip  # remove leading and trailing spaces
@@ -205,6 +204,27 @@ class Brewery < ActiveRecord::Base
   ### todo/fix:
   # reuse method - put into helper in textutils or somewhere else ??
 
+  def self.normalize_address( old_address_line )
+    # for now only checks german 5-digit zip code
+    #
+    #  e.g.  Alte Plauener Straße 24 // 95028 Hof  becomes
+    #        95028 Hof // Alte Plauener Straße 24 
+    
+    new_address_line = old_address_line   # default - do nothing - just path through
+    
+    lines = old_address_line.split( '//' )
+
+    if lines.size == 2   # two lines / check for switching lines
+      line1 = lines[0].strip
+      line2 = lines[1].strip
+      if line2 =~ /^[0-9]{5}\s/
+        new_address_line = "#{line2} // #{line1}"   # swap - let line w/ 5-digit zip code go first
+      end
+    end
+  
+    new_address_line
+  end
+
   def self.title_to_key( title )
 
       ## NB: downcase does NOT work for accented chars (thus, include in alternatives)

data/lib/beerdb/models/city.rb

@@ -2,6 +2,7 @@ module WorldDb::Models
 
 class City
     has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'city_id'
+    has_many :brands,    :class_name => 'BeerDb::Models::Brand',   :foreign_key => 'city_id'
     has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'city_id'
 end # class Country
 

data/lib/beerdb/models/country.rb

@@ -3,6 +3,7 @@ module WorldDb::Models
 
 class Country
     has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'country_id'
+    has_many :brands,    :class_name => 'BeerDb::Models::Brand',   :foreign_key => 'country_id'
     has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'country_id'
 end # class Country
 

data/lib/beerdb/models/region.rb

@@ -3,6 +3,7 @@ module WorldDb::Models
 
 class Region
     has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'region_id'
+    has_many :brands,    :class_name => 'BeerDb::Models::Brand',   :foreign_key => 'region_id'
     has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'region_id'
 end # class Region
 

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   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: &77345520 !ruby/object:Gem::Requirement
+  requirement: &83421770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *77345520
+  version_requirements: *83421770
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &77345300 !ruby/object:Gem::Requirement
+  requirement: &83421550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *77345300
+  version_requirements: *83421550
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &77345080 !ruby/object:Gem::Requirement
+  requirement: &83421330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *77345080
+  version_requirements: *83421330
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77344860 !ruby/object:Gem::Requirement
+  requirement: &83421110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *77344860
+  version_requirements: *83421110
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77344640 !ruby/object:Gem::Requirement
+  requirement: &83420890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *77344640
+  version_requirements: *83420890
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: