beerdb 0.7.0 → 0.7.1

data/lib/beerdb/reader.rb

@@ -2,12 +2,79 @@
 
 module BeerDb
 
+
+#
+# rename n split TextUtils::ValueHelper into
+#  WorldDb::Matcher  - match_country, etc.
+#  BeerDb::Matcher   - match_brewery, etc.
+
+
+## todo: move to worlddb for reuse!!! - find a better name?
+
+module FixtureMatcher
+
+  def match_xxx_for_country( name, xxx )  # xxx e.g. 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
+      yield( 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
+      yield( country_key )
+      true
+    else
+      false # no match found
+    end
+  end
+
+  def match_xxx_for_country_n_region( name, xxx ) # 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
+      yield( country_key, region_key )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+  def match_beers_for_country( name, &block )
+    match_xxx_for_country( name, 'beers', block )
+  end
+
+  def match_beers_for_country_n_region( name, &block )
+    match_xxx_for_country_n_region( name, 'beers', block )
+  end
+
+  def match_breweries_for_country( name, &block )
+    match_xxx_for_country( name, 'breweries', block )
+  end
+
+  def match_breweries_for_country_n_region( name, &block )
+    match_xxx_for_country_n_region( name, 'breweries', block )
+  end
+
+
+end # module FixtureMatcher
+
 class Reader
 
   include LogUtils::Logging
 
   include BeerDb::Models
 
+  include FixtureMatcher # see above
+
   attr_reader :include_path
 
 
@@ -31,35 +98,23 @@ class Reader
 
   def load( name )
 
-    if name =~ /\/([a-z]{2})\/beers/
-      # classic style: e.g. /at/beers
-      # auto-add required country code (from folder structure)
-      load_beers_for_country( $1, name )
-    elsif name =~ /\/([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/beers/
-      # new style: e.g.  /at-austria/w-wien/beers
-      # auto-add required country n region code (from folder structure)
-      load_beers_for_country_n_region( $1, $2, name )
-    elsif name =~ /\/([a-z]{2})-[^\/]+\/beers/
-      # new style: e.g. /at-austria/beers
-      # auto-add required country code (from folder structure)
-      load_beers_for_country( $1, name )
-    elsif name =~ /\.hl$/   # e.g. breweries.hl   # NB: must end w/ .hl
+    if name =~ /\.hl$/   # e.g. breweries.hl   # NB: must end w/ .hl
        load_brewery_prod( name )
     elsif name =~ /\/([a-z]{2})\.wikipedia/   # e.g. de.wikipedia
        # auto-add required lang e.g. de or en etc.
        load_brewery_wikipedia( $1, name )
-    elsif name =~ /\/([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/breweries/
-      # new style: e.g.  /at-austria/w-wien/breweries
-      # auto-add required country n region code (from folder structure)
-      load_breweries_for_country_n_region( $1, $2, name )
-    elsif name =~ /\/([a-z]{2})-[^\/]+\/breweries/
-      # new style: e.g.  /at-austria/breweries
-      # auto-add required country (from folder structure)
-      load_breweries_for_country( $1, name )
-    elsif name =~ /\/([a-z]{2})\/breweries/
-      # classic style: e.g. /at/breweries
-      # auto-add required country code (from folder structure)
-      load_breweries_for_country( $1, name )
+    elsif match_beers_for_country_n_region( name ) do |country_key, region_key|
+            load_beers_for_country_n_region( country_key, region_key, name )
+          end
+    elsif match_beers_for_country( name ) do |country_key|
+            load_beers_for_country( country_key, name )
+          end
+    elsif match_breweries_for_country_n_region( name ) do |country_key, region_key|
+            load_breweries_for_country_n_region( country_key, region_key, name )
+          end
+    elsif match_breweries_for_country( name ) do |country_key|
+            load_breweries_for_country( country_key, name )
+          end
     else
       logger.error "unknown beer.db fixture type >#{name}<"
       # todo/fix: exit w/ error

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &81804710 !ruby/object:Gem::Requirement
+  requirement: &72946910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *81804710
+  version_requirements: *72946910
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &81804490 !ruby/object:Gem::Requirement
+  requirement: &72946690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *81804490
+  version_requirements: *72946690
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &81804270 !ruby/object:Gem::Requirement
+  requirement: &72946470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *81804270
+  version_requirements: *72946470
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81804050 !ruby/object:Gem::Requirement
+  requirement: &72946250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *81804050
+  version_requirements: *72946250
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81803830 !ruby/object:Gem::Requirement
+  requirement: &72946030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *81803830
+  version_requirements: *72946030
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: