worlddb 1.7.1 → 1.7.2

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/worlddb/cli/opts.rb
 lib/worlddb/console.rb
 lib/worlddb/data/fixtures.rb
 lib/worlddb/deleter.rb
+lib/worlddb/matcher.rb
 lib/worlddb/models/city.rb
 lib/worlddb/models/continent.rb
 lib/worlddb/models/country.rb

data/lib/worlddb/matcher.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+
+module WorldDb
+
+module Matcher
+
+  def match_xxx_for_country( name, xxx, blk )  # xxx e.g. cities|regions|beers|breweries
+    if name =~ /(?:^|\/)([a-z]{2})-[^\/]+\/#{xxx}/
+      # new style: e.g. /at-austria/beers or ^at-austria!/beers
+      # auto-add required country code (from folder structure)
+      country_key = $1.dup
+      blk.call( country_key )
+      true # bingo - match found
+    elsif name =~ /\/([a-z]{2})\/#{xxx}/
+      # classic style: e.g. /at/beers (europe/at/beers)
+      # auto-add required country code (from folder structure)
+      country_key = $1.dup
+      blk.call( country_key )
+      true
+    else
+      false # no match found
+    end
+  end
+
+  def match_xxx_for_country_n_region( name, xxx, blk ) # xxx e.g. beers|breweries
+    if name =~ /(?:^|\/)([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/#{xxx}/
+      # new style: e.g.  /at-austria/w-wien/beers or
+      #                  ^at-austria!/w-wien/beers 
+      # nb: country must start name (^) or coming after / e.g. europe/at-austria/...
+      #
+      # auto-add required country n region code (from folder structure)
+      country_key = $1.dup
+      region_key  = $2.dup
+      blk.call( country_key, region_key )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+  def match_cities_for_country( name, &blk )
+    match_xxx_for_country( name, 'cities', blk )
+  end
+
+  def match_regions_for_country( name, &blk )
+    match_xxx_for_country( name, 'regions', blk )
+  end
+
+  def match_regions_abbr_for_country( name, &blk )
+    match_xxx_for_country( name, 'regions\.abbr', blk )  # NB: . gets escaped for regex, that is, \.
+  end
+
+  def match_regions_iso_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
+    match_xxx_for_country( name, 'regions\.iso', blk )
+  end
+
+  def match_regions_nuts_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
+    match_xxx_for_country( name, 'regions\.nuts', blk )
+  end
+
+
+  def match_countries_for_continent( name )
+    if name =~ /^([a-z][a-z\-_]+[a-z])\/countries/     # e.g. africa/countries or america/countries
+      ### NB: continent changed to regions (e.g. middle-east, caribbean, north-america, etc.)
+      ## auto-add continent (from folder structure) as tag
+      ## fix: allow dash/hyphen/minus in tag
+      continent = $1.dup
+      yield( continent )
+      true
+    else
+      false # no match found
+    end
+  end
+
+end # module Matcher
+
+end # module WorldDb

data/lib/worlddb/reader.rb

@@ -10,10 +10,13 @@ class Reader
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use City instead of Models::City
   include WorldDb::Models
-  
+
 
 ## value helpers e.g. is_year?, is_taglist? etc.
   include TextUtils::ValueHelper
+  
+  include WorldDb::Matcher  # e.g. match_cities_for_country, match_regions_for_country, etc.
+
 
   attr_reader :include_path
 
@@ -77,23 +80,29 @@ class Reader
        load_xxx( 'motor', name )
     elsif name =~ /^tag.*\.(\d)$/
        load_tags( name, :grade => $1.to_i )
-    elsif name =~ /^([a-z][a-z\-_]+[a-z])\/countries/     # e.g. africa/countries or america/countries
-      ### NB: continent changed to regions (e.g. middle-east, caribbean, north-america, etc.)
-      ## auto-add continent (from folder structure) as tag
-      ## fix: allow dash/hyphen/minus in tag
-      load_countries( name, :tags => $1.tr('-', '_') )
-    elsif name =~ /\/([a-z]{2})\/cities/
-      ## auto-add required country code (from folder structure)
-      load_cities( $1, name )
-    elsif name =~ /\/([a-z]{2})\/regions\.abbr/
-      load_regions_xxx( $1, 'abbr', name )
-    elsif name =~ /\/([a-z]{2})\/regions\.iso/
-      load_regions_xxx( $1, 'iso', name )
-    elsif name =~ /\/([a-z]{2})\/regions\.nuts/
-      load_regions_xxx( $1, 'nuts', name )
-    elsif name =~ /\/([a-z]{2})\/regions/
-      ## auto-add required country code (from folder structure)
-      load_regions( $1, name )
+    elsif match_countries_for_continent( name ) do |continent|  # # e.g. africa/countries or america/countries
+            ### NB: continent changed to regions (e.g. middle-east, caribbean, north-america, etc.)
+            ## auto-add continent (from folder structure) as tag
+            ## fix: allow dash/hyphen/minus in tag
+            load_countries( name, :tags => continent.tr('-', '_') )
+          end
+    elsif match_cities_for_country( name ) do |country_key|  #  name =~ /\/([a-z]{2})\/cities/
+            ## auto-add required country code (from folder structure)
+            load_cities( country_key, name )
+          end
+    elsif match_regions_abbr_for_country( name ) do |country_key|   # name =~ /\/([a-z]{2})\/regions\.abbr/
+            load_regions_xxx( country_key, 'abbr', name )
+          end
+    elsif match_regions_iso_for_country( name ) do |country_key|  # name =~ /\/([a-z]{2})\/regions\.iso/
+            load_regions_xxx( country_key, 'iso', name )
+          end
+    elsif match_regions_nuts_for_country( name ) do |country_key|  # name =~ /\/([a-z]{2})\/regions\.nuts/
+            load_regions_xxx( country_key, 'nuts', name )
+          end
+    elsif match_regions_for_country( name ) do |country_key|  # name =~ /\/([a-z]{2})\/regions/
+            ## auto-add required country code (from folder structure)
+            load_regions( country_key, name )
+          end
     else
       logger.error "unknown world.db fixture type >#{name}<"
       # todo/fix: exit w/ error
@@ -101,6 +110,7 @@ class Reader
   end
 
 
+
   def load_countries( name, more_attribs={} )
     load_fixtures_for( Country, name, more_attribs )
   end

data/lib/worlddb/version.rb

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

data/lib/worlddb.rb

@@ -37,6 +37,7 @@ require 'worlddb/models/tagging'
 require 'worlddb/models/lang'
 require 'worlddb/models/usage'
 require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
+require 'worlddb/matcher'
 require 'worlddb/reader'
 require 'worlddb/deleter'
 require 'worlddb/stats'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &78717170 !ruby/object:Gem::Requirement
+  requirement: &75034640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *78717170
+  version_requirements: *75034640
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &78716950 !ruby/object:Gem::Requirement
+  requirement: &75034420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *78716950
+  version_requirements: *75034420
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &78716740 !ruby/object:Gem::Requirement
+  requirement: &75034210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78716740
+  version_requirements: *75034210
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78716520 !ruby/object:Gem::Requirement
+  requirement: &75033990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *78716520
+  version_requirements: *75033990
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78716300 !ruby/object:Gem::Requirement
+  requirement: &75033770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *78716300
+  version_requirements: *75033770
 description: worlddb - world.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -85,6 +85,7 @@ files:
 - lib/worlddb/console.rb
 - lib/worlddb/data/fixtures.rb
 - lib/worlddb/deleter.rb
+- lib/worlddb/matcher.rb
 - lib/worlddb/models/city.rb
 - lib/worlddb/models/continent.rb
 - lib/worlddb/models/country.rb