winedb 0.1.5 → 0.1.6

data/Manifest.txt

@@ -2,6 +2,10 @@ HISTORY.md
 Manifest.txt
 README.md
 Rakefile
+data/families.txt
+data/grapes-red.txt
+data/grapes-white.txt
+data/setups/all.yml
 lib/winedb.rb
 lib/winedb/models/family.rb
 lib/winedb/models/forward.rb
@@ -23,4 +27,7 @@ lib/winedb/schema.rb
 lib/winedb/version.rb
 test/helper.rb
 test/test_fixture_matchers.rb
+test/test_grapes.rb
 test/test_models.rb
+test/test_wineries.rb
+test/test_wines.rb

data/data/families.txt

@@ -0,0 +1,40 @@
+
+ww, White Wine
+## add subfamilies e.g. White Wine Varietal, White Wine Blend/Cuvée
+
+rw, Red Wine
+## add subfamilies e.g. Red Wine Varietal, Red Wine Blend/Cuvée
+
+
+Rosé Wine   # -- what code to use ?? any conventions ???
+
+
+dw, Dessert Wine (Sweet) # -- what code to use ?? any conventions ???
+
+## add
+# [ba]
+#  Beerenauslese
+#
+# [tba]
+#   Trochenbeerenauslese
+#
+# Eiswein
+# Ausbruch
+#
+
+
+fw, Fortified Wine   # -- what code to use ?? any conventions ???
+#  add Port, Madeira, Sherry, Marsala etc.
+
+sw, Sparkling Wine  # -- what code to use ?? any conventions ???
+#  Champagne, Cava, Prosecco, etc.
+
+
+xx, Other  # -- what code to use ?? any convetion ??
+
+
+#
+#
+# todo/check:
+#  use wine color?  not the same as family in some case (is orthogonal?)
+#   e.g. for sparkling wine or dessert wine (red,rose,white possible?) - needed - why? why not? 

data/data/grapes-red.txt

@@ -0,0 +1,16 @@
+###################################
+# Red Wine Styles / Types
+
+zw, Zweigelt|Blauer Zweigelt|Rotburger
+bf, Blaufränkisch
+bp, Blauer Portugieser|Português Azul
+bb, Blauburger
+sl, St. Laurent|Sankt Laurent
+pn, Pinot Noir|Blauburgunder|Blauer Spätburgunder
+me, Merlot
+cs, Cabernet Sauvignon
+bw, Blauer Wildbacher  ## Schilcher
+ro, Roesler
+sy, Syrah|Shiraz
+cf, Cabernet Franc
+ra, Ráthay

data/data/grapes-white.txt

@@ -0,0 +1,35 @@
+###################################
+# White Wine Styles / Types
+
+gv, Grüner Veltliner|Weißgipfler
+wr, Welschriesling
+mt, Müller Thurgau|Rivaner
+wb, Weißburgunder|Weißer Burgunder|Pinot Blanc|Klevner
+rr, Riesling|Rheinriesling|Weißer Riesling
+ch, Chardonnay|Morillon
+sb, Sauvignon Blanc
+nb, Neuburger
+mk, Muskateller|Gelber Muskateller|Roter Muskateller
+fv, Frühroter Veltliner|Malvasier
+sr, Scheurebe|Sämling 88
+mo, Muskat-Ottonel
+tr, Traminer|Gelber Traminer|Gewürztraminer|Roter Traminer
+bo, Bouvier
+pg, Pinot Gris|Grauburgunder|Ruländer
+rv, Roter Veltliner
+gb, Goldburger
+rg, Rotgipfler
+zf, Zierfandler|Spätrot
+sv, Sylvaner|Silvaner|Grüner Sylvaner
+ju, Jubiläumsrebe
+fu, Furmint
+
+
+##################
+# what to do with non-official listed styles:
+#
+#  - kr, Kerner ???              - de.wikipedia: Kerner_(Rebsorte)
+#  - rm, Rosenmuskateller  ???   - de.wikipedia: Rosenmuskateller
+#  - se, Sémillon    ???         - de.wikipedia: Sémillon
+#  - 
+

data/data/setups/all.yml

@@ -0,0 +1,8 @@
+############################
+#  builtin seed data
+
+data:
+- grapes-red
+- grapes-white
+- families
+

data/lib/winedb.rb

@@ -47,6 +47,11 @@ module WineDb
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end
 
+  def self.data_path
+    "#{root}/data"
+  end
+
+
   def self.create
     CreateDb.new.up
 
@@ -70,6 +75,10 @@ module WineDb
     read_setup( 'setups/all', include_path, opts )
   end # method read_all
 
+  def self.read_builtin
+    read_setup( 'setups/all', data_path )
+  end
+
   def self.delete!
     ## fix/todo: move into deleter class (see worlddb,sportdb etc.)
     Model::Grape.delete_all

data/lib/winedb/models/grape.rb

@@ -5,7 +5,92 @@ module WineDb
 
 class Grape < ActiveRecord::Base
 
-  ## to be done
+  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.
+
+  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
+    Grape.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_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 (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 = Grape.find_by_key( attribs[ :key ] )
+
+    if rec.present?
+      logger.debug "update Grape #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Grape:"
+      rec = Grape.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 Grape
 

data/lib/winedb/reader.rb

@@ -131,7 +131,11 @@ class Reader
 
   def load( name )
 
-    if match_wines_for_country_n_region( name ) do |country_key, region_key|
+    #  grapes - allow e.g.
+    #   - /grapes or /grapes-red or /grapes-white
+    if name =~ /(^|\/)grapes(-(red|white))?$/
+      load_grapes( name )
+    elsif match_wines_for_country_n_region( name ) do |country_key, region_key|
         ### fix: use region_key too
         load_wines_for_country( country_key, name )
        end
@@ -152,6 +156,27 @@ class Reader
   end
 
 
+  def load_grapes( name, more_attribs={} )
+    if name =~ /(^|\/)grapes-red$/
+      more_attribs[ :red ] = true
+    elsif name =~ /(^|\/)grapes-white$/
+      more_attribs[ :white ] = true
+    else
+      # do nothing
+    end
+
+    load_grapes_worker( name, more_attribs )
+  end
+
+  def load_grapes_worker( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    reader.each_line do |new_attributes, values|
+      Grape.create_or_update_from_attribs( new_attributes, values )
+    end # each_line
+  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})<"
@@ -164,6 +189,7 @@ class Reader
   end
 
 
+
   def load_wines_worker( name, more_attribs={} )
     reader = ValuesReaderV2.new( name, include_path, more_attribs )
 

data/lib/winedb/schema.rb

@@ -89,6 +89,7 @@ create_table :grapes do |t|
   t.boolean  :red,   null: false, default: false
   t.boolean  :white, null: false, default: false
 
+  t.integer  :since
   t.string   :web        # optional web page
   t.string   :wikipedia  # optional wiki(pedia page)
 

data/lib/winedb/version.rb

@@ -1,5 +1,5 @@
 
 module WineDb
-   VERSION = '0.1.5'
+   VERSION = '0.1.6'
 end
 

data/test/test_grapes.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+
+class TestGrapes < MiniTest::Unit::TestCase
+
+  def setup  # runs before every test
+    PersonDb.delete!
+    WineDb.delete!   # always clean-out tables
+  end
+
+
+  def test_load_grape_values
+ 
+    key = 'gv'
+
+    values = [
+      key,
+      'Grüner Veltliner',
+      'gv'
+    ]
+
+    more_attribs = {
+      white: true
+    }
+
+    grape = Grape.create_or_update_from_values( values, more_attribs )
+
+    grape2 = Grape.find_by_key!( key )
+    assert_equal grape2.id, grape.id
+
+    assert_equal values[1],  grape.title
+    assert_equal true,       grape.white
+    assert_equal false,      grape.red
+  end
+
+
+end # class TestGrapes
+

data/test/test_models.rb

@@ -1,10 +1,5 @@
 # encoding: utf-8
 
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_helper.rb
-#  or better
-#     rake test
 
 require 'helper'
 
@@ -54,61 +49,20 @@ class TestModels < MiniTest::Unit::TestCase
     PersonDb.tables
   end
 
+  def test_builtin
+    WineDb.read_builtin
 
-  def test_load_wine_values
- 
-    key = 'gruenerveltlinerspiegel'
+    gv = Grape.find_by_key!( 'gv' )
+    assert_equal 'gv', gv.key
+    assert_equal 'Grüner Veltliner',  gv.title
+    assert_equal true,  gv.white
+    assert_equal false, gv.red
 
-    values = [
-      'Grüner Veltliner Spiegel',
-      '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 wine2.id, wine.id
-
-    assert_equal values[0],  wine.title
-    assert_equal AT.id,      wine.country_id
-    assert_equal AT.title,   wine.country.title
-  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
-    ]
-
-    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 'Anton Bauer',       wy.title
-    assert_equal AT.id,               wy.country_id
-    assert_equal AT.title,            wy.country.title
-    assert_equal 'www.antonbauer.at', wy.web
-    assert_equal 'Neufang 42 // 3483 Feuersbrunn', wy.address
-
-    ## check for auto-create person
-    p = Person.find_by_key!( 'antonbauer' ) 
-    assert_equal 'Anton Bauer', p.name
+    zw = Grape.find_by_key!( 'zw' )
+    assert_equal 'zw', zw.key
+    assert_equal 'Zweigelt',  zw.title
+    assert_equal false,  zw.white
+    assert_equal true, zw.red
   end
 
 

data/test/test_wineries.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'helper'
+
+
+class TestWineries < MiniTest::Unit::TestCase
+
+  def setup  # runs before every test
+    PersonDb.delete!
+    WineDb.delete!   # always clean-out tables
+  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
+    ]
+
+    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 'Anton Bauer',       wy.title
+    assert_equal AT.id,               wy.country_id
+    assert_equal AT.title,            wy.country.title
+    assert_equal 'www.antonbauer.at', wy.web
+    assert_equal 'Neufang 42 // 3483 Feuersbrunn', wy.address
+
+    ## check for auto-create person
+    p = Person.find_by_key!( 'antonbauer' ) 
+    assert_equal 'Anton Bauer', p.name
+  end
+
+
+end # class TestModels
+

data/test/test_wines.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+
+class TestWines < MiniTest::Unit::TestCase
+
+  def setup  # runs before every test
+    PersonDb.delete!
+    WineDb.delete!   # always clean-out tables
+  end
+
+
+  def test_load_wine_values
+ 
+    key = 'gruenerveltlinerspiegel'
+
+    values = [
+      'Grüner Veltliner Spiegel',
+      '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 wine2.id, wine.id
+
+    assert_equal values[0],  wine.title
+    assert_equal AT.id,      wine.country_id
+    assert_equal AT.title,   wine.country.title
+  end
+
+
+end # class TestWines
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winedb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &78517140 !ruby/object:Gem::Requirement
+  requirement: &77482170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78517140
+  version_requirements: *77482170
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &78516770 !ruby/object:Gem::Requirement
+  requirement: &77481300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *78516770
+  version_requirements: *77481300
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &78516440 !ruby/object:Gem::Requirement
+  requirement: &77480750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78516440
+  version_requirements: *77480750
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &78515940 !ruby/object:Gem::Requirement
+  requirement: &77479900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *78515940
+  version_requirements: *77479900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78515510 !ruby/object:Gem::Requirement
+  requirement: &77581620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *78515510
+  version_requirements: *77581620
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78514750 !ruby/object:Gem::Requirement
+  requirement: &77581310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *78514750
+  version_requirements: *77581310
 description: winedb - wine.db command line tool
 email: winedb@googlegroups.com
 executables: []
@@ -88,6 +88,10 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- data/families.txt
+- data/grapes-red.txt
+- data/grapes-white.txt
+- data/setups/all.yml
 - lib/winedb.rb
 - lib/winedb/models/family.rb
 - lib/winedb/models/forward.rb
@@ -109,7 +113,10 @@ files:
 - lib/winedb/version.rb
 - test/helper.rb
 - test/test_fixture_matchers.rb
+- test/test_grapes.rb
 - test/test_models.rb
+- test/test_wineries.rb
+- test/test_wines.rb
 - .gemtest
 homepage: https://github.com/geraldb/wine.db.ruby
 licenses:
@@ -139,5 +146,8 @@ signing_key:
 specification_version: 3
 summary: winedb - wine.db command line tool
 test_files:
+- test/test_wines.rb
 - test/test_models.rb
+- test/test_grapes.rb
+- test/test_wineries.rb
 - test/test_fixture_matchers.rb