sportdb 1.1.0 → 1.2.0

data/Rakefile

@@ -23,7 +23,7 @@ Hoe.spec 'sportdb' do
   # self.history_file = 'History.md'
   
   self.extra_deps = [
-    ['worlddb', '~> 1.1.0'],  # NB: worlddb already includes
+    ['worlddb', '~> 1.2.0'],  # NB: worlddb already includes
                                #         - commander
                                #         - logutils
                                #         - textutils

data/lib/sportdb/cli/main.rb

@@ -4,6 +4,7 @@ require 'commander/import'
 
 # our own code / additional for cli only
 
+require 'logutils/db'
 require 'sportdb/cli/opts'
 
 
@@ -60,6 +61,8 @@ def connect_to_db( options )
   pp db_config
 
   ActiveRecord::Base.establish_connection( db_config )
+  
+  LogDb.setup  # start logging to db
 end
 
 

data/lib/sportdb/lang.rb

@@ -4,7 +4,11 @@ module SportDB
 
 class Lang
 
-  def initialize( logger=nil )
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
+
+  def initialize
 
     @lang = 'en'   # make default lang english/en
 
@@ -37,11 +41,11 @@ class Lang
   attr_reader :lang
 
   def lang=(value)
-    puts "setting lang to #{value}"
+    logger.debug "setting lang to #{value}"
     
     if @lang != value
       # reset cached values on language change
-      puts "reseting cached lang values (lang changed from #{@lang} to #{value})"
+      logger.debug "reseting cached lang values (lang changed from #{@lang} to #{value})"
 
       @group = nil
       @round = nil
@@ -184,7 +188,7 @@ private
       key     = key_wild.to_s.strip
       values  = values_wild.to_s.strip
        
-      puts "processing key >>#{key}<< with words >>#{values}<<"
+      logger.debug "processing key >>#{key}<< with words >>#{values}<<"
        
       ary += values.split('|')
     end
@@ -196,8 +200,11 @@ end # class Lang
 
 class LangChecker
 
-  def initialize( logger=nil )
-    ## add logger here
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
+  
+  def initialize
   end
 
   def analyze( name, include_path )
@@ -205,7 +212,7 @@ class LangChecker
     
     path = "#{include_path}/#{name}.txt"
 
-    puts "*** parsing data '#{name}' (#{path})..."
+    logger.info "parsing data '#{name}' (#{path})..."
 
     text = File.read_utf8( path )
     
@@ -227,11 +234,11 @@ class LangChecker
     
     # dump stats
     
-    puts "****************************************"
+    logger.info "****************************************"
     lang_counts.each_with_index do |item,index|
       ## e.g. 1. en: 20 words
       ##      2. de: 2 words
-      puts "#{index+1}. #{item[0]}: #{item[1]}"
+      logger.info "#{index+1}. #{item[0]}: #{item[1]}"
     end
     
     ## return lang code w/ highest count
@@ -244,7 +251,7 @@ private
     pos = text.index( word )
     while pos.nil? == false
       count += 1
-      puts "bingo - found >>#{word}<< on pos #{pos}, count: #{count}"
+      logger.debug "bingo - found >>#{word}<< on pos #{pos}, count: #{count}"
       ### todo: check if pos+word.length/size needs +1 or similar
       pos = text.index( word, pos+word.length)
     end

data/lib/sportdb/reader.rb

@@ -4,17 +4,18 @@ module SportDB
 
 class Reader
 
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
+
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use Team instead of Models::Team 
   include SportDB::Models
 
 
-  def initialize( opts={} )
-    @logger = LogUtils::Logger.new
+  def initialize
   end
 
-  attr_reader :logger
-
   def load_setup( setup, include_path )
     ary = load_fixture_setup( setup, include_path )
     load( ary, include_path )
@@ -136,7 +137,7 @@ class Reader
 
     logger.info "parsing data '#{name}' (#{path})..."
 
-    reader = ValuesReader.new( logger, path, more_values )
+    reader = ValuesReader.new( path, more_values )
 
     load_leagues_worker( reader )
     
@@ -151,7 +152,7 @@ class Reader
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    reader = HashReader.new( logger, path )
+    reader = HashReader.new( path )
 
     reader.each_typed do |key, value|
 
@@ -169,16 +170,16 @@ class Reader
 
           ## check if it exists
           if season.present?
-            puts "*** update season #{season.id}-#{season.key}:"
+            logger.debug "update season #{season.id}-#{season.key}:"
           else
-            puts "*** create season:"
+            logger.debug "create season:"
             season = Season.new
             season_attribs[ :key ] = item.to_s.strip
           end
           
           season_attribs[:title] = item.to_s.strip
      
-          puts season_attribs.to_json
+          logger.debug season_attribs.to_json
           
           season.update_attributes!( season_attribs )
         end
@@ -201,7 +202,7 @@ class Reader
 
     logger.info "parsing data '#{name}' (#{path})..."
 
-    reader = HashReader.new( logger, path )
+    reader = HashReader.new( path )
 
     event_attribs = {}
 
@@ -274,7 +275,7 @@ class Reader
       event = Event.new
     end
     
-    puts event_attribs.to_json
+    logger.debug event_attribs.to_json
     
     event.update_attributes!( event_attribs )
     
@@ -286,7 +287,7 @@ class Reader
   def load_fixtures_from_string( event_key, text )  # load from string (e.g. passed in via web form)
 
     ## todo/fix: move code into LineReader e.g. use LineReader.fromString() - why? why not?
-    reader = StringLineReader.new( logger, text )
+    reader = StringLineReader.new( text )
     
     load_fixtures_worker( event_key, reader )
 
@@ -302,7 +303,7 @@ class Reader
     
     SportDB.lang.lang = LangChecker.new.analyze( name, include_path )
 
-    reader = LineReader.new( logger, path )
+    reader = LineReader.new( path )
     
     load_fixtures_worker( event_key, reader )
 
@@ -316,7 +317,7 @@ class Reader
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    reader = ValuesReader.new( logger, path, more_values )
+    reader = ValuesReader.new( path, more_values )
 
     load_teams_worker( reader )
     
@@ -456,7 +457,7 @@ private
       })
     end
       
-    puts  group_attribs.to_json
+    logger.debug group_attribs.to_json
    
     @group.update_attributes!( group_attribs )
 
@@ -495,9 +496,9 @@ private
         
     @round = Round.find_by_event_id_and_pos( @event.id, pos )
     if @round.present?
-      puts "*** update round #{@round.id}:"
+      logger.debug "update round #{@round.id}:"
     else
-      puts "*** create round:"
+      logger.debug "create round:"
       @round = Round.new
           
       round_attribs = round_attribs.merge( {
@@ -508,7 +509,7 @@ private
       })
     end
         
-    puts round_attribs.to_json
+    logger.debug round_attribs.to_json
    
     @round.update_attributes!( round_attribs )
 
@@ -517,7 +518,7 @@ private
   end
 
   def parse_game( line )
-    puts "parsing game (fixture) line: >#{line}<"
+    logger.debug "parsing game (fixture) line: >#{line}<"
 
     pos = find_game_pos!( line )
 
@@ -528,7 +529,7 @@ private
     date  = find_date!( line )
     scores = find_scores!( line )
         
-    puts "  line: >#{line}<"
+    logger.debug "  line: >#{line}<"
 
 
     ### todo: cache team lookups in hash?
@@ -557,9 +558,9 @@ private
     game_attribs[ :pos ]      = pos        if pos.present?
 
     if game.present?
-      puts "*** update game #{game.id}:"
+      logger.debug "update game #{game.id}:"
     else
-      puts "*** create game:"
+      logger.debug "create game:"
       game = Game.new
 
       more_game_attribs = {
@@ -575,7 +576,7 @@ private
       game_attribs = game_attribs.merge( more_game_attribs )
     end
 
-    puts game_attribs.to_json
+    logger.debug game_attribs.to_json
 
     game.update_attributes!( game_attribs )
   end
@@ -594,7 +595,7 @@ private
     end # lines.each
     
     @patch_rounds.each do |k,v|
-      puts "*** patch start_at/end_at date for round #{k}:"
+      logger.debug "patch start_at/end_at date for round #{k}:"
       round = Round.find( k )
       games = round.games.order( 'play_at asc' ).all
       
@@ -611,7 +612,7 @@ private
       round_attribs[:start_at] = games[0].play_at
       round_attribs[:end_at  ] = games[-1].play_at
 
-      puts round_attribs.to_json
+      logger.debug round_attribs.to_json
       round.update_attributes!( round_attribs )
     end
     

data/lib/sportdb/utils.rb

@@ -19,14 +19,14 @@ module SportDB::FixtureHelpers
     ## todo: check for adding ignore case for regex (e.g. 1st leg/1st Leg)
     
     if line =~ SportDB.lang.regex_leg1
-      puts "  two leg knockout; skip knockout flag on first leg"
+      logger.debug "  two leg knockout; skip knockout flag on first leg"
       false
     elsif line =~ SportDB.lang.regex_knockout_round
-      puts "   setting knockout flag to true"
+      logger.debug "   setting knockout flag to true"
       true
     elsif line =~ /K\.O\.|Knockout/
         ## NB: add two language independent markers, that is, K.O. and Knockout
-      puts "   setting knockout flag to true (lang independent marker)"
+      logger.debug "   setting knockout flag to true (lang independent marker)"
       true
     else
       false
@@ -61,8 +61,8 @@ module SportDB::FixtureHelpers
 
     title = match[0]
 
-    puts "   title: >#{title}<"
-    puts "   pos: >#{pos}<"
+    logger.debug "   title: >#{title}<"
+    logger.debug "   pos: >#{pos}<"
       
     line.sub!( regex, '[GROUP|TITLE+POS]' )
 
@@ -81,7 +81,7 @@ module SportDB::FixtureHelpers
     # e.g.  (1)   - must start line 
     regex = /^[ \t]*\((\d{1,3})\)[ \t]+/
     if line =~ regex
-      puts "   pos: >#{$1}<"
+      logger.debug "   pos: >#{$1}<"
       
       line.sub!( regex, '[ROUND|POS] ' )  ## NB: add back trailing space that got swallowed w/ regex -> [ \t]+
       return $1.to_i
@@ -110,7 +110,7 @@ module SportDB::FixtureHelpers
     
     if line =~ regex
       value = $1.to_i
-      puts "   pos: >#{value}<"
+      logger.debug "   pos: >#{value}<"
       
       line.sub!( regex, '[ROUND|POS]' )
 
@@ -139,7 +139,7 @@ module SportDB::FixtureHelpers
 
     if line =~ regex_db
       value = "#{$1}-#{$2}-#{$3} #{$4}:#{$5}"
-      puts "   date: >#{value}<"
+      logger.debug "   date: >#{value}<"
 
       ## todo: lets you configure year
       ##  and time zone (e.g. cet, eet, utc, etc.)
@@ -149,14 +149,14 @@ module SportDB::FixtureHelpers
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_db2
       value = "#{$1}-#{$2}-#{$3} 12:00"
-      puts "   date: >#{value}<"
+      logger.debug "   date: >#{value}<"
       
       line.sub!( regex_db2, '[DATE.DB2]' )
 
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_de2
       value = "#{$3}-#{$2}-#{$1} #{$4}:#{$5}"
-      puts "   date: >#{value}<"
+      logger.debug "   date: >#{value}<"
 
       ## todo: lets you configure year
       ##  and time zone (e.g. cet, eet, utc, etc.)
@@ -166,7 +166,7 @@ module SportDB::FixtureHelpers
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_de
       value = "2012-#{$2}-#{$1} #{$3}:#{$4}"
-      puts "   date: >#{value}<"
+      logger.debug "   date: >#{value}<"
 
       ## todo: lets you configure year
       ##  and time zone (e.g. cet, eet, utc, etc.)
@@ -188,7 +188,7 @@ module SportDB::FixtureHelpers
     # e.g.  (1)   - must start line 
     regex = /^[ \t]*\((\d{1,3})\)[ \t]+/
     if line =~ regex
-      puts "   pos: >#{$1}<"
+      logger.debug "   pos: >#{$1}<"
       
       line.sub!( regex, '[POS] ' )
       return $1.to_i
@@ -222,7 +222,7 @@ module SportDB::FixtureHelpers
     scores = []
     
     if line =~ regex
-      puts "   score: >#{$1}-#{$2}<"
+      logger.debug "   score: >#{$1}-#{$2}<"
       
       line.sub!( regex, '[SCORE]' )
 
@@ -230,7 +230,7 @@ module SportDB::FixtureHelpers
       scores << $2.to_i
       
       if line =~ regex_ot
-        puts "   score.ot: >#{$1}-#{$2}<"
+        logger.debug "   score.ot: >#{$1}-#{$2}<"
       
         line.sub!( regex_ot, '[SCORE.OT]' )
 
@@ -238,7 +238,7 @@ module SportDB::FixtureHelpers
         scores << $2.to_i
       
         if line =~ regex_p
-          puts "   score.p: >#{$1}-#{$2}<"
+          logger.debug "   score.p: >#{$1}-#{$2}<"
       
           line.sub!( regex_p, '[SCORE.P]' )
 
@@ -256,7 +256,7 @@ module SportDB::FixtureHelpers
     
     if line =~ regex
       value = "#{$1}"
-      puts "   team#{index}: >#{value}<"
+      logger.debug "   team#{index}: >#{value}<"
       
       line.sub!( regex, "[TEAM#{index}]" )
 
@@ -297,7 +297,7 @@ module SportDB::FixtureHelpers
       ## check add $ e.g. (\b| |\t|$) does this work? - check w/ Benfica Lis.$
       regex = /\b#{value}(\b| |\t|$)/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
       if line =~ regex
-        puts "     match for team >#{key}< >#{value}<"
+        logger.debug "     match for team >#{key}< >#{value}<"
         # make sure @@oo{key}oo@@ doesn't match itself with other key e.g. wacker, wac, etc.
         line.sub!( regex, "@@oo#{key}oo@@ " )    # NB: add one space char at end
         return true    # break out after first match (do NOT continue)
@@ -317,4 +317,3 @@ module SportDB::FixtureHelpers
   
 
 end # module SportDB::FixtureHelpers
-

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-21 00:00:00 Z
+date: 2013-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: worlddb
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency