winedb 0.1.4 → 0.1.5

data/lib/winedb/models/wine.rb

@@ -67,7 +67,13 @@ class Wine < ActiveRecord::Base
       elsif match_website( value ) do |website|  # check for url/internet address e.g. www.ottakringer.at
               attribs[ :web ] = website
             end
-# -- moved to vintage (that is, abv depends on year)
+      elsif value =~ /^winery:/   ## winery:<key> e.g. winery:antonbauer
+        winery_key = value[7..-1].strip  ## cut off by: prefix
+        winery = Winery.find_by_key!( winery_key )
+        attribs[ :winery_id ] = winery.id
+
+
+# -- todo/fix: move 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

data/lib/winedb/models/winery.rb

@@ -46,6 +46,38 @@ class Winery < ActiveRecord::Base
     ## 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 if :title or :synonyms includes person name e.g.  ends w/ (????)
+    ##   patch and auto-add person
+    ###  --todo/fix: move code into find_key_n_title (for reuse!!!) !!!!!!
+
+    titles  = [ new_attributes[:title] ]
+    titles += new_attributes[:synonyms].split('|')  if new_attributes[:synonyms]
+
+    persons = []
+
+    titles = titles.map do |title_raw|
+      title = title_raw.strip
+      ### todo: add support for name synonyms e.g. separated by * ascii or <bullet>
+      if title =~ /\s+\([\d?]{4}\)$/   ## -- allow (19??) or (????) or (2100) etc.
+        logger.debug "  found person >#{title}< in title"
+        ### cut-off year
+        person_name = title[0...-6].strip   ## cut-off enclosed year and spaces
+        person_year = $1.to_s
+        ## todo: year if person_year is all digits ? if not use nil
+
+        persons << [person_name, person_year]
+        person_name  # note: return person_name as new title (that is, title w/ year cut-off)
+      else
+        title # pass through as is
+      end
+    end
+
+    new_attributes[:title]    = titles[0]
+    new_attributes[:synonyms] = titles[1..-1].join('|')  if titles.size > 1
+
+
 
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
     value_tag_keys += find_tags_in_attribs!( new_attributes )
@@ -111,6 +143,38 @@ class Winery < ActiveRecord::Base
     rec.update_attributes!( new_attributes )
 
 
+    #################################
+    # auto-add person if present
+    
+    if persons.size > 0
+      persons.each do |person|
+
+        person_name = person[0]
+        person_key  = TextUtils.title_to_key( person_name )
+
+        person_attributes = {
+          name: person_name
+        }
+
+        person_rec = Person.find_by_key( person_key )
+        if person_rec.present?
+          logger.debug "  auto-update Person #{person_rec.id}-#{person_rec.key}:"
+        else
+          logger.debug "  auto-create Person:"
+          person_rec =Person.new
+          person_attributes[ :key ] = person_key
+        end
+
+        logger.debug person_attributes.to_json
+
+        person_rec.update_attributes!( person_attributes )
+
+        ## todo: add winery_id reference to person !!!!
+        ### add person_id reference to winery!!!
+      end
+    end
+
+
     ##############################
     # auto-add city if not present and country n region present
     

data/lib/winedb/version.rb

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

data/test/test_models.rb

@@ -12,9 +12,11 @@ require 'helper'
 class TestModels < MiniTest::Unit::TestCase
 
   def setup  # runs before every test
+    PersonDb.delete!
     WineDb.delete!   # always clean-out tables
   end
-  
+
+
   def test_worlddb_assocs
     assert_equal 0, AT.wines.count
     assert_equal 0, AT.wineries.count
@@ -35,18 +37,21 @@ class TestModels < MiniTest::Unit::TestCase
 
 
   def test_count
+    assert_equal 0, Person.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
+    # print stats
+    WineDb.tables
+    PersonDb.tables
   end
 
 
@@ -66,13 +71,14 @@ class TestModels < MiniTest::Unit::TestCase
     wine = Wine.create_or_update_from_values( values, more_attribs )
 
     wine2 = Wine.find_by_key!( key )
-    assert_equal wine.id,  wine2.id
+    assert_equal wine2.id, wine.id
 
-    assert_equal wine.title,         values[0]
-    assert_equal wine.country_id,    AT.id
-    assert_equal wine.country.title, AT.title
+    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'
@@ -94,11 +100,15 @@ class TestModels < MiniTest::Unit::TestCase
     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'
+    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
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winedb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75024810 !ruby/object:Gem::Requirement
+  requirement: &78517140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *75024810
+  version_requirements: *78517140
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &75024420 !ruby/object:Gem::Requirement
+  requirement: &78516770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *75024420
+  version_requirements: *78516770
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &75024150 !ruby/object:Gem::Requirement
+  requirement: &78516440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75024150
+  version_requirements: *78516440
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &75023560 !ruby/object:Gem::Requirement
+  requirement: &78515940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *75023560
+  version_requirements: *78515940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75022950 !ruby/object:Gem::Requirement
+  requirement: &78515510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *75022950
+  version_requirements: *78515510
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75022510 !ruby/object:Gem::Requirement
+  requirement: &78514750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *75022510
+  version_requirements: *78514750
 description: winedb - wine.db command line tool
 email: winedb@googlegroups.com
 executables: []