beerdb 0.9.3 → 0.9.4

data/lib/beerdb/reader.rb

@@ -13,9 +13,6 @@ module Matcher
     match_xxx_for_country_n_region( name, 'beers', &blk )
   end
 
-  ## todo: add match_brewpubs ???
-  ##   - autoadd  brewpub flag!! use more_attribs??
-
   def match_breweries_for_country( name, &blk )
     match_xxx_for_country( name, 'breweries', &blk )
   end
@@ -24,6 +21,16 @@ module Matcher
     match_xxx_for_country_n_region( name, 'breweries', &blk )
   end
 
+  ## todo: autoadd  brewpub flag!! use more_attribs??
+  def match_brewpubs_for_country( name, &blk )
+    match_xxx_for_country( name, 'brewpubs', &blk )
+  end
+
+  def match_brewpubs_for_country_n_region( name, &blk )
+    match_xxx_for_country_n_region( name, 'brewpubs', &blk )
+  end
+
+
 end # module Matcher
 
 
@@ -45,7 +52,7 @@ class Reader
 
 
   def load_setup( name )
-    path = "#{include_path}/#{name}.yml"
+    path = "#{include_path}/#{name}.txt"
 
     logger.info "parsing data '#{name}' (#{path})..."
 
@@ -57,14 +64,10 @@ class Reader
   end # method load_setup
 
 
+
   def load( name )
 
-    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 match_beers_for_country_n_region( name ) do |country_key, region_key|
+    if 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|
@@ -76,6 +79,14 @@ class Reader
     elsif match_breweries_for_country( name ) do |country_key|
             load_breweries_for_country( country_key, name )
           end
+    elsif match_brewpubs_for_country_n_region( name ) do |country_key, region_key|
+            ## todo: autoadd  brewpub flag!! use more_attribs??
+            load_breweries_for_country_n_region( country_key, region_key, name )
+          end
+    elsif match_brewpubs_for_country( name ) do |country_key|
+            ## todo: autoadd  brewpub flag!! use more_attribs??
+            load_breweries_for_country( country_key, name )
+          end
     else
       logger.error "unknown beer.db fixture type >#{name}<"
       # todo/fix: exit w/ error
@@ -83,37 +94,6 @@ class Reader
   end
 
 
-  def load_brewery_wikipedia( lang_key, name )
-    reader = HashReaderV2.new( name, include_path )
-
-    reader.each do |key, value|
-      brewery = Brewery.find_by_key!( key )
-      
-      wikipedia = "#{lang_key}.wikipedia.org/wiki/#{value.strip}"
-      logger.debug "  adding #{key} => >#{wikipedia}<"
-      brewery.wikipedia = wikipedia
-      brewery.save!
-    end
-  end
-
-
-  def load_brewery_prod( name )
-    reader = HashReaderV2.new( name, include_path )
-
-    reader.each do |key, value|
-      brewery = Brewery.find_by_key!( key )
-      
-      if value =~ /(?:([0-9][0-9_ ]+[0-9]|[0-9]{1,2})\s*hl)/  # e.g. 20_0000 hl or 50hl etc.
-        prod =  $1.gsub(/[ _]/, '').to_i
-        logger.debug "  adding #{key} => >#{prod}<"
-        brewery.prod = prod
-        brewery.save!
-      else
-        logger.warn "  unknown type for brewery prod value >#{value}<; regex pattern match failed"
-      end
-    end
-  end
-
   def load_beers_for_country_n_region( country_key, region_key, name, more_attribs={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"

data/lib/beerdb/version.rb

@@ -1,6 +1,6 @@
 
 module BeerDb
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end
 
 

data/lib/beerdb.rb

@@ -5,6 +5,9 @@
 
 # core and stlibs
 
+## stdlibs
+# -- get required already by worlddb (remove ??)
+
 require 'yaml'
 require 'pp'
 require 'logger'
@@ -14,10 +17,11 @@ require 'erb'
 
 # 3rd party gems / libs
 
-require 'active_record'   ## todo: add sqlite3? etc.
+#  -- get required by worlddb
+# require 'active_record'   ## todo: add sqlite3? etc.
+# require 'logutils'
+# require 'textutils'
 
-require 'logutils'
-require 'textutils'
 require 'worlddb'
 
 ######################
@@ -176,7 +180,7 @@ end
 
 # our own code
 
-require 'beerdb/version'
+require 'beerdb/version'   ## version always goes first
 
 require 'beerdb/models/forward'
 require 'beerdb/models/country'
@@ -191,7 +195,9 @@ require 'beerdb/models/drink'     # db model extensions - move to its own addon
 require 'beerdb/models/bookmark'  # db model extensions - move to its own addon gem?
 require 'beerdb/models/note'      # db model extensions - move to its own addon gem?
 
-## add backwards compatible namespace (delete later!)
+
+## add backwards compatible namespace
+##  todo: move to forward -- check sportdb/worlddb convention ??
 module BeerDb
   Models = Model
 end
@@ -230,28 +236,7 @@ module BeerDb
     CreateDbExtrasDrinks.new.up
     CreateDbExtrasNotes.new.up
 
-    BeerDb::Model::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
-  end
-
-
-
-  module CodeReaderContext
-    #  make models available w/o namespace
-    #  e.g. lets you use Beer instead of BeerDb::Models::Beer
-    include BeerDb::Models    # check does it work w/ alias e.g. Models == Model
-    ## <evaluated code here>
-  end
-
-  def self.load( name, include_path='.' )  # NB: pass in w/o .rb extension e.g use users etc.
-    path = "#{include_path}/#{name}.rb"
-
-    puts "*** loading seed data '#{name}' (#{path})..."
-
-    ::CodeReader.new( path ).eval( CodeReaderContext )
-    ## nb: will get evaluated in context of passed in module like
-    ## module CodeReaderContext
-    ##  <seed code here>
-    ## end
+    ConfDb::Model::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
   end
 
 
@@ -282,6 +267,8 @@ module BeerDb
     Stats.new.tables
   end
 
+  ###
+  # fix: (re)use ConfDb.props
   def self.props
     Stats.new.props
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &85315900 !ruby/object:Gem::Requirement
+  requirement: &77761980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85315900
+  version_requirements: *77761980
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &85315630 !ruby/object:Gem::Requirement
+  requirement: &77761760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85315630
+  version_requirements: *77761760
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &85315370 !ruby/object:Gem::Requirement
+  requirement: &77761510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85315370
+  version_requirements: *77761510
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &85315060 !ruby/object:Gem::Requirement
+  requirement: &77761150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *85315060
+  version_requirements: *77761150
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &85314820 !ruby/object:Gem::Requirement
+  requirement: &77760800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85314820
+  version_requirements: *77760800
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &85314520 !ruby/object:Gem::Requirement
+  requirement: &77760460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85314520
+  version_requirements: *77760460
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &85314220 !ruby/object:Gem::Requirement
+  requirement: &77760170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *85314220
+  version_requirements: *77760170
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &85313860 !ruby/object:Gem::Requirement
+  requirement: &77759820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *85313860
+  version_requirements: *77759820
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &85313410 !ruby/object:Gem::Requirement
+  requirement: &77759280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85313410
+  version_requirements: *77759280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85313110 !ruby/object:Gem::Requirement
+  requirement: &77758880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *85313110
+  version_requirements: *77758880
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &85312790 !ruby/object:Gem::Requirement
+  requirement: &77758470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *85312790
+  version_requirements: *77758470
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: