worlddb 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c62e293d5310b55d31543e8153f06671c432d3ff
-  data.tar.gz: 84b4808b38432d6e67eef3c136719af4231ee060
+  metadata.gz: 59d359324b74a98a439db685262ac19f45b9b4fd
+  data.tar.gz: f365f7d48a5b8c231c6360619277198474946987
 SHA512:
-  metadata.gz: 0e9a6f9c97537eee941f18178d6d0115d9dd4dd202390c260054b90c4601c10b913ee8fd2cbc4f22ea552c590ea6e2297e663215331bd82471b980298e1dd92e
-  data.tar.gz: 07649e1df32a66995c83d72d0f7ff8ff29575a2d17b6c1b347b15812e80786777dc2d50b667241570431a0f74bc4cd45e5169439b0a0485f09bef1955b8a56ea
+  metadata.gz: 6af0ffb930e7adf561101da121a8b34e94155f50426a46b5a267a40769e2447f628ced943a97b1fbbf6711640a542dac9bd9af98845e43ca1605bb01358027e8
+  data.tar.gz: 3a4652518bcde53b53b6024b9c7cba9347b02cd3dc9d7d1ec18dbe4d14cf57d7e72a5c2970c7a020284dab17bea0e083b9ea3409b741815fdf4b09e67d072351

data/lib/worlddb/matcher.rb

@@ -11,10 +11,14 @@ module Matcher
     # note: allow  /cities and /1--hokkaido--cities
     xxx_pattern = "(?:#{xxx}|[0-9]+--[^\\/]+?--#{xxx})"    # note: double escape \\ required for backslash
 
+    ##
+    ## 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})-[^\/]+\/[0-9]+--[^\/]+\/#{xxx_pattern}/ ||   # (4)
+       name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+--#{xxx}/    # (5)
 
       country_key = $1.dup
       yield( country_key )
@@ -28,6 +32,9 @@ module Matcher
       # (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
+      #
+      # (5)  compact style (country part of filename):
+      #   e.g. /at-austria--cities or /europe/at-austria--cities
     else
       false # no match found
     end

data/lib/worlddb/version.rb

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

data/test/test_fixture_matchers.rb

@@ -33,6 +33,7 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
     beers_at = [
       'europe/at/beers',
       'europe/at-austria/beers',
+      'europe/at-austria--beers',
       'at-austria/beers',
       'at-austria!/beers',
       '1--at-austria--central/beers',
@@ -48,7 +49,7 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
       found = match_xxx_for_country( name, 'beers' ) do |country_key|
         assert_equal country_key, 'at'
       end
-      assert found
+      assert found, "no match found for '#{name}'"
     end
 
     breweries_at = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
 description: worlddb - world.db command line tool
 email: openmundi@googlegroups.com
 executables:
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: worlddb
+rubyforge_project: 
 rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4