beerdb 0.9.12 → 0.9.13

data/lib/beerdb/reader_file.rb

@@ -13,19 +13,50 @@ class Reader < ReaderBase
   def create_fixture_reader( name )
     path = "#{@include_path}/#{name}.txt"
 
-    logger.info "parsing data '#{name}' (#{path})..."
+    logger.info "parsing data (setup) '#{name}' (#{path})..."
 
-    FixtureReader.new( path )
+    FixtureReader.from_file( path )
   end
 
   def create_beers_reader( name, more_attribs={} )
-    ValuesReaderV2.new( name, @include_path, more_attribs )
+    real_name = name_to_real_name( name )
+    
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (beers) '#{name}' (#{path})..."
+
+    ValuesReader.from_file( path, more_attribs )
+    ## ValuesReaderV2.new( name, @include_path, more_attribs )
   end
 
   def create_breweries_reader( name, more_attribs={} )
-    ValuesReaderV2.new( name, @include_path, more_attribs )
+    real_name = name_to_real_name( name )
+
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (breweries) '#{name}' (#{path})..."
+
+    ValuesReader.from_file( path, more_attribs )
+    ## ValuesReaderV2.new( name, @include_path, more_attribs )
   end
 
+private
+
+  def name_to_real_name( name )
+    # map name to real_name path
+    # name might include !/ for virtual path (gets cut off)
+    # e.g. at-austria!/w-wien/beers becomse w-wien/beers
+    pos = name.index( '!/')
+    if pos.nil?
+      name # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      # at-austria!/w-wien/beers becomes
+      # w-wien/beers
+      name[ (pos+2)..-1 ]
+    end
+  end
 
 end # class Reader
 end # module BeerDb
+

data/lib/beerdb/version.rb

@@ -2,7 +2,7 @@
 module BeerDb
   MAJOR = 0 ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 12
+  PATCH = 13
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74199020 !ruby/object:Gem::Requirement
+  requirement: &82424030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74199020
+  version_requirements: *82424030
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74198640 !ruby/object:Gem::Requirement
+  requirement: &82423660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74198640
+  version_requirements: *82423660
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74198220 !ruby/object:Gem::Requirement
+  requirement: &82746400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74198220
+  version_requirements: *82746400
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74197590 !ruby/object:Gem::Requirement
+  requirement: &82746080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74197590
+  version_requirements: *82746080
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &74197120 !ruby/object:Gem::Requirement
+  requirement: &82745850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74197120
+  version_requirements: *82745850
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &74196610 !ruby/object:Gem::Requirement
+  requirement: &82745500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74196610
+  version_requirements: *82745500
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74196200 !ruby/object:Gem::Requirement
+  requirement: &82745060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74196200
+  version_requirements: *82745060
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &74195890 !ruby/object:Gem::Requirement
+  requirement: &82744620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *74195890
+  version_requirements: *82744620
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &74195620 !ruby/object:Gem::Requirement
+  requirement: &82743920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74195620
+  version_requirements: *82743920
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74193490 !ruby/object:Gem::Requirement
+  requirement: &82743610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74193490
+  version_requirements: *82743610
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74193140 !ruby/object:Gem::Requirement
+  requirement: &82743270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,18 +131,18 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *74193140
+  version_requirements: *82743270
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74192860 !ruby/object:Gem::Requirement
+  requirement: &82742500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *74192860
+  version_requirements: *82742500
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: