beerdb-models 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 333f48b7fbc66cb2fa3d9ef78a9815496c093fc7
-  data.tar.gz: 283dc0368e9bdf46e69f8a774ed6a6daca3efbac
+  metadata.gz: 4e0814546ffaf1bdce1f0a10a33183cb5d3642c4
+  data.tar.gz: 95860781d2554c27001e6db34eb1b926bba44473
 SHA512:
-  metadata.gz: 728c6d69adb5ad926a5fea6f852d1d92dd30f5479741a2810454c770abbef939466627752c31b4a335d0e4553568238186e530432382a6de75f62c734adfa4ba
-  data.tar.gz: cfb8cf388ccf45838213c4ac8b3fe296df9747c00a272c200944f0f2a348c83ea7db3bb2797e6c3f8fc6078b880fbf430b43dbce545134826d9b924463a957b5
+  metadata.gz: b0190214a599104891fe8620f3fd04b33001cbcc4c4651a93e8111ac6aacf782f471f336a50bd56a82aa1a87bd68c260d8c3005e0f4122c996c15651542282bb
+  data.tar.gz: 7f26566ee130d0a570f8bdd5abe363ebd496ef6ff11bbe8878a6704564a08c3c5ddc72b0aedefcdd125c4146cc57e2bb73cc3c0b2b0eaa0af3fb77ac5d77b4a7

data/Manifest.txt

@@ -1,30 +1,30 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-lib/beerdb/deleter.rb
-lib/beerdb/models.rb
-lib/beerdb/models/beer.rb
-lib/beerdb/models/brand.rb
-lib/beerdb/models/brewery.rb
-lib/beerdb/models/forward.rb
-lib/beerdb/models/tag.rb
-lib/beerdb/models/world/city.rb
-lib/beerdb/models/world/country.rb
-lib/beerdb/models/world/region.rb
-lib/beerdb/reader.rb
-lib/beerdb/reader_file.rb
-lib/beerdb/reader_zip.rb
-lib/beerdb/readers/beer.rb
-lib/beerdb/readers/brewery.rb
-lib/beerdb/readers/quick.rb
-lib/beerdb/schema.rb
-lib/beerdb/serializers/beer.rb
-lib/beerdb/serializers/brewery.rb
-lib/beerdb/stats.rb
-lib/beerdb/version.rb
-test/data/great-beers-europe.txt
-test/helper.rb
-test/test_fixture_matchers.rb
-test/test_reader_quick.rb
-test/test_values.rb
+HISTORY.md
+Manifest.txt
+README.md
+Rakefile
+lib/beerdb/deleter.rb
+lib/beerdb/models.rb
+lib/beerdb/models/beer.rb
+lib/beerdb/models/brand.rb
+lib/beerdb/models/brewery.rb
+lib/beerdb/models/forward.rb
+lib/beerdb/models/tag.rb
+lib/beerdb/models/world/city.rb
+lib/beerdb/models/world/country.rb
+lib/beerdb/models/world/state.rb
+lib/beerdb/reader.rb
+lib/beerdb/reader_file.rb
+lib/beerdb/reader_zip.rb
+lib/beerdb/readers/beer.rb
+lib/beerdb/readers/brewery.rb
+lib/beerdb/readers/quick.rb
+lib/beerdb/schema.rb
+lib/beerdb/serializers/beer.rb
+lib/beerdb/serializers/brewery.rb
+lib/beerdb/stats.rb
+lib/beerdb/version.rb
+test/data/great-beers-europe.txt
+test/helper.rb
+test/test_fixture_matchers.rb
+test/test_reader_quick.rb
+test/test_values.rb

data/README.md

@@ -1,8 +1,8 @@
 # beerdb-models - beer.db schema 'n' models for easy (re)use
 
 
-* home  :: [github.com/beerkit/beer.db.models](https://github.com/beerkit/beer.db.models)
-* bugs  :: [github.com/beerkit/beer.db.models/issues](https://github.com/beerkit/beer.db.models/issues)
+* home  :: [github.com/beerkit/beer.db](https://github.com/beerkit/beer.db)
+* bugs  :: [github.com/beerkit/beer.db/issues](https://github.com/beerkit/beer.db/issues)
 * gem   :: [rubygems.org/gems/beerdb-models](https://rubygems.org/gems/beerdb-models)
 * rdoc  :: [rubydoc.info/gems/beerdb-models](http://rubydoc.info/gems/beerdb-models)
 * forum :: [groups.google.com/group/beerdb](https://groups.google.com/group/beerdb)
@@ -92,6 +92,8 @@ wien.breweries
 
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `beerdb-models` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
@@ -99,4 +101,3 @@ Use it as you please with no restrictions whatsoever.
 
 Send them along to the [Open Beer & Brewery Database Forum/Mailing List](http://groups.google.com/group/beerdb).
 Thanks!
-

data/Rakefile

@@ -3,13 +3,13 @@ require './lib/beerdb/version.rb'
 
 
 Hoe.spec 'beerdb-models' do
-  
+
   self.version = BeerDb::VERSION
-  
+
   self.summary = "beerdb-models - beer.db schema 'n' models for easy (re)use"
   self.description = summary
 
-  self.urls    = ['https://github.com/beerkit/beer.db.models']
+  self.urls    = ['https://github.com/beerkit/beer.db']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'beerdb@googlegroups.com'
@@ -19,13 +19,13 @@ Hoe.spec 'beerdb-models' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['worlddb-models', '>= 2.2.0'],  # Note: worlddb-models pulls in all dependencies
+    ['worlddb-models', '>= 2.3.4'],  # Note: worlddb-models pulls in all dependencies
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 1.9.2'
+    required_ruby_version: '>= 2.3'
   }
 
 end

data/lib/beerdb/models.rb

@@ -10,7 +10,7 @@ require 'beerdb/version'   ## version always goes first
 
 require 'beerdb/models/forward'
 require 'beerdb/models/world/country'
-require 'beerdb/models/world/region'
+require 'beerdb/models/world/state'
 require 'beerdb/models/world/city'
 require 'beerdb/models/tag'
 require 'beerdb/models/beer'

data/lib/beerdb/models/beer.rb

@@ -7,12 +7,12 @@ class Beer < ActiveRecord::Base
 
   extend TextUtils::TagHelper  # will add self.find_tags, self.find_tags_in_attribs!, etc.
 
-  # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
+  # Note: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
   #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, self.is_address?, is_taglist? etc.
+  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_state?, self.is_address?, is_taglist? etc.
 
   belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
+  belongs_to :state,   :class_name => 'WorldDb::Model::State',   :foreign_key => 'state_id'
   belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
   belongs_to :brand,   :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brand_id'
@@ -55,7 +55,7 @@ class Beer < ActiveRecord::Base
 
 
   def as_json_v2( opts={} )
-    # NB: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2
+    # Note: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2
     BeerSerializer.new( self ).as_json
   end
 
@@ -64,7 +64,7 @@ class Beer < ActiveRecord::Base
 
     attribs, more_values = find_key_n_title( values )
     attribs = attribs.merge( more_attribs )
-      
+
     # check for optional values
     Beer.create_or_update_from_attribs( attribs, more_values )
   end
@@ -74,23 +74,23 @@ class Beer < ActiveRecord::Base
 
     # fix: add/configure logger for ActiveRecord!!!
     logger = LogKernel::Logger.root
-    
+
     value_tag_keys    = []
-     
+
     ## check for grades (e.g. ***/**/*) in titles (will add attribs[:grade] to hash)
     ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
     attribs[ :grade ] ||= 4
-    
+
     ### check for "default" tags - that is, if present attribs[:tags] remove from hash
     value_tag_keys += find_tags_in_attribs!( attribs )
-    
+
     ## check for optional values
     values.each_with_index do |value,index|
       if match_country(value) do |country|
            attribs[ :country_id ] = country.id
          end
-      elsif match_region_for_country(value, attribs[:country_id]) do |region|
-              attribs[ :region_id ] = region.id
+      elsif match_state_for_country(value, attribs[:country_id]) do |state|
+              attribs[ :state_id ] = state.id
             end
       elsif match_city(value) do |city|
               if city.present?
@@ -103,19 +103,19 @@ class Beer < ActiveRecord::Base
       elsif match_brewery(value) do |brewery|
               attribs[ :brewery_id ] = brewery.id
 
-              # for easy queries cache city and region ids
-          
+              # for easy queries cache city and state ids
+
               # 1) check if brewery has city - if yes, use it for beer too
               if brewery.city.present?
                 attribs[ :city_id ] = brewery.city.id
               end
 
-              # 2) check if brewery has city w/ region if yes, use it for beer to
-              #   if not check for region for brewery
-              if brewery.city.present? && brewery.city.region.present?
-                attribs[ :region_id ] = brewery.city.region.id
-              elsif brewery.region.present?
-                attribs[ :region_id ] = brewery.region.id
+              # 2) check if brewery has city w/ state if yes, use it for beer to
+              #   if not check for state for brewery
+              if brewery.city.present? && brewery.city.state.present?
+                attribs[ :state_id ] = brewery.city.state.id
+              elsif brewery.state.present?
+                attribs[ :state_id ] = brewery.state.id
               end
             end
       elsif match_year( value ) do |num|  # founded/established year e.g. 1776
@@ -154,27 +154,27 @@ class Beer < ActiveRecord::Base
       logger.debug "create Beer:"
       rec = Beer.new
     end
-      
+
     logger.debug attribs.to_json
 
     rec.update_attributes!( attribs )
 
     ##################
-    # add taggings 
+    # add taggings
 
 ##
 ##  fix: delete all tags first or only add diff?
 ##  fix e.g.
 ##
 ## [debug] update Beer 1340-opatsvetlevycepni:
-## [debug] {"title":"Opat Světlé Výčepní","key":"opatsvetlevycepni","country_id":130,"txt":"cz-czech-republic!/beers","grade":4,"brewery_id":839,"city_id":1154,"region_id":241,"abv":4.2,"og":11.0}
+## [debug] {"title":"Opat Světlé Výčepní","key":"opatsvetlevycepni","country_id":130,"txt":"cz-czech-republic!/beers","grade":4,"brewery_id":839,"city_id":1154,"state_id":241,"abv":4.2,"og":11.0}
 ## [debug]    adding 1 taggings: >>pale lager<<...
 ## rake aborted!
 ## ActiveRecord::RecordNotUnique: SQLite3::ConstraintException: columns taggable_id, taggable_type, tag_id are not unique: INSERT INTO "taggings" ("created_at", "tag_id", "taggable_id", "taggable_type", "updated_at") VALUES (?, ?, ?, ?, ?)
 
 =begin
     if value_tag_keys.size > 0
-        
+
         value_tag_keys.uniq!  # remove duplicates
         logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
 

data/lib/beerdb/models/brand.rb

@@ -6,10 +6,10 @@ module BeerDb
 class Brand < ActiveRecord::Base
 
   # NB: use extend - is_<type>? become class methods e.g. self.is_<type>?
-  extend TextUtils::ValueHelper  # e.g. self.find_key_n_title, self.is_year?, self.is_region?, is_address?, is_taglist? etc.
+  extend TextUtils::ValueHelper  # e.g. self.find_key_n_title, self.is_year?, self.is_state?, is_address?, is_taglist? etc.
 
   belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
+  belongs_to :state,   :class_name => 'WorldDb::Model::State',   :foreign_key => 'state_id'
   belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
   belongs_to :brewery, :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brewery_id'
@@ -50,7 +50,7 @@ class Brand < ActiveRecord::Base
       logger.debug "create Brand:"
       rec = Brand.new
     end
-      
+
     logger.debug attribs.to_json
 
     rec.update_attributes!( attribs )

data/lib/beerdb/models/brewery.rb

@@ -9,13 +9,13 @@ class Brewery < ActiveRecord::Base
 
   # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
   #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, is_address?, is_taglist? etc.
+  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_state?, is_address?, is_taglist? etc.
   extend TextUtils::AddressHelper  # e.g self.normalize_addr, self.find_city_in_addr, etc.
 
   self.table_name = 'breweries'
 
   belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
+  belongs_to :state,   :class_name => 'WorldDb::Model::State',   :foreign_key => 'state_id'
   belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
   has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brewery_id'
@@ -38,9 +38,9 @@ class Brewery < ActiveRecord::Base
 
   def m?()  prod_m == true;  end
   def l?()  prod_l == true;  end
-  
+
   ## TODO: activerecord supplies brewpub? already? same as attrib; check w/ test case (and remove here)
-  def brewpub?()  brewpub == true;  end   
+  def brewpub?()  brewpub == true;  end
 
 
 
@@ -80,8 +80,8 @@ class Brewery < ActiveRecord::Base
       if match_country(value) do |country|
            new_attributes[ :country_id ] = country.id
          end
-      elsif match_region_for_country(value,new_attributes[:country_id]) do |region|
-              new_attributes[ :region_id ] = region.id
+      elsif match_state_for_country(value,new_attributes[:country_id]) do |state|
+              new_attributes[ :state_id ] = state.id
             end
       elsif match_city(value) do |city|
               if city.present?
@@ -91,10 +91,10 @@ class Brewery < ActiveRecord::Base
                 logger.warn "city with key #{value[5..-1]} missing - for brewery #{new_attributes[:key]}"
               end
 
-              ## for easy queries: cache region_id (from city)
-              #  - check if city w/ region if yes, use it for brewery too
-              if city.present? && city.region.present?
-                new_attributes[ :region_id ] = city.region.id
+              ## for easy queries: cache state_id (from city)
+              #  - check if city w/ state if yes, use it for brewery too
+              if city.present? && city.state.present?
+                new_attributes[ :state_id ] = city.state.id
               end
             end
       elsif match_year( value ) do |num|  # founded/established year e.g. 1776
@@ -131,19 +131,19 @@ class Brewery < ActiveRecord::Base
       logger.debug "create Brewery:"
       rec = Brewery.new
     end
-      
+
     logger.debug new_attributes.to_json
 
     rec.update_attributes!( new_attributes )
 
 
     ##############################
-    # auto-add city if not present and country n region present
-    
+    # auto-add city if not present and country n state present
+
     if new_attributes[:city_id].blank? &&
        new_attributes[:country_id].present? &&
-       new_attributes[:region_id].present?
-       
+       new_attributes[:state_id].present?
+
       country_key = rec.country.key
 
       ###
@@ -158,9 +158,9 @@ class Brewery < ActiveRecord::Base
         ## todo: how to handle nil/empty address lines?
 
         city_title = find_city_in_addr( new_attributes[:address], country_key )
-        
+
         if city_title.present?
-          
+
           ## for czech  - some cleanup
           ##   remove any (remaining) digits in city title
           city_title = city_title.gsub( /[0-9]/, '' ).strip
@@ -168,7 +168,7 @@ class Brewery < ActiveRecord::Base
           city_values = [city_title]
           city_attributes = {
             country_id: rec.country_id,
-            region_id:  rec.region_id
+            state_id:   rec.state_id
           }
           # todo: add convenience helper create_or_update_from_title
           city = City.create_or_update_from_values( city_values, city_attributes )
@@ -194,7 +194,7 @@ class Brewery < ActiveRecord::Base
 
       ## todo/fix: use strip_inline_comments (e.g #() or (()) - why?? why not??)
       #   - allows titles as usual (use new syntax for inline comments e.g. #() or (()) for example)
-      
+
       # remove optional longer title part in () e.g. Las Palmas (de Gran Canaria), Palma (de Mallorca)
       value_brands = TextUtils.strip_subtitles( value_brands )
 
@@ -206,7 +206,7 @@ class Brewery < ActiveRecord::Base
       brand_attribs = {
         brewery_id: rec.id,
         country_id: rec.country_id,
-        region_id:  rec.region_id,
+        state_id:   rec.state_id,
         city_id:    rec.city_id
       }
 
@@ -253,4 +253,3 @@ end # class Brewery
 
   end # module Model
 end # module BeerDb
-

data/lib/beerdb/models/forward.rb

@@ -12,7 +12,7 @@ module BeerDb
 
   Continent = WorldDb::Model::Continent
   Country   = WorldDb::Model::Country
-  Region    = WorldDb::Model::Region
+  State     = WorldDb::Model::State
   City      = WorldDb::Model::City
 
   Tag       = TagDb::Model::Tag
@@ -29,7 +29,7 @@ module BeerDb
   ## convenience alias (for better english ;-) )
   ##   lets you use =>  include Models  (instead of include Model)
   Models = Model
-  
+
 end # module BeerDb
 
 
@@ -43,4 +43,3 @@ module WorldDb
 
   end # module Model
 end # module WorldDb
-

data/lib/beerdb/models/world/{region.rb → state.rb}

@@ -3,12 +3,11 @@
 module WorldDb
   module Model
 
-class Region
-  has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'region_id'
-  has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'region_id'
-  has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'region_id'
-end # class Region
+class State
+  has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'state_id'
+  has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'state_id'
+  has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'state_id'
+end # class State
 
   end # module Model
 end # module WorldDb
-

data/lib/beerdb/reader.rb

@@ -9,24 +9,24 @@ module Matcher
     match_xxx_for_country( name, 'beers', &blk )
   end
 
-  def match_beers_for_country_n_region( name, &blk )
-    match_xxx_for_country_n_region( name, 'beers', &blk )
+  def match_beers_for_country_n_state( name, &blk )
+    match_xxx_for_country_n_state( name, 'beers', &blk )
   end
 
   def match_breweries_for_country( name, &blk )
     match_xxx_for_country( name, 'breweries', &blk )
   end
 
-  def match_breweries_for_country_n_region( name, &blk )
-    match_xxx_for_country_n_region( name, 'breweries', &blk )
+  def match_breweries_for_country_n_state( name, &blk )
+    match_xxx_for_country_n_state( name, 'breweries', &blk )
   end
 
   def match_brewpubs_for_country( name, &blk )
     match_xxx_for_country( name, 'brewpubs', &blk )
   end
 
-  def match_brewpubs_for_country_n_region( name, &blk )
-    match_xxx_for_country_n_region( name, 'brewpubs', &blk )
+  def match_brewpubs_for_country_n_state( name, &blk )
+    match_xxx_for_country_n_state( name, 'brewpubs', &blk )
   end
 
 
@@ -55,20 +55,20 @@ class ReaderBase
 
   def load( name )
 
-    if match_beers_for_country_n_region( name ) do |country_key, region_key|
-            load_beers_for_country_n_region( country_key, region_key, name )
+    if match_beers_for_country_n_state( name ) do |country_key, state_key|
+            load_beers_for_country_n_state( country_key, state_key, name )
           end
     elsif match_beers_for_country( name ) do |country_key|
             load_beers_for_country( country_key, name )
           end
-    elsif match_breweries_for_country_n_region( name ) do |country_key, region_key|
-            load_breweries_for_country_n_region( country_key, region_key, name )
+    elsif match_breweries_for_country_n_state( name ) do |country_key, state_key|
+            load_breweries_for_country_n_state( country_key, state_key, name )
           end
     elsif match_breweries_for_country( name ) do |country_key|
             load_breweries_for_country( country_key, name )
           end
-    elsif match_brewpubs_for_country_n_region( name ) do |country_key, region_key|
-            load_breweries_for_country_n_region( country_key, region_key, name, brewpub: true )
+    elsif match_brewpubs_for_country_n_state( name ) do |country_key, state_key|
+            load_breweries_for_country_n_state( country_key, state_key, name, brewpub: true )
           end
     elsif match_brewpubs_for_country( name ) do |country_key|
             load_breweries_for_country( country_key, name, brewpub: true )
@@ -80,19 +80,20 @@ class ReaderBase
   end
 
 
-  def load_beers_for_country_n_region( country_key, region_key, name, more_attribs={} )
-    country = Country.find_by_key!( country_key )
+  def load_beers_for_country_n_state( country_key, state_key, name, more_attribs={} )
+    country = Country.find_by!( key: country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
     more_attribs[ :country_id ] = country.id
 
-    # NB: region lookup requires country id (region key only unique for country)
-    region  = Region.find_by_key_and_country_id( region_key, country.id )
-    if region.nil?
-      # note: allow unknown region keys; issue warning n skip region
-      logger.warn "Region w/ key >#{region_key}< not found; skip adding region"
+    # Note: state lookup requires country id (state key only unique for country)
+    ##  check: was find_by_key_and_country_id
+    state  = State.find_by( key: state_key, country_id: country.id )
+    if state.nil?
+      # note: allow unknown state keys; issue warning n skip state
+      logger.warn "State w/ key >#{state_key}< not found; skip adding state"
     else
-      logger.debug "Region #{region.key} >#{region.title}<"
-      more_attribs[ :region_id  ] = region.id
+      logger.debug "State #{state.key} >#{state.title}<"
+      more_attribs[ :state_id  ] = state.id
     end
 
     more_attribs[ :txt ] = name  # store source ref
@@ -101,7 +102,7 @@ class ReaderBase
   end
 
   def load_beers_for_country( country_key, name, more_attribs={} )
-    country = Country.find_by_key!( country_key )
+    country = Country.find_by!( key: country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
     more_attribs[ :country_id ] = country.id
@@ -112,20 +113,21 @@ class ReaderBase
   end
 
 
-  def load_breweries_for_country_n_region( country_key, region_key, name, more_attribs={} )
-    country = Country.find_by_key!( country_key )
+  def load_breweries_for_country_n_state( country_key, state_key, name, more_attribs={} )
+    country = Country.find_by!( key: country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
     more_attribs[ :country_id ] = country.id
 
-    # note: region lookup requires country id (region key only unique for country)
-    region  = Region.find_by_key_and_country_id( region_key, country.id )
-    if region.nil?
-      # note: allow unknown region keys; issue warning n skip region
-      logger.warn "Region w/ key >#{region_key}< not found; skip adding region"
+    # note: state lookup requires country id (state key only unique for country)
+    ##   was: State.find_by_key_and_country_id( state_key, country.id )
+    state = State.find_by( key: state_key, country_id: country.id )
+    if state.nil?
+      # note: allow unknown state keys; issue warning n skip state
+      logger.warn "State w/ key >#{state_key}< not found; skip adding state"
     else
-      logger.debug "Region #{region.key} >#{region.title}<"
-      more_attribs[ :region_id  ] = region.id
+      logger.debug "State #{state.key} >#{state.title}<"
+      more_attribs[ :state_id  ] = state.id
     end
 
     more_attribs[ :txt ] = name  # store source ref
@@ -134,7 +136,7 @@ class ReaderBase
   end
 
   def load_breweries_for_country( country_key, name, more_attribs={} )
-    country = Country.find_by_key!( country_key )
+    country = Country.find_by!( key: country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
     more_attribs[ :country_id ] = country.id

data/lib/beerdb/readers/beer.rb

@@ -29,7 +29,7 @@ class BeerReader
 
   def self.from_string( text, more_attribs={} )
     BeerReader.new( text, more_attribs )
-  end  
+  end
 
   def initialize( text, more_attribs={} )
     ## todo/fix: how to add opts={} ???
@@ -44,12 +44,12 @@ class BeerReader
 
     ### todo: cleanup - check if [] works for build_title...
     #     better cleaner way ???
-    if @more_attribs[:region_id].present?
-      known_breweries_source = Brewery.where( region_id:  @more_attribs[:region_id] )
+    if @more_attribs[:state_id].present?
+      known_breweries_source = Brewery.where( state_id:  @more_attribs[:state_id] )
     elsif @more_attribs[:country_id].present?
       known_breweries_source = Brewery.where( country_id: @more_attribs[:country_id] )
     else
-      logger.warn "no region or country specified; use empty brewery ary for header mapper"
+      logger.warn "no state or country specified; use empty brewery ary for header mapper"
       known_breweries_source = []
     end
 
@@ -61,7 +61,7 @@ class BeerReader
       ## note: check for header attrib; if present remove
       ### todo: cleanup code later
       ## fix: add to new_attributes hash instead of values ary
-      ##   - fix: match_brewery()   move region,city code out of values loop for reuse at the end
+      ##   - fix: match_brewery()   move state,city code out of values loop for reuse at the end
       if new_attributes[:header].present?
         brewery_line = new_attributes[:header].dup   # note: make sure we make a copy; will use in-place string ops
         new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!

data/lib/beerdb/schema.rb

@@ -3,9 +3,11 @@
 module BeerDb
 
 
-class CreateDb < ActiveRecord::Migration
+class CreateDb
+
 
 def up
+    ActiveRecord::Schema.define do
 
 create_table :beers do |t|
   t.string  :key,      null: false   # import/export key
@@ -26,7 +28,7 @@ create_table :beers do |t|
   ## add t.boolean :lite  flag ??
   t.decimal    :kcal,  precision: 10, scale: 2     # kcal/100ml e.g. 45.0 kcal/100ml
 
-  ## check: why decimal and not float? 
+  ## check: why decimal and not float?
   t.decimal    :abv,   precision: 10, scale: 2     # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
   t.decimal    :og,    precision: 10, scale: 2     # malt extract (original gravity) in plato
   t.integer    :srm    # color in srm
@@ -73,7 +75,7 @@ create_table :beers do |t|
 
 
   t.references :country,  null: false
-  t.references :region   # optional
+  t.references :state    # optional
   t.references :city     # optional
 
   t.timestamps
@@ -89,7 +91,7 @@ create_table :brands do |t|   # beer families (sharing same name e.g. brand)
   t.integer :since
 
   ## scope of brand (global/intern'l/national/regional/local) ??
-  t.boolean :global,     null: false, default: false 
+  t.boolean :global,     null: false, default: false
   t.boolean :internl,    null: false, default: false
   t.boolean :national,   null: false, default: false
   t.boolean :regional,   null: false, default: false
@@ -108,7 +110,7 @@ create_table :brands do |t|   # beer families (sharing same name e.g. brand)
   t.references :brewery   # optional (for now)
 
   t.references :country,  null: false
-  t.references :region   # optional
+  t.references :state    # optional
   t.references :city     # optional
 
   t.timestamps
@@ -124,7 +126,7 @@ create_table :breweries do |t|
   ## fix: add flag for  ca./about  boolean opened_guess / opened_est / opened_??
   ##   ca. / about  1010  marker   e.g  t.boolean : opened_est (for estimate) or similar!!!
   ## renamed to founded to since
-  ## t.integer :founded  # year founded/established    - todo/fix: rename to since? 
+  ## t.integer :founded  # year founded/established    - todo/fix: rename to since?
   t.integer :closed  # optional;  year brewery closed
 
 ## todo: add optional parent brewery (owned_by)  ???
@@ -177,18 +179,15 @@ create_table :breweries do |t|
   # (or better use has many parents w/ percentage of ownership; might not be 100%)
 
   t.references :country,   null: false
-  t.references :region   # optional
+  t.references :state    # optional
   t.references :city     # optional
-  
+
   t.timestamps
 end
 
+ end  # Schema.define
 end # method up
 
-def down
-  raise ActiveRecord::IrreversibleMigration
-end
-
 
 end # class CreateDb
 

data/lib/beerdb/version.rb

@@ -2,8 +2,8 @@
 
 module BeerDb
   MAJOR = 1 ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 1
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -18,4 +18,3 @@ module BeerDb
     "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
   end
 end  # module BeerDb
-

data/test/helper.rb

@@ -11,7 +11,7 @@ require 'beerdb/models'
 
 
 Country = WorldDb::Model::Country
-Region  = WorldDb::Model::Region
+State   = WorldDb::Model::State
 
 ## todo: get all models aliases (e.g. from console script)
 
@@ -46,18 +46,18 @@ def fillup_in_memory_db
   ## add some counties
 
   at = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
-  Region.create!( key: 'w', title: 'Wien', country_id: at.id )
-  
+  State.create!( key: 'w', title: 'Wien', country_id: at.id )
+
   de = Country.create!( key: 'de', title: 'Germany', code: 'DEU', pop: 0, area: 0 )
-  Region.create!( key: 'by', title: 'Bayern', country_id: de.id )
-  
+  State.create!( key: 'by', title: 'Bayern', country_id: de.id )
+
 end
 
 setup_in_memory_db()
 fillup_in_memory_db()
 
-AT   =  Country.find_by_key!( 'at' )
-W    =  Region.find_by_key!( 'w' )
+AT   =  Country.find_by!( key: 'at' )
+W    =  State.find_by!( key: 'w' )
 
-DE   =  Country.find_by_key!( 'de' )
-BY   =  Region.find_by_key!( 'by' )
+DE   =  Country.find_by!( key: 'de' )
+BY   =  State.find_by!( key: 'by' )

data/test/test_fixture_matchers.rb

@@ -46,7 +46,7 @@ class TestFixtureMatchers < MiniTest::Test
   end # method test_country
 
 
-  def test_country_n_region
+  def test_country_n_state
 
     beers_at = [
       'europe/at-austria/w-wien/beers',
@@ -57,9 +57,9 @@ class TestFixtureMatchers < MiniTest::Test
     ]
 
     beers_at.each do |name|
-      found = match_beers_for_country_n_region( name ) do |country_key,region_key|
+      found = match_beers_for_country_n_state( name ) do |country_key,state_key|
         assert( country_key == 'at')
-        assert( region_key  == 'w' )
+        assert( state_key  == 'w' )
       end
       assert( found == true )
     end
@@ -73,13 +73,13 @@ class TestFixtureMatchers < MiniTest::Test
     ]
 
     breweries_at.each do |name|
-      found = match_breweries_for_country_n_region( name ) do |country_key,region_key|
+      found = match_breweries_for_country_n_state( name ) do |country_key,state_key|
         assert( country_key == 'at')
-        assert( region_key  == 'w' )
+        assert( state_key  == 'w' )
       end
       assert( found == true )
     end
-  end # method test_country_n_region
+  end # method test_country_n_state
 
 
-end # class TestFixtureMatchers
+end # class TestFixtureMatchers

data/test/test_values.rb

@@ -37,7 +37,7 @@ class TestValues < MiniTest::Test
     assert_equal beer.id,  beer2.id
 
     assert_equal beer.title,         values[0]
-    assert_equal beer.country_id,    AT.id 
+    assert_equal beer.country_id,    AT.id
     assert_equal beer.country.title, AT.title
     assert_equal beer.abv,           5.2
     assert_equal beer.og,            11.8
@@ -64,7 +64,7 @@ class TestValues < MiniTest::Test
       country_id: AT.id
     }
 
-    
+
     by = Brewery.create_or_update_from_values( values, more_attribs )
 
     by2 = Brewery.find_by_key!( key )
@@ -122,7 +122,7 @@ class TestValues < MiniTest::Test
 
     ## fix!!!!!!!!: use different brewery! use one w/ synonyms
     ###
-    
+
     # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
     #   brands: Ottakringer
 
@@ -170,7 +170,7 @@ class TestValues < MiniTest::Test
 
     more_attribs = {
       country_id: AT.id,
-      region_id: W.id
+      state_id: W.id
     }
 
     by = Brewery.create_or_update_from_values( values, more_attribs )
@@ -193,7 +193,7 @@ class TestValues < MiniTest::Test
     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
@@ -201,12 +201,12 @@ class TestValues < MiniTest::Test
 
   def test_load_brewery_values_w_city_de
 
-    # hofbraeu, Hofbräu München, 1589, www.hofbraeu-muenchen.de, 81829 München // Hofbräuallee 1 
+    # hofbraeu, Hofbräu München, 1589, www.hofbraeu-muenchen.de, 81829 München // Hofbräuallee 1
 
     key = 'hofbraeu'
 
     values = [
-      key, 
+      key,
       'Hofbräu München',
       '1589',
       'www.hofbraeu-muenchen.de',
@@ -216,7 +216,7 @@ class TestValues < MiniTest::Test
 
     more_attribs = {
       country_id: DE.id,
-      region_id:  BY.id
+      state_id:  BY.id
     }
 
     by = Brewery.create_or_update_from_values( values, more_attribs )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beerdb-models
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: beerdb-models - beer.db schema 'n' models for easy (re)use
 email: beerdb@googlegroups.com
 executables: []
@@ -61,7 +61,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -75,7 +74,7 @@ files:
 - lib/beerdb/models/tag.rb
 - lib/beerdb/models/world/city.rb
 - lib/beerdb/models/world/country.rb
-- lib/beerdb/models/world/region.rb
+- lib/beerdb/models/world/state.rb
 - lib/beerdb/reader.rb
 - lib/beerdb/reader_file.rb
 - lib/beerdb/reader_zip.rb
@@ -92,7 +91,7 @@ files:
 - test/test_fixture_matchers.rb
 - test/test_reader_quick.rb
 - test/test_values.rb
-homepage: https://github.com/beerkit/beer.db.models
+homepage: https://github.com/beerkit/beer.db
 licenses:
 - Public Domain
 metadata: {}
@@ -106,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -114,11 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: beerdb-models - beer.db schema 'n' models for easy (re)use
-test_files:
-- test/test_values.rb
-- test/test_reader_quick.rb
-- test/test_fixture_matchers.rb
+test_files: []