beerdb 0.6.11 → 0.6.12

data/lib/beerdb/models/brewery.rb

@@ -172,7 +172,7 @@ class Brewery < ActiveRecord::Base
        
       country_key = rec.country.key
 
-      if county_key == 'at' || country_key == 'de'
+      if country_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] )

data/lib/beerdb/version.rb

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

data/test/test_values.rb

@@ -85,4 +85,87 @@ class TestValues < MiniTest::Unit::TestCase
   end
 
 
+  def test_load_brewery_values_w_city_at
+
+    # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
+    #   brands: Ottakringer
+
+    new_attributes = {
+      key: 'ottakringer',
+      title: 'Ottakringer Brauerei',
+      synonyms: '',
+      country_id: AT.id,
+      region_id: W.id
+    }
+
+    values = [
+      '1838',
+      'www.ottakringer.at',
+      '1160 Wien // Ottakringer Platz 1',
+      'brands: Ottakringer'
+    ]
+    
+    by = Brewery.create_or_update_from_values( new_attributes, values )
+
+    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    assert( by.id == by2.id )
+
+    assert( by.title         == new_attributes[:title] )
+    assert( by.country_id    == AT.id )
+    assert( by.country.title == AT.title )
+    assert( by.since         == 1838 )
+    assert( by.web           == 'www.ottakringer.at' )
+    assert( by.address       == '1160 Wien // Ottakringer Platz 1' )
+
+    # check auto-created brand
+
+    br = Brand.find_by_key!( 'ottakringer')
+
+    assert( br.title         == 'Ottakringer' )
+    assert( br.brewery_id    == by.id )
+    assert( br.brewery.title == by.title )
+    assert( br.country_id    == by.country_id )
+    
+    # todo: check for auto-created city
+    assert( by.city.title == 'Wien' )
+  end
+
+
+  def test_load_brewery_values_w_city_de
+
+    # hofbraeu, Hofbräu München, 1589, www.hofbraeu-muenchen.de, 81829 München // Hofbräuallee 1 
+
+    new_attributes = {
+      key: 'hofbraeu',
+      title: 'Hofbräu München',
+      synonyms: '',
+      country_id: DE.id,
+      region_id: BY.id
+    }
+
+    values = [
+      '1589',
+      'www.hofbraeu-muenchen.de',
+      '81829 München // Hofbräuallee 1',
+      'brands: Hofbräu'
+    ]
+    
+    by = Brewery.create_or_update_from_values( new_attributes, values )
+
+    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    assert( by.id == by2.id )
+
+    assert( by.title         == new_attributes[:title] )
+    assert( by.country_id    == DE.id )
+    assert( by.country.title == DE.title )
+    assert( by.since         == 1589 )
+    assert( by.web           == 'www.hofbraeu-muenchen.de' )
+    assert( by.address       == '81829 München // Hofbräuallee 1' )
+
+    # tood: check auto-created brand
+    # todo: check for auto-created city
+    assert( by.city.title    == 'München' )
+
+  end
+
 end # class TestValues

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
   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: &76843520 !ruby/object:Gem::Requirement
+  requirement: &72702360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *76843520
+  version_requirements: *72702360
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &76843280 !ruby/object:Gem::Requirement
+  requirement: &72702100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *76843280
+  version_requirements: *72702100
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &76843050 !ruby/object:Gem::Requirement
+  requirement: &72701870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *76843050
+  version_requirements: *72701870
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &76842820 !ruby/object:Gem::Requirement
+  requirement: &72701650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *76842820
+  version_requirements: *72701650
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &76842600 !ruby/object:Gem::Requirement
+  requirement: &72701420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *76842600
+  version_requirements: *72701420
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: