sportdb-readers 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ef30f6dc1204b1df60614e54b168559f825eea
-  data.tar.gz: 3018c5e2286a33d4e61e52dec18c19d7fe270963
+  metadata.gz: 46dc2a6de0074a2c9a5f007503f99d34030e4c80
+  data.tar.gz: e5cd5ae577346962dcb69361a11504fbe7540a22
 SHA512:
-  metadata.gz: 933b31be66b7b556d9f8704b413243d30106d199dd0338ecc8aa7beb86e2058b8498741d5ddb0266ab658597fbf11ff01c6a48a80dd77d06909af605c6c8810d
-  data.tar.gz: 98519ae33ae7f29b24e7dcf99ad8dd5cc5ade378faac6ea1834bacc99491910634488f18f03f30a5f06b2a783ce679d418cc1974dee7ae3ed8d73c44336a1def
+  metadata.gz: 54a9a0865d2d8af5a405f0cb9a64eea7bc2e7f6ea7cae870dded60dd51f38301c4f40b494a5833330f248b4b556daf17e81984ba8243cef3f170dd838565ef92
+  data.tar.gz: ee0035b74ada7e5d829f6778421e0c7be57728ac78aaa167edcebe44f93280310df9b09c7906580c9dca3a8b9d8360f9baf50959bbe0469a5bd3560187ee5837

data/Manifest.txt

@@ -6,7 +6,6 @@ lib/sportdb/readers.rb
 lib/sportdb/readers/conf_linter.rb
 lib/sportdb/readers/conf_parser_auto.rb
 lib/sportdb/readers/conf_reader.rb
-lib/sportdb/readers/datafile.rb
 lib/sportdb/readers/league_outline_reader.rb
 lib/sportdb/readers/match_linter.rb
 lib/sportdb/readers/match_parser.rb
@@ -16,6 +15,5 @@ lib/sportdb/readers/version.rb
 test/helper.rb
 test/test_conf_parser_auto.rb
 test/test_match_parser.rb
-test/test_package.rb
 test/test_read.rb
 test/test_reader.rb

data/lib/sportdb/readers.rb

@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-require 'zip'     ## todo/check: if zip is alreay included in a required module
-                  ## - move into sportdb-formats and add datafile!!!
-
-
 
 require 'sportdb/config'
 require 'sportdb/models'   ## add sql database support
@@ -20,7 +16,6 @@ require 'sportdb/readers/conf_linter'
 require 'sportdb/readers/match_parser'
 require 'sportdb/readers/match_reader'
 require 'sportdb/readers/match_linter'
-require 'sportdb/readers/datafile'
 require 'sportdb/readers/package'
 
 

data/lib/sportdb/readers/package.rb

@@ -4,12 +4,14 @@ module SportDb
 
     CONF_RE        = Datafile::CONF_RE
     CLUB_PROPS_RE  = Datafile::CLUB_PROPS_RE
-    LEAGUES_RE     = Datafile::LEAGUES_REGEX   ## todo/check: rename to _RE
-    CLUBS_RE       = Datafile::CLUBS_REGEX     ## todo/check: rename to _RE
+    LEAGUES_RE     = Datafile::LEAGUES_RE
+    CLUBS_RE       = Datafile::CLUBS_RE
 
 
     ## note: if pattern includes directory add here (otherwise move to more "generic" datafile) - why? why not?
