sportdb 1.8.9 → 1.8.10

data/lib/sportdb/readers/game.rb

@@ -106,8 +106,19 @@ class GameReader
   end   # method load_fixtures
 
 
-  def parse_group( line )
-    logger.debug "parsing group line: >#{line}<"
+
+  def parse_group_header( line )
+    logger.debug "parsing group header line: >#{line}<"
+
+    title, pos = find_group_title_and_pos!( line )
+
+    logger.debug "    title: >#{title}<"
+    logger.debug "    pos: >#{pos}<"
+    logger.debug "  line: >#{line}<"
+  end
+
+  def parse_group_def( line )
+    logger.debug "parsing group def line: >#{line}<"
     
     match_teams!( line )
     team_keys = find_teams!( line )
@@ -144,9 +155,29 @@ class GameReader
       @group.teams << team
     end
   end
-  
-  def parse_round( line )
-    logger.debug "parsing round line: >#{line}<"
+
+
+  def parse_round_def( line )
+    logger.debug "parsing round def line: >#{line}<"
+
+    start_at = find_date!( line, start_at: @event.start_at )
+    end_at   = find_date!( line, start_at: @event.start_at )
+
+    # note: if end_at nil? -- assume start_at == end_at
+
+    ## pos = find_round_pos!( line )
+    ## title = find_round_title!( line )
+
+    logger.debug "    start_at: #{start_at}"
+    logger.debug "    end_at:   #{end_at}"
+
+    logger.debug "  line: >#{line}<"
+  end
+
+
+
+  def parse_round_header( line )
+    logger.debug "parsing round header line: >#{line}<"
 
     ### todo/fix/check:  move cut off optional comment in reader for all lines? why? why not?
     cut_off_end_of_line_comment!( line )  # cut off optional comment starting w/ #
@@ -154,6 +185,8 @@ class GameReader
     # NB: cut off optional title2 starting w/  //  first
     title2 = find_round_title2!( line )
 
+    # todo/fix: check if it is possible title2 w/ group?
+    #  add an example here
     group_title, group_pos = find_group_title_and_pos!( line )
 
     pos = find_round_pos!( line )
@@ -205,15 +238,28 @@ class GameReader
     @patch_rounds[ @round.id ] = @round.id
   end
 
+
+  def try_parse_game( line )
+    # note: clone line; for possible test do NOT modify in place for now
+    # note: returns true if parsed, false if no match
+    parse_game( line.dup )
+  end
+
   def parse_game( line )
     logger.debug "parsing game (fixture) line: >#{line}<"
 
-    pos = find_game_pos!( line )
-
     match_teams!( line )
     team1_key = find_team1!( line )
     team2_key = find_team2!( line )
 
+    ## note: if we do NOT find two teams; return false - no match found
+    if team1_key.nil? || team2_key.nil?
+      logger.debug "  no game match (two teams required) found for line: >#{line}<"
+      return false
+    end
+
+    pos = find_game_pos!( line )
+
     if is_postponed?( line )
       postponed  = true
       date_v2    = find_date!( line, start_at: @event.start_at )
@@ -293,21 +339,69 @@ class GameReader
       game.update_attributes!( game_attribs )
     end
 
+    return true   # game match found
   end # method parse_game
 
 
+  def try_parse_date_header( line )
+    # note: clone line; for possible test do NOT modify in place for now
+    # note: returns true if parsed, false if no match
+    parse_date_header( line.dup )
+  end
+
+  def parse_date_header( line )
+    # note: returns true if parsed, false if no match
+ 
+    # line with NO teams  plus include date e.g.
+    #   [Fri Jun/17]  or
+    #   Jun/17  or
+    #   Jun/17:   etc.
+
+
+    match_teams!( line )
+    team1_key = find_team1!( line )
+    team2_key = find_team2!( line )
+
+    date  = find_date!( line, start_at: @event.start_at )
+
+    if date.present? && team1_key.nil? && team2_key.nil?
+      logger.debug( "date header line found: >#{line}<")
+      logger.debug( "    date: #{date}")
+      return true
+    else
+      return false
+    end
+  end
+
+
+
   def parse_fixtures( reader )
       
     reader.each_line do |line|
-      if is_round?( line )
-        parse_round( line )
-      elsif is_group?( line ) ## NB: group goes after round (round may contain group marker too)
-        parse_group( line )
+
+      if is_round_def?( line ) 
+        ## todo/fix:  add round definition (w begin n end date)
+        ## todo: do not patch rounds with definition (already assume begin/end date is good)
+        ##  -- how to deal with matches that get rescheduled/postponed?
+        parse_round_def( line )
+      elsif is_round?( line )
+        parse_round_header( line )
+      elsif is_group_def?( line ) ## NB: group goes after round (round may contain group marker too)
+        ### todo: add pipe (|) marker (required)
+        parse_group_def( line )
+      elsif is_group?( line )
+        ##  -- lets you set group  e.g. Group A etc.
+        parse_group_header( line )
+      elsif try_parse_game( line )
+        # do nothing here
+      elsif try_parse_date_header( line )
+        # do nothing here
       else
-        parse_game( line )
+        logger.info "skipping line (no match found): ><"
       end
     end # lines.each
-    
+
+
     @patch_rounds.each do |k,v|
       logger.debug "patch start_at/end_at date for round #{k}:"
       round = Round.find( k )

data/lib/sportdb/utils_group.rb

@@ -3,16 +3,29 @@
 module SportDb
   module FixtureHelpers
 
+  def is_group_def?( line )
+    # NB: check after is_round? (round may contain group reference!)
+    ## must include bar (|) marker (make required)
+    line =~ /\|/ && is_group?( line )
+  end
+
   def is_group?( line )
     # NB: check after is_round? (round may contain group reference!)
-    line =~ SportDb.lang.regex_group
+    ## note: =~ return nil if not match found, and 0,1, etc for match
+    (line =~ SportDb.lang.regex_group) != nil
   end
 
   def find_group_title_and_pos!( line )
     ## group pos - for now support single digit e.g 1,2,3 or letter e.g. A,B,C or HEX
     ## nb:  (?:)  = is for non-capturing group(ing)
+
+    ## fix:
+    ##   get Group|Gruppe|Grupo from lang!!!! do NOT hardcode in place
+
+    ## todo:
+    ##   check if Group A:  or [Group A]  works e.g. : or ] get matched by \b ???
     regex = /(?:Group|Gruppe|Grupo)\s+((?:\d{1}|[A-Z]{1,3}))\b/
-    
+
     match = regex.match( line )
     
     return [nil,nil] if match.nil?

data/lib/sportdb/utils_round.rb

@@ -3,8 +3,14 @@
 module SportDb
   module FixtureHelpers
 
+  def is_round_def?( line )
+    ## must include bar (|) marker (make required)
+    line =~ /\|/ && is_round?( line ) 
+  end
+
   def is_round?( line )
-    line =~ SportDb.lang.regex_round
+    ## note: =~ return nil if not match found, and 0,1, etc for match
+    (line =~ SportDb.lang.regex_round) != nil
   end
 
   def is_knockout_round?( line )

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.9'
+  VERSION = '1.8.10'
 end
 
 

data/test/test_utils.rb

@@ -10,16 +10,75 @@ require 'helper'
 
 class TestUtils < MiniTest::Unit::TestCase
 
+  def test_is_group_def
+    SportDb.lang.lang = 'en'
 
-  class Reader
-    include LogUtils::Logging      # add logger
-    include SportDb::FixtureHelpers
+    lines = [
+      'Group A |',
+      'Group B |'
+     ]
+
+     reader = Reader.new
+
+     lines.each do |line|
+       assert_equal true, reader.is_group_def?( line )
+     end
+  end
+
+  def test_is_group
+    SportDb.lang.lang = 'en'
+
+    lines = [
+      'Group A',
+      'Group A:',
+      '[Group A]'
+     ]
+
+     reader = Reader.new
+
+     lines.each do |line|
+       assert_equal true, reader.is_group?( line )
+     end
+  end
+
+
+  def test_is_round_def
+    SportDb.lang.lang = 'en'
+
+    lines = [
+      'Matchday 1 |',
+      'Round 1    |'
+     ]
+
+     reader = Reader.new
+
+     lines.each do |line|
+       assert_equal true, reader.is_round_def?( line )
+     end
+  end
+
+  def test_is_round
+    SportDb.lang.lang = 'en'
+
+    lines = [
+      'Matchday 1',
+      '[Matchday 1]',
+      'Matchday 1:',
+      'Round 1'
+     ]
+
+     reader = Reader.new
+
+     lines.each do |line|
+       assert_equal true, reader.is_round?( line )
+     end
   end
 
+
   def test_is_knockout_round
-     SportDb.lang.lang = 'en'
+    SportDb.lang.lang = 'en'
 
-     lines = [
+    lines = [
       '(4) Quarter-finals',
       '(5) Semi-finals',
       '(6) Final'
@@ -28,7 +87,7 @@ class TestUtils < MiniTest::Unit::TestCase
      reader = Reader.new
 
      lines.each do |line|
-       assert( reader.is_knockout_round?( line ) )
+       assert_equal true, reader.is_knockout_round?( line )
      end
   end
 
@@ -49,9 +108,17 @@ class TestUtils < MiniTest::Unit::TestCase
      reader = Reader.new
 
      lines.each do |line|
-       assert( reader.is_knockout_round?( line ) )
+       assert_equal true, reader.is_knockout_round?( line )
      end
+  end
+
+private
+  #######################
+  # private helpers
 
+  class Reader
+    include LogUtils::Logging      # add logger
+    include SportDb::FixtureHelpers
   end
 
 end # class TestUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.8.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &83212550 !ruby/object:Gem::Requirement
+  requirement: &70027260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83212550
+  version_requirements: *70027260
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &83212160 !ruby/object:Gem::Requirement
+  requirement: &70026730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83212160
+  version_requirements: *70026730
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &83211780 !ruby/object:Gem::Requirement
+  requirement: &70026040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83211780
+  version_requirements: *70026040
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &83211330 !ruby/object:Gem::Requirement
+  requirement: &70025700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *83211330
+  version_requirements: *70025700
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &83211060 !ruby/object:Gem::Requirement
+  requirement: &70025340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83211060
+  version_requirements: *70025340
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &83210570 !ruby/object:Gem::Requirement
+  requirement: &70025010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *83210570
+  version_requirements: *70025010
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &83210080 !ruby/object:Gem::Requirement
+  requirement: &70024680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *83210080
+  version_requirements: *70024680
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83209780 !ruby/object:Gem::Requirement
+  requirement: &70024390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83209780
+  version_requirements: *70024390
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83209410 !ruby/object:Gem::Requirement
+  requirement: &70024030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83209410
+  version_requirements: *70024030
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83209070 !ruby/object:Gem::Requirement
+  requirement: &70023610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *83209070
+  version_requirements: *70023610
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: