datafile 0.2.5 → 0.3.0

data/test/test_builder.rb

@@ -15,8 +15,8 @@ class TestBuilder < MiniTest::Test
 
   world  'world.db', setup: 'countries'
 
-  football 'national-teams'      ## NOTE: default is setup: 'all'
-  
+  football 'national-teams'      ## NOTE: default is setup: 'all
+
   ### todo/fix: download archive only once(!!) even if included more than once
   ## football 'world-cup', setup: '2014_quali'
 
@@ -27,16 +27,16 @@ class TestBuilder < MiniTest::Test
 EOS
 
     builder = Datafile::Builder.load( code )
-    
+
     datafile = builder.datafile
-    ## datafile.run
-    ## datafile.download
-    ## datafile.read
-    
+    datafile.run
+
+    datafile.download
+    datafile.read
     datafile.dump
-    
+
     ## change worker (defaults to ZipWorker)
-    datafile.worker = Datafile::FileWorker.new( datafile )
+    datafile.worker = Datafile::FileWorker
     datafile.dump
 
     assert true  # if we get here - test success

data/test/test_file_dataset_registry.rb

@@ -13,10 +13,10 @@ class TestFileDatasetRegistry < MiniTest::Test
     registry = Datafile::FileDatasetRegistry.new
     registry.merge( openfootball: '../../openfootball' )
 
-    assert_equal '../../openfootball/at-austria', registry.lookup( 'openfootball/at-austria')
+    assert_equal '../../openfootball/austria',    registry.lookup( 'openfootball/austria')
     assert_equal '../../openmundi/world.db',      registry.lookup( 'openmundi/world.db' )
 
-    assert_equal '../../openfootball/at-austria', registry.lookup!( 'openfootball/at-austria')
+    assert_equal '../../openfootball/austria',    registry.lookup!( 'openfootball/austria')
     assert_equal '../../openmundi/world.db',      registry.lookup!( 'openmundi/world.db' )
 
     assert_equal '../../openfootball/national-teams', registry.lookup( 'openfootball/national-teams')
@@ -24,4 +24,3 @@ class TestFileDatasetRegistry < MiniTest::Test
   end
 
 end # class TestFileDatasetRegistry
-

data/test/test_file_worker.rb

@@ -21,19 +21,18 @@ class TestFileWorker < MiniTest::Test
     ActiveRecord::Base.establish_connection( adapter:  'sqlite3',
                                              database: ':memory:' )
     SportDb.create_all
-    SportDb.read_builtin
 
     ## change worker (defaults to ZipWorker)
-    world_datafile.worker = Datafile::FileWorker.new( world_datafile )
+    world_datafile.worker = Datafile::FileWorker
     world_datafile.dump
-    world_datafile.read
+##    world_datafile.read
 
     registry = Datafile::FileDataset.registry
     registry.merge( openfootball: '../../openfootball' )
 
-    eurocup_datafile.worker = Datafile::FileWorker.new( eurocup_datafile )
+    eurocup_datafile.worker = Datafile::FileWorker
     eurocup_datafile.dump
-    eurocup_datafile.read
+##    eurocup_datafile.read
 
     assert true  # if we get here - test success
   end

data/test/test_football_dataset.rb

@@ -12,13 +12,13 @@ class TestFootballDataset < MiniTest::Test
   def test_names
     pp Datafile::FootballDataset.known_datasets
 
-    at   = Datafile::FootballDataset.new( 'at-austria' )
-    at2  = Datafile::FootballDataset.new( 'openfootball/at-austria' ) 
+    at   = Datafile::FootballDataset.new( 'austria' )
+    at2  = Datafile::FootballDataset.new( 'openfootball/austria' )
     xxx  = Datafile::FootballDataset.new( 'xxx' )
     xxx2 = Datafile::FootballDataset.new( 'openfootball/xxx' )
 
-    assert_equal 'openfootball/at-austria', at.name
-    assert_equal 'openfootball/at-austria', at2.name
+    assert_equal 'openfootball/austria', at.name
+    assert_equal 'openfootball/austria', at2.name
 
     assert_equal 'openfootball/xxx', xxx.name
     assert_equal 'openfootball/xxx', xxx2.name
@@ -27,7 +27,7 @@ class TestFootballDataset < MiniTest::Test
   ## move to test datasets - why, why not ??
   def test_world
     at   = Datafile::WorldDataset.new( 'austria.db' )
-    at2  = Datafile::WorldDataset.new( 'openmundi/austria.db' ) 
+    at2  = Datafile::WorldDataset.new( 'openmundi/austria.db' )
     xxx  = Datafile::WorldDataset.new( 'xxx' )
     xxx2 = Datafile::WorldDataset.new( 'openmundi/xxx' )
 
@@ -39,13 +39,13 @@ class TestFootballDataset < MiniTest::Test
   end
 
   def test_beer
-    at   = Datafile::BeerDataset.new( 'at-austria' )
-    at2  = Datafile::BeerDataset.new( 'openbeer/at-austria' )
+    at   = Datafile::BeerDataset.new( 'austria' )
+    at2  = Datafile::BeerDataset.new( 'openbeer/austria' )
     xxx  = Datafile::BeerDataset.new( 'xxx' )
     xxx2 = Datafile::BeerDataset.new( 'openbeer/xxx' )
 
-    assert_equal 'openbeer/at-austria', at.name
-    assert_equal 'openbeer/at-austria', at2.name
+    assert_equal 'openbeer/austria', at.name
+    assert_equal 'openbeer/austria', at2.name
 
     assert_equal 'openbeer/xxx', xxx.name
     assert_equal 'openbeer/xxx', xxx2.name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datafile
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -72,51 +58,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: datafile - builder for downloading n reading datasets
 email: opensport@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
 - data/football.txt
 - lib/datafile.rb
 - lib/datafile/builder.rb
-- lib/datafile/builder2.rb
 - lib/datafile/datafile.rb
-- lib/datafile/datasets/dataset.rb
+- lib/datafile/dataset.rb
 - lib/datafile/version.rb
-- lib/datafile/workers/dataset.rb
 - lib/datafile/workers/file/dataset.rb
 - lib/datafile/workers/file/registry.rb
 - lib/datafile/workers/file/worker.rb
-- lib/datafile/workers/zip/beer.rb
 - lib/datafile/workers/zip/dataset.rb
-- lib/datafile/workers/zip/football.rb
 - lib/datafile/workers/zip/worker.rb
-- lib/datafile/workers/zip/world.rb
 - test/datafile/eurocup.rb
 - test/datafile/stadiums.rb
 - test/datafile/world.rb
-- test/datafile2/at.rb
 - test/helper.rb
 - test/test_builder.rb
-- test/test_builder2.rb
 - test/test_file_dataset_registry.rb
 - test/test_file_worker.rb
 - test/test_football_dataset.rb
@@ -134,7 +112,7 @@ 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:
   - - ">="
@@ -142,13 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: datafile - builder for downloading n reading datasets
-test_files:
-- test/test_builder2.rb
-- test/test_builder.rb
-- test/test_file_dataset_registry.rb
-- test/test_football_dataset.rb
-- test/test_file_worker.rb
+test_files: []

data/lib/datafile/builder2.rb

@@ -1,90 +0,0 @@
-# encoding: utf-8
-
-module Datafile
-
-
-###
-##  check/todo: rename to BatchBuilder, MultiBuilder,etc - find better name - why, why not??
-
-class BuilderEx
-
-  def self.load_file( path )
-    code = File.read_utf8( path )
-    self.load( code )
-  end
-
-  def self.load( code )
-    builder = BuilderEx.new
-    builder.instance_eval( code )
-    builder
-  end
-
-
-  include LogUtils::Logging
-
-  def initialize
-    @datafiles = []
-    @datafile = nil
-  end
-
-  attr_reader :datafiles
-
-
-  def task( arg )
-
-    logger.info( "[builder] add task '#{arg.inspect}' : #{arg.class.name}" )
-
-    if arg.kind_of?( String ) || arg.kind_of?( Symbol )   # e.g. 'at' or :at
-      name = arg.to_s
-      ## note: always default to FileWorker for now
-      ##  -- use file: true -- find better name e.g. worker/source: file - why? why not??
-      @datafile = Datafile.new( name: name, deps: [], file: true )
-      yield  ### execute block in context
-       ## b = Builder.new
-       ## block.call( b )  ## same as b.instance_eval( &block) ???
-       ## b.instance_eval( code )
-       ## b = Builder.load( &block )
-    elsif arg.kind_of?( Hash )  ## Hash  e.g. :at_calc => :at etc.
-      key   = arg.keys.first
-      value = arg[key]   ## todo: check if single value? always turn into array
-
-      name  = key.to_s   ## get first key (assume it's name)
-      if value.kind_of?( Array )
-        deps = value.map { |v| v.to_s }   ## convert to strings
-      else  ## assume single string/symbol -- convert to array
-        deps = [value.to_s]
-      end
-      @datafile = Datafile.new( name: name, deps: deps, file: true )  ## note: always default to FileWorker for now
-      yield   ### execute block in context
-      ## to be done
-    else
-      ## fix: report error: unknown type
-    end
-
-    @datafiles << @datafile
-  end
-
-  def calc( &block )
-    logger.info( "[builder] add script calc-block" )
-    @datafile.scripts << Script.new( block )
-  end
-
-  ################################
-  # "classic/standard" datasets
-  def beer( name, opts={} )
-    logger.info( "[builder] add beer-dataset '#{name}'" )
-    @datafile.datasets << BeerDataset.new( name, opts )
-  end
-
-  def football( name, opts={} )
-    logger.info( "[builder] add football-dataset '#{name}'" )
-    @datafile.datasets << FootballDataset.new( name, opts )
-  end
-
-  def world( name, opts={} )
-    logger.info( "[builder] add world-dataset '#{name}'" )
-    @datafile.datasets << WorldDataset.new( name, opts )
-  end
-
-end # class Builder2
-end # module Datafile

data/lib/datafile/workers/dataset.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-module Datafile
-
-class Error < StandardError
-end
-
-####
-# todo/check:
-# rename to DatasetNotFound or similar??
-# use "common" error class - why? why not?
-class DatasetNotFoundError < Error
-  attr_reader :message
-
-  def initialize( message )
-    @message = message
-  end
-
-  def to_s
-    "datset not found => #{@message}"
-  end
-end
-
-
-class DatasetNode     ### find a better name (e.g. DatasetWorker, DatasetBase, DatasetRef, DatasetWrapper ???) ???
-
-  include LogUtils::Logging
-
-  def initialize( dataset )
-    @dataset = dataset
-  end
-
-  def name()  @dataset.name;  end
-  def opts()  @dataset.opts;  end
-  def setup() @dataset.setup; end
-
-end # class DatasetNode
-
-
-end # module Datafile

data/lib/datafile/workers/zip/beer.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-module Datafile
-
-class BeerZipDataset < ZipDataset
-
-  def initialize( dataset )
-    super( dataset )
-  end
-
-  def read
-    logger.info( "read beer-dataset (zip) '#{name}', '#{setup}'" )
-
-    BeerDb.read_setup_from_zip( local_zip_name, setup, local_zip_root )
-  end
-end  # class BeerZipDataset
-
-end # module Datafile

data/lib/datafile/workers/zip/football.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-module Datafile
-
-class FootballZipDataset < ZipDataset
-
-  def initialize( dataset )
-    super( dataset )
-  end
-
-  def read
-    logger.info( "read football-dataset (zip) '#{name}', '#{setup}'" )
-
-    SportDb.read_setup_from_zip( local_zip_name, setup, local_zip_root )
-  end
-end  # class FootballZipDataset
-
-end # module Datafile

data/lib/datafile/workers/zip/world.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-module Datafile
-
-class WorldZipDataset < ZipDataset
-
-  def initialize( dataset )
-    super( dataset )
-  end
-
-  def read
-    logger.info( "read world-dataset (zip) '#{name}', '#{setup}'" )
-
-    WorldDb.read_setup_from_zip( local_zip_name, setup, local_zip_root, { skip_tags: true } )
-  end
-end  # class WorldZipDataset
-
-end # module Datafile

data/test/datafile2/at.rb

@@ -1,51 +0,0 @@
-
-puts "[eval] self in top = #{self.class.name}"
-
-task :at => :importbuiltin do
-  puts "[eval] self in data (enter) = #{self.class.name}"
-  football 'at-austria'
-  puts "[eval] self in data (leave) = #{self.class.name}"
-end
-
-task :at_2014_15 => :importbuiltin do
-  football 'at-austria', setup: '2014-15'
-end
-
-
-task :at_recalc => :at do
-  calc do
-    [['at.2012/13'],
-     ['at.2013/14'],
-     ['at.2014/15', 'at.2.2014/15']].each do |event_key|
-       recalc_standings( event_key, out_root: './build/at-autria' )
-    end
-  end
-end
-
-task :at_2014_15_recalc => :at_2014_15 do
-  calc do
-    recalc_standings( ['at.2014/15', 'at.2.2014/15'], out_root: './build/at-autria' )
-  end
-end
-
-
-task :test_at_recalc => :env  do
-  calc do
-    recalc_standings( ['at.2014/15', 'at.2.2014/15'], out_root: './build/at-autria' )
-    ## debug verison - write to ./build/at-austria 
-    ## recalc_standings( ['at.2014/15', 'at.2.2014/15'], out_root: './build/at-austria' )
-  end
-end
-
-
-## check if method def works too
-
-puts "[eval] another self in top = #{self.class.name}"
-
-
-def test_hello()
-  puts "[eval] self in method test_hello = #{self.class.name}"
-  puts "hello from test_hello"  
-end
-
-test_hello()