-    MATCH_RE = %r{ /\d{4}-\d{2}        ## season folder e.g. /2019-20
+    MATCH_RE = %r{ /(?: \d{4}-\d{2}        ## season folder e.g. /2019-20
+                      | \d{4}              ## season year-only folder e.g. /2019
+                    )
                    /[a-z0-9_-]+\.txt$  ## txt e.g /1-premierleague.txt
                 }x
 

data/lib/sportdb/readers/version.rb

@@ -6,7 +6,7 @@ module Readers
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 4
-  PATCH = 6
+  PATCH = 7
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config
@@ -98,7 +98,6 @@ files:
 - lib/sportdb/readers/conf_linter.rb
 - lib/sportdb/readers/conf_parser_auto.rb
 - lib/sportdb/readers/conf_reader.rb
-- lib/sportdb/readers/datafile.rb
 - lib/sportdb/readers/league_outline_reader.rb
 - lib/sportdb/readers/match_linter.rb
 - lib/sportdb/readers/match_parser.rb
@@ -108,7 +107,6 @@ files:
 - test/helper.rb
 - test/test_conf_parser_auto.rb
 - test/test_match_parser.rb
-- test/test_package.rb
 - test/test_read.rb
 - test/test_reader.rb
 homepage: https://github.com/sportdb/sport.db

data/lib/sportdb/readers/datafile.rb

@@ -1,173 +0,0 @@
-
-
-module Datafile
-
-
-  ## todo/fix: move regex patterns upstream to datafile in sportdb-formats!!
-
-  CONF_RE  = %r{ /\.conf\.txt$
-               }x
-
-
-  CLUB_PROPS_RE = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
-                         (?:[a-z]{1,4}\.)?   # optional country code/key e.g. eng.clubs.props.txt
-                        clubs\.props\.txt$
-                     }x
-  def self.match_club_props( path, pattern: CLUB_PROPS_RE ) pattern.match( path ); end
-
-
-  ZIP_RE = %r{ \.zip$
-            }x
-  def self.match_zip( path, pattern: ZIP_RE ) pattern.match( path ); end
-
-
-
-  ## exclude pattern
-  ##  for now exclude all files in directories starting with a dot (e.g. .git/ or .github/ or .build/ etc.)
-  ##  todo/check: rename to EXCLUDE_DOT_DIRS_RE - why? why not?
-  EXCLUDE_RE = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
-                        \.[a-zA-Z0-9_-]+  ## (almost) any name BUT must start with dot e.g.  .git, .build, etc.
-                        /
-                     }x
-  def self.match_exclude( path, pattern: EXCLUDE_RE ) pattern.match( path ); end
-
-
-class Package; end    ## use a shared base class for DirPackage, ZipPackage, etc.
-
-class DirPackage < Package    ## todo/check: find a better name e.g. UnzippedPackage, FilesystemPackage, etc. - why? why not?
-class Entry
-  def initialize( pack, path )
-    @pack = pack  ## parent package
-    @path = path
-    ## todo/fix!!!!: calculate @name (cut-off pack.path!!!)
-    @name =  path
-  end
-  def name()  @name; end
-  def read()  File.open( @path, 'r:utf-8' ).read; end
-end  # class DirPackage::Entry
-
-
-  attr_reader :name, :path
-
-  def initialize( path )
-    ## todo/fix:  expand_path ?! - why? why not? if you pass in ./ basename will be . and NOT directory name, for example!!!
-    @path = path   ## rename to root_path or base_path or somehting - why? why not?
-
-    basename = File.basename( path )   ## note: ALWAYS keeps "extension"-like name if present (e.g. ./austria.zip => austria.zip)
-    @name = basename
-  end
-
-  def each( pattern:,  extension: 'txt' )    ## todo/check: rename to glob or something - why? why not?
-    ##   use just .* for extension or remove and check if File.file? and skip File.directory? - why? why not?
-    ## note: incl. files starting with dot (.)) as candidates (normally excluded with just *)
-    Dir.glob( "#{@path}/**/{*,.*}.#{extension}" ).each do |path|
-      ## todo/fix: (auto) skip and check for directories
-      if EXCLUDE_RE.match( path )
-        ## note: skip dot dirs (e.g. .build/, .git/, etc.)
-      elsif pattern.match( path )
-        yield( Entry.new( self, path ))
-      else
-        ## puts "  skipping >#{path}<"
-      end
-    end
-  end
-
-  def find( name )
-    Entry.new( self, "#{@path}/#{name}" )
-  end
-end  # class DirPackage
-
-
-## helper wrapper for datafiles in zips
-class ZipPackage < Package
-class Entry
-  def initialize( pack, entry )
-    @pack  = pack
-    @entry = entry
-  end
-
-  def name()  @entry.name; end
-  def read
-    txt = @entry.get_input_stream.read
-    ##  puts "** encoding: #{txt.encoding}"  #=> encoding: ASCII-8BIT
-    txt = txt.force_encoding( Encoding::UTF_8 )
-    txt
-  end
-end # class ZipPackage::Entry
-
-  attr_reader :name, :path
-
-  def initialize( path )
-    @path = path
-
-    extname  = File.extname( path )    ## todo/check: double check if extension is .zip - why? why not?
-    basename = File.basename( path, extname )
-    @name = basename
-  end
-
-  def each( pattern: )
-    Zip::File.open( @path ) do |zipfile|
-      zipfile.each do |entry|
-        if entry.directory?
-          next ## skip
-        elsif entry.file?
-          if EXCLUDE_RE.match( entry.name )
-            ## note: skip dot dirs (e.g. .build/, .git/, etc.)
-          elsif pattern.match( entry.name )
-            yield( Entry.new( self, entry ) )   # wrap entry in uniform access interface / api
-          else
-            ## puts "  skipping >#{entry.name}<"
-          end
-        else
-          puts "** !!! ERROR !!! #{entry.name} is unknown zip file type in >#{@path}<, sorry"
-          exit 1
-        end
-      end
-    end
-  end
-
-  def find( name )
-     entries = match_entry( name )
-     if entries.empty?
-       puts "** !!! ERROR !!! zip entry >#{name}< not found in >#{@path}<; sorry"
-       exit 1
-     elsif entries.size > 1
-       puts "** !!! ERROR !!! ambigious zip entry >#{name}<; found #{entries.size} entries in >#{@path}<:"
-       pp entries
-       exit 1
-     else
-       Entry.new( self, entries[0] )    # wrap entry in uniform access interface / api
-     end
-  end
-
-private
-  def match_entry( name )
-    ## todo/fix:  use Zip::File.glob or find_entry or something better/faster?  why? why not?
-
-    pattern = %r{ #{Regexp.escape( name )}    ## match string if ends with name
-                   $
-                }x
-
-    entries = []
-    Zip::File.open( @path ) do |zipfile|
-      zipfile.each do |entry|
-        if entry.directory?
-          next ## skip
-        elsif entry.file?
-          if EXCLUDE_RE.match( entry.name )
-            ## note: skip dot dirs (e.g. .build/, .git/, etc.)
-          elsif pattern.match( entry.name )
-            entries << entry
-          else
-            ## no match; skip too
-          end
-        else
-          puts "** !!! ERROR !!! #{entry.name} is unknown zip file type in >#{@path}<, sorry"
-          exit 1
-        end
-      end
-    end
-    entries
-  end
-end  # class ZipPackage
-end  # module Datafile

data/test/test_package.rb

@@ -1,41 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_package.rb
-
-
-require 'helper'
-
-
-class TestPackage < MiniTest::Test
-
-  def test_exclude
-    assert Datafile.match_exclude( '.build/' )
-    assert Datafile.match_exclude( '.git/' )
-
-    assert Datafile.match_exclude( '/.build/' )
-    assert Datafile.match_exclude( '/.git/' )
-
-    assert Datafile.match_exclude( '.build/leagues.txt' )
-    assert Datafile.match_exclude( '.git/leagues.txt' )
-
-    assert Datafile.match_exclude( '/.build/leagues.txt' )
-    assert Datafile.match_exclude( '/.git/leagues.txt' )
-  end
-
-  def test_read
-    [Datafile::DirPackage.new( '../../../openfootball/england' ),
-     Datafile::ZipPackage.new( 'tmp/england-master.zip' )].each do |eng|
-       assert eng.find( '2015-16/.conf.txt' ).read.start_with?( '= English Premier League 2015/16' )
-       assert eng.find( '2017-18/.conf.txt' ).read.start_with?( '= English Premier League 2017/18' )
-       assert eng.find( '2015-16/1-premierleague-i.txt' ).read.start_with?( '= English Premier League 2015/16' )
-    end
-
-    [Datafile::DirPackage.new( '../../../openfootball/austria' ),
-     Datafile::ZipPackage.new( 'tmp/austria-master.zip' )].each do |at|
-       assert at.find( '2018-19/.conf.txt' ).read.start_with?( '= Österr. Bundesliga 2018/19' )
-    end
-  end  # method test_read
-
-end  # class TestPackage