sportdb-readers 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b15f6d3dbaef2a2d05eca174b86731092ba54b6
-  data.tar.gz: 265e5151c0e81d1beaf5b7cad751f4abfef484e5
+  metadata.gz: a75121e5975c7428ee0ca635b90a1103d455d784
+  data.tar.gz: 80531e6bc8e447dc191527f0c2368cac99620b63
 SHA512:
-  metadata.gz: b943c21d84d36738e562e68a73f2a5de58e7ec693361ad74a96aa04d9ed0f9b5201c876cea62fae0d8daa532f090a6556ade2f78abfac3d12282c987f6710ef5
-  data.tar.gz: 66ee60adbd4ed8bfc34718d3520b24b5840e11193ffeb9f0fab83bc1fec9e7947febc0bc09bfa06123df0b310d1435d74310f5e9a422d3b0a4d0c25f689a5da2
+  metadata.gz: eb47f23f83386d6f3bcd9df958ca0e05379c23de572312fa8889ea5066afd9f8c94158b8dc3ad275704c7e557f930f23ffe2cbd0fd814a1357b5627086b964c2
+  data.tar.gz: e8ec9a04a9b2d6190924588206cb9e3ffe625e61a280825bdc79c5faa616a1ef3e717bffdcc722b73866dc2b4a0e68133380f773b3e1a0d45a16ad3a52e892b4

data/lib/sportdb/readers.rb

@@ -60,9 +60,9 @@ module SportDb
 
   def self.read( path, season: nil, sync: true )
     pack = if File.directory?( path )          ## if directory assume "unzipped" package
-              Package.new( path )
+              DirPackage.new( path )
            elsif File.file?( path ) && Datafile.match_zip( path )  ## check if file is a .zip (archive) file
-              Package.new( path )
+              ZipPackage.new( path )
            else                                ## no package; assume single (standalone) datafile
              nil
            end

data/lib/sportdb/readers/package.rb

@@ -10,19 +10,25 @@ module SportDb
                    /[a-z0-9_-]+\.txt$  ## txt e.g /1-premierleague.txt
                 }x
 
-    def initialize( path )
-      if !File.exist?( path )  ## file or directory
-        puts "** !!! ERROR !!! file NOT found >#{path}<; cannot open package"
-        exit 1
-      end
+    def initialize( path_or_pack )
+      if path_or_pack.is_a?( Datafile::DirPackage ) ||
+         path_or_pack.is_a?( Datafile::ZipPackage )
+        @pack = path_or_pack
+      else   ## assume it's a (string) path
+        path = path_or_pack
+        if !File.exist?( path )  ## file or directory
+          puts "** !!! ERROR !!! file NOT found >#{path}<; cannot open package"
+          exit 1
+        end
 
-      if File.directory?( path )
-        @pack = Datafile::DirPackage.new( path )     ## delegate to "generic" package
-      elsif File.file?( path ) && File.extname( path ) == '.zip'  # note: includes dot (.) eg .zip
-        @pack = Datafile::ZipPackage.new( path )
-      else
-        puts "** !!! ERROR !!! cannot open package - directory or file with .zip extension required"
-        exit 1
+        if File.directory?( path )
+          @pack = Datafile::DirPackage.new( path )     ## delegate to "generic" package
+        elsif File.file?( path ) && File.extname( path ) == '.zip'  # note: includes dot (.) eg .zip
+          @pack = Datafile::ZipPackage.new( path )
+        else
+          puts "** !!! ERROR !!! cannot open package - directory or file with .zip extension required"
+          exit 1
+        end
       end
     end
 
@@ -87,4 +93,14 @@ module SportDb
       end
     end
   end   # class Package
+
+
+  class DirPackage < Package
+    def initialize( path )   super( Datafile::DirPackage.new( path ) ); end
+  end
+
+  class ZipPackage < Package
+    def initialize( path )   super( Datafile::ZipPackage.new( path ) ); end
+  end
+
 end   # module SportDb

data/lib/sportdb/readers/version.rb

@@ -6,7 +6,7 @@ module Readers
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 3
-  PATCH = 3
+  PATCH = 4
   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.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config