beerdb 0.9.10 → 0.9.11

data/lib/beerdb.rb

@@ -90,8 +90,8 @@ module BeerDb
     reader.load_setup( setup )
   end
 
-  def self.read_setup_from_zip( setup, zip_path, opts={} )  ## todo/check - use a better (shorter) name ??
-    reader = ZipReader.new( zip_path, opts )
+  def self.read_setup_from_zip( zip_name, setup, include_path, opts={} )  ## todo/check - use a better (shorter) name ??
+    reader = ZipReader.new( zip_name, include_path, opts )
     reader.load_setup( setup )
     reader.close
   end

data/lib/beerdb/reader_file.rb

@@ -2,16 +2,16 @@
 
 module BeerDb
 
-class Reader < ReaderBase  ## todo: "old" classic reader - rename to FileReader ?? why? why not?
+## todo: "old" classic reader - rename to FileReader ?? why? why not?
 
-  attr_reader :include_path
+class Reader < ReaderBase  
 
   def initialize( include_path, opts = {} )
     @include_path = include_path
   end
 
   def create_fixture_reader( name )
-    path = "#{include_path}/#{name}.txt"
+    path = "#{@include_path}/#{name}.txt"
 
     logger.info "parsing data '#{name}' (#{path})..."
 
@@ -19,11 +19,11 @@ class Reader < ReaderBase  ## todo: "old" classic reader - rename to FileReader
   end
 
   def create_beers_reader( name, more_attribs={} )
-    ValuesReaderV2.new( name, include_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 )
+    ValuesReaderV2.new( name, @include_path, more_attribs )
   end
 
 

data/lib/beerdb/reader_zip.rb

@@ -3,38 +3,100 @@
 module BeerDb
 
 
-
-
 class ZipReader < ReaderBase
 
-
-  ## todo/fix: add a close method - why? why not ???
-
-  def initialize( zip_path, opts = {} )
-    @zip_path = zip_path
-    ## check if zip exists
-
-    @zip_file = Zip::File.open( zip_path )   ## NOTE: do NOT create if file is missing; let it crash
+  def initialize( name, include_path, opts = {} )
+
+    ## todo/fix: make include_path an opts (included in opts?) - why? why not??
+
+    path = "#{include_path}/#{name}.zip"
+    ## todo: check if zip exists
+
+    @zip_file = Zip::File.open( path )   ## NOTE: do NOT create if file is missing; let it crash
+    
+    ### allow prefix (path) in name
+    ###    e.g. assume all files relative to setup manifest
+    ## e.g. at-austria-master/setups/all.txt or
+    ##      be-belgium-master/setups/all.txt
+    ##  for
+    ##    setups/all.txt
+    ###
+    ##  will get (re)set w/ fixture/setup reader
+    ##
+    ## todo/fix: change/rename to @relative_path ?? - why? why not? 
+    @zip_prefix = ''
   end
 
+
   def close
+    ## todo/check: add a close method - why? why not ???
     @zip_file.close
   end
 
 
   def create_fixture_reader( name )
-    FixtureReader.from_zip( @zip_file, name )
+    ## e.g. pass in =>  setups/all  or setups/test etc.  e.g. w/o .txt extension
+    query = "**/#{name}.txt"
+
+    ## note: returns an array of Zip::Entry
+    candidates = @zip_file.glob( query )
+    pp candidates
+
+    ## use first candidates entry as match
+    ## todo/fix: issue warning if more than one entries/matches!!
+
+    ## get fullpath e.g. at-austria-master/setups/all.txt
+    path = candidates[0].name
+    logger.debug "  zip entry path >>#{path}<<"
+
+    ## cut-off at-austria-master/    NOTE: includes trailing slash (if present)
+    @zip_prefix = path[ 0...(path.size-name.size) ]
+    logger.debug "  zip entry prefix >>#{@zip_prefix}<<"
+
+    logger.info "parsing data in zip '#{name}' (#{path})..."
+
+    FixtureReader.from_zip( @zip_file, path )
   end
 
+
   def create_beers_reader( name, more_attribs={} )
-    ValuesReader.from_zip( @zip_file, name, more_attribs )
+    path = name_to_zip_entry_path( name )
+    ValuesReader.from_zip( @zip_file, path, more_attribs )
   end
 
   def create_breweries_reader( name, more_attribs={} )
-    ValuesReader.from_zip( @zip_file, name, more_attribs )
+    path = name_to_zip_entry_path( name )
+    ValuesReader.from_zip( @zip_file, path, more_attribs )
+  end
+
+private
+
+  def path_to_real_path( path )
+    # map name to name_real_path
+    # name might include !/ for virtual path (gets cut off)
+    # e.g. at-austria!/w-wien/beers becomse w-wien/beers
+    pos = path.index( '!/')
+    if pos.nil?
+      path # 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
+      path[ (pos+2)..-1 ]
+    end
+  end
+
+  def name_to_zip_entry_path( name )
+    path = "#{name}.txt"
+
+    real_path = path_to_real_path( path )
+
+    # NOTE: add possible zip entry prefix path
+    #          (if present includes trailing slash e.g. /)
+    entry_path = "#{@zip_prefix}#{real_path}"
+    entry_path
   end
 
 
 end # class ZipReader
 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 = 10
+  PATCH = 11
   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.10
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &78783500 !ruby/object:Gem::Requirement
+  requirement: &82679170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78783500
+  version_requirements: *82679170
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &78783230 !ruby/object:Gem::Requirement
+  requirement: &82678680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78783230
+  version_requirements: *82678680
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &78782980 !ruby/object:Gem::Requirement
+  requirement: &82678340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78782980
+  version_requirements: *82678340
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &78782670 !ruby/object:Gem::Requirement
+  requirement: &82677590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *78782670
+  version_requirements: *82677590
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &78782440 !ruby/object:Gem::Requirement
+  requirement: &82677180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78782440
+  version_requirements: *82677180
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &78782200 !ruby/object:Gem::Requirement
+  requirement: &82676660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78782200
+  version_requirements: *82676660
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &78779430 !ruby/object:Gem::Requirement
+  requirement: &82676150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *78779430
+  version_requirements: *82676150
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &78778980 !ruby/object:Gem::Requirement
+  requirement: &82675760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *78778980
+  version_requirements: *82675760
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &78778580 !ruby/object:Gem::Requirement
+  requirement: &82675400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78778580
+  version_requirements: *82675400
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &78778210 !ruby/object:Gem::Requirement
+  requirement: &82675140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78778210
+  version_requirements: *82675140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78777770 !ruby/object:Gem::Requirement
+  requirement: &82674800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *78777770
+  version_requirements: *82674800
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78777430 !ruby/object:Gem::Requirement
+  requirement: &82674480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *78777430
+  version_requirements: *82674480
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: