beerdb 0.9.9 → 0.9.10

data/Manifest.txt

@@ -17,6 +17,8 @@ lib/beerdb/models/world/city.rb
 lib/beerdb/models/world/country.rb
 lib/beerdb/models/world/region.rb
 lib/beerdb/reader.rb
+lib/beerdb/reader_file.rb
+lib/beerdb/reader_zip.rb
 lib/beerdb/schema.rb
 lib/beerdb/serializers/beer.rb
 lib/beerdb/serializers/brewery.rb

data/Rakefile

@@ -32,6 +32,8 @@ Hoe.spec 'beerdb' do
     ## 3rd party
     ['gli', '>= 2.5.6'],
 
+    ['rubyzip'],   ## NOTE: used for ZipReader (optional in textutils, thus, pull it in here)
+
     ['activerecord']  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
   ]

data/lib/beerdb.rb

@@ -19,6 +19,9 @@ require 'uri'
 
 # 3rd party gems / libs
 
+require 'zip'   ## (optionally for textutils e.g. soft dependency - pull in here)
+
+
 #  -- get required by worlddb
 # require 'active_record'   ## todo: add sqlite3? etc.
 # require 'logutils'
@@ -46,6 +49,8 @@ require 'beerdb/serializers/brewery'
 
 require 'beerdb/schema'
 require 'beerdb/reader'
+require 'beerdb/reader_file'
+require 'beerdb/reader_zip'
 require 'beerdb/deleter'
 require 'beerdb/stats'
 
@@ -85,6 +90,12 @@ 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 )
+    reader.load_setup( setup )
+    reader.close
+  end
+
   def self.read_all( include_path, opts={} )  # load all builtins (using plain text reader); helper for convenience
     read_setup( 'setups/all', include_path, opts )
   end # method read_all

data/lib/beerdb/reader.rb

@@ -33,7 +33,7 @@ module Matcher
 end # module Matcher
 
 
-class Reader
+class ReaderBase
 
   include LogUtils::Logging
 
@@ -42,20 +42,9 @@ class Reader
   include WorldDb::Matcher   ## fix: move to BeerDb::Matcher module ??? - cleaner?? why? why not?
   include BeerDb::Matcher # lets us use match_teams_for_country etc.
 
-  attr_reader :include_path
-
-
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-  end
-
 
   def load_setup( name )
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = FixtureReader.new( path )
+    reader = create_fixture_reader( name )   ### "virtual" method - required by concrete class
 
     reader.each do |fixture_name|
       load( fixture_name )
@@ -124,7 +113,8 @@ class Reader
 
 
   def load_beers_worker( name, more_attribs={} )
-    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    reader = create_beers_reader( name, more_attribs )  ### "virtual" method - required by concrete class
 
     ### todo: cleanup - check if [] works for build_title...
     #     better cleaner way ???
@@ -208,7 +198,7 @@ class Reader
       ## no marker; do nothing
     end
 
-    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+    reader = create_breweries_reader( name, more_attribs ) ### "virtual" method - required by concrete class
 
     reader.each_line do |new_attributes, values|
       
@@ -225,5 +215,5 @@ class Reader
     end # each_line
   end
 
-end # class Reader
+end # class ReaderBase
 end # module BeerDb

data/lib/beerdb/reader_file.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+module BeerDb
+
+class Reader < ReaderBase  ## todo: "old" classic reader - rename to FileReader ?? why? why not?
+
+  attr_reader :include_path
+
+  def initialize( include_path, opts = {} )
+    @include_path = include_path
+  end
+
+  def create_fixture_reader( name )
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    FixtureReader.new( path )
+  end
+
+  def create_beers_reader( name, more_attribs={} )
+    ValuesReaderV2.new( name, include_path, more_attribs )
+  end
+
+  def create_breweries_reader( name, more_attribs={} )
+    ValuesReaderV2.new( name, include_path, more_attribs )
+  end
+
+
+end # class Reader
+end # module BeerDb

data/lib/beerdb/reader_zip.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+
+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
+  end
+
+  def close
+    @zip_file.close
+  end
+
+
+  def create_fixture_reader( name )
+    FixtureReader.from_zip( @zip_file, name )
+  end
+
+  def create_beers_reader( name, more_attribs={} )
+    ValuesReader.from_zip( @zip_file, name, more_attribs )
+  end
+
+  def create_breweries_reader( name, more_attribs={} )
+    ValuesReader.from_zip( @zip_file, name, more_attribs )
+  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 = 9
+  PATCH = 10
   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.9
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74572130 !ruby/object:Gem::Requirement
+  requirement: &78783500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74572130
+  version_requirements: *78783500
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74571860 !ruby/object:Gem::Requirement
+  requirement: &78783230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74571860
+  version_requirements: *78783230
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74571590 !ruby/object:Gem::Requirement
+  requirement: &78782980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74571590
+  version_requirements: *78782980
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74571300 !ruby/object:Gem::Requirement
+  requirement: &78782670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74571300
+  version_requirements: *78782670
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &74571090 !ruby/object:Gem::Requirement
+  requirement: &78782440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74571090
+  version_requirements: *78782440
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &74570870 !ruby/object:Gem::Requirement
+  requirement: &78782200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74570870
+  version_requirements: *78782200
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74570590 !ruby/object:Gem::Requirement
+  requirement: &78779430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74570590
+  version_requirements: *78779430
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &74570350 !ruby/object:Gem::Requirement
+  requirement: &78778980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,21 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *74570350
+  version_requirements: *78778980
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &78778580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *78778580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74570150 !ruby/object:Gem::Requirement
+  requirement: &78778210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74570150
+  version_requirements: *78778210
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74569870 !ruby/object:Gem::Requirement
+  requirement: &78777770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *74569870
+  version_requirements: *78777770
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74569620 !ruby/object:Gem::Requirement
+  requirement: &78777430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +142,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *74569620
+  version_requirements: *78777430
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -161,6 +172,8 @@ files:
 - lib/beerdb/models/world/country.rb
 - lib/beerdb/models/world/region.rb
 - lib/beerdb/reader.rb
+- lib/beerdb/reader_file.rb
+- lib/beerdb/reader_zip.rb
 - lib/beerdb/schema.rb
 - lib/beerdb/serializers/beer.rb
 - lib/beerdb/serializers/brewery.rb