rsssf 0.1.0 → 0.3.0

data/lib/rsssf/reports/schedule.rb

@@ -1,77 +1,126 @@
-# encoding: utf-8
+
 
 module Rsssf
-     
+
+
+ScheduleStat = Struct.new(
+    :path,     ## path to .txt file
+    :errors   ## array or nil
+)
+
+
+
 class ScheduleReport
 
+  include Utils       ## e.g. year_from_file, etc.
+
+##
+##  quick hack?  pass along (optional) patch
+
+
+def self.build( files, title:,
+                       patch: nil )
+
+  stats = []
+  files.each_with_index do |file,i|
+
+    puts "==> [#{i+1}/#{files.size}] reading >#{file}<..."
+
+    txt = read_text( file )
+
+    stat = ScheduleStat.new
+    stat.path   = file
+    stat.errors = []
+
+    stats << stat
+  end
+
+  new( stats, title: title )
+end
+
+
 attr_reader :title
 
-def initialize( stats, opts )
+def initialize( stats,  title: )
   @stats = stats
-  @opts  = opts
-    
-  @title = opts[:title] || 'Your Title Here' 
+  @title = title
 end
 
-def save( path )
-  ### save report as README.md in repo
-  File.open( path, 'w' ) do |f|
-    f.write build_summary
-  end
-end
+### save report as README.md in repo
+def save( path ) write_text( path, build_summary ); end
+
 
 def build_summary
-  ## sort start by season (latest first) than by name (e.g. 1-bundesliga, cup, etc.)
+  ## sort start 1) by season (latest first) than
+  ##            2) by name (e.g. 1-bundesliga, cup, etc.)
   stats = @stats.sort do |l,r|
-    v =  r.season   <=> l.season
-    v =  l.filename <=> r.filename  if v == 0  ## same season
+    v =  File.basename(File.dirname(r.path)) <=> File.basename(File.dirname(l.path))
+    v =  File.basename(l.path) <=> File.basename(r.path)    if v == 0  ## same season
     v
   end
 
-  header =<<EOS
+  header =<<TXT
 
 # #{title}
 
 football.db RSSSF (Rec.Sport.Soccer Statistics Foundation) Archive Data for
 #{title}
 
-_Last Update: #{Time.now}_
-
-EOS
-
+TXT
 
-  footer =<<EOS
 
-## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum](http://groups.google.com/group/opensport).
-Thanks!
-EOS
+  errors = []
 
 
-  txt = ''
+  txt = String.new
   txt << header
-  
-  txt << "| Season | League, Cup | Rounds |\n"
+
+  txt << "| Season | League, Cup | Errors |\n"
   txt << "| :----- | :---------- | -----: |\n"
 
-  stats.each do |stat|
-    txt << "| #{stat.season} "
-    txt << "| [#{stat.filename}](#{stat.path}/#{stat.filename}) "
-    txt << "| #{stat.rounds} "
-    txt << "|\n"
+
+  stats.each_with_index do |stat,i|
+
+      path = stat.path
+      season_dir = File.basename(File.dirname( path ))
+      filename   = File.basename( path ) ## incl. extension !!
+
+      season = Season( season_dir )
+      ## note - use archive_dir_for_season for archive path
+
+
+      txt << "| #{season_dir} "
+      txt << "| [#{filename}](#{archive_dir_for_season(season)}/#{filename}) "
+
+      txt <<   if stat.errors.size > 0
+                 "|  **!! #{stat.errors.size}**  "
+               else
+                 "|  OK  "
+               end
+      txt << "|\n"
+
+      errors += stat.errors  if stat.errors.size > 0
   end
 
-  txt << "\n\n" 
+   if errors.size > 0
+     txt << "\n\n"
+     txt << "#{errors.size} errors in #{stats.size} datafile(s)\n\n"
+
+     txt << "```\n"
+     errors.each do |path, msg, line|
+        season_dir = File.basename(File.dirname( path ))
+        filename   = File.basename( path ) ## incl. extension !!
+
+        txt <<"#{season_dir}/#{filename} -- #{msg}\n"
+        txt << "     in line >#{line}<\n"    unless line.empty?
+     end
+     txt << "```\n"
+   end
+
 
-  txt << footer
   txt
 end  # method build_summary
 
 end  ## class ScheduleReport
 end  ## module Rsssf
-
-## add (shortcut) alias
-RsssfScheduleReport = Rsssf::ScheduleReport
-

data/lib/rsssf/schedule.rb

@@ -1,31 +1,21 @@
-# encoding: utf-8
 
 module Rsssf
 
 class Schedule
 
-def self.from_string( txt )
-  self.new( txt )
-end
 
-attr_accessor :rounds     # track no of rounds
+#  attr_accessor :rounds     # track no of rounds - why? why not?
   
 def initialize( txt )
   @txt = txt
   
-  @rounds = nil   # undefined
+  ## @rounds = nil   # undefined
 end
 
 
-def save( path )
-  File.open( path, 'w' ) do |f|
-    f.write @txt
-  end    
+def save( path, header: )
+  write_text( path, header + @txt )
 end
 
 end  ## class Schedule
 end  ## module Rsssf
-
-## add (shortcut) alias
-RsssfSchedule = Rsssf::Schedule
-

data/lib/rsssf/utils.rb

@@ -1,75 +1,67 @@
-# encoding: utf-8
 
 module Rsssf
 module Utils
 
+
+## move to Page - why? why not?
+
 def year_from_file( path )
-  extname  = File.extname( path )
-  basename = File.basename( path, extname )  ## e.g. duit92.txt or duit92.html => duit92
+  ## e.g. duit92.txt or duit92.html => duit92
+  basename = File.basename( path, File.extname( path ))
   year_from_name( basename )
 end
 
 
-def year_from_name( name )
-  if name =~ /(\d+)/
-    digits = $1.to_s
-    num    = digits.to_i
 
-    if digits.size == 4   ## e.g. 1980 or 2011 etc.
-      num
-    elsif digits.size == 2  ## e.g. 00, 20 or 99 etc.
-      if num <= 16  ## assume 20xx for now from 00..16
-        2000+num
-      else               ## assume 19xx for now
-        1900+num
-      end
-    else
-      fail( "no year found in name #{name}; expected two or four digits")
-    end
-  else
-    fail( "no year found in name #{name}")
-  end
-end  # method year_from_name
 
+##  note - add lookbehind and lookahead for boundary NOT A NUMBER!!
+##     other will match 4 digits in 5 digits number etc.
+##                 or 2 digits in 3 digits number etc.
 
-def year_to_season( year )
+YEAR_FROM_NAME_RE = %r{ (?<! \d)       ## note - no digit before allowed
+                        (?:  \d{4}
+                           | \d{2} )
+                      (?! \d)        ## no digit after allowed
+                    }x
 
-  ## todo: require four digit years? why? why not??
+def year_from_name( name )
+  ## note - make sure it works for special case like:
+  ##             mex2-2010  !!!
+  ##   only match  two digits (YY) or four digits (YYYY)
 
-  ## e.g. 64   => 1963-64
-  ##      2011 => 2010-11   etc.
+  if m=YEAR_FROM_NAME_RE.match( name )
+    digits = m[0].to_s
+    num    = digits.to_i(10)
 
-  if year <= 16  ## assume 20xx for now from 00..16
-    year += 2000
-  elsif year <= 99
-    year += 1900
+    if digits.size == 4   ## e.g. 1980 or 2011 etc.
+         num
+    else ##  digits.size == 2  ## e.g. 00, 20 or 99 etc.
+        ## assume 20xx for now from 00..09
+        ## assume 19xx for 10..99
+        num <= 9 ?  2000+num : 1900+num
+    end
   else
-    # use as is; assume four digit year
-  end  
+    fail( "no year found in name #{name}; expected two or four digits")
+  end
+end  # method year_from_name
 
-  year_prev = year-1
 
-  "%4d-%02d" % [year_prev, year%100]   ## e.g. return 1974-75
-end
 
+def archive_dir_for_season( season )
+  season = Season( season )
 
-def archive_dir_for_year( year )
-  season = year_to_season( year )
-  if year <= 2010   # e.g. season 2009-10
+  if season < Season('2010')   # e.g. season 2009-10
     ## use archive folder (w/ 1980s etc)
     ## get decade folder
-    decade  = year-1
+    decade  = season.start_year     ## 1999/2000 2000
     decade -= decade % 10   ## turn 1987 into 1980 etc
-    "archive/#{decade}s/#{season}"
+    "archive/#{decade}s/#{season.to_path}"
   else
-    season 
+    season.to_path
   end
 end
 
 
+
 end  # module Utils
 end  # module Rsssf
-
-## add (shortcut) alias
-RsssfUtils = Rsssf::Utils
-

data/lib/rsssf/version.rb

@@ -1,10 +1,8 @@
-# encoding: utf-8
-
 
 module Rsssf
 
   MAJOR = 0
-  MINOR = 1
+  MINOR = 3
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
@@ -13,12 +11,15 @@ module Rsssf
   end
 
   def self.banner
-    "rsssf/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "rsssf/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+     File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
   end
 
-end # module Rsssf
+  def self.config_dir
+    "#{root}/config"
+  end
 
+end # module Rsssf

data/lib/rsssf.rb

@@ -1,34 +1,97 @@
-# encoding: utf-8
+$LOAD_PATH.unshift( '/sports/rubycocos/webclient/webclient/lib' )
+$LOAD_PATH.unshift( '/sports/rubycocos/webclient/webget/lib' )
 
-## stdlibs
-require 'pp'
-require 'yaml'
-require 'uri'
 
+## 3rd party (our own)
+require 'season/formats'   ## add season support
+require 'webget'           ## incl. webget, webcache, webclient, etc.
+
+require 'cocos'
+require_relative '_cocos_'    ## move/add to upstream!!!
 
-## 3rd party libs
-require 'textutils'      ## used for File.read_utf8 etc.
-require 'fetcher'        ## used for Fetcher::Worker.new.fetch etc.
 
 
 ## our own code
-require 'rsssf/version'    # note: let version always go first
+require_relative 'rsssf/version'    # note: let version always go first
+
+require_relative 'rsssf/utils'      # include Utils - goes first
+
+require_relative 'rsssf/download'
+
+require_relative 'rsssf/convert/convert'
+require_relative 'rsssf/convert/html_entities'
+require_relative 'rsssf/convert/html_to_txt'
+require_relative 'rsssf/convert/errata'
+require_relative 'rsssf/convert/html_to_txt/replace_heading'
+require_relative 'rsssf/convert/html_to_txt/replace_a_name'
+require_relative 'rsssf/convert/html_to_txt/replace_a_href'
+require_relative 'rsssf/convert/html_to_txt/replace_hr'
+require_relative 'rsssf/convert/html_to_txt/remove_emails'
+require_relative 'rsssf/convert/html_to_txt/beautify_anchors'
+require_relative 'rsssf/convert/html_to_txt/make_heading'
+
+
+require_relative 'rsssf/prepare/download'
+require_relative 'rsssf/prepare/convert'
+require_relative 'rsssf/prepare/convert-meta'
+require_relative 'rsssf/prepare/convert-links'
+require_relative 'rsssf/prepare/convert-postproc'
+require_relative 'rsssf/prepare/convert-navlines'
+
+
+
+require_relative 'rsssf/page'
+require_relative 'rsssf/page-meta'                  # e.g. Page.parse_meta( txt )
+require_relative 'rsssf/page-find_schedule.rb'
+
+require_relative 'rsssf/schedule'
+
+require_relative 'rsssf/reports/schedule'
+require_relative 'rsssf/reports/page'
+
+require_relative 'rsssf/project'   ### replace with projct
+
+require_relative 'rsssf/parse_schedules'
+
+
+
+###
+# fmtfix machinery
+
+
+require_relative 'rsssf/fmtfix/rounds'
+require_relative 'rsssf/fmtfix/dates_helpers'
+require_relative 'rsssf/fmtfix/dates'
+require_relative 'rsssf/fmtfix/headers'
+
+require_relative 'rsssf/fmtfix/fmtfix-base'
+require_relative 'rsssf/fmtfix/fmtfix'
+require_relative 'rsssf/fmtfix/errata'
+require_relative 'rsssf/fmtfix/score'
+require_relative 'rsssf/fmtfix/goals'
+require_relative 'rsssf/fmtfix/topscorers'
+require_relative 'rsssf/fmtfix/tables'
+require_relative 'rsssf/fmtfix/outline'
+require_relative 'rsssf/fmtfix/patch_headings'  ## or use outline_patch or such - why? why not?
+
+
 
-require 'rsssf/utils'      # include Utils - goes first
-require 'rsssf/html2txt'   # include Filters - goes first
 
-require 'rsssf/fetch'
-require 'rsssf/page'
-require 'rsssf/schedule'
-require 'rsssf/patch'
 
-require 'rsssf/reports/schedule'
-require 'rsssf/reports/page'
+#############
+## add (shortcut) alias(es)
+RsssfPage           = Rsssf::Page
+RsssfPageConverter  = Rsssf::PageConverter
+RsssfPageStat       = Rsssf::PageStat
+RsssfPageReport     = Rsssf::PageReport
 
-require 'rsssf/repo'
+RsssfSchedule       = Rsssf::Schedule
+RsssfScheduleStat   = Rsssf::ScheduleStat
+RsssfScheduleReport = Rsssf::ScheduleReport
 
+RsssfUtils          = Rsssf::Utils
 
 
 
 ## say hello
-puts Rsssf.banner   if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
+puts Rsssf.banner   ##  if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rsssf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logutils
+  name: cocos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: textutils
+  name: season-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fetcher
+  name: webget
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,63 +56,106 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '4.2'
 description: rsssf - tools 'n' scripts for RSSSF (Rec.Sport.Soccer Statistics Foundation)
   archive data
-email: opensport@googlegroups.com
+email: gerald.bauer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
+- config/groups_en.txt
+- config/rounds_en.txt
+- config/rounds_es.txt
+- config/rounds_misc.txt
 files:
-- ".gemtest"
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
+- config/groups_en.txt
+- config/rounds_en.txt
+- config/rounds_es.txt
+- config/rounds_misc.txt
+- lib/_cocos_.rb
 - lib/rsssf.rb
-- lib/rsssf/fetch.rb
-- lib/rsssf/html2txt.rb
+- lib/rsssf/convert/convert.rb
+- lib/rsssf/convert/errata.rb
+- lib/rsssf/convert/html_entities.rb
+- lib/rsssf/convert/html_to_txt.rb
+- lib/rsssf/convert/html_to_txt/beautify_anchors.rb
+- lib/rsssf/convert/html_to_txt/make_heading.rb
+- lib/rsssf/convert/html_to_txt/remove_emails.rb
+- lib/rsssf/convert/html_to_txt/replace_a_href.rb
+- lib/rsssf/convert/html_to_txt/replace_a_name.rb
+- lib/rsssf/convert/html_to_txt/replace_heading.rb
+- lib/rsssf/convert/html_to_txt/replace_hr.rb
+- lib/rsssf/download.rb
+- lib/rsssf/fmtfix/dates.rb
+- lib/rsssf/fmtfix/dates_helpers.rb
+- lib/rsssf/fmtfix/errata.rb
+- lib/rsssf/fmtfix/fmtfix-base.rb
+- lib/rsssf/fmtfix/fmtfix.rb
+- lib/rsssf/fmtfix/goals.rb
+- lib/rsssf/fmtfix/headers.rb
+- lib/rsssf/fmtfix/outline.rb
+- lib/rsssf/fmtfix/patch_headings.rb
+- lib/rsssf/fmtfix/rounds.rb
+- lib/rsssf/fmtfix/score.rb
+- lib/rsssf/fmtfix/tables.rb
+- lib/rsssf/fmtfix/topscorers.rb
+- lib/rsssf/page-find_schedule.rb
+- lib/rsssf/page-meta.rb
 - lib/rsssf/page.rb
-- lib/rsssf/patch.rb
-- lib/rsssf/repo.rb
+- lib/rsssf/parse_schedules.rb
+- lib/rsssf/prepare/convert-links.rb
+- lib/rsssf/prepare/convert-meta.rb
+- lib/rsssf/prepare/convert-navlines.rb
+- lib/rsssf/prepare/convert-postproc.rb
+- lib/rsssf/prepare/convert.rb
+- lib/rsssf/prepare/download.rb
+- lib/rsssf/project.rb
 - lib/rsssf/reports/page.rb
 - lib/rsssf/reports/schedule.rb
 - lib/rsssf/schedule.rb
 - lib/rsssf/utils.rb
 - lib/rsssf/version.rb
-- test/helper.rb
-- test/test_utils.rb
-homepage: https://github.com/sportdb/rsssf
+homepage: https://github.com/rsssf/scripts
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -122,16 +165,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: rsssf - tools 'n' scripts for RSSSF (Rec.Sport.Soccer Statistics Foundation)
   archive data