sportdb-models 1.14.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 179911cd446977787834641fb8b19728b05d0e4a
-  data.tar.gz: 61469a6cb2ffa0b24f3567c7e263d62fded9250f
+  metadata.gz: dfd4954a8fe9eafb1880ac4d2ce1aef869c7e52a
+  data.tar.gz: 5ccd5c5c17e87a810660342ae15bbb74ec37db24
 SHA512:
-  metadata.gz: 4ffd8c25d110694f82f32205fc79b108375f85f705815be5288cddc058ac964f0a4a24c0541f53226e008bb3c4f818cf59dec62a55550fdeefd1e648b50623bf
-  data.tar.gz: 680a475c8be1cffc47740e7c0b72354073d99bc44930d1ee1f58bcdec3d4f5fcfbe11c9219df757495d5f102602b0738b63ae8b6204ee9438bec82d7ae1789d5
+  metadata.gz: 94a92900f689e5da69210adb12a4e0265dddd14059cb17dc176d6c017e52db032234c7c6bae38db07e65102c92b6383d56cdc0f99d8f99d4ee53ac7d40ed353f
+  data.tar.gz: 90357b9ea35cb0d8e62d9fbc48096cbf76db007c9443c4e8e81de59e4a50ae18fcd525344648ab30e91fe2665c11120d757c1c16541a78dc6541fab50f1881cd

data/lib/sportdb/readers/game.rb

@@ -3,6 +3,26 @@
 module SportDb
 
 
+class TeamMapper
+  def initialize( recs )
+    @mapper = TextUtils::TitleMapper2.new( recs, 'team' )
+  end
+
+  def find_teams!( line ) # Note: returns an array - note: plural! (teamsssss)
+    @mapper.find_keys!( line )
+  end
+
+  def find_team!( line )  # Note: returns key (string or nil)
+    @mapper.find_key!( line )
+  end
+
+  def map_teams!( line )
+    @mapper.map_titles!( line )
+  end
+end # class TeamMapper
+
+
+
 class GameReader
 
   include LogUtils::Logging
@@ -172,7 +192,10 @@ class GameReader
     logger.debug "Event #{@event.key} >#{@event.title}<"
 
     ### fix: use build_title_table_for ??? why? why not??
-    @known_teams  = @event.known_teams_table
+    ## @known_teams  = @event.known_teams_table
+
+    @mapper_teams = TeamMapper.new( @event.teams )
+
 
     @known_grounds  = TextUtils.build_title_table_for( @event.grounds )
 
@@ -208,8 +231,8 @@ class GameReader
   def parse_group_def( line )
     logger.debug "parsing group def line: >#{line}<"
     
-    match_teams!( line )
-    team_keys = find_teams!( line )
+    @mapper_teams.map_teams!( line )
+    team_keys = @mapper_teams.find_teams!( line )
       
     title, pos = find_group_title_and_pos!( line )
 
@@ -417,9 +440,10 @@ class GameReader
   def parse_game( line )
     logger.debug "parsing game (fixture) line: >#{line}<"
 
-    match_teams!( line )
-    team1_key = find_team1!( line )
-    team2_key = find_team2!( line )
+    @mapper_teams.map_teams!( line )   ### todo/fix: limit mapping to two(2) teams - why? why not?  might avoid matching @ Barcelona ??
+    team_keys = @mapper_teams.find_teams!( line )
+    team1_key = team_keys[0]
+    team2_key = team_keys[1] 
 
     ## note: if we do NOT find two teams; return false - no match found
     if team1_key.nil? || team2_key.nil?
@@ -634,9 +658,10 @@ class GameReader
     #   Jun/17:   etc.
 
 
-    match_teams!( line )
-    team1_key = find_team1!( line )
-    team2_key = find_team2!( line )
+    @mapper_teams.map_teams!( line )
+    team_keys = @mapper_teams.find_teams!( line )
+    team1_key = team_keys[0]
+    team2_key = team_keys[1]
 
     date  = find_date!( line, start_at: @event.start_at )
 

data/lib/sportdb/utils_teams.rb

@@ -5,25 +5,30 @@ module SportDb
 
 
   def find_teams!( line ) # NB: returns an array - note: plural! (teamsss)
+    puts "*** find_teams! deprecated -- use TeamMapper!!!"
     TextUtils.find_keys_for!( 'team', line )
   end
   
   def find_team!( line )  # NB: returns key (string or nil)
+    puts "*** find_team! deprecated -- use TeamMapper!!!"
     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 )
+    puts "*** find_team1! deprecated -- use TeamMapper!!!"
     TextUtils.find_key_for!( 'team1', line )
   end
 
   def find_team2!( line )
+    puts "*** find_team2! deprecated -- use TeamMapper!!!"
     TextUtils.find_key_for!( 'team2', line )
   end
 
   ## todo/fix: pass in known_teams as a parameter? why? why not?
 
   def map_teams!( line )
+    puts "*** map_teams! deprecated -- use TeamMapper!!!"
     TextUtils.map_titles_for!( 'team', line, @known_teams )
   end
   
@@ -40,4 +45,4 @@ module SportDb
 
 
   end # module FixtureHelpers
-end # module SportDb
+end # module SportDb

data/lib/sportdb/version.rb

@@ -3,8 +3,8 @@
 module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 14
-  PATCH = 2
+  MINOR = 15
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: sportdb-models - sport.db schema 'n' models for easy (re)use
 email: opensport@googlegroups.com
 executables: []
@@ -75,7 +75,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md