datafile 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62443719632bb6ef1b75ce5b79ef146e1ddca9b1
-  data.tar.gz: 5d39b5537c4f280cb395d2be2e9abec702d910b4
+  metadata.gz: 8afa4e20859ba348f32a1d45f7d385623146099d
+  data.tar.gz: 276cbc2838cd98a227af23ae3bced081b584ed05
 SHA512:
-  metadata.gz: 04882e94add84a5c478025535375760c21ea006714a1f6e3d8b92660d98477d460065306082ac4ebf321621c7782d99beac8ae0ab7f75f28c3d430ef80658e84
-  data.tar.gz: 1ece9f87e091abf9fb494777aaf626a647188a788b4ede359bfb0a940eb53dffb50db90e6354d59cb128b383a980968928ccbfdfcc86eacd8fef766f11bf55b7
+  metadata.gz: 6c59a27aa7fc14e30cc48cc0a16252eac83d08ccbea25e2008aa4f8bcf9c06fcff3a918ca3f831334532e55cda699466acb8e3d513ef5d41b2a973d9d001f2cb
+  data.tar.gz: a7ab8bf94cc1e1feb28ecdb3d2bb9e6a9de90c948a092501650726f18b08e8eaa1874e920fc966a6ea298c9b2bb4470110400f4b22e7f521f2d713497041e42b

data/Manifest.txt

@@ -2,6 +2,7 @@ HISTORY.md
 Manifest.txt
 README.md
 Rakefile
+data/football.txt
 lib/datafile.rb
 lib/datafile/builder.rb
 lib/datafile/builder2.rb
@@ -26,3 +27,4 @@ test/test_builder.rb
 test/test_builder2.rb
 test/test_file_dataset_registry.rb
 test/test_file_worker.rb
+test/test_football_dataset.rb

data/data/football.txt

@@ -0,0 +1,45 @@
+##########################################################
+# known football.db (openfootball) datasets (repos)
+
+#####################
+# -- Basics
+
+openfootball/stadiums
+openfootball/players
+openfootball/assocs
+
+##########################
+# -- National Teams
+
+openfootball/national-teams
+
+openfootball/world-cup
+openfootball/euro-cup
+openfootball/africa-cup
+openfootball/north-america-gold-cup
+openfootball/copa-america
+openfootball/confed-cup
+
+#########################
+# -- Clubs
+
+openfootball/clubs
+
+openfootball/eng-england
+openfootball/at-austria
+openfootball/de-deutschland
+openfootball/es-espana
+openfootball/it-italy
+openfootball/fr-france
+openfootball/ch-confoederatio-helvetica
+openfootball/europe-champions-league
+
+openfootball/major-league-soccer
+openfootball/mx-mexico
+openfootball/north-america-champions-league
+
+openfootball/br-brazil
+openfootball/copa-sudamericana
+openfootball/copa-libertadores
+
+openfootball/club-world-cup

data/lib/datafile.rb

@@ -26,6 +26,14 @@ require 'datafile/builder'
 require 'datafile/builder2'
 
 
+module Datafile
+  def self.data_path
+    "#{root}/data"
+  end
+end # module Datafile
+
+
+
 # say hello
 puts Datafile.banner    if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
 

data/lib/datafile/datasets/dataset.rb

@@ -1,5 +1,22 @@
 # encoding: utf-8
 
+
+############
+# fix: move global method to ??
+
+def read_known_datasets( path )
+    ary = []
+    lines = File.read( path )  ### fix: use File.read_utf8 ??
+    lines.each_line do |line|
+      ## skip blank and comments lines
+      next   if /^\s*#/ =~ line || /^\s*$/ =~ line
+
+      ary << line.strip
+    end
+    ary
+end
+
+
 module Datafile
 
 class Dataset
@@ -29,15 +46,46 @@ class WorldDataset < Dataset
   def file_worker()  WorldFileDataset.new( self ); end
 end  # class WorldDataset
 
+
+
 class FootballDataset < Dataset
-  def initialize( name, opts={} )
+
+  @@known_football_datasets = nil
+
+  def self.known_datasets
+    ## return array of known datasets
+    ### todo/fix - use \\= idiom - why, why not??
+    if @@known_football_datasets.nil?
+      @@known_football_datasets = read_known_datasets( "#{::Datafile.data_path}/football.txt" )
+    end
+    @@known_football_datasets
+  end
+
+
+  def initialize( name_easy, opts={} )
+
+    ## check if name include slash (e.g. /)
+    ##  - if not auto-add openfootball/ (default)
+    if name_easy.index( '/' ).nil?
+      name = "openfootball/#{name_easy}"
+    else
+      name = name_easy   ## just pass through for now
+    end
+
     super( name, opts )
+
+    ### check for known datasets; warn: if not known (might be a typo)
+    unless FootballDataset.known_datasets.include?( name )
+      ## todo: use logger - why, why not??
+      puts "*** warn: unknown football dataset '#{name}', typo ???"
+    end
   end
 
   def zip_worker()   FootballZipDataset.new( self );  end
   def file_worker()  FootballFileDataset.new( self ); end
 end # class FootballDataset
 
+
 class BeerDataset < Dataset
   def initialize( name, opts={} )
     super( name, opts )

data/lib/datafile/version.rb

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

data/test/datafile2/at.rb

@@ -3,12 +3,12 @@ puts "[eval] self in top = #{self.class.name}"
 
 task :at => :importbuiltin do
   puts "[eval] self in data (enter) = #{self.class.name}"
-  football 'openfootball/at-austria'
+  football 'at-austria'
   puts "[eval] self in data (leave) = #{self.class.name}"
 end
 
 task :at_2014_15 => :importbuiltin do
-  football 'openfootball/at-austria', setup: '2014-15'
+  football 'at-austria', setup: '2014-15'
 end
 
 

data/test/test_builder.rb

@@ -15,12 +15,12 @@ class TestBuilder < MiniTest::Test
 
   world  'openmundi/world.db', setup: 'countries'
 
-  football 'openfootball/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 'openfootball/world-cup', setup: '2014_quali'
+  ## football 'world-cup', setup: '2014_quali'
 
-  football 'openfootball/world-cup', setup: '2014'
+  football 'world-cup', setup: '2014'
 
 ## more comments
 

data/test/test_football_dataset.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_football_dataset.rb
+
+
+require 'helper'
+
+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' ) 
+    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/xxx', xxx.name
+    assert_equal 'openfootball/xxx', xxx2.name
+  end
+
+end # class TestFootballDataset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datafile
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -94,6 +94,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- data/football.txt
 - lib/datafile.rb
 - lib/datafile/builder.rb
 - lib/datafile/builder2.rb
@@ -118,6 +119,7 @@ files:
 - test/test_builder2.rb
 - test/test_file_dataset_registry.rb
 - test/test_file_worker.rb
+- test/test_football_dataset.rb
 homepage: https://github.com/rubylibs/datafile
 licenses:
 - Public Domain
@@ -148,4 +150,5 @@ 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