datafile 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8afa4e20859ba348f32a1d45f7d385623146099d
-  data.tar.gz: 276cbc2838cd98a227af23ae3bced081b584ed05
+  metadata.gz: 42277d01f83ab3de43b42c67bd360d8e33a4ec96
+  data.tar.gz: 0dbac9ee1f7dd981b82c661846b99fa4870fffb0
 SHA512:
-  metadata.gz: 6c59a27aa7fc14e30cc48cc0a16252eac83d08ccbea25e2008aa4f8bcf9c06fcff3a918ca3f831334532e55cda699466acb8e3d513ef5d41b2a973d9d001f2cb
-  data.tar.gz: a7ab8bf94cc1e1feb28ecdb3d2bb9e6a9de90c948a092501650726f18b08e8eaa1874e920fc966a6ea298c9b2bb4470110400f4b22e7f521f2d713497041e42b
+  metadata.gz: dfdf41d1c6110b5581b50e46b215bee08a92f0fefb5fbcdc8c7730f2bfdb00cd0f2c4934083996aed2a60a823a0b545240487e08e4909f6eb3612513fffb06db
+  data.tar.gz: 8ab664e96b5fa743818a45c80411618dd5dd245cbaad81270a1b27471320b47cd4f0eb3181d33a0f98def76fb2c6ee8a264827b97acbbd4c0af148f44089738d

data/lib/datafile/datasets/dataset.rb

@@ -38,7 +38,16 @@ end # class Dataset
 
 
 class WorldDataset < Dataset
-  def initialize( name, opts={} )
+  def initialize( name_easy, opts={} )
+
+    ## check if name include slash (e.g. /)
+    ##  - if not auto-add openmundi/ (default)
+    if name_easy.index( '/' ).nil?
+      name = "openmundi/#{name_easy}"
+    else
+      name = name_easy   ## just pass through for now
+    end
+
     super( name, opts )  ## todo/check: just juse super (e.g. pass along all params - why? why not?)
   end
   
@@ -87,7 +96,16 @@ end # class FootballDataset
 
 
 class BeerDataset < Dataset
-  def initialize( name, opts={} )
+  def initialize( name_easy, opts={} )
+
+    ## check if name include slash (e.g. /)
+    ##  - if not auto-add openbeer/ (default)
+    if name_easy.index( '/' ).nil?
+      name = "openbeer/#{name_easy}"
+    else
+      name = name_easy   ## just pass through for now
+    end
+
     super( name, opts )
   end
 

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 = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/datafile/eurocup.rb

@@ -1,6 +1,6 @@
 #####################
 # national teams
 
-football 'openfootball/national-teams'
-football 'openfootball/euro-cup'
+football 'national-teams'
+football 'euro-cup'
 

data/test/datafile/stadiums.rb

@@ -1,2 +1,3 @@
 
-football 'openfootball/stadiums'   ## NOTE: default is setup: 'all'
+football 'stadiums'   ## NOTE: default is setup: 'all'
+

data/test/datafile/world.rb

@@ -1,3 +1,3 @@
 
-world 'openmundi/world.db', setup: 'countries'
+world 'world.db', setup: 'countries'
 

data/test/test_builder.rb

@@ -13,7 +13,7 @@ class TestBuilder < MiniTest::Test
     code =<<EOS
 ## comments
 
-  world  'openmundi/world.db', setup: 'countries'
+  world  'world.db', setup: 'countries'
 
   football 'national-teams'      ## NOTE: default is setup: 'all'
   

data/test/test_football_dataset.rb

@@ -24,4 +24,31 @@ class TestFootballDataset < MiniTest::Test
     assert_equal 'openfootball/xxx', xxx2.name
   end
 
+  ## move to test datasets - why, why not ??
+  def test_world
+    at   = Datafile::WorldDataset.new( 'austria.db' )
+    at2  = Datafile::WorldDataset.new( 'openmundi/austria.db' ) 
+    xxx  = Datafile::WorldDataset.new( 'xxx' )
+    xxx2 = Datafile::WorldDataset.new( 'openmundi/xxx' )
+
+    assert_equal 'openmundi/austria.db', at.name
+    assert_equal 'openmundi/austria.db', at2.name
+
+    assert_equal 'openmundi/xxx', xxx.name
+    assert_equal 'openmundi/xxx', xxx2.name
+  end
+
+  def test_beer
+    at   = Datafile::BeerDataset.new( 'at-austria' )
+    at2  = Datafile::BeerDataset.new( 'openbeer/at-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/xxx', xxx.name
+    assert_equal 'openbeer/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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils