sportdb 1.9.3 → 1.9.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 75701bce9778f7729f1ea7a9e5244ba7fb471edb
+  data.tar.gz: e08713c56ec7e46286b7b8f2ded213d1b8db42aa
+SHA512:
+  metadata.gz: 996b1532556e67a7b9b56db38e955f87375968ae0fb4c872ae2eb377f83730c05c9777e01f073638e76dc6e077061e92d6b988ece00c12b8073fbc9b0d1db87d
+  data.tar.gz: 837ba63144656e2596294e4f76e490889592456e9d77d63155fcf7b466a6640d7342a9d57f236cb702d211286d1fa04e01d8f31184254ece93c5e6425753ec4c

data/config/fixtures/en.yml

@@ -4,7 +4,7 @@
 
 group:      Group
 
-round:      Round|Matchday
+round:      Round|Matchday|Week
 
 stage:    Stage|Phase|Rounds
 # e.g.

data/lib/sportdb/matcher.rb

@@ -14,6 +14,10 @@ module Matcher
     match_xxx_for_country( name, 'teams', &blk )
   end
 
+  def match_clubs_for_country( name, &blk )
+    match_xxx_for_country( name, 'clubs', &blk )
+  end
+
   def match_tracks_for_country( name, &blk )
     match_xxx_for_country( name, 'tracks', &blk )
   end

data/lib/sportdb/reader.rb

@@ -90,7 +90,7 @@ class Reader
     elsif name =~ /^skiers/ # e.g. skiers.men.txt in ski.db
       reader = PersonDb::PersonReader.new( include_path )
       reader.read( name )
-    elsif name =~ /^teams/   # e.g. teams.txt in formula1.db
+    elsif name =~ /^teams/   # e.g. teams.txt in formula1.db   ### fix: check if used for football ? - add clubs
       reader = TeamReader.new( include_path )
       reader.read( name )
     elsif name =~ /\/races/  # e.g. 2013/races.txt in formula1.db
@@ -124,12 +124,22 @@ class Reader
     elsif name =~ /\/squads/ || name =~ /\/rosters/  # e.g. 2013/squads.txt in formula1.db
       reader = RaceTeamReader.new( include_path )
       reader.read( name )
+
+
+##  fix!!! - find a better unique pattern  to generic???
+##
+##    fix: use two routes/tracks/modes:
+##
+##    races w/ records etc   and  teams/matches etc.   split into two to make code easier to read/extend!!!
+##
     elsif name =~ /\/([0-9]{2})-/
       race_pos = $1.to_i
       # NB: assume @event is set from previous load 
       race = Race.find_by_event_id_and_pos( @event.id, race_pos )
       reader = RecordReader.new( include_path )
       reader.read( name, race_id: race.id ) # e.g. 2013/04-gp-monaco.txt in formula1.db
+
+
     elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
       reader = SeasonReader.new( include_path )
       reader.read( name )
@@ -156,13 +166,25 @@ class Reader
             #  e.g. at/teams at/teams.2 de/teams etc.                
             country = Country.find_by_key!( country_key )
             reader = TeamReader.new( include_path )
-            reader.read( name, club: true, country_id: country.id )
+            reader.read( name, club: true, country_id: country.id )  ## fix: club flag - do NOT set - why? why not?
+          end
+    elsif match_clubs_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/clubs/
+            # auto-add country code (from folder structure) for country-specific clubs
+            #  e.g. at/teams at/teams.2 de/teams etc.                
+            country = Country.find_by_key!( country_key )
+            reader = TeamReader.new( include_path )
+            reader.read( name, club: true, country_id: country.id )  ## note: always sets club flag to true
           end
-    elsif name =~ /(?:^|\/)teams/
+    elsif name =~ /(?:^|\/)teams/   ## fix: check if teams rule above (e.g. /^teams/ )conflicts/matches first ???
       reader = TeamReader.new( include_path )
-      reader.read( name, club: is_club_fixture?( name ) )
-    elsif name =~ /\/(\d{4}|\d{4}_\d{2})(--[^\/]+)?\// ||
-          name =~ /\/(\d{4}|\d{4}_\d{2})$/
+      reader.read( name, club: is_club_fixture?( name ) )  ## fix: cleanup - use is_club_fixture? still needed w/ new clubs in name?
+    elsif name =~ /(?:^|\/)clubs/
+      reader = TeamReader.new( include_path )
+      reader.read( name, club: true )   ## note: always sets club flag to true
+    elsif name =~ /\/(\d{4}|\d{4}[_\-]\d{2})(--[^\/]+)?\// ||
+          name =~ /\/(\d{4}|\d{4}[_\-]\d{2})$/
+
+      # note: allow 2013_14 or 2013-14 (that, is dash or underscore)
 
       # note: keep a "public" reference of last event in @event  - e.g. used/required by squads etc.
       eventreader = EventReader.new( include_path )

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.9.3'
+  VERSION = '1.9.4'
 end
 
 

metadata

@@ -1,148 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.3
-  prerelease: 
+  version: 1.9.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &77222090 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77222090
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &77221830 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77221830
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &77221580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77221580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &77221170 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *77221170
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &77220840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77220840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &77220610 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77220610
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &77220380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77220380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &77220110 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *77220110
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &77219890 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *77219890
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77219700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77219700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77219450 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *77219450
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77219100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *77219100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -318,6 +353,7 @@ files:
 homepage: https://github.com/sportdb/sport.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -335,38 +371,36 @@ 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: 1.8.17
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: sportdb - sport.db command line tool
 test_files:
+- test/test_assoc_reader.rb
+- test/test_changes.rb
+- test/test_cursor.rb
 - test/test_date.rb
+- test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb
-- test/test_cursor.rb
-- test/test_standings.rb
-- test/test_scores.rb
-- test/test_winner.rb
-- test/test_round_def.rb
-- test/test_utils.rb
-- test/test_squad_reader.rb
+- test/test_reader.rb
 - test/test_reader_from_string.rb
-- test/test_round_header.rb
 - test/test_round_auto.rb
-- test/test_goals.rb
-- test/test_reader.rb
-- test/test_assoc_reader.rb
-- test/test_changes.rb
+- test/test_round_def.rb
+- test/test_round_header.rb
+- test/test_scores.rb
+- test/test_squad_reader.rb
+- test/test_standings.rb
+- test/test_utils.rb
+- test/test_winner.rb