lib/sportdb/reader.rb in sportdb-1.2.0 vs lib/sportdb/reader.rb in sportdb-1.3.0

@@ -2,13 +2,11 @@
 
 module SportDB
 
 class Reader
 
-  def logger
-    @logger ||= LogUtils[ self ]
-  end
+  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
 
@@ -62,22 +60,22 @@
         logger.error "unknow fixture type in setup (yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<); skipping"
       end
     
     end
     
-    puts "[debug] fixture setup:"
-    pp ary
+    logger.debug "fixture setup:"
+    logger.debug ary.to_json
     
     ary
       
   end # load_fixture_setup
 
 
   def load( ary, include_path )   # convenience helper for all-in-one reader
     
-    puts "[debug] enter load(include_path=>>#{include_path}<<):"
-    pp ary
+    logger.debug "enter load(include_path=>>#{include_path}<<):"
+    logger.debug ary.to_json
     
     ary.each do |rec|
       if rec.kind_of?( String )
         ## assume single fixture name
         name = rec
@@ -139,12 +137,11 @@
 
     reader = ValuesReader.new( path, more_values )
 
     load_leagues_worker( reader )
     
-    ### todo/fix: add prop
-    ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+    Prop.create_from_fixture!( name, path )
      
   end # load_leagues
 
 
   def load_seasons( name, include_path )
@@ -158,11 +155,11 @@
 
       ## puts "processing event attrib >>#{key}<< >>#{value}<<..."
 
       if key == 'seasons'
         
-        puts "#{value.class.name}: >>#{value}<<"
+        logger.debug "#{value.class.name}: >>#{value}<<"
         
         ## nb: assume value is an array
         value.each do |item|
           season_attribs = {}
           
@@ -188,12 +185,11 @@
         logger.error "unknown seasons key; skipping"
       end
   
     end # each key,value
     
-    ### todo/fix: add prop
-    ### Prop.create_from_sportdb_fixture!( name, path )
+    Prop.create_from_fixture!( name, path )
   
   end  # load_seasons
 
 
 
@@ -277,11 +273,11 @@
     
     logger.debug event_attribs.to_json
     
     event.update_attributes!( event_attribs )
     
-    ### todo/fix: add prop
+    Prop.create_from_fixture!( name, path )
   
   end  # load_event
 
 
   def load_fixtures_from_string( event_key, text )  # load from string (e.g. passed in via web form)
@@ -305,12 +301,11 @@
 
     reader = LineReader.new( path )
     
     load_fixtures_worker( event_key, reader )
 
-    ## fix add prop
-    ## Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+    Prop.create_from_fixture!( name, path )
   end
 
 
   def load_teams( name, include_path, more_values={} )
     path = "#{include_path}/#{name}.txt"
@@ -319,12 +314,11 @@
 
     reader = ValuesReader.new( path, more_values )
 
     load_teams_worker( reader )
     
-    ## todo/fix: add prop
-    ## Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.txt.#{SportDB::VERSION}" )    
+    Prop.create_from_fixture!( name, path )
   end # load_teams
 
 private
 
   include SportDB::FixtureHelpers
@@ -355,11 +349,11 @@
       else
         logger.debug "create League:"
         rec = League.new
       end
       
-      puts attribs.to_json
+      logger.debug attribs.to_json
    
       rec.update_attributes!( attribs )
 
     end # each lines
 
@@ -400,11 +394,11 @@
       else
         logger.debug "create Team:"
         rec = Team.new
       end
       
-      puts attribs.to_json
+      logger.debug attribs.to_json
    
       rec.update_attributes!( attribs )
 
     end # each lines
   end # method load_teams_worker
@@ -420,10 +414,10 @@
     @round         = nil
     
     
     @event = Event.find_by_key!( event_key )
     
-    logger.info "Event #{@event.key} >#{@event.title}<"
+    logger.debug "Event #{@event.key} >#{@event.title}<"
     
     @known_teams = @event.known_teams_table
     
     parse_fixtures( reader )