sportdb 1.8.3 → 1.8.5

data/lib/sportdb/utils_scores.rb

@@ -0,0 +1,91 @@
+# encoding: utf-8
+
+module SportDb
+  module FixtureHelpers
+
+
+  def find_scores!( line )
+
+    # note: always call after find_dates !!!
+    #  scores match date-like patterns!!  e.g. 10-11  or 10:00 etc.
+    #   -- note: score might have two digits too
+
+    ### fix: depending on language allow 1:1 or 1-1
+    ##   do NOT allow mix and match
+    ##  e.g. default to en is  1-1
+    ##    de is 1:1 etc.
+    
+
+    # extract score from line
+    # and return it
+    # NB: side effect - removes date from line string
+    
+    # note: regex should NOT match regex extra time or penalty
+    #  thus, we do NOT any longer allow spaces for now between
+    #   score and marker (e.g. nV,iE, etc.)
+
+    # e.g. 1:2 or 0:2 or 3:3 // 1-1 or 0-2 or 3-3
+    regex = /\b(\d{1,2})[:\-](\d{1,2})\b/
+
+    ## todo: add/allow english markers e.g. aet ??
+
+    ## fix: use case insansitive flag instead e.g. /i
+    #    instead of [nN] etc.
+
+    # e.g. 1:2nV  => after extra time a.e.t
+    regex_et = /\b(\d{1,2})[:\-](\d{1,2})[nN][vV]\b/
+
+    # e.g. 5:4iE  => penalty / after penalty a.p
+    regex_p = /\b(\d{1,2})[:\-](\d{1,2})[iI][eE]\b/
+
+    scores = []
+
+    ## todo: how to handle game w/o extra time
+    #   but w/ optional penalty ???  e.g. used in copa liberatores, for example
+    #    retrun 0,0 or nil,nil for extra time score ?? or -1, -1 ??
+    #    for now use nil,nil
+
+    if line =~ regex
+      logger.debug "   score: >#{$1}-#{$2}<"
+      
+      line.sub!( regex, '[SCORE]' )
+
+      scores << $1.to_i
+      scores << $2.to_i
+    end
+
+    ## todo:
+    ##   reverse matching order ??? allows us to support spaces for nV and iE
+    ##    why? why not??
+
+    if line =~ regex_et
+      logger.debug "   score.et: >#{$1}-#{$2}<"
+      
+      line.sub!( regex_et, '[SCORE.ET]' )
+
+      ## check scores empty? - fill with nil,nil
+      scores += [nil,nil]  if scores.size == 0
+
+      scores << $1.to_i
+      scores << $2.to_i
+    end
+
+    if line =~ regex_p
+      logger.debug "   score.p: >#{$1}-#{$2}<"
+      
+      line.sub!( regex_p, '[SCORE.P]' )
+
+      ## check scores empty? - fill with nil,nil
+      scores += [nil,nil]  if scores.size == 0
+      scores += [nil,nil]  if scores.size == 2
+
+      scores << $1.to_i
+      scores << $2.to_i
+    end
+    scores
+  end # methdod find_scores!
+
+
+  end # module FixtureHelpers
+end # module SportDb
+

data/lib/sportdb/utils_teams.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+module SportDb
+  module FixtureHelpers
+
+
+  def find_teams!( line ) # NB: returns an array - note: plural! (teamsss)
+    TextUtils.find_keys_for!( 'team', line )
+  end
+  
+  def find_team!( line )  # NB: returns key (string or nil)
+    TextUtils.find_key_for!( 'team', line )
+  end
+
+  ## todo: check if find_team1 gets used?  if not remove it!!  use find_teams!
+  def find_team1!( line )
+    TextUtils.find_key_for!( 'team1', line )
+  end
+
+  def find_team2!( line )
+    TextUtils.find_key_for!( 'team2', line )
+  end
+
+  ## todo/fix: pass in known_teams as a parameter? why? why not?
+
+  def map_teams!( line )
+    TextUtils.map_titles_for!( 'team', line, @known_teams )
+  end
+  
+  def map_team!( line )  # alias map_teams!
+    map_teams!( line )
+  end
+
+
+
+  ## depreciated methods - use map_
+  def match_teams!( line )   ## fix: rename to map_teams!! - remove match_teams!
+    ## todo: issue depreciated warning
+    map_teams!( line )
+  end # method match_teams!
+
+  def match_track!( line )  ## fix: rename to map_track!!!
+    ## todo: issue depreciated warning
+    map_track!( line )
+  end # method match_tracks!
+
+
+  end # module FixtureHelpers
+end # module SportDb

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.3'
+  VERSION = '1.8.5'
 end
 
 
@@ -8,3 +8,4 @@ end
 # fix: remove old alias for SportDb
 
 SportDB = SportDb
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &18821544 !ruby/object:Gem::Requirement
+  requirement: &20942556 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *18821544
+  version_requirements: *20942556
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &18819840 !ruby/object:Gem::Requirement
+  requirement: &20939616 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *18819840
+  version_requirements: *20939616
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &18818232 !ruby/object:Gem::Requirement
+  requirement: &20837484 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *18818232
+  version_requirements: *20837484
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18832080 !ruby/object:Gem::Requirement
+  requirement: &20834256 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *18832080
+  version_requirements: *20834256
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18826716 !ruby/object:Gem::Requirement
+  requirement: &20832636 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *18826716
+  version_requirements: *20832636
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -153,9 +153,15 @@ files:
 - lib/sportdb/service/views/index.erb
 - lib/sportdb/service/views/layout.erb
 - lib/sportdb/stats.rb
-- lib/sportdb/title.rb
 - lib/sportdb/updater.rb
 - lib/sportdb/utils.rb
+- lib/sportdb/utils_date.rb
+- lib/sportdb/utils_group.rb
+- lib/sportdb/utils_map.rb
+- lib/sportdb/utils_record.rb
+- lib/sportdb/utils_round.rb
+- lib/sportdb/utils_scores.rb
+- lib/sportdb/utils_teams.rb
 - lib/sportdb/version.rb
 - test/helper.rb
 - test/test_changes.rb

data/lib/sportdb/title.rb

@@ -1,146 +0,0 @@
-# encoding: utf-8
-
-################
-# 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