beerdb 0.9.1 → 0.9.2

data/lib/beerdb/models/beer.rb

@@ -86,10 +86,10 @@ class Beer < ActiveRecord::Base
     ## check for grades (e.g. ***/**/*) in titles (will add attribs[:grade] to hash)
     ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
     attribs[ :grade ] ||= 4
-           
+    
     ### check for "default" tags - that is, if present attribs[:tags] remove from hash
     value_tag_keys += find_tags_in_attribs!( attribs )
-
+    
     ## check for optional values
     values.each_with_index do |value,index|
       if match_country(value) do |country|

data/lib/beerdb/reader.rb

@@ -13,6 +13,9 @@ 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
@@ -142,10 +145,45 @@ class Reader
     load_beers_worker( name, more_attribs )
   end
 
+
   def load_beers_worker( name, more_attribs={} )
     reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
+    ### todo: cleanup - check if [] works for build_title...
+    #     better cleaner way ???
+    if more_attribs[:region_id].present?
+      known_breweries_source = Brewery.where( region_id:  more_attribs[:region_id] )
+    elsif more_attribs[:country_id].present?
+      known_breweries_source = Brewery.where( country_id: more_attribs[:country_id] )
+    else
+      logger.warn "no region or country specified; use empty brewery ary for header mapper"
+      known_breweries_source = []
+    end
+
+    known_breweries  = TextUtils.build_title_table_for( known_breweries_source )
+
+
     reader.each_line do |new_attributes, values|
+
+      ## note: check for header attrib; if present remove
+      ### todo: cleanup code later
+      ## fix: add to new_attributes hash instead of values ary
+      ##   - fix: match_brewery()   move region,city code out of values loop for reuse at the end
+      if new_attributes[:header].present?
+        brewery_line = new_attributes[:header].dup   # note: make sure we make a copy; will use in-place string ops
+        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
+
+        logger.debug "  trying to find brewery in line >#{brewery_line}<"
+        ## todo: check what map_titles_for! returns (nothing ???)
+        TextUtils.map_titles_for!( 'brewery', brewery_line, known_breweries )
+        brewery_key = TextUtils.find_key_for!( 'brewery', brewery_line )
+        logger.debug "  brewery_key = >#{brewery_key}<"
+        unless brewery_key.nil?
+          ## bingo! add brewery_id upfront, that is, as first value in ary
+          values = values.unshift "by:#{brewery_key}"
+        end
+      end
+
       Beer.create_or_update_from_attribs( new_attributes, values )
     end # each_line
   end
@@ -187,6 +225,16 @@ class Reader
     reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|
+      
+      #######
+      # fix: move to (inside)
+      #    Brewery.create_or_update_from_attribs ||||
+      ## note: group header not used for now; do NOT forget to remove from hash!
+      if new_attributes[:header].present?
+        logger.warn "removing unused group header #{new_attributes[:header]}"
+        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
+      end
+      
       Brewery.create_or_update_from_attribs( new_attributes, values )
     end # each_line
   end

data/lib/beerdb/version.rb

@@ -1,6 +1,6 @@
 
 module BeerDb
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end
 
 

data/lib/beerdb.rb

@@ -20,6 +20,159 @@ require 'logutils'
 require 'textutils'
 require 'worlddb'
 
+######################
+# fix begin:
+
+
+################
+# todo: move module to textutils!!!
+
+### fix: move to textutils??
+
+
+## todo: rename to  TitleHelpers? TitleMatcher? TitleMapper? TitleMapping? TitleMappings? TitleFinder? TitleHelpers?
+#   or rename to KeyMapping?, KeyMapper?, KeyTable? etc.
+
+
+module TextUtils::TitleTable
+
+
+def build_title_table_for( records )
+    ## build known tracks table w/ synonyms e.g.
+    #
+    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
+    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
+    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
+
+    known_titles = []
+
+    records.each_with_index do |rec,index|
+
+      title_candidates = []
+      title_candidates << rec.title
+
+      title_candidates += rec.synonyms.split('|') if rec.synonyms.present?
+
+
+      ## check if title includes subtitle e.g. Grand Prix Japan (Suzuka Circuit)
+      #  make subtitle optional by adding title w/o subtitle e.g. Grand Prix Japan
+
+      titles = []
+      title_candidates.each do |t|
+        titles << t
+        if t =~ /\(.+\)/
+          extra_title = t.gsub( /\(.+\)/, '' ) # remove/delete subtitles
+          extra_title.strip!   # strip leading n trailing withspaces too!
+          titles << extra_title
+        end
+      end
+
+
+      ## NB: sort here by length (largest goes first - best match)
+      #  exclude code and key (key should always go last)
+      titles = titles.sort { |left,right| right.length <=> left.length }
+      
+      ## escape for regex plus allow subs for special chars/accents
+      titles = titles.map { |title| TextUtils.title_esc_regex( title )  }
+
+      ## NB: only include code field - if defined
+      titles << rec.code          if rec.respond_to?(:code) && rec.code.present?
+
+      known_titles << [ rec.key, titles ]
+
+      ### fix: use plain logger
+      LogUtils::Logger.root.debug "  #{rec.class.name}[#{index+1}] #{rec.key} >#{titles.join('|')}<"
+    end
+
+    known_titles
+end
+
+
+
+def find_key_for!( name, line )
+  regex = /@@oo([^@]+?)oo@@/     # e.g. everything in @@ .... @@ (use non-greedy +? plus all chars but not @, that is [^@])
+
+  upcase_name   = name.upcase
+  downcase_name = name.downcase
+
+  if line =~ regex
+    value = "#{$1}"
+    ### fix: use plain logger
+    LogUtils::Logger.root.debug "   #{downcase_name}: >#{value}<"
+      
+    line.sub!( regex, "[#{upcase_name}]" )
+
+    return $1
+  else
+    return nil
+  end
+end
+
+
+def find_keys_for!( name, line )  # NB: keys (plural!) - will return array
+  counter = 1
+  keys = []
+
+  downcase_name = name.downcase
+
+  key = find_key_for!( "#{downcase_name}#{counter}", line )
+  while key.present?
+    keys << key
+    counter += 1
+    key = find_key_for!( "#{downcase_name}#{counter}", line )
+  end
+
+  keys
+end
+
+
+def map_titles_for!( name, line, title_table )
+  title_table.each do |rec|
+    key    = rec[0]
+    values = rec[1]
+    map_title_worker_for!( name, line, key, values )
+  end
+end
+
+
+def map_title_worker_for!( name, line, key, values )
+
+  downcase_name = name.downcase
+
+  values.each do |value|
+    ## nb: \b does NOT include space or newline for word boundry (only alphanums e.g. a-z0-9)
+    ## (thus add it, allows match for Benfica Lis.  for example - note . at the end)
+
+    ## check add $ e.g. (\b| |\t|$) does this work? - check w/ Benfica Lis.$
+    regex = /\b#{value}(\b| |\t|$)/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
+    if line =~ regex
+      ### fix: use plain logger
+      LogUtils::Logger.root.debug "     match for #{downcase_name}  >#{key}< >#{value}<"
+      # make sure @@oo{key}oo@@ doesn't match itself with other key e.g. wacker, wac, etc.
+      line.sub!( regex, "@@oo#{key}oo@@ " )    # NB: add one space char at end
+      return true    # break out after first match (do NOT continue)
+    end
+  end
+  return false
+end
+
+
+
+end # module TextUtils::TitleTable
+
+
+
+## auto-include methods
+
+module TextUtils
+  # make helpers available as class methods e.g. TextUtils.convert_unicode_dashes_to_plain_ascii
+  extend TitleTable  # lets us use TextUtils.build_title_table_for etc.
+end
+
+# quich fix end:
+########################
+
+
 
 # our own code
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &20992524 !ruby/object:Gem::Requirement
+  requirement: &20877528 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *20992524
+  version_requirements: *20877528
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &20991924 !ruby/object:Gem::Requirement
+  requirement: &20877180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *20991924
+  version_requirements: *20877180
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &20991348 !ruby/object:Gem::Requirement
+  requirement: &20876820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *20991348
+  version_requirements: *20876820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20990748 !ruby/object:Gem::Requirement
+  requirement: &20876532 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20990748
+  version_requirements: *20876532
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20990208 !ruby/object:Gem::Requirement
+  requirement: &20876208 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *20990208
+  version_requirements: *20876208
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: