winedb 0.1.0 → 0.1.1

data/Manifest.txt

@@ -14,4 +14,5 @@ lib/winedb/reader.rb
 lib/winedb/schema.rb
 lib/winedb/version.rb
 test/helper.rb
+test/test_fixture_matchers.rb
 test/test_models.rb

data/lib/winedb/reader.rb

@@ -9,17 +9,37 @@ module Matcher
     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_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
+    #  at-austria!/1--n-niederoesterreich--eastern/wagram--wagram--wines
+
+    ### 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 )
+  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
+  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
+
+    ### 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" )
+
+    match_xxx_for_country_n_region( name_fixed, 'wineries', &blk )
+  end
 
 end # module Matcher
 
@@ -56,9 +76,17 @@ class Reader
 
   def load( name )
 
-    if match_wines_for_country( name ) do |country_key|
+    if 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
+    elsif match_wines_for_country( name ) do |country_key|
             load_wines_for_country( country_key, name )
           end
+    elsif match_wineries_for_country_n_region( name ) do |country_key, region_key|
+        ### fix: use region_key too
+            load_wineries_for_country( country_key, name )
+          end
     elsif match_wineries_for_country( name ) do |country_key|
             load_wineries_for_country( country_key, name )
           end

data/lib/winedb/version.rb

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

data/test/test_fixture_matchers.rb

@@ -0,0 +1,120 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+### todo/fix: move to worlddb along with fixture matcher module!!
+
+class TestFixtureMatchers < MiniTest::Unit::TestCase
+
+  include WorldDb::Matcher
+  include WineDb::Matcher
+
+
+  def test_country
+
+    wines_at = [
+      'europe/at/wines',
+      'europe/at-austria/wines',
+      'at-austria/wines',
+      'at-austria!/wines',
+      '1--at-austria--central/wines',
+      'europe/1--at-austria--central/wines'
+    ]
+
+    wines_at.each do |name|
+      found = match_wines_for_country( name ) do |country_key|
+        assert( country_key == 'at')
+      end
+      assert( found == true )
+    end
+
+    wineries_at = [
+      'europe/at/wineries',
+      'europe/at-austria/wineries',
+      'at-austria/wineries',
+      'at-austria!/wineries',
+      '1--at-austria--central/wineries',
+      'europe/1--at-austria--central/wineries'
+    ]
+
+    wineries_at.each do |name|
+      found = match_wineries_for_country( name ) do |country_key|
+        assert( country_key == 'at')
+      end
+      assert( found == true )
+    end
+  end # method test_country
+
+
+  def test_country_n_region
+
+    wines_at = [
+      'europe/at-austria/n-niederoesterreich/wines',
+      'at-austria/n-niederoesterreich/wines',
+      'at-austria!/n-niederoesterreich/wines',
+      '1--at-austria--central/1--n-niederoesterreich--eastern/wines',
+      'europe/1--at-austria--central/1--n-niederoesterreich--eastern/wines'
+    ]
+
+    wines_at.each do |name|
+      found = match_wines_for_country_n_region( name ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+      end
+      assert( found == true )
+    end
+
+    wineries_at = [
+      'europe/at-austria/n-niederoesterreich/wineries',
+      'at-austria/n-niederoesterreich/wineries',
+      'at-austria!/n-niederoesterreich/wineries',
+      '1--at-austria--central/1--n-niederoesterreich--eastern/wineries',
+      'europe/1--at-austria--central/1--n-niederoesterreich--eastern/wineries'
+    ]
+
+    wineries_at.each do |name|
+      found = match_wineries_for_country_n_region( name ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+      end
+      assert( found == true )
+    end
+  end # method test_country_n_region
+
+
+  def test_wine_region ### sub region e.g. wagram, wachau, etc.
+
+    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--wagram--wines'
+    ]
+
+    wines_at.each do |name|
+      found = match_wines_for_country_n_region( name ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+      end
+      assert( found == true )
+    end
+
+    wineries_at = [
+      'at-austria!/1--n-niederoesterreich--eastern/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--wagram--wineries'
+    ]
+
+    wineries_at.each do |name|
+      found = match_wineries_for_country_n_region( name ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'n' )
+      end
+      assert( found == true )
+    end
+  end # method test_wine_region
+
+
+end # class TestFixtureMatchers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winedb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &71681830 !ruby/object:Gem::Requirement
+  requirement: &71105380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *71681830
+  version_requirements: *71105380
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &71681430 !ruby/object:Gem::Requirement
+  requirement: &71105150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *71681430
+  version_requirements: *71105150
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &71681160 !ruby/object:Gem::Requirement
+  requirement: &71104870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *71681160
+  version_requirements: *71104870
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71680880 !ruby/object:Gem::Requirement
+  requirement: &71104610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *71680880
+  version_requirements: *71104610
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &71680600 !ruby/object:Gem::Requirement
+  requirement: &71104340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *71680600
+  version_requirements: *71104340
 description: winedb - wine.db command line tool
 email: winedb@googlegroups.com
 executables: []
@@ -89,6 +89,7 @@ files:
 - lib/winedb/schema.rb
 - lib/winedb/version.rb
 - test/helper.rb
+- test/test_fixture_matchers.rb
 - test/test_models.rb
 - .gemtest
 homepage: https://github.com/geraldb/wine.db.ruby
@@ -120,3 +121,4 @@ specification_version: 3
 summary: winedb - wine.db command line tool
 test_files:
 - test/test_models.rb
+- test/test_fixture_matchers.rb