worlddb 1.8.1 → 1.8.2

data/lib/worlddb/matcher.rb

@@ -6,20 +6,28 @@ module Matcher
 
   def match_xxx_for_country( name, xxx )  # xxx e.g. cities|regions|beers|breweries
     #      auto-add required country code (from folder structure)
-    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/#{xxx}/         ||    # (1)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/#{xxx}/ ||    # (2)
-       name =~ /(?:^|\/)([a-z]{2,3})\/#{xxx}/                      # (3)
+    #  note: always let match_xxx_for_country_n_region go first
+
+    # note: allow  /cities and /1--hokkaido--cities
+    xxx_pattern = "(?:#{xxx}|[0-9]+--[^\\/]+?--#{xxx})"    # note: double escape \\ required for backslash
+
+    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/#{xxx_pattern}/         ||    # (1)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/#{xxx_pattern}/ ||    # (2)
+       name =~ /(?:^|\/)([a-z]{2,3})\/#{xxx_pattern}/                ||    # (3)
+       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--[^\/]+\/#{xxx_pattern}/    # (4)
 
       country_key = $1.dup
       yield( country_key )
       true # bingo - match found
       
       ######
-      # (1)  new style: e.g. /at-austria/beers or ^at-austria!/beers
+      # (1)  new style: e.g. /at-austria/beers or ^at-austria!/cities
       #
-      # (2)  new-new style e.g. /1--at-austria--central/beers
+      # (2)  new-new style e.g. /1--at-austria--central/cities
       #
-      # (3)  classic style: e.g. /at/beers (europe/at/beers)
+      # (3)  classic style: e.g. /at/beers (europe/at/cities)
+      #
+      # (4) new style w/ region w/o abbrev/code e.g. /ja-japon/1--hokkaido/cities
     else
       false # no match found
     end
@@ -27,25 +35,29 @@ module Matcher
 
   def match_xxx_for_country_n_region( name, xxx ) # xxx e.g. beers|breweries
     # auto-add required country n region code (from folder structure)
-    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx}/  ||                # (1)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+\/#{xxx}/ || # (2)
-       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+\/#{xxx}/         || # (3)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx}/            # (4)
-      
+
+    # note: allow  /cities and /1--hokkaido--cities
+    xxx_pattern = "(?:#{xxx}|[0-9]+--[^\\/]+?--#{xxx})"    # note: double escape \\ required for backslash
+
+    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/  ||                # (1)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/ || # (2)
+       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/         || # (3)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/            # (4)
+
       #######
       # nb: country must start name (^) or coming after / e.g. europe/at-austria/...
       # (1)
-      # new style: e.g.  /at-austria/w-wien/beers or
-      #                  ^at-austria!/w-wien/beers
+      # new style: e.g.  /at-austria/w-wien/cities or
+      #                  ^at-austria!/w-wien/cities
       # (2)
-      # new new style e.g.  /1--at-austria--central/1--w-wien--eastern/beers
+      # new new style e.g.  /1--at-austria--central/1--w-wien--eastern/cities
       #
       # (3)
-      #  new new mixed style e.g.  /at-austria/1--w-wien--eastern/beers
+      #  new new mixed style e.g.  /at-austria/1--w-wien--eastern/cities
       #      "classic" country plus new new region
       #
       # (4)
-      #  new new mixed style e.g.  /1--at-austria--central/w-wien/beers
+      #  new new mixed style e.g.  /1--at-austria--central/w-wien/cities
       #      new new country plus "classic" region
 
       country_key = $1.dup

data/lib/worlddb/version.rb

@@ -1,6 +1,6 @@
 
 module WorldDb
-  VERSION = '1.8.1'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.8.2'  # sync version w/ sport.db - why? why not?
 end
 
 ###########################################

data/test/test_fixture_matchers.rb

@@ -14,7 +14,10 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
       'europe/at/cities',
       'europe/at-austria/cities',
       'at-austria/cities',
-      'at-austria!/cities'
+      'at-austria!/cities',
+      'at-austria!/1--niederoesterreich--eastern--cities',
+      'at-austria!/1--niederoesterreich--eastern/cities',   # region w/o code/abbrev
+      'at-austria!/1--niederoesterreich--eastern/1--waldviertel--cities'
     ]
 
     cities_at.each do |name|
@@ -33,7 +36,12 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
       'at-austria/beers',
       'at-austria!/beers',
       '1--at-austria--central/beers',
-      'europe/1--at-austria--central/beers'
+      '1--at-austria--central/1--niederoesterreich--eastern--beers',
+      'europe/1--at-austria--central/beers',
+      'europe/1--at-austria--central/1--niederosterreich--eastern--beers',
+      'at-austria!/1--niederoesterreich--eastern--beers',
+      'at-austria!/1--niederoesterreich--eastern/beers',    # region w/o code/abbrev
+      'at-austria!/1--niederoesterreich--eastern/1--waldviertel--beers'
     ]
 
     beers_at.each do |name|
@@ -64,13 +72,16 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
     beers_at = [
       'europe/at-austria/w-wien/beers',
       'at-austria/w-wien/beers',
+      'at-austria/w-wien/2--leopoldstadt--beers',
       'at-austria!/w-wien/beers',
       '1--at-austria--central/1--w-wien--eastern/beers',
+      '1--at-austria--central/1--w-wien--eastern/2--leopoldstadt--beers',
       'europe/1--at-austria--central/1--w-wien--eastern/beers',
       'at-austria/1--w-wien--eastern/beers',
       'europe/at-austria!/1--w-wien--eastern/beers',
       '1--at-austria--central/w-wien/beers',
-      'europe/1--at-austria--central/w-wien/beers'
+      'europe/1--at-austria--central/w-wien/beers',
+      'europe/1--at-austria--central/w-wien/2--leopoldstadt--beers'
     ]
 
     beers_at.each do |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &20570436 !ruby/object:Gem::Requirement
+  requirement: &21659688 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *20570436
+  version_requirements: *21659688
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &20570136 !ruby/object:Gem::Requirement
+  requirement: &21659316 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *20570136
+  version_requirements: *21659316
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &20569776 !ruby/object:Gem::Requirement
+  requirement: &21658944 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *20569776
+  version_requirements: *21658944
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20569236 !ruby/object:Gem::Requirement
+  requirement: &21658572 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20569236
+  version_requirements: *21658572
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20568840 !ruby/object:Gem::Requirement
+  requirement: &21658176 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *20568840
+  version_requirements: *21658176
 description: worlddb - world.db command line tool
 email: openmundi@googlegroups.com
 executables: