sportdb 1.6.7 → 1.6.8

data/lib/sportdb/models/person.rb

@@ -5,6 +5,42 @@ class Person < ActiveRecord::Base
 
   has_many :goals
 
+  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+
+
+  def self.create_or_update_from_values( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check optional values
+    values.each_with_index do |value, index|
+      if value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
+        value_country = Country.find_by_key!( value )
+        new_attributes[ :country_id ] = value_country.id
+      else
+        ## todo: assume title2 ??
+        ## assume title2 if title2 is empty (not already in use)
+        ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end
+
+    rec = Person.find_by_key( new_attributes[ :key ] )
+    if rec.present?
+      logger.debug "update Person #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Person:"
+      rec = Person.new
+    end
+      
+    logger.debug new_attributes.to_json
+   
+    rec.update_attributes!( new_attributes )
+  end # create_or_update_from_values
+
+
 end  # class Person
 
 

data/lib/sportdb/reader.rb

@@ -83,8 +83,12 @@ class Reader
         ## assume single fixture name
         name = rec
         
-        if name  =~ /^circuits/
+        if name  =~ /^circuits/  # e.g. circuits.txt in formula1.db
           load_tracks( name )
+        elsif name =~ /^drivers/ # e.g. drivers.txt in formula1.db
+          load_persons( name )
+        elsif name =~ /^teams/   # e.g. teams.txt in formula1.db
+          load_teams( name )
         elsif name =~ /^seasons/
           load_seasons( name )
         elsif name =~ /^leagues/
@@ -174,6 +178,25 @@ class Reader
   end # load_tracks
 
 
+
+  def load_persons( name, more_values={} )
+
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = ValuesReader.new( path, more_values )
+
+    reader.each_line do |new_attributes, values|
+      Person.create_or_update_from_values( new_attributes, values )
+    end # each lines
+    
+    Prop.create_from_fixture!( name, path )
+
+  end # load_persons
+
+
+
   def load_seasons( name )
     path = "#{include_path}/#{name}.yml"
 

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.7'
+  VERSION = '1.6.8'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &73513280 !ruby/object:Gem::Requirement
+  requirement: &80599410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *73513280
+  version_requirements: *80599410
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &73513060 !ruby/object:Gem::Requirement
+  requirement: &80599190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *73513060
+  version_requirements: *80599190
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73512840 !ruby/object:Gem::Requirement
+  requirement: &80598970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *73512840
+  version_requirements: *80598970
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73512620 !ruby/object:Gem::Requirement
+  requirement: &80598750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *73512620
+  version_requirements: *80598750
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: