sportdb 1.8.11 → 1.8.12

data/lib/sportdb/readers/game.rb

@@ -81,15 +81,15 @@ class GameReader
 
 
   def load_fixtures_worker( event_key, reader )
-   
-    ## assume active activerecord connection
-    ##
-    
+    ## NB: assume active activerecord connection
+
     ## reset cached values
     @patch_rounds  = {}
-    @round         = nil
-    
-    
+    @round         = nil     ## fix: change/rename to @last_round !!!
+    @group         = nil     ## fix: change/rename to @last_group !!!
+    @last_date     = nil
+
+
     @event = Event.find_by_key!( event_key )
     
     logger.debug "Event #{@event.key} >#{@event.title}<"
@@ -134,12 +134,12 @@ class GameReader
       title: title
     }
         
-    @group = Group.find_by_event_id_and_pos( @event.id, pos )
-    if @group.present?
-      logger.debug "update group #{@group.id}:"
+    group = Group.find_by_event_id_and_pos( @event.id, pos )
+    if group.present?
+      logger.debug "update group #{group.id}:"
     else
       logger.debug "create group:"
-      @group = Group.new
+      group = Group.new
       group_attribs = group_attribs.merge( {
         event_id: @event.id,
         pos:   pos
@@ -148,14 +148,14 @@ class GameReader
       
     logger.debug group_attribs.to_json
    
-    @group.update_attributes!( group_attribs )
+    group.update_attributes!( group_attribs )
 
-    @group.teams.clear  # remove old teams
+    group.teams.clear  # remove old teams
     ## add new teams
     team_keys.each do |team_key|
       team = Team.find_by_key!( team_key )
       logger.debug "  adding team #{team.title} (#{team.code})"
-      @group.teams << team
+      group.teams << team
     end
   end
 
@@ -310,6 +310,17 @@ class GameReader
       date      = find_date!( line, start_at: @event.start_at )
     end
 
+    ###
+    # check if date found?
+    #   NB: ruby falsey is nil & false only (not 0 or empty array etc.)
+    if date
+      ### check: use date_v2 if present? why? why not?
+      @last_date = date    # keep a reference for later use
+    else
+      date = @last_date    # no date found; (re)use last seen date
+    end
+
+
     scores = find_scores!( line )
 
 
@@ -338,11 +349,11 @@ class GameReader
       # fix: check - what to do with hours e.g. start_at use 00:00 and for end_at use 23.59 ??
       #  -- for now - remove hours (e.g. use end_of_day and beginnig_of_day)
       
-      pp Round.all
+      ## pp Round.all
       
       round = Round.where( 'event_id = ? AND (start_at <= ? AND end_at >= ?)',
                              @event.id, date.end_of_day, date.beginning_of_day).first
-      pp round
+      ## pp round
       logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
     else
       ## use round from last round header
@@ -428,9 +439,11 @@ class GameReader
 
     date  = find_date!( line, start_at: @event.start_at )
 
-    if date.present? && team1_key.nil? && team2_key.nil?
+    if date && team1_key.nil? && team2_key.nil?
       logger.debug( "date header line found: >#{line}<")
       logger.debug( "    date: #{date}")
+      
+      @last_date = date   # keep a reference for later use
       return true
     else
       return false
@@ -467,7 +480,8 @@ class GameReader
 
 
 ###
-#  fix: do NOT patch if auto flag is set to false!!!
+#  fix: do NOT patch if auto flag is set to false !!!
+#   e.g. rounds got added w/ round def (not w/ round header)
 
     @patch_rounds.each do |k,v|
       logger.debug "patch start_at/end_at date for round #{k}:"

data/lib/sportdb/utils_date.rb

@@ -50,8 +50,16 @@ module SportDb
     regex_de3 = /\b(\d{1,2})\.(\d{1,2})\.(\d{4})\b/
 
     # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
-    regex_de4 = /\b(\d{1,2})\.(\d{1,2})\.(?:\s+|$)/    ## note: allow end-of-string/line too
-
+    #  note: allow end delimiter ] e.g. [Sa 12.01.] or end-of-string ($) too
+    #  note: we use a lookahead for last part e.g. (?:\s+|$|[\]]) - do NOT cosume
+    regex_de4 = /\b(\d{1,2})\.(\d{1,2})\.(?=\s+|$|[\]])/    ## note: allow end-of-string/line too
+
+    # fix: !!!!
+    #   date in [] will become [[DATE.DE4]] - when getting removed will keep ]!!!!
+    #   fix: change regex to \[[A-Z0-9.]\]  !!!!!!  plus add unit test too!!!
+    #
+    # fix: use more lookahead for all required trailing spaces!!!!!
+    # fix: use <name capturing group> for month,day,year etc.!!!
 
     # todo: make more generic for reuse
     month_abbrev_en = 'Jan|Feb|March|Mar|April|Apr|May|June|Jun|July|Jul|Aug|Sept|Sep|Oct|Nov|Dec'

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.11'
+  VERSION = '1.8.12'
 end
 
 

data/test/data/at-austria/2013_14/bl.txt

@@ -10,34 +10,37 @@
 6. Runde | Sa. 24.08. - So. 25.08.
 
 
-## 1. Runde  //  Sa+So 20.+21. Jul 2013
+# -- 1. Runde  //  Sa+So 20.+21. Jul 2013
 
-(Sa) 20.07. 16.30  Austria Wien         2:0  FC Admira Wacker
-(Sa) 20.07. 19.00  SC Wiener Neustadt   1:5  RB Salzburg
-(Sa) 20.07. 19.00  SV Grödig            0:0  SV Ried
-(Sa) 20.07. 19.00  Wolfsberger AC       2:2  Rapid Wien
+(Sa) 20.07.
+Austria Wien         2:0  FC Admira Wacker
+SC Wiener Neustadt   1:5  RB Salzburg
+SV Grödig            0:0  SV Ried
+Wolfsberger AC       2:2  Rapid Wien
 
-(So) 21.07. 16.30  FC Wacker Innsbruck  2:2  Sturm Graz
+(So) 21.07.
+FC Wacker Innsbruck  2:2  Sturm Graz
 
 
-## 2. Runde  // Sa+So 27.+28. Jul 2013
+# -- 2. Runde  // Sa+So 27.+28. Jul 2013
 
-(Sa) 27.07. 16.30  Rapid Wien           4:0  SC Wiener Neustadt
-(Sa) 27.07. 19.00  FC Admira Wacker     1:2  FC Wacker Innsbruck
-(Sa) 27.07. 19.00  SV Ried              1:0  Wolfsberger AC
-(Sa) 27.07. 19.00  RB Salzburg          5:1  Austria Wien
+(Sa) 27.07. Rapid Wien           4:0  SC Wiener Neustadt
+            FC Admira Wacker     1:2  FC Wacker Innsbruck
+            SV Ried              1:0  Wolfsberger AC
+            RB Salzburg          5:1  Austria Wien
 
-(So) 28.07. 16.30  Sturm Graz           0:2  SV Grödig
+(So) 28.07. Sturm Graz           0:2  SV Grödig
 
 
-## 3. Runde // Sa.+So. 3.+4. Aug 2013
+# -- 3. Runde // Sa.+So. 3.+4. Aug 2013
 
-(Sa) 03.08. 16.30  SC Wiener Neustadt   2:1  Wolfsberger AC
-(Sa) 03.08. 19.00  SV Grödig            7:1  FC Admira Wacker
-(Sa) 03.08. 19.00  FC Wacker Innsbruck  1:1  RB Salzburg
-(Sa) 03.08. 19.00  Austria Wien         3:3  SV Ried
-
-(So) 04.08. 16.30  Sturm Graz           2:4  Rapid Wien
+[Sa 03.08.]
+SC Wiener Neustadt   2:1  Wolfsberger AC
+SV Grödig            7:1  FC Admira Wacker
+FC Wacker Innsbruck  1:1  RB Salzburg
+Austria Wien         3:3  SV Ried
+[So 04.08.]
+Sturm Graz           2:4  Rapid Wien
 
 
 ## 4. Runde // Sa.+So. 10.+11. Aug 2013

data/test/data/at-austria/2013_14/bl_ii.txt

@@ -2,24 +2,28 @@
 # Österreichische Bundesliga 2013/14 -  Frühjahr
 
 
-22. Runde // Sa.+So.
+22. Runde
 
-(Sa) 08.02.  SV Ried           2:1   SC Wiener Neustadt
-(Sa) 08.02.  Wolfsberger AC    3:2   FC Wacker Innsbruck
-(Sa) 08.02.  RB Salzburg       6:0   SV Grödig
-(Sa) 08.02.  FC Admira Wacker  1:1   Sturm Graz
+[Sa 08.02.]
+SV Ried           2:1   SC Wiener Neustadt
+Wolfsberger AC    3:2   FC Wacker Innsbruck
+RB Salzburg       6:0   SV Grödig
+FC Admira Wacker  1:1   Sturm Graz
 
-(So) 09.02.  Rapid Wien        3:1    Austria Wien
+[So 09.02.]
+Rapid Wien        3:1    Austria Wien
 
 
-23. Runde // Sa.+So.
+23. Runde
 
-(Sa) 15.02.  SV Grödig           3:0  Wolfsberger AC
-(Sa) 15.02.  FC Wacker Innsbruck 1:1  SV Ried
-(Sa) 15.02.  Sturm Graz          1:4  RB Salzburg
-(Sa) 15.02.  Austria Wien        1:1  SC Wiener Neustadt
+Sa 15.02.
+SV Grödig           3:0  Wolfsberger AC
+FC Wacker Innsbruck 1:1  SV Ried
+Sturm Graz          1:4  RB Salzburg
+Austria Wien        1:1  SC Wiener Neustadt
 
-(So) 16.02.  FC Admira Wacker    2:1  Rapid Wien
+So 16.02.
+FC Admira Wacker    2:1  Rapid Wien
 
 
 24. Runde // Sa.+So.

metadata

@@ -1,164 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.11
+  version: 1.8.12
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71514400 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *71514400
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71514010 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *71514010
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71513170 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *71513170
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71512840 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+  version_requirements: *71512840
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71512460 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *71512460
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71512140 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.3'
+  version_requirements: *71512140
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71511840 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.6
+  version_requirements: *71511840
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71511520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *71511520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71511170 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+  version_requirements: *71511170
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71510800 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *71510800
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
 - Manifest.txt
-- README.md
 files:
 - HISTORY.md
 - Manifest.txt
@@ -287,7 +256,6 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -305,29 +273,31 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.10
+rubyforge_project: sportdb
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files:
-- test/test_changes.rb
-- test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
-- test/test_reader.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
+- test/test_cursor.rb
 - test/test_scores.rb
-- test/test_utils.rb
 - test/test_winner.rb
+- test/test_round_def.rb
+- test/test_utils.rb
+- test/test_round_header.rb
+- test/test_reader.rb
+- test/test_changes.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 40a271851bbcc415daa4d38228107ff187b11ada
-  data.tar.gz: e8566c5664d8c3041f090450d811399633960789
-SHA512:
-  metadata.gz: ea16708dac574bd45d742d4f5621b4226b0e24511a1b88c07758acfa056ce1b6eb8bdb8fbd24dedcde57bb58e702196c5658d17c38ea0651f6c4390e05e5ed6a
-  data.tar.gz: 267916684d3cc873c8edec9796b47fda7612f40aecde32b5b12153a86394d3b27df6ed33745bae9894770ad9606ba6fb3425cb4757f5f5fcef3036a0063680e7