beerdb 0.7.1 → 0.7.2

data/Manifest.txt

@@ -30,4 +30,5 @@ lib/beerdb/server/views/layout.erb
 lib/beerdb/stats.rb
 lib/beerdb/version.rb
 test/helper.rb
+test/test_fixture_matchers.rb
 test/test_values.rb

data/lib/beerdb/reader.rb

@@ -13,25 +13,25 @@ module BeerDb
 
 module FixtureMatcher
 
-  def match_xxx_for_country( name, xxx )  # xxx e.g. beers|breweries
+  def match_xxx_for_country( name, xxx, blk )  # 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 )
+      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
-      yield( country_key )
+      blk.call( country_key )
       true
     else
       false # no match found
     end
   end
 
-  def match_xxx_for_country_n_region( name, xxx ) # xxx e.g. beers|breweries
+  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 
@@ -40,7 +40,7 @@ module FixtureMatcher
       # auto-add required country n region code (from folder structure)
       country_key = $1.dup
       region_key  = $2.dup
-      yield( country_key, region_key )
+      blk.call( country_key, region_key )
       true # bingo - match found
     else
       false # no match found
@@ -48,20 +48,20 @@ module FixtureMatcher
   end
 
 
-  def match_beers_for_country( name, &block )
-    match_xxx_for_country( name, 'beers', block )
+  def match_beers_for_country( name, &blk )
+    match_xxx_for_country( name, 'beers', blk )
   end
 
-  def match_beers_for_country_n_region( name, &block )
-    match_xxx_for_country_n_region( name, 'beers', block )
+  def match_beers_for_country_n_region( name, &blk )
+    match_xxx_for_country_n_region( name, 'beers', blk )
   end
 
-  def match_breweries_for_country( name, &block )
-    match_xxx_for_country( name, 'breweries', block )
+  def match_breweries_for_country( name, &blk )
+    match_xxx_for_country( name, 'breweries', blk )
   end
 
-  def match_breweries_for_country_n_region( name, &block )
-    match_xxx_for_country_n_region( name, 'breweries', block )
+  def match_breweries_for_country_n_region( name, &blk )
+    match_xxx_for_country_n_region( name, 'breweries', blk )
   end
 
 

data/lib/beerdb/version.rb

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

data/test/test_fixture_matchers.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+
+
+require 'helper'
+
+### todo/fix: move to worlddb along with fixture matcher module!!
+
+class TestFixtureMatchers < MiniTest::Unit::TestCase
+
+  include BeerDb::FixtureMatcher
+
+
+  def test_country
+
+    beers_at = [
+      'europe/at/beers',
+      'europe/at-austria/beers',
+      'at-austria/beers',
+      'at-austria!/beers'
+    ]
+
+    beers_at.each do |name|
+      found = match_beers_for_country( name ) do |country_key|
+        assert( country_key == 'at')
+      end
+      assert( found == true )
+    end
+
+    breweries_at = [
+      'europe/at/breweries',
+      'europe/at-austria/breweries',
+      'at-austria/breweries',
+      'at-austria!/breweries'
+    ]
+
+    breweries_at.each do |name|
+      found = match_breweries_for_country( name ) do |country_key|
+        assert( country_key == 'at')
+      end
+      assert( found == true )
+    end
+  end # method test_country
+
+
+  def test_country_n_region
+
+    beers_at = [
+      'europe/at-austria/w-wien/beers',
+      'at-austria/w-wien/beers',
+      'at-austria!/w-wien/beers'
+    ]
+
+    beers_at.each do |name|
+      found = match_beers_for_country_n_region( name ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'w' )
+      end
+      assert( found == true )
+    end
+
+    breweries_at = [
+      'europe/at-austria/w-wien/breweries',
+      'at-austria/w-wien/breweries',
+      'at-austria!/w-wien/breweries'
+    ]
+
+    breweries_at.each do |name|
+      found = match_breweries_for_country_n_region( name ) do |country_key,region_key|
+        assert( country_key == 'at')
+        assert( region_key  == 'w' )
+      end
+      assert( found == true )
+    end
+  end # method test_country_n_region
+
+
+end # class TestFixtureMatchers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   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: &72946910 !ruby/object:Gem::Requirement
+  requirement: &71631860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *72946910
+  version_requirements: *71631860
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &72946690 !ruby/object:Gem::Requirement
+  requirement: &71631640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *72946690
+  version_requirements: *71631640
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &72946470 !ruby/object:Gem::Requirement
+  requirement: &71631420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *72946470
+  version_requirements: *71631420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72946250 !ruby/object:Gem::Requirement
+  requirement: &71631200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *72946250
+  version_requirements: *71631200
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &72946030 !ruby/object:Gem::Requirement
+  requirement: &71630980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *72946030
+  version_requirements: *71630980
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -106,6 +106,7 @@ files:
 - lib/beerdb/stats.rb
 - lib/beerdb/version.rb
 - test/helper.rb
+- test/test_fixture_matchers.rb
 - test/test_values.rb
 - .gemtest
 homepage: https://github.com/geraldb/beer.db.ruby
@@ -137,3 +138,4 @@ specification_version: 3
 summary: beerdb - beer.db command line tool
 test_files:
 - test/test_values.rb
+- test/test_fixture_matchers.rb