sportdb-config 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ebc860cc621c13172c0aa54ab8906349ee4d58
-  data.tar.gz: 78749ba61be6f1fe5735297c9bef55456ca2594c
+  metadata.gz: 1ae1c9a151f0ae45288637a313a7e931add98d41
+  data.tar.gz: 630ce245f08fb76a88d90366cc2b0c4ae1145fae
 SHA512:
-  metadata.gz: '0038100e050a67987428b4c1b033a4995eb3d15d7d82f65bead40479677a12f2b13f6129dbb750209eba74e64b4e54ce5bbf0755392e5986241a5cbf36ff7f03'
-  data.tar.gz: 330eb0c1dc2aa541f3c5be1ee43f198dde1225d012a2dd0d34baad4240edeee32c44027eb90432bc85c8a7977a912590baf5b3b61200d5db624833fa13555258
+  metadata.gz: f0c92d020a856963d9eb77b8d58dc52c1b59a0fcec4cedf9786ee016d667460527ce62a01114cc181a6bd721692f93fd4e659f8bc6c8ed8b3a8360153749ddd4
+  data.tar.gz: cbb79330d79b539240c1298f504a2bc46729dbf967dd7c1b9e60226d1e09539068cdccc8af288ab127d94423c1c65173ed9a63c90a8d6317e6e4506639c47ad0

data/lib/sportdb/config/team_reader.rb

@@ -15,9 +15,19 @@ class Team
   ##  todo: use just names for alt_names - why? why not?
   attr_accessor :name, :alt_names, :year, :ground, :city
 
+  ## more attribs - todo/fix - also add "upstream" to struct & model!!!!!
+  attr_accessor :district, :geos, :year_end
+
+  def historic?()  @year_end.nil? == false; end
+  alias_method  :past?, :historic?
+
+
   def initialize
     @alt_names = []
   end
+
+
+
 end # class Team
 
 
@@ -56,6 +66,7 @@ def self.parse( txt )
 
       ## check for duplicates - simple check for now - fix/improve
       ## todo/fix: (auto)remove duplicates - why? why not?
+      ##  todo/fix: add canonical name too!! might get duplicated in alt names!!!
       count      = last_rec.alt_names.size
       count_uniq = last_rec.alt_names.uniq.size
       if count != count_uniq
@@ -91,8 +102,18 @@ def self.parse( txt )
       if rec.name =~ /\(.+?\)/   ## note: use non-greedy (?) match
         name = rec.name.gsub( /\(.+?\)/, '' ).strip
         rec.alt_names << name
-      end
 
+        if rec.name =~ /\(([0-9]{4})-\)/            ## e.g. (2014-)
+          rec.year     = $1.to_i
+        elsif  rec.name =~ /\(-([0-9]{4})\)/            ## e.g. (-2014)
+          rec.year_end = $1.to_i
+        elsif  rec.name =~ /\(([0-9]{4})-([0-9]{4})\)/  ## e.g. (2011-2014)
+          rec.year     = $1.to_i
+          rec.year_end = $2.to_i
+        else
+          ## todo/check: warn about unknown year format
+        end
+      end
 
       ##  todo/check - check for unknown format values
       ##    e.g. too many values, duplicate years, etc.
@@ -103,13 +124,34 @@ def self.parse( txt )
         #   e.g. León     › Guanajuato     => León › Guanajuato
         value = value.strip.gsub( /[ \t]+/, ' ' )
         if value =~/^\d{4}$/   # e.g 1904
+          ## todo/check: issue warning if year is already set!!!!!!!
+          if rec.year
+            puts "!!! error - year already set to #{rec.year} - CANNOT overwrite with #{value}:"
+            pp rec
+            exit 1
+          end
           rec.year  = value.to_i
         elsif value.start_with?( '@' )   # e.g. @ Anfield
           ## cut-off leading @ and spaces
           rec.ground  = value[1..-1].strip
         else
           ## assume city / geo tree
-          rec.city = value
+          ## split into geo tree
+          geos = value.split( /[<>‹›]/ )   ## note: allow > < or › ‹
+          geos = geos.map { |geo| geo.strip }   ## remove all whitespaces
+
+          city     = geos[0]
+          ## check for "embedded" district e.g. London (Fulham) or Hamburg (St. Pauli) etc.
+          if city =~ /\((.+?)\)/   ## note: use non-greedy (?) match
+            rec.district  = $1.strip
+            city          = city.gsub( /\(.+?\)/, '' ).strip
+          end
+          rec.city = city
+
+          if geos.size > 1
+             ## cut-off city and keep the rest (of geo tree)
+             rec.geos = geos[1..-1]
+          end
         end
       end
 

data/lib/sportdb/config/version.rb

@@ -7,8 +7,8 @@ module Boot      ## note: use a different module than Config to avoid confusion
                  ##   maybe rename later gem itself to sportdb-boot - why? why not?
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 2
-  PATCH = 3
+  MINOR = 3
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_team_reader.rb

@@ -50,7 +50,58 @@ TXT
     assert_equal 5, recs.size
     assert_equal 'Atlanta United FC',  recs[0].name
     assert_equal 2017,                 recs[0].year
-    assert_equal 'Atlanta › Georgia',  recs[0].city
+    assert_equal 'Atlanta',            recs[0].city
+    assert_equal ['Georgia'],          recs[0].geos
   end
 
+
+  def test_parse_years
+    recs = SportDb::Import::TeamReader.parse( <<TXT )
+FC Dallas (1996-),         Frisco        › Texas
+Miami Fusion (1998-2001),  Fort Lauderdale › Florida
+CD Chivas USA (-2014),     Carson          › California
+TXT
+
+    pp recs
+
+    assert_equal 3, recs.size
+    assert_equal 1996,   recs[0].year
+    assert_equal false,  recs[0].historic?
+    assert_equal false,  recs[0].past?
+
+    assert_equal 1998,   recs[1].year
+    assert_equal 2001,   recs[1].year_end
+    assert_equal true,   recs[1].historic?
+    assert_equal true,   recs[1].past?
+
+    assert_equal 2014,   recs[2].year_end
+    assert_equal true,   recs[2].historic?
+    assert_equal true,   recs[2].past?
+  end
+
+  def test_parse_geos
+    recs = SportDb::Import::TeamReader.parse( <<TXT )
+#
+Fulham FC, 1879,  @ Craven Cottage,   London (Fulham)   › Greater London
+  | Fulham | FC Fulham
+Charlton Athletic FC,  @ The Valley,  London (Charlton) › Greater London
+  | Charlton | Charlton Athletic
+
+St. Pauli,   Hamburg (St. Pauli)
+TXT
+
+    pp recs
+
+    assert_equal 3, recs.size
+    assert_equal 'London',           recs[0].city
+    assert_equal 'Fulham',           recs[0].district
+    assert_equal ['Greater London'], recs[0].geos
+
+    assert_equal 'London',           recs[1].city
+    assert_equal 'Charlton',         recs[1].district
+    assert_equal ['Greater London'], recs[1].geos
+
+    assert_equal 'Hamburg',          recs[2].city
+    assert_equal 'St. Pauli',        recs[2].district
+  end
 end # class TestTeamReader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc