worlddb-models 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085e42158476f2f859016c01201f21833b8e18ab
-  data.tar.gz: 727bf2b5fc3e74034128984a808e87f81d032680
+  metadata.gz: c7166c33111b731ecc3e9199970da99ff49b725e
+  data.tar.gz: 230f400cbcc9d7586ffc12558aacdac894ae3947
 SHA512:
-  metadata.gz: 946a9dea95eccfa4ade780bf4164dbf7cbcfdd32ba3ac04d59d9524debef91185f6b6d187d4de7585ade785cf713a1bf7119b6e36bcf53f62d8dbd995b789eed
-  data.tar.gz: 206c286650fda59da6f5f33bca634e6e2998c0cac8e83ec20976d2a25113197c0f9f327d01aae85f6635576859892fbb2b9059c304904ca6362774a85c11fa75
+  metadata.gz: 0e9eeaa6e6803d5ae28d531f805ba38bf93f11c614fbbbd994e2c17321ed2f442376f851277befb1a156625ca8eb33a3991083b0a1d713185ef393dfce16c972
+  data.tar.gz: f7fb67fd482e3909c51fcd7bee5aa8f61da3dc34c270bb17021d3775ccff7518687f98a606310901d895d39626b722f6f89ede93d4c2989bbf13c33fecb7745e

data/Manifest.txt

@@ -36,6 +36,7 @@ lib/worlddb/stats.rb
 lib/worlddb/version.rb
 test/helper.rb
 test/test_fixture_matchers.rb
+test/test_fixture_matchers_ii.rb
 test/test_model_city.rb
 test/test_model_comp.rb
 test/test_model_country.rb

data/README.md

@@ -11,6 +11,15 @@ worlddb-models gem - world.db schema 'n' models for easy (re)use
 
 ## Usage Models
 
+Class Model Diagrams
+
+![](worlddb-models.png)
+
+Everything is a place.
+
+![](worlddb-models-place.png)
+
+
 `Country` Model - Example:
 
     at = Country.find_by! key: 'at'

data/lib/worlddb/matcher.rb

@@ -4,6 +4,18 @@ module WorldDb
 
 module Matcher
 
+  WORLD_COUNTRY_CODE_PATTERN    = '([a-z]{2,3})'
+  WORLD_COUNTRY_CLASSIC_PATTERN = "#{WORLD_COUNTRY_CODE_PATTERN}-[^\\/]+"          ## note: if you use "" need to double escape backslash!!!
+  WORLD_COUNTRY_MODERN_PATTERN  = "[0-9]+--#{WORLD_COUNTRY_CODE_PATTERN}-[^\\/]+"  ## note: if you use "" need to double escape backslash!!!
+
+  WORLD_REGION_CODE_PATTERN     = '([a-z]{1,3})'
+  WORLD_REGION_CLASSIC_PATTERN  = "#{WORLD_REGION_CODE_PATTERN}-[^\\/]+"
+  WORLD_REGION_MODERN_PATTERN   = "[0-9]+--#{WORLD_REGION_CODE_PATTERN}-[^\\/]+"
+
+    ## allow optional folders -- TODO: add restriction ?? e.g. must be 4+ alphas ???
+  WORLD_OPT_FOLDERS_PATTERN      = "(?:\\/[^\\/]+)*"     ## check: use double \\ or just \ ??
+
+
   def match_xxx_for_country( name, xxx )  # xxx e.g. cities|regions|beers|breweries
     #      auto-add required country code (from folder structure)
     #  note: always let match_xxx_for_country_n_region go first
@@ -14,16 +26,16 @@ module Matcher
     ##
     ## todo: add $-anchor at the end of pattern - why? why not?? (will include .txt or .yaml??)
 
-    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)
-       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+--#{xxx}/    # (5)
+    if name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{xxx_pattern}/   ||    # (1)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_MODERN_PATTERN}\/#{xxx_pattern}/    ||    # (2)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_CODE_PATTERN}\/#{xxx_pattern}/      ||    # (3)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/[0-9]+--[^\/]+\/#{xxx_pattern}/ ||   # (4)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_CODE_PATTERN}-[^\/]+--#{xxx}/    # (5)
 
       country_key = $1.dup
       yield( country_key )
       true # bingo - match found
-      
+
       ######
       # (1)  new style: e.g. /at-austria/beers or ^at-austria!/cities
       #
@@ -51,16 +63,16 @@ module Matcher
     #             at-austria!/1--n-niederoesterreich--eastern/wagram--wagram--wines
 
     # note: allow  /cities and /1--hokkaido--cities and /hokkaido--cities too
-    xxx_pattern = "(?:#{xxx}|[^\\/]+--#{xxx})"    # note: double escape \\ required for backslash
-    
-    ## allow optional folders -- TODO: add restriction ?? e.g. must be 4+ alphas ???
-    opt_folders_pattern = "(?:\/[^\/]+)*"
+    # note: allow anything before xxx for now  -- use/require dash (--) why, why not??
+    oldoldold_xxx_pattern = "(?:#{xxx}|[^\\/]+--#{xxx})"
+    xxx_pattern           = "(?:#{xxx}|[^\\/]+#{xxx})"   # note: double escape \\ required for backslash
+
     ## note: for now only (style #2) n (style #3)  that is long region allow opt folders
 
-    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})-[^\/]+#{opt_folders_pattern}\/#{xxx_pattern}/ || # (2)
-       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+#{opt_folders_pattern}\/#{xxx_pattern}/         || # (3)
-       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx_pattern}/            # (4)
+    if name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{WORLD_REGION_CLASSIC_PATTERN}#{WORLD_OPT_FOLDERS_PATTERN}\/#{xxx_pattern}/  ||                # (1)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_MODERN_PATTERN}\/#{WORLD_REGION_MODERN_PATTERN}#{WORLD_OPT_FOLDERS_PATTERN}\/#{xxx_pattern}/   || # (2)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{WORLD_REGION_MODERN_PATTERN}#{WORLD_OPT_FOLDERS_PATTERN}\/#{xxx_pattern}/  || # (3)
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_MODERN_PATTERN}\/#{WORLD_REGION_CLASSIC_PATTERN}\/#{xxx_pattern}/            # (4)
 
       #######
       # nb: country must start name (^) or coming after / e.g. europe/at-austria/...

data/lib/worlddb/version.rb

@@ -5,7 +5,7 @@ module WorldDb
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
   MINOR = 2
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_fixture_matchers_ii.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_fixture_matchers_ii.rb
+
+
+require 'helper'
+
+
+class TestFixtureMatchersII < MiniTest::Test
+
+  include WorldDb::Matcher
+
+  def test_country_n_region_breweries_franken
+    breweries_franken = [
+       'de-deutschland/by-bayern/franken!/1--oberfranken/100_000+_breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/20_000+-breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/coburger-land--breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/fichtelgebirge--breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/fraenkische-schweiz--breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/frankenwald--breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/hassberge--breweries',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/steigerwald--breweries',
+       'de-deutschland/by-bayern/franken!/2--mittelfranken/breweries',
+       'de-deutschland/by-bayern/franken!/2--mittelfranken/breweries_20_000+',
+       'de-deutschland/by-bayern/franken!/3--unterfranken/breweries',
+       'de-deutschland/by-bayern/franken!/3--unterfranken/breweries_100_000+',
+       'de-deutschland/by-bayern/franken!/3--unterfranken/breweries_20_000+',
+    ]
+    assert_match_xxx_for_country_n_region( breweries_franken, 'breweries', 'de', 'by' )
+  end # method test_country_n_region_breweries
+
+  def test_country_n_region_breweries_bayern
+    breweries_bayern = [
+      'de-deutschland/3--by-bayern!/1--oberbayern/breweries_(l)',
+      'de-deutschland/3--by-bayern!/1--oberbayern/breweries_(m)',
+      'de-deutschland/3--by-bayern!/1--oberbayern/breweries',
+      'de-deutschland/3--by-bayern!/2--niederbayern/breweries',
+      'de-deutschland/3--by-bayern!/2--niederbayern/breweries_100_000+',
+      'de-deutschland/3--by-bayern!/2--niederbayern/breweries_20_000+',
+      'de-deutschland/3--by-bayern!/3--oberpfalz/breweries',
+      'de-deutschland/3--by-bayern!/3--oberpfalz/breweries_100_000+',
+      'de-deutschland/3--by-bayern!/3--oberpfalz/breweries_20_000+',
+      'de-deutschland/3--by-bayern!/4--schwaben/breweries',
+      'de-deutschland/3--by-bayern!/4--schwaben/breweries_100_000+',
+      'de-deutschland/3--by-bayern!/4--schwaben/breweries_20_000+',
+    ]
+    assert_match_xxx_for_country_n_region( breweries_bayern, 'breweries', 'de', 'by' )
+  end # method test_country_n_region_breweries
+
+
+  def test_country_n_region_brewpubs_franken
+    brewpubs_franken = [
+       'de-deutschland/by-bayern/franken!/3--unterfranken/brewpubs',
+    ]
+    assert_match_xxx_for_country_n_region( brewpubs_franken, 'brewpubs', 'de', 'by' )
+  end
+
+  def test_country_n_region_brewpubs_bayern
+    brewpubs_bayern = [
+      'de-deutschland/3--by-bayern!/1--oberbayern/brewpubs',
+      'de-deutschland/3--by-bayern!/2--niederbayern/brewpubs',
+      'de-deutschland/3--by-bayern!/3--oberpfalz/brewpubs',
+      'de-deutschland/3--by-bayern!/4--schwaben/brewpubs',
+    ]
+    assert_match_xxx_for_country_n_region( brewpubs_bayern, 'brewpubs', 'de', 'by' )
+  end
+
+
+  def test_country_n_region_beers_franken
+    beers_franken = [
+       'de-deutschland/by-bayern/franken!/1--oberfranken/100_000+_beers',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/beers',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/fichtelgebirge-bayreuth--beers',
+       'de-deutschland/by-bayern/franken!/1--oberfranken/steigerwald-bamberg--beers',
+       'de-deutschland/by-bayern/franken!/3--unterfranken/beers_100_000+',
+    ]
+    assert_match_xxx_for_country_n_region( beers_franken, 'beers', 'de', 'by' )
+  end # method test_country_n_region_beers
+
+  def test_country_n_region_beers_bayern
+    beers_bayern = [
+      'de-deutschland/3--by-bayern!/1--oberbayern/beers--muenchen',
+      'de-deutschland/3--by-bayern!/1--oberbayern/beers_l',
+      'de-deutschland/3--by-bayern!/1--oberbayern/beers_m',
+      'de-deutschland/3--by-bayern!/1--oberbayern/beers',
+      'de-deutschland/3--by-bayern!/2--niederbayern/beers',
+      'de-deutschland/3--by-bayern!/2--niederbayern/beers_100_000+',
+      'de-deutschland/3--by-bayern!/3--oberpfalz/beers',
+      'de-deutschland/3--by-bayern!/3--oberpfalz/beers_100_000+',
+      'de-deutschland/3--by-bayern!/4--schwaben/beers_100_000+',
+    ]
+    assert_match_xxx_for_country_n_region( beers_bayern, 'beers', 'de', 'by' )
+  end # method test_country_n_region_beers
+
+
+private
+  def assert_match_xxx_for_country_n_region( ary, xxx, expected_country_key, expected_region_key )
+    ary.each do |name|
+      found = match_xxx_for_country_n_region( name, xxx ) do |country_key,region_key|
+        assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
+        assert_equal region_key,  expected_region_key,   "#{expected_region_key} expected is #{region_key}"
+      end
+      assert found, "no match for '#{name}'"
+    end
+  end
+
+end # class TestFixtureMatchersII

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -212,6 +212,7 @@ files:
 - lib/worlddb/version.rb
 - test/helper.rb
 - test/test_fixture_matchers.rb
+- test/test_fixture_matchers_ii.rb
 - test/test_model_city.rb
 - test/test_model_comp.rb
 - test/test_model_country.rb
@@ -250,3 +251,4 @@ test_files:
 - test/test_fixture_matchers.rb
 - test/test_model_country.rb
 - test/test_model_region.rb
+- test/test_fixture_matchers_ii.rb