beerdb 0.5.2 → 0.6.0

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/beerdb/cli/opts.rb
 lib/beerdb/console.rb
 lib/beerdb/deleter.rb
 lib/beerdb/models/beer.rb
+lib/beerdb/models/brand.rb
 lib/beerdb/models/brewery.rb
 lib/beerdb/models/city.rb
 lib/beerdb/models/country.rb

data/lib/beerdb/deleter.rb

@@ -10,6 +10,7 @@ module BeerDb
       # for now delete all tables
 
       Beer.delete_all
+      Brand.delete_all
       Brewery.delete_all
     end
     

data/lib/beerdb/models/beer.rb

@@ -8,6 +8,7 @@ class Beer < ActiveRecord::Base
   belongs_to :region,  :class_name => 'WorldDb::Models::Region',  :foreign_key => 'region_id'
   belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
 
+  belongs_to :brand,   :class_name => 'BeerDb::Models::Brewery',  :foreign_key => 'brand_id'
   belongs_to :brewery, :class_name => 'BeerDb::Models::Brewery',  :foreign_key => 'brewery_id'
 
   has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Models::Tagging'

data/lib/beerdb/models/brand.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+module BeerDb::Models
+
+class Brand < ActiveRecord::Base
+
+  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+  belongs_to :region,  :class_name => 'WorldDb::Models::Region',  :foreign_key => 'region_id'
+  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
+
+  belongs_to :brewery, :class_name => 'BeerDb::Models::Brewery',  :foreign_key => 'brewery_id'
+
+  has_many   :beers,   :class_name => 'BeerDb::Models::Beer',     :foreign_key => 'brand_id'
+
+  validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
+
+end # class Brand
+
+end # module BeerDb::Models

data/lib/beerdb/models/brewery.rb

@@ -11,6 +11,7 @@ class Brewery < ActiveRecord::Base
   belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
 
   has_many   :beers,   :class_name => 'BeerDb::Models::Beer',     :foreign_key => 'brewery_id'
+  has_many   :brands,  :class_name => 'BeerDb::Models::Brand',    :foreign_key => 'brand_id'
 
   has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Models::Tagging'
   has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Models::Tag'
@@ -83,6 +84,8 @@ class Brewery < ActiveRecord::Base
         end
       elsif value =~ /^[0-9]{4}$/   # founded/established year e.g. 1776
         new_attributes[ :since ] = value.to_i
+      elsif value =~ /^(?:([0-9][0-9_]*[0-9]|[0-9])\s?hl)$/  # e.g. 20_0000 hl or 50hl etc.
+        new_attributes[ :prod ] << $1.gsub(/_/, '').to_i
       elsif value =~ /^www\.|\.com$/   # check for url/internet address e.g. www.ottakringer.at
         # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
         new_attributes[ :web ] = value

data/lib/beerdb/models/forward.rb

@@ -16,6 +16,7 @@ module BeerDb::Models
   Prop      = WorldDb::Models::Prop
 
   class Beer < ActiveRecord::Base ; end
+  class Brand < ActiveRecord::Base ; end
   class Brewery < ActiveRecord::Base ; end
 
 end
@@ -24,6 +25,7 @@ end
 module WorldDb::Models
 
   Beer    = BeerDb::Models::Beer
+  Brand   = BeerDb::Models::Brand
   Brewery = BeerDb::Models::Brewery
 
 end

data/lib/beerdb/reader.rb

@@ -68,15 +68,65 @@ class Reader
     if name =~ /\/([a-z]{2})\/beers/
       ## auto-add required country code (from folder structure)
       load_beers( $1, name )
+    elsif name =~ /\.hl$/   # e.g. breweries.hl   # NB: must end w/ .hl
+       load_brewery_prod( name )
+    elsif name =~ /\/([a-z]{2})\.wikipedia/   # e.g. de.wikipedia
+       # auto-add required lang e.g. de or en etc.
+       load_brewery_wiki( $1, name )
+    elsif name =~ /\/([a-z]{2})\/breweries_([a-z]{1,2})(?:_|$)/  # NB: region key must end name or be followed by underscore (_)
+      ## auto-add required country code (from folder structure) plus region
+      load_breweries_for_country_n_region( $1, $2, name )
     elsif name =~ /\/([a-z]{2})\/breweries/
       ## auto-add required country code (from folder structure)
-      load_breweries( $1, name )
+      load_breweries_for_country( $1, name )
     else
       logger.error "unknown beer.db fixture type >#{name}<"
       # todo/fix: exit w/ error
     end
   end
-  
+
+  def load_brewery_wiki( lang_key, name )
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = HashReader.new( path )
+
+    reader.each do |key, value|
+      brewery = Brewery.find_by_key!( key )
+      
+      wiki = "#{lang_key}.wikipedia.org/wiki/#{value.strip}"
+      logger.debug "  adding #{key} => >#{wiki}<"
+      brewery.wiki = wiki
+      brewery.save!
+    end
+
+    Prop.create_from_fixture!( name, path )
+  end
+
+
+  def load_brewery_prod( name )
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = HashReader.new( path )
+
+    reader.each do |key, value|
+      brewery = Brewery.find_by_key!( key )
+      
+      if value =~ /(?:([0-9][0-9_]*[0-9]|[0-9])\s*hl)/  # e.g. 20_0000 hl or 50hl etc.
+        prod =  $1.gsub(/_/, '').to_i
+        logger.debug "  adding #{key} => >#{prod}<"
+        brewery.prod = prod
+        brewery.save!
+      else
+        logger.warn "  unknown type for brewery prod value >#{value}<; regex pattern match failed"
+      end
+    end
+
+    Prop.create_from_fixture!( name, path )
+  end
 
   def load_beers( country_key, name, more_values={} )
     country = Country.find_by_key!( country_key )
@@ -98,12 +148,32 @@ class Reader
   end
 
 
-  def load_breweries( country_key, name, more_values={} )
+  def load_breweries_for_country_n_region( country_key, region_key, name, more_values={} )
+    country = Country.find_by_key!( country_key )
+    logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
+
+    # NB: region lookup requires country id (region key only unique for country)
+    region  = Region.find_by_key_and_country_id!( region_key, country.id )
+    logger.debug "Region #{region.key} >#{region.title}<"
+
+    more_values[ :country_id ] = country.id
+    more_values[ :region_id  ] = region.id
+
+    load_breweries_worker( name, more_values )
+  end
+
+
+  def load_breweries_for_country( country_key, name, more_values={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
     more_values[ :country_id ] = country.id
 
+    load_breweries_worker( name, more_values )
+  end
+
+
+  def load_breweries_worker( name, more_values={} )
     path = "#{include_path}/#{name}.txt"
 
     logger.info "parsing data '#{name}' (#{path})..."

data/lib/beerdb/schema.rb

@@ -55,6 +55,15 @@ create_table :beers do |t|
 # 40+  | Imperial Stout                                | #030403 | 79
 
   t.references :brewery   # optional (for now)
+  t.references :brand     # optional (for now)
+
+
+  ## todo: add categories e.g. (A/B/C, 1/2/3, main/major/minor ??)
+  # - A-grade /1st class/ tier1 / main beer brand/bestseller/flagship ?
+  # - B-grade /2nd class/ tier2 / regular, major,   - todo: find better names?
+  # - C-grade /3nd class/ tier3/ / speciality, minor ?
+
+  t.integer :grade   # 1/2/3  (A/B/C)
 
   t.references :country,  :null => false
   t.references :region   # optional
@@ -64,6 +73,32 @@ create_table :beers do |t|
 end
 
 
+create_table :brands do |t|   # beer families (sharing same name e.g. brand)
+  t.string  :key,   :null => false   # import/export key
+  t.string  :title, :null => false
+  t.string  :synonyms  # comma separated list of synonyms
+  t.string  :web   # optional web page (e.g. www.ottakringer.at)
+  t.string  :wiki  # optional wiki(pedia page)
+  t.integer :since
+
+  ## scope of brand (global/intern'l/national/regional/local) ??
+  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
+  t.boolean :local,      :null => false, :default => false
+
+  t.integer :grade   # 1/2/3/4/5  (global/intern'l/national/regional/local)
+
+  t.references :brewery   # optional (for now)
+
+  t.references :country,   :null => false
+  t.references :region   # optional
+  t.references :city     # optional
+
+  t.timestamps
+end
+
 create_table :breweries do |t|
   t.string  :key,   :null => false   # import/export key
   t.string  :title, :null => false
@@ -76,9 +111,40 @@ create_table :breweries do |t|
 
 ## todo: add optional parent brewery (owned_by)
 
-  t.integer :prod  # (estimated) annual production in hl (1hl=100l) e.g. megabrewery 2_000_000, microbrewery 1_000 hl; brewbup 500 hl etc.
+  t.integer :prod  # (estimated) annual production/capacity in hl (1hl=100l) e.g. megabrewery 2_000_000, microbrewery 1_000 hl; brewbup 500 hl etc.
+
+  # grade - classified using annual production (capacity) in hl
+  # <     1_000 hl  => 11
+  # <     3_000 hl  => 10
+  # <     5_000 hl  => 9
+  # <    10_000 hl  => 8
+  # <    50_000 hl  => 7
+  # <   100_000 hl  => 6
+  # <   200_000 hl  => 5
+  # <   500_000 hl  => 4
+  # < 1_000_000 hl  => 3
+  # < 2_000_000 hl  => 2
+  # > 2_000_000 hl  => 1
+
+  t.integer :grade   # 1/2/3/4/5/6/7/8/9/10/11
+
 
   t.string  :web   # optional web page (e.g. www.ottakringer.at)
+  t.string  :wiki  # optional wiki(pedia page)
+
+  t.boolean :indie    # independent brewery (flag)
+
+  # for convenience (easy queries) use flags for top beer multinationals (-- later use just tags? more flexible)
+  t.boolean :abinbev     # owned by AB InBev / Anheuser-Busch InBev (and Grupo Modelo)
+  t.boolean :sabmiller   # owned by SAB Miller (in US cooperates w/ Molson Coors using MillerCoors venture)
+  t.boolean :heineken    # owned by Heineken
+  t.boolean :carlsberg   # owned by Carlsberg
+  t.boolean :molsoncoors  # owned by Molson Coors
+  t.boolean :diageo       # owned by Diageo (e.g. Guiness, Kilkenny,...)
+
+
+  # todo: add t.references :parent  # for parent brewery
+  # (or better use has many parents w/ percentage of ownership; might not be 100%)
 
   t.references :country,   :null => false
   t.references :region   # optional

data/lib/beerdb/stats.rb

@@ -8,6 +8,7 @@ module BeerDb
     def tables
       puts "Stats:"
       puts " #{'%5d' % Beer.count} beers"
+      puts " #{'%5d' % Brand.count} brands"
       puts " #{'%5d' % Brewery.count} breweries"
     end
     

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

data/lib/beerdb.rb

@@ -31,6 +31,7 @@ require 'beerdb/models/region'
 require 'beerdb/models/city'
 require 'beerdb/models/tag'
 require 'beerdb/models/beer'
+require 'beerdb/models/brand'
 require 'beerdb/models/brewery'
 require 'beerdb/schema'
 require 'beerdb/reader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &20592228 !ruby/object:Gem::Requirement
+  requirement: &73799560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *20592228
+  version_requirements: *73799560
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &20591964 !ruby/object:Gem::Requirement
+  requirement: &73799340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *20591964
+  version_requirements: *73799340
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &20591700 !ruby/object:Gem::Requirement
+  requirement: &73799120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,38 +43,36 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *20591700
+  version_requirements: *73799120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20591436 !ruby/object:Gem::Requirement
+  requirement: &73798900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *20591436
+  version_requirements: *73798900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20591172 !ruby/object:Gem::Requirement
+  requirement: &73798680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *20591172
+  version_requirements: *73798680
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
 - beerdb
 extensions: []
 extra_rdoc_files:
-- History.md
 - Manifest.txt
-- README.md
 files:
 - History.md
 - Manifest.txt
@@ -87,6 +85,7 @@ files:
 - lib/beerdb/console.rb
 - lib/beerdb/deleter.rb
 - lib/beerdb/models/beer.rb
+- lib/beerdb/models/brand.rb
 - lib/beerdb/models/brewery.rb
 - lib/beerdb/models/city.rb
 - lib/beerdb/models/country.rb
@@ -127,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: beerdb
-rubygems_version: 1.7.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: beerdb - beer.db command line tool