sportdb 1.6.11 → 1.6.12

data/lib/sportdb/models/event.rb

@@ -48,40 +48,7 @@ class Event < ActiveRecord::Base
 
 
   def known_teams_table
-    
-    ## build known teams table w/ synonyms e.g.
-    #
-    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
-    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
-    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
- 
-    known_teams = []
-     
-    teams.each_with_index do |team,index|
-
-      titles = []
-      titles << team.title
-      titles += team.synonyms.split('|') if team.synonyms.present?
-      
-      ## 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 )  }
-      
-      titles << team.code                  if team.code.present?
-      titles << team.key
-            
-      known_teams << [ team.key, titles ]
-      
-      ### fix:
-      ## plain logger
-      
-      LogUtils::Logger.root.debug "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
-    end
-    
-    known_teams
+    @known_teams_table ||= build_match_table_for( teams )
   end # method known_teams_table
 
 end # class Event

data/lib/sportdb/models/track.rb

@@ -9,44 +9,14 @@ class Track < ActiveRecord::Base
   #####################
   ## convenience helper for text parser/reader
 
-  ### fix: move to event!!! (e.g. scoped by event)
+
+  ### fix: move known_tracks_table to event!!! (e.g. scoped by event)
 
   def self.known_tracks_table
-    
-    ## build known tracks table w/ synonyms e.g.
-    #
-    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
-    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
-    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
- 
-    known_tracks = []
-     
-    Track.all.each_with_index do |track,index|
-
-      titles = []
-      titles << track.title
-      titles += track.synonyms.split('|') if track.synonyms.present?
-      
-      ## 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 )  }
-       
-      known_tracks << [ track.key, titles ]
-      
-      ### fix:
-      ## plain logger
-      
-      LogUtils::Logger.root.debug "  Track[#{index+1}] #{track.key} >#{titles.join('|')}<"
-    end
-    
-    known_tracks
+    @@known_tracks_table ||= build_match_table_for( Track.all )
   end # method known_tracks_table
 
 
-
   def self.create_or_update_from_values( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!

data/lib/sportdb/reader.rb

@@ -150,65 +150,44 @@ class Reader
   end # method load
 
 
-  def load_leagues( name, more_values={} )
-    
-    path = "#{include_path}/#{name}.txt"
+  def load_leagues( name, more_attribs={} )
 
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = ValuesReader.new( path, more_values )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|
       League.create_or_update_from_values( new_attributes, values )
     end # each lines
-    
-    Prop.create_from_fixture!( name, path )
-     
-  end # load_leagues
 
+  end # load_leagues
 
-  def load_tracks( name, more_values={} )
-
-    path = "#{include_path}/#{name}.txt"
 
-    logger.info "parsing data '#{name}' (#{path})..."
+  def load_tracks( name, more_attribs={} )
 
-    reader = ValuesReader.new( path, more_values )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|
       Track.create_or_update_from_values( new_attributes, values )
     end # each lines
-    
-    Prop.create_from_fixture!( name, path )
 
   end # load_tracks
 
 
 
-  def load_persons( name, more_values={} )
-
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
+  def load_persons( name, more_attribs={} )
 
-    reader = ValuesReader.new( path, more_values )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|
       Person.create_or_update_from_values( new_attributes, values )
     end # each lines
-    
-    Prop.create_from_fixture!( name, path )
 
   end # load_persons
 
 
 
   def load_seasons( name )
-    path = "#{include_path}/#{name}.yml"
-
-    logger.info "parsing data '#{name}' (#{path})..."
 
-    reader = HashReader.new( path )
+    reader = HashReaderV2.new( name, include_path )
 
 ####
 ## fix!!!!!
@@ -251,17 +230,12 @@ class Reader
       end
   
     end # each key,value
-    
-    Prop.create_from_fixture!( name, path )
-  
+
   end  # load_seasons
 
 
 
   def load_event( name )
-    path = "#{include_path}/#{name}.yml"
-
-    logger.info "parsing data '#{name}' (#{path})..."
 
 ####
 ## fix!!!!!
@@ -269,7 +243,7 @@ class Reader
 ##   use Event.create_or_update_from_hash_reader?? or similar
 #   move parsing code to model
 
-    reader = HashReader.new( path )
+    reader = HashReaderV2.new( name, include_path )
 
     event_attribs = {}
 
@@ -345,9 +319,7 @@ class Reader
     logger.debug event_attribs.to_json
     
     event.update_attributes!( event_attribs )
-    
-    Prop.create_from_fixture!( name, path )
-  
+
   end  # load_event
 
 
@@ -508,18 +480,12 @@ class Reader
   end # method load_races_worker
 
 
-  def load_teams( name, more_values={} )
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = ValuesReader.new( path, more_values )
+  def load_teams( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|
       Team.create_or_update_from_values( new_attributes, values )
     end # each lines
-    
-    Prop.create_from_fixture!( name, path )
   end # load_teams
 
 private

data/lib/sportdb/utils.rb

@@ -3,6 +3,48 @@
 ### some utils moved to worldbdb/utils for reuse
 
 
+### fix: move to textutils??
+
+
+def build_match_table_for( recs )
+    ## build known tracks table w/ synonyms e.g.
+    #
+    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
+    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
+    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
+ 
+    known_titles = []
+
+    recs.each_with_index do |rec,index|
+
+      titles = []
+      titles << rec.title
+      titles += rec.synonyms.split('|') if rec.synonyms.present?
+      
+      ## 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:
+      ## plain logger
+
+      LogUtils::Logger.root.debug "  #{rec.class.name}[#{index+1}] #{rec.key} >#{titles.join('|')}<"
+    end
+
+    known_titles
+end
+
+
+
+
 module SportDb::FixtureHelpers
 
   def is_postponed?( line )
@@ -286,47 +328,37 @@ module SportDb::FixtureHelpers
     end
     scores
   end # methdod find_scores!
-  
 
-  def find_team_worker!( line, index )
+
+  ## todo/fix:
+  #   find a better name find_xxx_by_title ?? find_xxx_w_match_table? or similiar
+  #  move to its own file/module for easier maintance
+  #    include build_match_table_for
+  #  - lets us change internals e.g. lets improve matcher using a reverse index, for example
+
+  def find_xxx_worker!( 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}"
-      logger.debug "   team#{index}: >#{value}<"
+      logger.debug "   #{downcase_name}: >#{value}<"
       
-      line.sub!( regex, "[TEAM#{index}]" )
+      line.sub!( regex, "[#{upcase_name}]" )
 
       return $1
     else
       return nil
     end
   end
-  
-  def find_teams!( line )
-    counter = 1
-    teams = []
-    
-    team = find_team_worker!( line, counter )
-    while team.present?
-      teams << team
-      counter += 1
-      team = find_team_worker!( line, counter )
-    end
-    
-    teams
-  end
 
-  def find_team1!( line )
-    find_team_worker!( line, 1 )
-  end
-  
-  def find_team2!( line )
-    find_team_worker!( line, 2 )
-  end
 
+  def match_xxx_worker!( name, line, key, values )
+
+    downcase_name = name.downcase
 
-  def match_team_worker!( line, key, values )
     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)
@@ -334,7 +366,7 @@ module SportDb::FixtureHelpers
       ## 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
-        logger.debug "     match for team >#{key}< >#{value}<"
+        logger.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)
@@ -342,50 +374,46 @@ module SportDb::FixtureHelpers
     end
     return false
   end
+
+
+
+  def find_teams!( line )
+    counter = 1
+    teams = []
+
+    team = find_xxx_worker!( "team#{counter}", line )
+    while team.present?
+      teams << team
+      counter += 1
+      team = find_xxx_worker!( "team#{counter}", line )
+    end
+
+    teams
+  end
+
+  ## todo: check if find_team1 gets used?  if not remove it!!  use find_teams!
+  def find_team1!( line )
+    find_xxx_worker!( 'team1', line )
+  end
+  
+  def find_team2!( line )
+    find_xxx_worker!( 'team2', line )
+  end
+
  
   ## todo/fix: pass in known_teams as a parameter? why? why not?
   def match_teams!( line )
     @known_teams.each do |rec|
       key    = rec[0]
       values = rec[1]
-      match_team_worker!( line, key, values )
-    end # each known_teams    
+      match_xxx_worker!( 'team', line, key, values )
+    end # each known_teams
   end # method match_teams!
 
 
 
-
-
   def find_track!( line )
-    regex = /@@oo([^@]+?)oo@@/     # e.g. everything in @@ .... @@ (use non-greedy +? plus all chars but not @, that is [^@])
-
-    if line =~ regex
-      value = "#{$1}"
-      logger.debug "   track#{index}: >#{value}<"
-      
-      line.sub!( regex, "[TRACK]" )
-
-      return $1
-    else
-      return nil
-    end
-  end
-
-  def match_track_worker!( line, key, values )
-    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
-        logger.debug "     match for track >#{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
+    find_xxx_worker!( 'track', line )
   end
 
   ## todo/fix: pass in known_tracks as a parameter? why? why not?
@@ -393,7 +421,7 @@ module SportDb::FixtureHelpers
     @known_tracks.each do |rec|
       key    = rec[0]
       values = rec[1]
-      match_track_worker!( line, key, values )
+      match_xxx_worker!( 'track', line, key, values )
     end # each known_tracks
   end # method match_tracks!
 

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.11'
+  VERSION = '1.6.12'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &73622090 !ruby/object:Gem::Requirement
+  requirement: &77877370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *73622090
+  version_requirements: *77877370
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &73621870 !ruby/object:Gem::Requirement
+  requirement: &77877150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *73621870
+  version_requirements: *77877150
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73621650 !ruby/object:Gem::Requirement
+  requirement: &77876930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *73621650
+  version_requirements: *77876930
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73621430 !ruby/object:Gem::Requirement
+  requirement: &77876710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *73621430
+  version_requirements: *77876710
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: