winedb 0.1.2 → 0.1.3

data/Manifest.txt

@@ -3,13 +3,21 @@ Manifest.txt
 README.md
 Rakefile
 lib/winedb.rb
-lib/winedb/models/city.rb
-lib/winedb/models/country.rb
+lib/winedb/models/family.rb
 lib/winedb/models/forward.rb
-lib/winedb/models/region.rb
+lib/winedb/models/grape.rb
+lib/winedb/models/person.rb
+lib/winedb/models/shop.rb
 lib/winedb/models/tag.rb
+lib/winedb/models/tavern.rb
+lib/winedb/models/variety.rb
+lib/winedb/models/vineyard.rb
+lib/winedb/models/vintage.rb
 lib/winedb/models/wine.rb
 lib/winedb/models/winery.rb
+lib/winedb/models/worlddb/city.rb
+lib/winedb/models/worlddb/country.rb
+lib/winedb/models/worlddb/region.rb
 lib/winedb/reader.rb
 lib/winedb/schema.rb
 lib/winedb/version.rb

data/lib/winedb.rb

@@ -15,13 +15,25 @@ require 'winedb/version'  # let it always go first
 require 'winedb/schema'
 
 require 'winedb/models/forward'
-require 'winedb/models/city'
-require 'winedb/models/country'
-require 'winedb/models/region'
+
+require 'winedb/models/worlddb/country'
+require 'winedb/models/worlddb/region'
+require 'winedb/models/worlddb/city'
+
 require 'winedb/models/tag'
+
+require 'winedb/models/family'
+require 'winedb/models/grape'
+require 'winedb/models/person'
+require 'winedb/models/shop'
+require 'winedb/models/tavern'
+require 'winedb/models/variety'
+require 'winedb/models/vineyard'
+require 'winedb/models/vintage'
 require 'winedb/models/wine'
 require 'winedb/models/winery'
 
+
 require 'winedb/reader'
 
 module WineDb
@@ -57,6 +69,34 @@ module WineDb
     read_setup( 'setups/all', include_path, opts )
   end # method read_all
 
+  def self.delete!
+    ## fix/todo: move into deleter class (see worlddb,sportdb etc.)
+    Model::Grape.delete_all
+    Model::Family.delete_all
+    Model::Variety.delete_all
+    Model::Vineyard.delete_all
+    Model::Person.delete_all
+    Model::Shop.delete_all
+    Model::Tavern.delete_all
+    Model::Vintage.delete_all
+    Model::Wine.delete_all
+    Model::Winery.delete_all
+  end
+  
+  def self.tables
+    ## fix/todo: move into stats class (see worlddb,sportdb etc.)
+    puts "  #{Model::Grape.count} grapes"
+    puts "  #{Model::Family.count} (wine) families"
+    puts "  #{Model::Variety.count} (wine) varieties"
+    puts "  #{Model::Vineyard.count} vineyards"
+    puts "  #{Model::Person.count} persons (winemakers)"
+    puts "  #{Model::Shop.count} shops (vinothek/enotecia)"
+    puts "  #{Model::Tavern.count} taverns (heurige)"
+    puts "  #{Model::Vintage.count} vintages"
+    puts "  #{Model::Wine.count} wines"
+    puts "  #{Model::Winery.count} wineries"
+  end
+
 
 end  # module WineDb
 

data/lib/winedb/models/family.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+###################
+# (Wine)-Family
+#
+#  e.g. - Red Wine
+#       - White Wine
+#       - Rose Wine
+#       - Desert (Sweet)
+#       - Sparkling (Champagne)
+#       - Fortified (Brandy,Port)
+#       - Other
+
+class Family < ActiveRecord::Base
+
+  self.table_name = 'families'
+  ## to be done
+
+end # class Family
+
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/forward.rb

@@ -19,6 +19,14 @@ module WineDb
 
   class Wine < ActiveRecord::Base ; end
   class Winery < ActiveRecord::Base ; end
+  class Grape < ActiveRecord::Base ; end
+  class Family < ActiveRecord::Base ; end
+  class Variety < ActiveRecord::Base ; end
+  class Vineyard < ActiveRecord::Base ; end
+  class Person < ActiveRecord::Base ; end
+  class Shop < ActiveRecord::Base ; end
+  class Tavern < ActiveRecord::Base ; end
+  class Vintage < ActiveRecord::Base ; end
 
   end # module Model
 

data/lib/winedb/models/grape.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Grape < ActiveRecord::Base
+
+  ## to be done
+
+end # class Grape
+
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/person.rb

@@ -0,0 +1,17 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+###
+# Winemaker
+
+class Person < ActiveRecord::Base
+
+  self.table_name = 'persons'
+  ## to be done
+
+end # class Person
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/shop.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Shop < ActiveRecord::Base
+
+  has_many :taggings, :as => :taggable,   class_name: 'WorldDb::Model::Tagging'
+  has_many :tags,  :through => :taggings, class_name: 'WorldDb::Model::Tag'
+
+  validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
+
+  ## to be done
+
+end # class Shop
+
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/tavern.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Tavern < ActiveRecord::Base
+
+  belongs_to :winery,  class_name: 'WineDb::Model::Winery', foreign_key: 'winery_id'
+
+  has_many :taggings, :as => :taggable,   class_name: 'WorldDb::Model::Tagging'
+  has_many :tags,  :through => :taggings, class_name: 'WorldDb::Model::Tag'
+
+  validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
+
+  ## to be done
+
+end # class Tavern
+
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/variety.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Variety < ActiveRecord::Base
+
+  self.table_name = 'varieties'
+  ## to be done
+
+end # class Variety
+
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/vineyard.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Vineyard < ActiveRecord::Base
+
+  has_many :wines,  class_name: 'WineDb::Model::Wine',   foreign_key: 'vineyard_id'
+
+  ## to be done
+
+end # class Vineyard
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/vintage.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Vintage < ActiveRecord::Base
+
+  ## to be done
+
+end # class Vintage
+
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/wine.rb

@@ -11,9 +11,10 @@ class Wine < ActiveRecord::Base
   #   self.create_or_update_from_values
   extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, 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 :city,    class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
+  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 :city,     class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
+  belongs_to :vineyard, class_name: 'WineDb::Model::Vineyard', foreign_key: 'vinyard_id'
 
   belongs_to :winery, :class_name => 'WineDb::Model::Winery', foreign_key: 'winery_id'
 
@@ -66,10 +67,11 @@ class Wine < ActiveRecord::Base
       elsif match_website( value ) do |website|  # check for url/internet address e.g. www.ottakringer.at
               attribs[ :web ] = website
             end
-      elsif match_abv( value ) do |num|   # abv (alcohol by volume)
-              # nb: also allows leading < e.g. <0.5%
-              attribs[ :abv ] = num
-            end
+# -- moved to vintage (that is, abv depends on year)
+#      elsif match_abv( value ) do |num|   # abv (alcohol by volume)
+#              # nb: also allows leading < e.g. <0.5%
+#              attribs[ :abv ] = num
+#            end
       elsif (values.size==(index+1)) && is_taglist?( value )  # tags must be last entry
         logger.debug "   found tags: >>#{value}<<"
         value_tag_keys += find_tags( value )

data/lib/winedb/models/winery.rb

@@ -18,6 +18,7 @@ class Winery < ActiveRecord::Base
   belongs_to :region,  class_name: 'WorldDb::Model::Region',  foreign_key: 'region_id'
   belongs_to :city,    class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
 
+  has_one    :tavern,  class_name: 'WineDb::Model::Tavern',  foreign_key: 'tavern_id'
   has_many   :wines,   class_name: 'WineDb::Model::Wine',    foreign_key: 'wine_id'
 
   has_many :taggings, :as => :taggable,   class_name: 'WorldDb::Model::Tagging'

data/lib/winedb/models/worlddb/city.rb

@@ -0,0 +1,14 @@
+module WorldDb
+  module Model
+
+class City
+  has_many :wines,     class_name: 'WineDb::Model::Wine',     foreign_key: 'city_id'
+  has_many :wineries,  class_name: 'WineDb::Model::Winery',   foreign_key: 'city_id'
+  has_many :taverns,   class_name: 'WineDb::Model::Tavern',   foreign_key: 'city_id'
+  has_many :shops,     class_name: 'WineDb::Model::Shop',     foreign_key: 'city_id'
+  has_many :vineyards, class_name: 'WineDb::Model::Vineyard', foreign_key: 'city_id'
+end # class Country
+
+
+  end # module Model
+end # module WorldDb

data/lib/winedb/models/{country.rb → worlddb/country.rb}

@@ -5,6 +5,8 @@ module WorldDb
 class Country
   has_many :wines,     class_name: 'WineDb::Model::Wine',   foreign_key: 'country_id'
   has_many :wineries,  class_name: 'WineDb::Model::Winery', foreign_key: 'country_id'
+  has_many :taverns,   class_name: 'WineDb::Model::Tavern', foreign_key: 'country_id'
+  has_many :shops,     class_name: 'WineDb::Model::Shop',   foreign_key: 'country_id'
 end # class Country
 
 

data/lib/winedb/models/worlddb/region.rb

@@ -0,0 +1,12 @@
+module WorldDb
+  module Model
+
+class Region
+  has_many :wines,    class_name: 'WineDb::Model::Wine',   foreign_key: 'region_id'
+  has_many :wineries, class_name: 'WineDb::Model::Winery', foreign_key: 'region_id'
+  has_many :taverns,  class_name: 'WineDb::Model::Tavern', foreign_key: 'region_id'
+  has_many :shops,    class_name: 'WineDb::Model::Shop',   foreign_key: 'region_id'
+end # class Region
+
+  end # module Model
+end # module WorldDb

data/lib/winedb/reader.rb

@@ -5,11 +5,12 @@ module WineDb
 
 module Matcher
 
-  def match_wines_for_country( name, &blk )
-    match_xxx_for_country( name, 'wines', &blk )
-  end
+  def fix_match_xxx_for_country_n_region( name, xxx ) # xxx e.g. wine|wineries
+
+    ## todo/fix: move code into worlddb matcher!!!!
+    ## -- allow opt_folders after long regions
+    ## -- allow anything before -- for xxx
 
-  def match_wines_for_country_n_region( name, &blk )
     ### fix allow prefixes for wines (move into core!!!) e.g.
     ##
     #  at-austria!/1--n-niederoesterreich--eastern/wagram--wines
@@ -18,9 +19,53 @@ module Matcher
     ### strip subregion if present e.g.
     #  /wagram--wines  becomes /wines n
     #  /wagram--wagram--wines   becomes / wines etc.
-    name_fixed = name.sub( /\/([a-z]+--)*wines$/, "/wines" )
 
-    match_xxx_for_country_n_region( name_fixed, 'wines', &blk )
+    # auto-add required country n region code (from folder structure)
+
+    # note: allow  /cities and /1--hokkaido--cities and /hokkaido--cities too
+    xxx_pattern = "(?:#{xxx}|[^\\/]+--#{xxx})"    # note: double escape \\ required for backslash
+    
+    ## allow optional folders -- TODO: add restriction ?? e.g. must be 4+ alphas ???
+    opt_folders_pattern = "(?:\/[^\/]+)*"
+    ## note: for now only (2) n (3)  that is long region allow opt folders
+
+    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/  ||                # (1)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+#{opt_folders_pattern}\/#{xxx_pattern}/ || # (2)
+       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+#{opt_folders_pattern}\/#{xxx_pattern}/         || # (3)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/            # (4)
+
+      #######
+      # nb: country must start name (^) or coming after / e.g. europe/at-austria/...
+      # (1)
+      # new style: e.g.  /at-austria/w-wien/cities or
+      #                  ^at-austria!/w-wien/cities
+      # (2)
+      # new new style e.g.  /1--at-austria--central/1--w-wien--eastern/cities
+      #
+      # (3)
+      #  new new mixed style e.g.  /at-austria/1--w-wien--eastern/cities
+      #      "classic" country plus new new region
+      #
+      # (4)
+      #  new new mixed style e.g.  /1--at-austria--central/w-wien/cities
+      #      new new country plus "classic" region
+
+      country_key = $1.dup
+      region_key  = $2.dup
+      yield( country_key, region_key )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+  def match_wines_for_country( name, &blk )
+    match_xxx_for_country( name, 'wines', &blk )
+  end
+
+  def match_wines_for_country_n_region( name, &blk )
+    fix_match_xxx_for_country_n_region( name, 'wines', &blk )
   end
 
   def match_wineries_for_country( name, &blk )
@@ -28,17 +73,20 @@ module Matcher
   end
 
   def match_wineries_for_country_n_region( name, &blk )
-    ### fix allow prefixes for wineries (move into core!!!) e.g.
-    ##
-    #  at-austria!/1--n-niederoesterreich--eastern/wagram--wineries
-    #  at-austria!/1--n-niederoesterreich--eastern/wagram--wagram--wineries
+    fix_match_xxx_for_country_n_region( name, 'wineries', &blk )
+  end
 
-    ### strip subregion if present e.g.
-    #  /wagram--wineries  becomes /wineries n
-    #  /wagram--wagram--wineries   becomes / wineries etc.
-    name_fixed = name.sub( /\/([a-z]+--)*wineries$/, "/wineries" )
+  ## for now vineyards, shops, taverns require country n region
+  def match_vineyards_for_country_n_region( name, &blk )
+    fix_match_xxx_for_country_n_region( name, 'vineyards', &blk )
+  end
+
+  def match_shops_for_country_n_region( name, &blk )
+    fix_match_xxx_for_country_n_region( name, 'shops', &blk )
+  end
 
-    match_xxx_for_country_n_region( name_fixed, 'wineries', &blk )
+  def match_taverns_for_country_n_region( name, &blk )
+    fix_match_xxx_for_country_n_region( name, 'taverns', &blk )
   end
 
 end # module Matcher

data/lib/winedb/schema.rb

@@ -7,27 +7,35 @@ class CreateDb < ActiveRecord::Migration
 
 def up
 
+#######
+# todo/fix:  rename title to name
+
+
+
+###
+# wines
+#
+# note: key is NOT unique; require winery key
+#  winery.key+wines.key => unique key  e.g.  antonbauer.gruenerveltiner
+
 create_table :wines do |t|
   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 url link (e.g. )
-  t.integer :since  # optional year (e.g. 1896)
-
-  ## check: why decimal and not float? 
-  t.decimal    :abv    # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
-
   t.references :winery   # optional (for now)
+  t.references :variety  # optional (for now) -- todo/fix:  make required!!! why not??? possible??
 
-
-  t.string  :txt            # source ref
-  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
-
+  t.string  :web    # optional url link (e.g. )
+  t.integer :since  # optional year (e.g. 1896)
 
   t.references :country, null: false
   t.references :region   # optional
   t.references :city     # optional
+  t.references :vineyard # optional e.g. Spiegel, Gmoerk, Rosenberg, etc.
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
 
   t.timestamps
 end
@@ -38,9 +46,7 @@ create_table :wineries do |t|
   t.string  :title,    null: false
   t.string  :synonyms  # comma separated list of synonyms
   t.string  :address
-  t.integer :since
-  ## renamed to founded to since
-  ## t.integer :founded  # year founded/established    - todo/fix: rename to since? 
+  t.integer :since   ## renamed founded to since
   t.integer :closed  # optional;  year winery closed
 
   t.integer :area    # in ha e.g. 8 ha   # Weingarten/rebflaeche
@@ -48,21 +54,174 @@ create_table :wineries do |t|
   # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
   t.integer :grade, null: false, default: 4
 
+  t.string  :web        # optional web page (e.g. www.ottakringer.at)
+  t.string  :wikipedia  # optional wiki(pedia page)
+
+
+  t.references :country,  null: false
+  t.references :region   # optional
+  t.references :city     # optional
+
+  t.references :person  # optional for now   - winemaker/kellermeister e.g. Anton Bauer (1971) etc.
+  t.references :tavern  # optional (heurige)
 
   t.string  :txt            # source ref
   t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
 
+  t.timestamps
+end
+
+create_table :vintages do |t|
+  t.integer    :year,  null: false
+  t.references :wine,  null: false
+
+  ## check: why decimal and not float? 
+  t.decimal    :abv    # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
+
+  t.timestamps  
+end
+
+create_table :grapes do |t|
+  t.string   :key,      null: false   # import/export key
+  t.string   :title,    null: false
+  t.string   :synonyms  # comma separated list of synonyms
+
+  t.boolean  :red,   null: false, default: false
+  t.boolean  :white, null: false, default: false
+
+  t.string   :web        # optional web page
+  t.string   :wikipedia  # optional wiki(pedia page)
+
+  t.timestamps
+end
+
+####
+# wine families
+#
+#  todo/fix: allow subfamilies e.g. red wine => 1) red wine varietal, 2) red wine blended/cuvee etc.
+
+create_table :families do |t|  # wine family e.g.  red wine/white wine/rose wine/sparkling(champagne,etc.)/desert(sweet)/fortified(port,etc.)/other etc.
+  t.string     :key,      null: false   # import/export key
+  t.string     :title,    null: false
+  t.string     :synonyms  # comma separated list of synonyms
+
+  t.timestamps
+end
+
+####
+# wine variety
+#  e.g. varietal (Gr. Veltiner) or blend/cuvee (Red Wine Cuvee) etc.
+create_table :varieties do |t|
+  t.string     :key,      null: false   # import/export key
+  t.string     :title,    null: false
+  t.string     :synonyms  # comma separated list of synonyms
+  t.references :family,   null: false
+
+  ## note: for now cuvee will NOT record blended varieties (maybe add later??)
+  t.boolean    :cuvee,    null: false, default: false  # blended variety
+  t.boolean    :varietal, null: false, default: false
+  t.references :grape    # note: optional - only varietal has a main grape (+80%); cuvee/blended is a mix of grapes
+  t.timestamps
+end
+
+##########################
+# (Wine)Taverns/Heurige
+
+create_table :taverns do |t|
+  t.string     :key,      null: false   # import/export key
+  t.string     :title,    null: false
+  t.string     :synonyms  # comma separated list of synonyms
+  t.references :winery    # for now optional -- todo/fix: make required!!!
+
+  t.string  :address
+  t.integer :since
+
+  t.string   :web        # optional web page (e.g. www.urbaniheuriger.at)
+  t.string   :wikipedia  # optional wiki(pedia page)
+
+  t.references :country,  null: false
+  t.references :region   # optional
+  t.references :city     # optional
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
+
+  t.timestamps
+end
+
+
+#################################
+# (Wine)Shops/Vinothek/Enoteca
+
+create_table :shops do |t|
+  t.string  :key,      null: false   # import/export key
+  t.string  :title,    null: false
+  t.string  :synonyms  # comma separated list of synonyms
+
+  t.string  :address
+  t.integer :since
+
   t.string  :web        # optional web page (e.g. www.ottakringer.at)
   t.string  :wikipedia  # optional wiki(pedia page)
 
-
   t.references :country,  null: false
   t.references :region   # optional
   t.references :city     # optional
-  
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
+
+  t.timestamps
+end
+
+
+################
+# vineyards
+#
+# e.g. Spiegel, Rosenberg, Gmoerk, etc.
+
+create_table :vineyards do |t|
+  t.string     :key,      null: false   # import/export key
+  t.string     :title,    null: false
+  t.string     :synonyms   # comma separated list of synonyms
+  t.references :city,     null: false
+
+  t.integer :area    # in ha e.g. 8 ha   # Weingarten/rebflaeche
+
+  t.timestamps
+end
+
+#########################
+# persons (wine makers)
+#  e.g. Anton Bauer (1971) etc.
+#
+#  note: use persons table (not makers table) and use kind/typ for (wine)maker
+#
+#  todo: move persons to friends.db project for (re)use;
+#   see player in football.db too ???
+#  and  drivers in formula1.db too and
+# and  skiers in ski.db etc.
+
+create_table :persons do |t|    # use people ? instead of persons (person/persons makes it easier?)
+  t.string      :key,      null: false   # import/export key
+  t.string      :name,     null: false
+  t.string      :synonyms  # comma separated list of synonyms
+
+  ## todo: add gender flag (male/female -man/lady  how?)
+  t.date        :born_at     # optional date of birth (birthday)
+  ## todo: add country of birth  might not be the same as nationality
+
+  t.references  :city
+  t.references  :region
+  t.references  :country      ## ,  null: false
+
+  t.references  :nationality  ## , null: false  # by default assume same as country of birth (see above)
+
   t.timestamps
 end
 
+
+
 end # method up
 
 def down

data/lib/winedb/version.rb

@@ -1,4 +1,4 @@
 
 module WineDb
-   VERSION = '0.1.2'
+   VERSION = '0.1.3'
 end

data/test/helper.rb

@@ -31,8 +31,17 @@ City    = WorldDb::Model::City
 
 ## todo: get all models aliases (e.g. from console script)
 
-Wine    = WineDb::Model::Wine
-Winery  = WineDb::Model::Winery
+Grape    = WineDb::Model::Grape
+Family   = WineDb::Model::Family
+Variety  = WineDb::Model::Variety
+Vineyard = WineDb::Model::Vineyard
+Person   = WineDb::Model::Person
+Shop     = WineDb::Model::Shop
+Tavern   = WineDb::Model::Tavern
+Vintage  = WineDb::Model::Vintage
+Wine     = WineDb::Model::Wine
+Winery   = WineDb::Model::Winery
+
 
 
 def setup_in_memory_db
@@ -63,14 +72,15 @@ end
 def fillup_in_memory_db
   ## add some counties
 
-  at = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
-  n  = Region.create!( key: 'n', title: 'Niederösterreich', country_id: at.id )
+  at          = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
+  n           = Region.create!( key: 'n', title: 'Niederösterreich', country_id: at.id )
+  feuersbrunn = City.create!( key: 'feuersbrunn', title: 'Feuersbrunn', country_id: at.id, region_id: n.id )
 
 end
 
 setup_in_memory_db()
 fillup_in_memory_db()
 
-AT   =  Country.find_by_key!( 'at' )
-N    =  Region.find_by_key!( 'n' )
-
+AT          =  Country.find_by_key!( 'at' )
+N           =  Region.find_by_key!( 'n' )
+FEUERSBRUNN =  City.find_by_key!( 'feuersbrunn' )

data/test/test_fixture_matchers.rb

@@ -87,6 +87,11 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
 
     wines_at = [
       'at-austria!/1--n-niederoesterreich--eastern/wines',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/wines',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--wines',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn/wines',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/wagram--wines',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/wagram/wines',
       'at-austria!/1--n-niederoesterreich--eastern/wagram--wines',
       'at-austria!/1--n-niederoesterreich--eastern/wagram--feuersbrunn--wines',
       'at-austria!/1--n-niederoesterreich--eastern/wagram--wagram--wines'
@@ -103,7 +108,10 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
     wineries_at = [
       'at-austria!/1--n-niederoesterreich--eastern/wineries',
       'at-austria!/1--n-niederoesterreich--eastern/wagram--wineries',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/wineries',
       'at-austria!/1--n-niederoesterreich--eastern/wagram--feuersbrunn--wineries',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--wineries',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn/wineries',
       'at-austria!/1--n-niederoesterreich--eastern/wagram--wagram--wineries'
     ]
 
@@ -117,4 +125,30 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
   end # method test_wine_region
 
 
+  def test_misc
+    vineyards = 'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--vineyards'
+    taverns   = 'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--taverns'
+    shops     = 'at-austria!/1--n-niederoesterreich--eastern/wagram/shops'
+
+    found = match_vineyards_for_country_n_region( vineyards ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+    end
+    assert( found == true )
+
+    found = match_taverns_for_country_n_region( taverns ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+    end
+    assert( found == true )
+
+    found = match_shops_for_country_n_region( shops ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+    end
+    assert( found == true ) 
+  end
+
+
+
 end # class TestFixtureMatchers

data/test/test_models.rb

@@ -11,13 +11,51 @@ require 'helper'
 
 class TestModels < MiniTest::Unit::TestCase
 
-  def test_load_wine_values
+  def setup  # runs before every test
+    WineDb.delete!   # always clean-out tables
+  end
+  
+  def test_worlddb_assocs
+    assert_equal 0, AT.wines.count
+    assert_equal 0, AT.wineries.count
+    assert_equal 0, AT.taverns.count
+    assert_equal 0, AT.shops.count
+
+    assert_equal 0, N.wines.count
+    assert_equal 0, N.wineries.count
+    assert_equal 0, N.taverns.count
+    assert_equal 0, N.shops.count
+
+    assert_equal 0, FEUERSBRUNN.wines.count
+    assert_equal 0, FEUERSBRUNN.wineries.count
+    assert_equal 0, FEUERSBRUNN.taverns.count
+    assert_equal 0, FEUERSBRUNN.shops.count
+    assert_equal 0, FEUERSBRUNN.vineyards.count
+  end
+
 
+  def test_count
+    assert_equal 0, Grape.count
+    assert_equal 0, Family.count
+    assert_equal 0, Variety.count
+    assert_equal 0, Vineyard.count
+    assert_equal 0, Person.count
+    assert_equal 0, Shop.count
+    assert_equal 0, Tavern.count
+    assert_equal 0, Vintage.count
+    assert_equal 0, Wine.count
+    assert_equal 0, Winery.count
+    
+    WineDb.tables  # print stats
+  end
+
+
+  def test_load_wine_values
+ 
     key = 'gruenerveltlinerspiegel'
 
     values = [
       'Grüner Veltliner Spiegel',
-      '12.3 %',
       'gv'
     ]
 
@@ -33,7 +71,6 @@ class TestModels < MiniTest::Unit::TestCase
     assert_equal wine.title,         values[0]
     assert_equal wine.country_id,    AT.id
     assert_equal wine.country.title, AT.title
-    assert_equal wine.abv,           12.3
   end
 
   def test_load_winery_values
@@ -45,8 +82,7 @@ class TestModels < MiniTest::Unit::TestCase
       'Anton Bauer (1971)',
       'www.antonbauer.at',
       'Neufang 42 // 3483 Feuersbrunn',
-      '25 ha',  ### todo: make sure it will not get matched as tag
-      'tag'
+      '25 ha'  ### todo: make sure it will not get matched as tag
     ]
 
     more_attribs = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winedb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77127330 !ruby/object:Gem::Requirement
+  requirement: &81648500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *77127330
+  version_requirements: *81648500
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &77126990 !ruby/object:Gem::Requirement
+  requirement: &81647750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *77126990
+  version_requirements: *81647750
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &77126430 !ruby/object:Gem::Requirement
+  requirement: &81647430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *77126430
+  version_requirements: *81647430
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77126100 !ruby/object:Gem::Requirement
+  requirement: &81719370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *77126100
+  version_requirements: *81719370
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77125700 !ruby/object:Gem::Requirement
+  requirement: &81718560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *77125700
+  version_requirements: *81718560
 description: winedb - wine.db command line tool
 email: winedb@googlegroups.com
 executables: []
@@ -78,13 +78,21 @@ files:
 - README.md
 - Rakefile
 - lib/winedb.rb
-- lib/winedb/models/city.rb
-- lib/winedb/models/country.rb
+- lib/winedb/models/family.rb
 - lib/winedb/models/forward.rb
-- lib/winedb/models/region.rb
+- lib/winedb/models/grape.rb
+- lib/winedb/models/person.rb
+- lib/winedb/models/shop.rb
 - lib/winedb/models/tag.rb
+- lib/winedb/models/tavern.rb
+- lib/winedb/models/variety.rb
+- lib/winedb/models/vineyard.rb
+- lib/winedb/models/vintage.rb
 - lib/winedb/models/wine.rb
 - lib/winedb/models/winery.rb
+- lib/winedb/models/worlddb/city.rb
+- lib/winedb/models/worlddb/country.rb
+- lib/winedb/models/worlddb/region.rb
 - lib/winedb/reader.rb
 - lib/winedb/schema.rb
 - lib/winedb/version.rb

data/lib/winedb/models/city.rb

@@ -1,11 +0,0 @@
-module WorldDb
-  module Model
-
-class City
-    has_many :wines,    class_name: 'WineDb::Model::Wine',   foreign_key: 'city_id'
-    has_many :wineries, class_name: 'WineDb::Model::Winery', foreign_key: 'city_id'
-end # class Country
-
-
-  end # module Model
-end # module WorldDb

data/lib/winedb/models/region.rb

@@ -1,10 +0,0 @@
-module WorldDb
-  module Model
-
-class Region
-    has_many :wines,    class_name: 'WineDb::Model::Wine',   foreign_key: 'region_id'
-    has_many :wineries, class_name: 'WineDb::Model::Winery', foreign_key: 'region_id'
-end # class Region
-
-  end # module Model
-end # module WorldDb