sportdb 1.6.13 → 1.6.14

data/lib/sportdb/lang.rb

@@ -206,12 +206,8 @@ class LangChecker
   def initialize
   end
 
-  def analyze( name, include_path )
+  def analyze( path )
     # return lang code e.g. en, de, es
-    
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
 
     text = File.read_utf8( path )
     

data/lib/sportdb/reader.rb

@@ -2,13 +2,30 @@
 
 module SportDb
 
+module Matcher
+
+  def match_leagues_for_country( name, &blk )
+    match_xxx_for_country( name, 'leagues', blk )
+  end
+
+  def match_teams_for_country( name, &blk )
+    match_xxx_for_country( name, 'teams', blk )
+  end
+
+end # module Matcher
+
+
 class Reader
 
   include LogUtils::Logging
 
+
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use Team instead of Models::Team 
-  include SportDB::Models
+  include SportDb::Models
+
+  include WorldDb::Matcher
+  include SportDb::Matcher # lets us use match_teams_for_country etc.
 
 
   attr_reader :include_path
@@ -98,7 +115,7 @@ class Reader
           # NB: assume @event is set from previous load 
           race = Race.find_by_event_id_and_pos( @event.id, race_pos )
           load_records( name, race_id: race.id ) # e.g. 2013/04-gp-monaco.txt in formula1.db
-        elsif name =~ /^seasons/
+        elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
           load_seasons( name )
         elsif name =~ /^leagues/
           if name =~ /club/
@@ -108,18 +125,18 @@ class Reader
             # e.g. leagues
             load_leagues( name )
           end
-        elsif name =~ /^([a-z]{2})\/leagues/
-          # auto-add country code (from folder structure) for country-specific leagues
-          #  e.g. at/leagues
-          country_key = $1
-          country = Country.find_by_key!( country_key )
-          load_leagues( name, club: true, country_id: country.id )
-        elsif name =~ /^([a-z]{2})\/teams/
-          # auto-add country code (from folder structure) for country-specific teams
-          #  e.g. at/teams at/teams.2 de/teams etc.
-          country_key = $1
-          country = Country.find_by_key!( country_key )
-          load_teams( name, club: true, country_id: country.id )
+        elsif match_leagues_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/leagues/
+                # auto-add country code (from folder structure) for country-specific leagues
+                #  e.g. at/leagues
+                country = Country.find_by_key!( country_key )
+                load_leagues( name, club: true, country_id: country.id )
+              end
+        elsif match_teams_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/teams/
+                # auto-add country code (from folder structure) for country-specific teams
+                #  e.g. at/teams at/teams.2 de/teams etc.                
+                country = Country.find_by_key!( country_key )
+                load_teams( name, club: true, country_id: country.id )
+              end
         elsif name =~ /\/teams/
           if name =~ /club/
             # club teams (many countries)
@@ -190,11 +207,7 @@ class Reader
 
   def load_seasons( name )
 
-    path = "#{include_path}/#{name}.yml"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = HashReader.new( path )
+    reader = HashReaderV2.new( name, include_path )
 
 ####
 ## fix!!!!!
@@ -239,22 +252,17 @@ class Reader
   
     end # each key,value
 
-    Prop.create_from_fixture!( name, path )
-
   end  # load_seasons
 
 
   def fetch_event( name )
     # get/fetch/find event from yml file
 
-    path = "#{include_path}/#{name}.yml"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-
     ## todo/fix: use h = HashFile.load( path ) or similar instead of HashReader!!
 
-    reader = HashReader.new( path )
+    ## todo/fix: add option for not adding prop automatically?? w/ HashReaderV2
+
+    reader = HashReaderV2.new( name, include_path )
 
     event_attribs = {}
 
@@ -289,11 +297,7 @@ class Reader
 ##   use Event.create_or_update_from_hash_reader?? or similar
 #   move parsing code to model
 
-    path = "#{include_path}/#{name}.yml"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = HashReader.new( path )
+    reader = HashReaderV2.new( name, include_path )
 
     event_attribs = {}
 
@@ -375,8 +379,6 @@ class Reader
     
     event.update_attributes!( event_attribs )
 
-    Prop.create_from_fixture!( name, path )
-
   end  # load_event
 
 
@@ -392,12 +394,24 @@ class Reader
   end
 
   def load_fixtures( event_key, name )  # load from file system
+
+    ## todo: move name_real_path code to LineReaderV2 ????
+    pos = name.index( '!/')
+    if pos.nil?
+      name_real_path = name   # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      #   at-austria!/w-wien/beers becomes
+      #   w-wien/beers
+      name_real_path = name[ (pos+2)..-1 ]
+    end
+
      
-    path = "#{include_path}/#{name}.txt"
+    path = "#{include_path}/#{name_real_path}.txt"
 
     logger.info "parsing data '#{name}' (#{path})..."
     
-    SportDB.lang.lang = LangChecker.new.analyze( name, include_path )
+    SportDB.lang.lang = LangChecker.new.analyze( path )
 
     reader = LineReader.new( path )
     

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.13'
+  VERSION = '1.6.14'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &72775370 !ruby/object:Gem::Requirement
+  requirement: &18220920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *72775370
+  version_requirements: *18220920
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &72775150 !ruby/object:Gem::Requirement
+  requirement: &18220452 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,36 +32,38 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *72775150
+  version_requirements: *18220452
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72774930 !ruby/object:Gem::Requirement
+  requirement: &18219588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *72774930
+  version_requirements: *18219588
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &72774710 !ruby/object:Gem::Requirement
+  requirement: &18219000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *72774710
+  version_requirements: *18219000
 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
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sportdb
-rubygems_version: 1.8.17
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: sportdb - sport.db command line tool