winedb 0.0.1 → 0.1.0

data/Manifest.txt

@@ -3,4 +3,15 @@ Manifest.txt
 README.md
 Rakefile
 lib/winedb.rb
+lib/winedb/models/city.rb
+lib/winedb/models/country.rb
+lib/winedb/models/forward.rb
+lib/winedb/models/region.rb
+lib/winedb/models/tag.rb
+lib/winedb/models/wine.rb
+lib/winedb/models/winery.rb
+lib/winedb/reader.rb
+lib/winedb/schema.rb
 lib/winedb/version.rb
+test/helper.rb
+test/test_models.rb

data/lib/winedb.rb

@@ -1,7 +1,28 @@
 
 
+# 3rd party gems / libs
+
+require 'active_record'   ## todo: add sqlite3? etc.
+
+require 'logutils'
+require 'textutils'
+require 'worlddb'
+
+
+### our own code
+
 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/tag'
+require 'winedb/models/wine'
+require 'winedb/models/winery'
 
+require 'winedb/reader'
 
 module WineDb
   
@@ -13,6 +34,30 @@ module WineDb
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end
 
+  def self.create
+    CreateDb.new.up
+
+    WineDb::Model::Prop.create!( key: 'db.schema.wine.version', value: VERSION )
+  end
+
+
+  def self.read( ary, include_path )
+    reader = Reader.new( include_path )
+    ary.each do |name|
+      reader.load( name )
+    end
+  end
+
+  def self.read_setup( setup, include_path, opts={} )
+    reader = Reader.new( include_path, opts )
+    reader.load_setup( setup )
+  end
+
+  def self.read_all( include_path, opts={} )  # load all builtins (using plain text reader); helper for convenience
+    read_setup( 'setups/all', include_path, opts )
+  end # method read_all
+
+
 end  # module WineDb
 
 

data/lib/winedb/models/city.rb

@@ -0,0 +1,11 @@
+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/country.rb

@@ -0,0 +1,13 @@
+module WorldDb
+  module Model
+
+
+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'
+end # class Country
+
+
+  end # module Model
+end # module WorldDb
+

data/lib/winedb/models/forward.rb

@@ -0,0 +1,39 @@
+### forward references
+##   require first to resolve circular references
+
+
+module WineDb
+  module Model
+
+  ## todo: why? why not use include WorldDb::Models here???
+
+  Continent = WorldDb::Model::Continent
+  Country   = WorldDb::Model::Country
+  Region    = WorldDb::Model::Region
+  City      = WorldDb::Model::City
+
+  Tag       = WorldDb::Model::Tag
+  Tagging   = WorldDb::Model::Tagging
+
+  Prop      = WorldDb::Model::Prop
+
+  class Wine < ActiveRecord::Base ; end
+  class Winery < ActiveRecord::Base ; end
+
+  end # module Model
+
+  ## note: for convenciene (and compatibility) add alias Models for Model namespace
+  ##  e.g lets you use include WineDb::Models
+  Models = Model
+
+end # module WineDb
+
+
+module WorldDb
+  module Model
+
+  Wine   = WineDb::Model::Wine
+  Winery = WineDb::Model::Winery
+
+  end
+end

data/lib/winedb/models/region.rb

@@ -0,0 +1,10 @@
+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

data/lib/winedb/models/tag.rb

@@ -0,0 +1,12 @@
+module WorldDb
+  module Model
+
+
+class Tag
+  has_many :wines,    :through => :taggings, :source => :taggable, source_type: 'WineDb::Model::Wine',   class_name: 'WineDb::Model::Wine'
+  has_many :wineries, :through => :taggings, :source => :taggable, source_type: 'WineDb::Model::Winery', class_name: 'WineDb::Model::Winery'
+end # class Country
+
+
+  end # module Model
+end # module WorldDb

data/lib/winedb/models/wine.rb

@@ -0,0 +1,123 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Wine < 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
+  #   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 :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' }
+
+
+
+  def self.create_or_update_from_values( values, more_attribs={} )
+
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
+      
+    # check for optional values
+    Wine.create_or_update_from_attribs( attribs, more_values )
+  end
+
+
+  def self.create_or_update_from_attribs( attribs, values )
+
+    # fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+    
+    value_tag_keys    = []
+         
+    ### 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
+            end
+      elsif match_city(value) do |city|
+              if city.present?
+                attribs[ :city_id ] = city.id
+              else
+                ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
+                logger.warn "city with key #{value[5..-1]} missing for beer #{attribs[:key]}"
+              end
+            end
+      elsif match_year( value ) do |num|  # founded/established year e.g. 1776
+              attribs[ :since ] = num
+            end
+      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
+      elsif (values.size==(index+1)) && is_taglist?( value )  # tags must be last entry
+        logger.debug "   found tags: >>#{value}<<"
+        value_tag_keys += find_tags( value )
+      else
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{attribs[:key]}"
+      end
+    end # each value
+
+    #  rec = Wine.find_by_key_and_country_id( attribs[ :key ], attribs[ :country_id] )
+    rec = Wine.find_by_key( attribs[ :key ] )
+
+    if rec.present?
+      logger.debug "update Wine #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Wine:"
+      rec = Wine.new
+    end
+      
+    logger.debug attribs.to_json
+
+    rec.update_attributes!( attribs )
+
+    ##################
+    # add taggings 
+
+    if value_tag_keys.size > 0
+        
+        value_tag_keys.uniq!  # remove duplicates
+        logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
+
+        ### fix/todo: check tag_ids and only update diff (add/remove ids)
+
+        value_tag_keys.each do |key|
+          tag = Tag.find_by_key( key )
+          if tag.nil?  # create tag if it doesn't exit
+            logger.debug "   creating tag >#{key}<"
+            tag = Tag.create!( key: key )
+          end
+          rec.tags << tag
+        end
+    end
+    
+    rec # NB: return created or updated obj
+
+  end # method create_or_update_from_values
+
+end # class Wine
+
+  end # module Model
+end # module WineDb

data/lib/winedb/models/winery.rb

@@ -0,0 +1,172 @@
+# encoding: UTF-8
+
+module WineDb
+  module Model
+
+class Winery < 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
+  #   self.create_or_update_from_values
+  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, is_address?, is_taglist? etc.
+  extend TextUtils::AddressHelper  # e.g self.normalize_addr, self.find_city_in_addr, etc.
+
+  self.table_name = 'wineries'
+
+  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'
+
+  has_many   :wines,   class_name: 'WineDb::Model::Wine',    foreign_key: 'wine_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' }
+
+
+  def self.create_or_update_from_values( values, more_attribs={} )
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
+
+    # check for optional values
+    Winery.create_or_update_from_attribs( attribs, more_values )
+  end
+
+
+  def self.create_or_update_from_attribs( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    value_tag_keys    = []
+
+    ## check for grades (e.g. ***/**/*) in titles (will add new_attributes[:grade] to hash)
+    ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
+    new_attributes[ :grade ] ||= 4
+
+    ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
+    value_tag_keys += find_tags_in_attribs!( new_attributes )
+
+    ## check for optional values
+    values.each_with_index do |value,index|
+      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
+            end
+      elsif match_city(value) do |city|
+              if city.present?
+                new_attributes[ :city_id ] = city.id
+              else
+                ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
+                logger.warn "city with key #{value[5..-1]} missing - for winery #{new_attributes[:key]}"
+              end
+
+              ## for easy queries: cache region_id (from city)
+              #  - check if city w/ region if yes, use it for winery too
+              if city.present? && city.region.present?
+                new_attributes[ :region_id ] = city.region.id
+              end
+            end
+      elsif match_year( value ) do |num|  # founded/established year e.g. 1776
+              new_attributes[ :since ] = num
+            end
+      elsif match_website( value ) do |website|  # 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 ] = website
+            end
+      elsif is_address?( value ) # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
+        new_attributes[ :address ] = normalize_addr( value )
+      elsif (values.size==(index+1)) && is_taglist?( value ) # tags must be last entry
+        logger.debug "   found tags: >>#{value}<<"
+        value_tag_keys += find_tags( value )
+      else
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end # each value
+
+    ## todo: check better style using self.find_by_key?? why? why not?
+    rec = Winery.find_by_key( new_attributes[ :key ] )
+
+    if rec.present?
+      logger.debug "update Winery #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Winery:"
+      rec = Winery.new
+    end
+
+    logger.debug new_attributes.to_json
+
+    rec.update_attributes!( new_attributes )
+
+
+    ##############################
+    # auto-add city if not present and country n region present
+    
+    if new_attributes[:city_id].blank? &&
+       new_attributes[:country_id].present? &&
+       new_attributes[:region_id].present?
+       
+      country_key = rec.country.key
+
+      if country_key == 'at' || country_key == 'de'
+
+        ## todo: how to handle nil/empty address lines?
+
+        city_title = find_city_in_addr( new_attributes[:address], country_key )
+        
+        if city_title.present?
+          
+          city_values = [city_title]
+          city_attributes = {
+            country_id: rec.country_id,
+            region_id:  rec.region_id
+          }
+          # todo: add convenience helper create_or_update_from_title
+          city = City.create_or_update_from_values( city_values, city_attributes )
+
+          ### fix/todo: set new autoadd flag too?
+          ##  e.g. check if updated? e.g. timestamp created <> updated otherwise assume created?
+
+          ## now at last add city_id to winery!
+          rec.city_id = city.id
+          rec.save!
+        else
+          logger.warn "auto-add city for #{new_attributes[:key]} (#{country_key}) >>#{new_attributes[:address]}<< failed; no city title found"
+        end
+      end
+    end
+
+    ##################
+    ## add taggings
+
+    if value_tag_keys.size > 0
+        
+      value_tag_keys.uniq!  # remove duplicates
+      logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
+
+      ### fix/todo: check tag_ids and only update diff (add/remove ids)
+
+      value_tag_keys.each do |key|
+        tag = Tag.find_by_key( key )
+        if tag.nil?  # create tag if it doesn't exit
+          logger.debug "   creating tag >#{key}<"
+          tag = Tag.create!( key: key )
+        end
+        rec.tags << tag
+      end
+    end
+
+    rec # NB: return created or updated obj
+
+  end # method create_or_update_from_values
+
+
+end # class Winery
+
+  end # module Model
+end # module WineDb

data/lib/winedb/reader.rb

@@ -0,0 +1,156 @@
+# encoding: UTF-8
+
+module WineDb
+
+
+module Matcher
+
+  def match_wines_for_country( name, &blk )
+    match_xxx_for_country( name, 'wines', &blk )
+  end
+
+#  def match_wines_for_country_n_region( name, &blk )
+#    match_xxx_for_country_n_region( name, 'wines', &blk )
+#  end
+
+  def match_wineries_for_country( name, &blk )
+    match_xxx_for_country( name, 'wineries', &blk )
+  end
+
+#  def match_wineries_for_country_n_region( name, &blk )
+#    match_xxx_for_country_n_region( name, 'wineries', &blk )
+#  end
+
+end # module Matcher
+
+
+class Reader
+
+  include LogUtils::Logging
+
+  include WineDb::Models
+
+  include WorldDb::Matcher   ## fix: move to WineDb::Matcher module ??? - cleaner?? why? why not?
+  include WineDb::Matcher # lets us use match_teams_for_country etc.
+
+  attr_reader :include_path
+
+
+  def initialize( include_path, opts = {} )
+    @include_path = include_path
+  end
+
+
+  def load_setup( name )
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = FixtureReader.new( path )
+
+    reader.each do |fixture_name|
+      load( fixture_name )
+    end
+  end # method load_setup
+
+
+  def load( name )
+
+    if match_wines_for_country( name ) do |country_key|
+            load_wines_for_country( country_key, name )
+          end
+    elsif match_wineries_for_country( name ) do |country_key|
+            load_wineries_for_country( country_key, name )
+          end
+    else
+      logger.error "unknown wine.db fixture type >#{name}<"
+      # todo/fix: exit w/ error
+    end
+  end
+
+
+  def load_wines_for_country( country_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
+
+    more_attribs[ :txt ] = name  # store source ref
+
+    load_wines_worker( name, more_attribs )
+  end
+
+
+  def load_wines_worker( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    ### todo: cleanup - check if [] works for build_title...
+    #     better cleaner way ???
+    if more_attribs[:region_id].present?
+      known_wineries_source = Winery.where( region_id:  more_attribs[:region_id] )
+    elsif more_attribs[:country_id].present?
+      known_wineries_source = Winery.where( country_id: more_attribs[:country_id] )
+    else
+      logger.warn "no region or country specified; use empty winery ary for header mapper"
+      known_wineries_source = []
+    end
+
+    known_wineries = TextUtils.build_title_table_for( known_wineries_source )
+
+    reader.each_line do |new_attributes, values|
+
+      ## note: check for header attrib; if present remove
+      ### todo: cleanup code later
+      ## fix: add to new_attributes hash instead of values ary
+      ##   - fix: match_winery()   move region,city code out of values loop for reuse at the end
+      if new_attributes[:header].present?
+        winery_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!
+
+        logger.debug "  trying to find winery in line >#{winery_line}<"
+        ## todo: check what map_titles_for! returns (nothing ???)
+        TextUtils.map_titles_for!( 'winery', winery_line, known_wineries )
+        winery_key = TextUtils.find_key_for!( 'winery', winery_line )
+        logger.debug "  winery_key = >#{winery_key}<"
+        unless winery_key.nil?
+          ## bingo! add winery_id upfront, that is, as first value in ary
+          values = values.unshift "winery:#{winery_key}"
+        end
+      end
+
+      Wine.create_or_update_from_attribs( new_attributes, values )
+    end # each_line
+  end
+
+
+  def load_wineries_for_country( country_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
+
+    more_attribs[ :txt ] = name  # store source ref
+
+    load_wineries_worker( name, more_attribs )
+  end
+
+  def load_wineries_worker( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    reader.each_line do |new_attributes, values|
+      
+      #######
+      # fix: move to (inside)
+      #    Winery.create_or_update_from_attribs ||||
+      ## note: group header not used for now; do NOT forget to remove from hash!
+      if new_attributes[:header].present?
+        logger.warn "removing unused group header #{new_attributes[:header]}"
+        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
+      end
+      
+      Winery.create_or_update_from_attribs( new_attributes, values )
+    end # each_line
+  end
+
+end # class Reader
+end # module WineDb

data/lib/winedb/schema.rb

@@ -0,0 +1,75 @@
+# encoding: UTF-8
+
+module WineDb
+
+class CreateDb < ActiveRecord::Migration
+
+
+def up
+
+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.string  :txt            # source ref
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
+
+
+  t.references :country, null: false
+  t.references :region   # optional
+  t.references :city     # optional
+
+  t.timestamps
+end
+
+
+create_table :wineries 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
+  ## renamed to founded to since
+  ## t.integer :founded  # year founded/established    - todo/fix: rename to since? 
+  t.integer :closed  # optional;  year winery closed
+
+  t.integer :area    # in ha e.g. 8 ha   # Weingarten/rebflaeche
+
+  # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
+  t.integer :grade, null: false, default: 4
+
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
+
+  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.timestamps
+end
+
+end # method up
+
+def down
+  raise ActiveRecord::IrreversibleMigration
+end
+
+
+end # class CreateDb
+
+end # module WineDb

data/lib/winedb/version.rb

@@ -1,4 +1,4 @@
 
 module WineDb
-   VERSION = '0.0.1'
+   VERSION = '0.1.0'
 end

data/test/helper.rb

@@ -0,0 +1,76 @@
+# encoding: UTF-8
+
+## $:.unshift(File.dirname(__FILE__))
+
+## minitest setup
+
+# require 'minitest/unit'
+require 'minitest/autorun'
+
+# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
+
+
+# ruby stdlibs
+
+require 'json'
+require 'uri'
+require 'pp'
+
+# ruby gems
+
+require 'active_record'
+
+# our own code
+
+require 'winedb'
+require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
+
+Country = WorldDb::Model::Country
+Region  = WorldDb::Model::Region
+City    = WorldDb::Model::City
+
+## todo: get all models aliases (e.g. from console script)
+
+Wine    = WineDb::Model::Wine
+Winery  = WineDb::Model::Winery
+
+
+def setup_in_memory_db
+  # Database Setup & Config
+
+  db_config = {
+    adapter:  'sqlite3',
+    database: ':memory:'
+  }
+
+  pp db_config
+
+  ActiveRecord::Base.logger = Logger.new( STDOUT )
+  ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+  ## NB: every connect will create a new empty in memory db
+  ActiveRecord::Base.establish_connection( db_config )
+
+
+  ## build schema
+
+  LogDb.create
+  WorldDb.create
+  WineDb.create
+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 )
+
+end
+
+setup_in_memory_db()
+fillup_in_memory_db()
+
+AT   =  Country.find_by_key!( 'at' )
+N    =  Region.find_by_key!( 'n' )
+

data/test/test_models.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_helper.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+
+class TestModels < MiniTest::Unit::TestCase
+
+  def test_load_wine_values
+
+    key = 'gruenerveltlinerspiegel'
+
+    values = [
+      'Grüner Veltliner Spiegel',
+      '12.3 %',
+      'gv'
+    ]
+
+    more_attribs = {
+      country_id: AT.id
+    }
+
+    wine = Wine.create_or_update_from_values( values, more_attribs )
+
+    wine2 = Wine.find_by_key!( key )
+    assert_equal wine.id,  wine2.id
+
+    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
+
+    key = 'antonbauer'
+
+    values = [
+      key,
+      'Anton Bauer (1971)',
+      'www.antonbauer.at',
+      'Neufang 42 // 3483 Feuersbrunn',
+      '25 ha',  ### todo: make sure it will not get matched as tag
+      'tag'
+    ]
+
+    more_attribs = {
+      country_id: AT.id
+    }
+
+    wy = Winery.create_or_update_from_values( values, more_attribs )
+
+    wy2 = Winery.find_by_key!( key )
+    assert_equal wy.id, wy2.id
+
+    assert_equal wy.title,         values[1]
+    assert_equal wy.country_id,    AT.id
+    assert_equal wy.country.title, AT.title
+    assert_equal wy.web,           'www.antonbauer.at'
+    assert_equal wy.address,       'Neufang 42 // 3483 Feuersbrunn'
+  end
+
+
+end # class TestModels
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winedb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77438490 !ruby/object:Gem::Requirement
+  requirement: &71681830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *77438490
+  version_requirements: *71681830
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &77438010 !ruby/object:Gem::Requirement
+  requirement: &71681430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *77438010
+  version_requirements: *71681430
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &77457290 !ruby/object:Gem::Requirement
+  requirement: &71681160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *77457290
+  version_requirements: *71681160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77456620 !ruby/object:Gem::Requirement
+  requirement: &71680880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *77456620
+  version_requirements: *71680880
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77455830 !ruby/object:Gem::Requirement
+  requirement: &71680600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *77455830
+  version_requirements: *71680600
 description: winedb - wine.db command line tool
 email: winedb@googlegroups.com
 executables: []
@@ -78,7 +78,19 @@ files:
 - README.md
 - Rakefile
 - lib/winedb.rb
+- lib/winedb/models/city.rb
+- lib/winedb/models/country.rb
+- lib/winedb/models/forward.rb
+- lib/winedb/models/region.rb
+- lib/winedb/models/tag.rb
+- lib/winedb/models/wine.rb
+- lib/winedb/models/winery.rb
+- lib/winedb/reader.rb
+- lib/winedb/schema.rb
 - lib/winedb/version.rb
+- test/helper.rb
+- test/test_models.rb
+- .gemtest
 homepage: https://github.com/geraldb/wine.db.ruby
 licenses:
 - Public Domain
@@ -106,4 +118,5 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: winedb - wine.db command line tool
-test_files: []
+test_files:
+- test/test_models.rb