sportdb-models 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942cefb9499f99a5fc881b0d5ea1fb6d36315151
-  data.tar.gz: 0d2638fe812b34d2e1d56a759bbd79434c9b14ac
+  metadata.gz: 6581b2503f64b81e2e13054cfd6fcdc82ef1cd92
+  data.tar.gz: 53c61cb4597030a55359c09a8952d2ffa3b3d0ee
 SHA512:
-  metadata.gz: d1005ea0b22cb6aa7a411a3cfdbebb4637ef8d850b379de2d3395d0053001882b342353cbb88ecc322ae991fbb8472e4663bd89d23a6379c399eb4baaf7c1408
-  data.tar.gz: 90ff71d8d400abb55a5d7b2dd69b474175a1dfbdaac5d302e9e9f76fbc29684a5679632c091d55bde3b4fa9cfe715e455e2cba5f2483afb19ec7bf46a9669dd7
+  metadata.gz: 8e07c41d35dbd0beff9d7ac7d90256d83d5d176140b246f9271afaf246b2ddeef7082632743e8db3f3bdb9364d93e19357541d4509d53b897ce68643e4cbb7ef
+  data.tar.gz: c5240235260c31b5968e2069b0797b6d8f56d5c9aa271f6e0e55e8255da43829e874cb8b5afa4489c15fc0ac9b6cdeffdcc7f768055e290578c9fa66f89f577b

data/Manifest.txt

@@ -50,6 +50,7 @@ lib/sportdb/models/world/continent.rb
 lib/sportdb/models/world/country.rb
 lib/sportdb/models/world/state.rb
 lib/sportdb/patterns.rb
+lib/sportdb/pretty_printer.rb
 lib/sportdb/reader.rb
 lib/sportdb/reader_file.rb
 lib/sportdb/reader_zip.rb
@@ -81,6 +82,7 @@ test/data/at-austria/2013_14/el.txt
 test/data/at-austria/2013_14/el.yml
 test/data/at-austria/2013_14/squads/austria.txt
 test/data/at-austria/2013_14/squads/salzburg.txt
+test/data/at-austria/2014_15/1-bundesliga-ii.txt
 test/data/at-austria/leagues.txt
 test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
@@ -128,6 +130,7 @@ test/test_date.rb
 test/test_goals.rb
 test/test_lang.rb
 test/test_load.rb
+test/test_pp.rb
 test/test_reader.rb
 test/test_reader_from_string.rb
 test/test_round_auto.rb

data/lib/sportdb/models.rb

@@ -88,6 +88,8 @@ require 'sportdb/lang'
 require 'sportdb/deleter'
 require 'sportdb/stats'
 
+require 'sportdb/pretty_printer'
+
 
 module SportDb
 

data/lib/sportdb/pretty_printer.rb

@@ -0,0 +1,175 @@
+# encoding: UTF-8
+
+module SportDb
+
+
+###
+## reads in a text files
+##   and tries to fix up/patch some parts
+
+
+class Patcher
+
+  include LogUtils::Logging
+
+  def initialize( root, opts={} )
+    @root  = root
+    @path  = opts[:path] || opts[:paths]    # pass in regex as string
+    @names = opts[:name] || opts[:names]    # pass in regex as string
+
+    @path_regex  = Regexp.new( @path )  if @path
+    @names_regex = Regexp.new( @names ) if @names
+  end
+
+
+  def find_files
+    ## note: for now always filter by .txt extension
+    files = Dir[ "#{@root}/**/*.txt" ]
+
+    puts "before filter:"
+    pp files
+
+    files = files.select do |f|
+
+      basename = File.basename( f )
+      dirname  = File.dirname( f )   # note: add trailing slash
+      dirname = "#{dirname}/"
+
+      puts "  basename=>#{basename}<, dirname=>#{dirname}<"
+
+      if @path_regex
+        match_dirname =  @path_regex === dirname    # note: use === (triple) for true/false regex match
+      else
+        match_dirname = true
+      end
+      
+      if @names_regex
+        match_basename = @names_regex === basename
+      else
+        match_basename = true
+      end
+
+      match_basename && match_dirname
+    end
+
+    puts "after filter:"
+    pp files
+
+    files
+  end # method find_files
+
+
+  def patch( save=false)
+    files = find_files
+    change_logs = []
+
+    files.each do |file|
+      p = PrettyPrinter.from_file( file )
+      new_text, change_log = p.patch
+      
+      next if change_log.empty?   ## no changes
+      
+      if save
+        File.open( file, 'w' ) do |f|
+          f.write new_text
+        end
+      end
+
+      change_logs << [file, change_log]
+    end
+
+    change_logs  ## return change_logs or empty array
+  end # method patch
+
+end  ## class Patcher
+
+
+class PrettyPrinter
+  
+  include LogUtils::Logging
+
+  def self.from_file( path, opts={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text, opts )
+  end
+
+  def self.from_string( text, opts={} )
+    self.new( text, opts )
+  end  
+
+
+  def initialize( text, opts={} )
+    @old_text = text
+    @opts     = opts
+  end
+
+
+  ## change to DE_SCORES_REGEX or SCORES_DE_REGEX ??
+  SCORES_REGEX = /\b
+                  (?<score1>\d{1,2})
+                    -
+                  (?<score2>\d{1,2})
+                  \b
+                 /x
+
+  def patch  ## return new text (and change log??)
+    new_text = ''
+    change_log = []   ## track changes  - rename - use edits? changes? etc.
+    line_no = 0
+
+    @old_text.each_line do |line|
+      line_no +=1
+
+      # comments allow:
+      # 1) #####  (shell/ruby style)
+      # 2) --  comment here (haskel/?? style)
+      # 3) % comment here (tex/latex style)
+
+      if line =~ /^\s*#/ || line =~ /^\s*--/ || line =~ /^\s*%/
+        # skip komments and do NOT copy to result (keep comments secret!)
+        logger.debug "[#{line_no}] add comment line >#{line}<"
+        new_text << line
+        next
+      end
+
+      if line =~ /^\s*$/ 
+        # kommentar oder leerzeile überspringen 
+        logger.debug "[#{line_no}] add blank line >#{line}<"
+        new_text << line
+        next
+      end
+
+      ## do nothing for now
+      if line =~ SCORES_REGEX
+        ## patch scores format
+        logger.debug "** found scores >#{line}<"
+
+        new_line = line.dup
+        new_line.gsub!( SCORES_REGEX ) do |m|
+          logger.debug " match: >#{m}<  : #{m.class.name}"
+
+          old_scores = m
+          ## todo: how to use named captures? possible?
+          new_scores = "#{$1}:#{$2}"
+
+          change_log << [line_no, "changed >#{old_scores}< to >#{new_scores}< in >#{line}<"]
+
+          new_scores
+        end
+
+        logger.debug "[#{line_no}] add patched line >#{new_line}<"
+        new_text << new_line
+      else
+        logger.debug "[#{line_no}] add >#{line}<"
+        new_text << line
+      end
+    end # each lines
+
+    [new_text, change_log]
+  end # method patch
+
+
+end # class PrettyPrinter
+end # module SportDb

data/lib/sportdb/version.rb

@@ -3,7 +3,7 @@
 module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 12
+  MINOR = 13
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/data/at-austria/2014_15/1-bundesliga-ii.txt

@@ -0,0 +1,158 @@
+###################################################
+# Österreichische Bundesliga 2014/15 -  Frühjahr
+
+
+20. Runde
+
+[Sa 14.2.]
+  Rapid Wien      3-0   SV Ried
+  SV Grödig       0-2   Sturm Graz
+  Wolfsberger AC  1-0   Austria Wien
+  Wr. Neustadt    0-2   RB Salzburg
+  SCR Altach      2-0   Admira Wacker
+
+21. Runde
+
+[Sa 21.2.]
+  SV Grödig       2-0   Wolfsberger AC
+  Austria Wien    5-2   SCR Altach
+  Sturm Graz      3-3   Wr. Neustadt
+  SV Ried         2-2   RB Salzburg
+  Admira Wacker   1-1   Rapid Wien
+
+22. Runde
+
+[Sa 28.2.]
+  RB Salzburg    3-1   SV Grödig
+  Rapid Wien     1-0   Sturm Graz
+  SV Ried        2-2   Admira Wacker
+  Wr. Neustadt   1-0   Austria Wien
+  SCR Altach     1-0   Wolfsberger AC
+
+23. Runde
+
+[Di 3.3.]
+  Rapid Wien     1-0  SCR Altach
+  SV Grödig      1-3  Wr. Neustadt
+  Sturm Graz     2-1  Austria Wien
+  Wolfsberger AC 1-2  SV Ried
+  Admira Wacker  1-4  RB Salzburg
+
+24. Runde
+
+[Sa 7.3.]
+  RB Salzburg    0-1  SCR Altach
+  Austria Wien   2-1  Rapid Wien
+  Sturm Graz     2-0  Wolfsberger AC
+  SV Ried        2-1  SV Grödig
+  Wr. Neustadt   0-0  Admira Wacker
+
+25. Runde
+
+[Sa 14.3.]
+  RB Salzburg    2-1  Sturm Graz
+  Rapid Wien     4-0  SV Grödig
+  Wolfsberger AC 2-0  Wr. Neustadt
+  Admira Wacker  1-1  Austria Wien
+  SCR Altach     2-1  SV Ried
+
+26. Runde
+
+[Sa 21.3.]
+  SV Grödig      0-1  SCR Altach
+  Austria Wien   0-1  SV Ried
+  Sturm Graz     3-1  Admira Wacker
+  Wolfsberger AC 3-2  RB Salzburg
+  Wr. Neustadt   0-1  Rapid Wien
+
+27. Runde
+
+[Sa 4.4.]
+  RB Salzburg    3-1  Austria Wien
+  Rapid Wien     4-1  Wolfsberger AC
+  SV Ried        1-2  Sturm Graz
+  Admira Wacker  2-3  SV Grödig
+  SCR Altach     3-1  Wr. Neustadt    
+
+28. Runde
+
+[Sa 11.4.]
+  Rapid Wien     3-3  RB Salzburg
+  SV Grödig      1-1  Austria Wien
+  Sturm Graz     5-0  SCR Altach
+  Wolfsberger AC 2-0  Admira Wacker
+  Wr. Neustadt   0-1  SV Ried
+
+29. Runde
+
+[Sa 18.4.]
+  RB Salzburg    6-0  Wr. Neustadt
+  Austria Wien   1-1  Wolfsberger AC
+  Sturm Graz     2-1  SV Grödig
+  SV Ried        0-1  Rapid Wien
+  Admira Wacker  2-2  SCR Altach
+
+30. Runde
+
+[Sa 25.4.]
+  RB Salzburg    2-1  SV Ried
+  Rapid Wien     1-1  Admira Wacker
+  Wolfsberger AC 2-1  SV Grödig
+  Wr. Neustadt   4-4  Sturm Graz
+  SCR Altach     2-0  Austria Wien
+
+31. Runde
+
+[Sa 2.5.]
+  SV Grödig      0-3  RB Salzburg
+  Austria Wien   2-1  Wr. Neustadt
+  Sturm Graz     2-2  Rapid Wien
+  Wolfsberger AC 2-0  SCR Altach
+  Admira Wacker  1-0  SV Ried
+
+32. Runde
+
+[Sa 9.5.]
+  RB Salzburg    4-0  Admira Wacker
+  Austria Wien   0-0  Sturm Graz
+  SV Ried        4-0  Wolfsberger AC
+  Wr. Neustadt   2-4  SV Grödig
+  SCR Altach     1-3  Rapid Wien
+
+33. Runde
+
+[Sa 16.5.]
+  Rapid Wien     4-1  Austria Wien
+  SV Grödig      3-2  SV Ried
+  Wolfsberger AC 1-0  Sturm Graz
+  Admira Wacker  0-0  Wr. Neustadt
+  SCR Altach     2-2  RB Salzburg
+
+34. Runde
+
+[Di 19.5.]
+  SV Grödig      0-2  Rapid Wien     
+  Austria Wien   0-1  Admira Wacker
+  Sturm Graz     0-0  RB Salzburg
+  SV Ried        4-1  SCR Altach
+  Wr. Neustadt   2-0  Wolfsberger AC
+
+35. Runde
+
+[So 24.5.]
+  RB Salzburg    3-0  Wolfsberger AC
+  Rapid Wien     0-0  Wr. Neustadt
+  SV Ried        0-2  Austria Wien
+  Admira Wacker  1-2  Sturm Graz
+  SCR Altach     2-0  SV Grödig
+
+36. Runde
+
+[So 31.5.]
+  SV Grödig      0-1  Admira Wacker
+  Austria Wien   1-1  RB Salzburg
+  Sturm Graz     0-0  SV Ried
+  Wolfsberger AC 0-5  Rapid Wien
+  Wr. Neustadt   0-1  SCR Altach
+
+

data/test/helper.rb

@@ -62,6 +62,13 @@ PersonReader       = PersonDb::PersonReader
 ######
 # New Reader ShortCuts
 
+module TestPrettyPrinter
+  def self.from_file( name, opts={} )
+    SportDb::PrettyPrinter.from_file( "#{SportDb.test_data_path}/#{name}.txt", opts )
+  end
+end
+
+
 module TestTeamReader
   def self.from_file( name, more_attribs={} )
     TeamReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )

data/test/test_pp.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_pp.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestPp < MiniTest::Test
+  
+  def test_patch
+
+    r = TestPrettyPrinter.from_file( 'at-austria/2014_15/1-bundesliga-ii' )
+    new_text, change_log = r.patch
+
+    puts new_text
+
+    pp change_log
+
+
+    p = SportDb::Patcher.new( "#{SportDb.test_data_path}/at-austria",
+                               path: '/\d{4}_\d{2}/$',
+                               names: 'bundesliga|el'
+                            )
+    change_logs = p.patch   # note: defaults to save=false (for now)
+
+    pp change_logs
+
+    assert true ## assume ok if we get here
+  end  # method test_patch
+
+end # class TestPp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -128,6 +128,7 @@ files:
 - lib/sportdb/models/world/country.rb
 - lib/sportdb/models/world/state.rb
 - lib/sportdb/patterns.rb
+- lib/sportdb/pretty_printer.rb
 - lib/sportdb/reader.rb
 - lib/sportdb/reader_file.rb
 - lib/sportdb/reader_zip.rb
@@ -159,6 +160,7 @@ files:
 - test/data/at-austria/2013_14/el.yml
 - test/data/at-austria/2013_14/squads/austria.txt
 - test/data/at-austria/2013_14/squads/salzburg.txt
+- test/data/at-austria/2014_15/1-bundesliga-ii.txt
 - test/data/at-austria/leagues.txt
 - test/data/at-austria/teams.txt
 - test/data/at-austria/teams_2.txt
@@ -206,6 +208,7 @@ files:
 - test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb
+- test/test_pp.rb
 - test/test_reader.rb
 - test/test_reader_from_string.rb
 - test/test_round_auto.rb
@@ -257,6 +260,7 @@ test_files:
 - test/test_round_def.rb
 - test/test_utils.rb
 - test/test_reader_from_string.rb
+- test/test_pp.rb
 - test/test_round_header.rb
 - test/test_round_auto.rb
 - test/test_goals.rb