winedb 0.1.3 → 0.1.4

data/Rakefile

@@ -26,6 +26,7 @@ Hoe.spec 'winedb' do
                                #         - logutils
                                #         - textutils
                                
+    ['persondb' ],
      ## 3rd party
     ['gli', '>= 2.5.6']
   ]

data/lib/winedb.rb

@@ -7,6 +7,7 @@ require 'active_record'   ## todo: add sqlite3? etc.
 require 'logutils'
 require 'textutils'
 require 'worlddb'
+require 'persondb'
 
 
 ### our own code
@@ -75,7 +76,6 @@ module WineDb
     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
@@ -89,7 +89,6 @@ module WineDb
     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"

data/lib/winedb/models/forward.rb

@@ -17,13 +17,15 @@ module WineDb
 
   Prop      = WorldDb::Model::Prop
 
+  Person    = PersonDb::Model::Person
+
+
   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
@@ -45,3 +47,13 @@ module WorldDb
 
   end
 end
+
+module PersonDb
+  module Model
+
+  Wine   = WineDb::Model::Wine
+  Winery = WineDb::Model::Winery
+
+  end
+end
+

data/lib/winedb/models/person.rb

@@ -1,17 +1,19 @@
 # encoding: UTF-8
 
-module WineDb
+########
+# NOTE: model resides in persondb gem
+
+module PersonDb
   module Model
 
 ###
-# Winemaker
+# extensions for winemaker
 
-class Person < ActiveRecord::Base
+class Person
 
-  self.table_name = 'persons'
   ## to be done
 
 end # class Person
 
   end # module Model
-end # module WineDb
+end # module PersonDb

data/lib/winedb/reader.rb

@@ -61,6 +61,7 @@ module Matcher
 
 
   def match_wines_for_country( name, &blk )
+    ## check: allow/add synonyms e.g. weine, vinos etc. ???
     match_xxx_for_country( name, 'wines', &blk )
   end
 
@@ -73,6 +74,7 @@ module Matcher
   end
 
   def match_wineries_for_country_n_region( name, &blk )
+    ## check: allow/add synonyms e.g. producers ? weingueter ??
     fix_match_xxx_for_country_n_region( name, 'wineries', &blk )
   end
 
@@ -82,13 +84,18 @@ module Matcher
   end
 
   def match_shops_for_country_n_region( name, &blk )
+    ## check: allow/add synonyms e.g. vinotheken, enotecas
     fix_match_xxx_for_country_n_region( name, 'shops', &blk )
   end
 
   def match_taverns_for_country_n_region( name, &blk )
-    fix_match_xxx_for_country_n_region( name, 'taverns', &blk )
+    ## also try synonyms e.g. heurige (if not match for taverns)
+    found = fix_match_xxx_for_country_n_region( name, 'taverns', &blk )
+    found = fix_match_xxx_for_country_n_region( name, 'heurige', &blk ) unless found
+    found
   end
 
+
 end # module Matcher
 
 

data/lib/winedb/schema.rb

@@ -191,36 +191,6 @@ create_table :vineyards do |t|
   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
 

data/lib/winedb/version.rb

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

data/test/helper.rb

@@ -25,9 +25,11 @@ require 'active_record'
 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
+Country  = WorldDb::Model::Country
+Region   = WorldDb::Model::Region
+City     = WorldDb::Model::City
+
+Person   = PersonDb::Model::Person
 
 ## todo: get all models aliases (e.g. from console script)
 
@@ -35,7 +37,6 @@ 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
@@ -65,6 +66,7 @@ def setup_in_memory_db
 
   LogDb.create
   WorldDb.create
+  PersonDb.create
   WineDb.create
 end
 

data/test/test_fixture_matchers.rb

@@ -126,17 +126,24 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
 
 
   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'
+    taverns   = [
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--taverns',
+      'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--heurige'
+    ]
 
-    found = match_vineyards_for_country_n_region( vineyards ) do |country_key,region_key|
+    taverns.each do |tavern|
+      found = match_taverns_for_country_n_region( tavern ) do |country_key,region_key|
         assert( country_key == 'at')
         assert( region_key  == 'n' )
+      end
+      assert( found == true )
     end
-    assert( found == true )
 
-    found = match_taverns_for_country_n_region( taverns ) do |country_key,region_key|
+
+    vineyards = 'at-austria!/1--n-niederoesterreich--eastern/wagram/feuersbrunn--vineyards'
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winedb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &81648500 !ruby/object:Gem::Requirement
+  requirement: &75024810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *81648500
+  version_requirements: *75024810
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &81647750 !ruby/object:Gem::Requirement
+  requirement: &75024420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *81647750
+  version_requirements: *75024420
+- !ruby/object:Gem::Dependency
+  name: persondb
+  requirement: &75024150 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *75024150
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &81647430 !ruby/object:Gem::Requirement
+  requirement: &75023560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *81647430
+  version_requirements: *75023560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81719370 !ruby/object:Gem::Requirement
+  requirement: &75022950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *81719370
+  version_requirements: *75022950
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81718560 !ruby/object:Gem::Requirement
+  requirement: &75022510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *81718560
+  version_requirements: *75022510
 description: winedb - wine.db command line tool
 email: winedb@googlegroups.com
 executables: []